[haiku-commits] haiku: hrev45117 - src/preferences/appearance

From: humdingerb@xxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 1 Jan 2013 17:49:28 +0100 (CET)
hrev45117 adds 1 changeset to branch 'master'
old head: 5745a40dd1813a745fc4b899862597c3f618ef6c
new head: 612ab9791896498800cce95a52d2a50f61f6b78f
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=612ab97+%5E5745a40

----------------------------------------------------------------------------

612ab97: Re-arranged tabs
  
  Pu the tabs back in the order it used to be. "Fonts" and "Colors"
  are probably changed more often than "Look and feel".
  
  Also re-arranged a few lines of code to reflect that order and sorted
  the includes.

                                        [ Humdinger <humdingerb@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev45117
Commit:      612ab9791896498800cce95a52d2a50f61f6b78f
URL:         http://cgit.haiku-os.org/haiku/commit/?id=612ab97
Author:      Humdinger <humdingerb@xxxxxxxxx>
Date:        Tue Jan  1 16:44:25 2013 UTC

----------------------------------------------------------------------------

1 file changed, 15 insertions(+), 15 deletions(-)
src/preferences/appearance/APRWindow.cpp | 30 ++++++++++++++--------------

----------------------------------------------------------------------------

diff --git a/src/preferences/appearance/APRWindow.cpp 
b/src/preferences/appearance/APRWindow.cpp
index 61203bc..87afe94 100644
--- a/src/preferences/appearance/APRWindow.cpp
+++ b/src/preferences/appearance/APRWindow.cpp
@@ -21,9 +21,9 @@
 
 #include "AntialiasingSettingsView.h"
 #include "APRView.h"
-#include "LookAndFeelSettingsView.h"
 #include "defs.h"
 #include "FontView.h"
+#include "LookAndFeelSettingsView.h"
 
 
 #undef B_TRANSLATION_CONTEXT
@@ -50,19 +50,19 @@ APRWindow::APRWindow(BRect frame)
 
        BTabView* tabView = new BTabView("tabview", B_WIDTH_FROM_LABEL);
 
-       fLookAndFeelSettings = new LookAndFeelSettingsView(
-               B_TRANSLATE("Look and feel"));
-
        fFontSettings = new FontView(B_TRANSLATE("Fonts"));
 
        fColorsView = new APRView(B_TRANSLATE("Colors"));
 
+       fLookAndFeelSettings = new LookAndFeelSettingsView(
+               B_TRANSLATE("Look and feel"));
+
        fAntialiasingSettings = new AntialiasingSettingsView(
                B_TRANSLATE("Antialiasing"));
 
-       tabView->AddTab(fLookAndFeelSettings);
        tabView->AddTab(fFontSettings);
        tabView->AddTab(fColorsView);
+       tabView->AddTab(fLookAndFeelSettings);
        tabView->AddTab(fAntialiasingSettings);
 
        _UpdateButtons();
@@ -91,8 +91,8 @@ APRWindow::MessageReceived(BMessage *message)
                case kMsgSetDefaults:
                        fFontSettings->SetDefaults();
                        fColorsView->SetDefaults();
-                       fAntialiasingSettings->SetDefaults();
                        fLookAndFeelSettings->SetDefaults();
+                       fAntialiasingSettings->SetDefaults();
 
                        _UpdateButtons();
                        break;
@@ -100,8 +100,8 @@ APRWindow::MessageReceived(BMessage *message)
                case kMsgRevert:
                        fColorsView->Revert();
                        fAntialiasingSettings->Revert();
-                       fFontSettings->Revert();
                        fLookAndFeelSettings->Revert();
+                       fFontSettings->Revert();
 
                        _UpdateButtons();
                        break;
@@ -128,10 +128,10 @@ APRWindow::_IsDefaultable() const
 //     printf("colors defaultable: %d\n", fColorsView->IsDefaultable());
 //     printf("AA defaultable: %d\n", fAntialiasingSettings->IsDefaultable());
 //     printf("decor defaultable: %d\n", 
fLookAndFeelSettings->IsDefaultable());
-       return fColorsView->IsDefaultable()
-               || fFontSettings->IsDefaultable()
-               || fAntialiasingSettings->IsDefaultable()
-               || fLookAndFeelSettings->IsDefaultable();
+       return fFontSettings->IsDefaultable()
+               || fColorsView->IsDefaultable()
+               || fLookAndFeelSettings->IsDefaultable()
+               || fAntialiasingSettings->IsDefaultable();
 }
 
 
@@ -142,8 +142,8 @@ APRWindow::_IsRevertable() const
 //     printf("colors revertable: %d\n", fColorsView->IsRevertable());
 //     printf("AA revertable: %d\n", fAntialiasingSettings->IsRevertable());
 //     printf("decor revertable: %d\n", fLookAndFeelSettings->IsRevertable());
-       return fColorsView->IsRevertable()
-               || fFontSettings->IsRevertable()
-               || fAntialiasingSettings->IsRevertable()
-               || fLookAndFeelSettings->IsRevertable();
+       return fFontSettings->IsRevertable()
+               || fColorsView->IsRevertable()
+               || fLookAndFeelSettings->IsRevertable()
+               || fAntialiasingSettings->IsRevertable();
 }
[haiku-commits] haiku: hrev45117 - src/preferences/appearance

Other related posts:
