i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-arranged tabs

Browse Source 
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.
This commit is contained in:
Humdinger
2013-01-01 17:44:25 +01:00
parent 5745a40dd1
commit 612ab97918
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/appearance/APRWindow.cpp
+15 -15
View File
@@ -21,9 +21,9 @@
#include "AntialiasingSettingsView.h" #include "AntialiasingSettingsView.h"
#include "APRView.h" #include "APRView.h"
#include "LookAndFeelSettingsView.h"
#include "defs.h" #include "defs.h"
#include "FontView.h" #include "FontView.h"
#include "LookAndFeelSettingsView.h"
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
@@ -50,19 +50,19 @@ APRWindow::APRWindow(BRect frame)
BTabView* tabView = new BTabView("tabview", B_WIDTH_FROM_LABEL); BTabView* tabView = new BTabView("tabview", B_WIDTH_FROM_LABEL);
fLookAndFeelSettings = new LookAndFeelSettingsView(
B_TRANSLATE("Look and feel"));
fFontSettings = new FontView(B_TRANSLATE("Fonts")); fFontSettings = new FontView(B_TRANSLATE("Fonts"));
fColorsView = new APRView(B_TRANSLATE("Colors")); fColorsView = new APRView(B_TRANSLATE("Colors"));
fLookAndFeelSettings = new LookAndFeelSettingsView(
B_TRANSLATE("Look and feel"));
fAntialiasingSettings = new AntialiasingSettingsView( fAntialiasingSettings = new AntialiasingSettingsView(
B_TRANSLATE("Antialiasing")); B_TRANSLATE("Antialiasing"));
tabView->AddTab(fLookAndFeelSettings);
tabView->AddTab(fFontSettings); tabView->AddTab(fFontSettings);
tabView->AddTab(fColorsView); tabView->AddTab(fColorsView);
tabView->AddTab(fLookAndFeelSettings);
tabView->AddTab(fAntialiasingSettings); tabView->AddTab(fAntialiasingSettings);
_UpdateButtons(); _UpdateButtons();
@@ -91,8 +91,8 @@ APRWindow::MessageReceived(BMessage *message)
case kMsgSetDefaults: case kMsgSetDefaults:
fFontSettings->SetDefaults(); fFontSettings->SetDefaults();
fColorsView->SetDefaults(); fColorsView->SetDefaults();
fAntialiasingSettings->SetDefaults();
fLookAndFeelSettings->SetDefaults(); fLookAndFeelSettings->SetDefaults();
fAntialiasingSettings->SetDefaults();
_UpdateButtons(); _UpdateButtons();
break; break;
@@ -100,8 +100,8 @@ APRWindow::MessageReceived(BMessage *message)
case kMsgRevert: case kMsgRevert:
fColorsView->Revert(); fColorsView->Revert();
fAntialiasingSettings->Revert(); fAntialiasingSettings->Revert();
fFontSettings->Revert();
fLookAndFeelSettings->Revert(); fLookAndFeelSettings->Revert();
fFontSettings->Revert();
_UpdateButtons(); _UpdateButtons();
break; break;
@@ -128,10 +128,10 @@ APRWindow::_IsDefaultable() const
// printf("colors defaultable: %d\n", fColorsView->IsDefaultable()); // printf("colors defaultable: %d\n", fColorsView->IsDefaultable());
// printf("AA defaultable: %d\n", fAntialiasingSettings->IsDefaultable()); // printf("AA defaultable: %d\n", fAntialiasingSettings->IsDefaultable());
// printf("decor defaultable: %d\n", fLookAndFeelSettings->IsDefaultable()); // printf("decor defaultable: %d\n", fLookAndFeelSettings->IsDefaultable());
return fColorsView->IsDefaultable() return fFontSettings->IsDefaultable()
|| fFontSettings->IsDefaultable() || fColorsView->IsDefaultable()
|| fAntialiasingSettings->IsDefaultable() || fLookAndFeelSettings->IsDefaultable()
|| fLookAndFeelSettings->IsDefaultable(); || fAntialiasingSettings->IsDefaultable();
} }
@@ -142,8 +142,8 @@ APRWindow::_IsRevertable() const
// printf("colors revertable: %d\n", fColorsView->IsRevertable()); // printf("colors revertable: %d\n", fColorsView->IsRevertable());
// printf("AA revertable: %d\n", fAntialiasingSettings->IsRevertable()); // printf("AA revertable: %d\n", fAntialiasingSettings->IsRevertable());
// printf("decor revertable: %d\n", fLookAndFeelSettings->IsRevertable()); // printf("decor revertable: %d\n", fLookAndFeelSettings->IsRevertable());
return fColorsView->IsRevertable() return fFontSettings->IsRevertable()
|| fFontSettings->IsRevertable() || fColorsView->IsRevertable()
|| fAntialiasingSettings->IsRevertable() || fLookAndFeelSettings->IsRevertable()
|| fLookAndFeelSettings->IsRevertable(); || fAntialiasingSettings->IsRevertable();
} }