From cca6cae659cc8ab5bbacaf49c35d95e40e4d7f88 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 10 Nov 2014 09:54:08 +0100 Subject: [PATCH] Terminal preferences: replace "Cancel" with "Revert" This is the standard way in Haiku preference panels. --- src/apps/terminal/AppearPrefView.cpp | 21 ++++++--------------- src/apps/terminal/PrefWindow.cpp | 9 +++++---- src/apps/terminal/PrefWindow.h | 2 ++ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp index 2308779b4d..b51fd79ac6 100644 --- a/src/apps/terminal/AppearPrefView.cpp +++ b/src/apps/terminal/AppearPrefView.cpp @@ -152,16 +152,7 @@ AppearancePrefView::AppearancePrefView(const char* name, fColorField->SetAlignment(B_ALIGN_RIGHT); fColorSchemeField->SetAlignment(B_ALIGN_RIGHT); - fTabTitle->SetText(PrefHandler::Default()->getString(PREF_TAB_TITLE)); - fWindowTitle->SetText(PrefHandler::Default()->getString(PREF_WINDOW_TITLE)); - - fColorControl->SetValue( - PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR)); - - fBlinkCursor->SetValue(PrefHandler::Default()->getBool(PREF_BLINK_CURSOR)); - fBrightInsteadOfBold->SetValue(PrefHandler::Default()->getBool( - PREF_BRIGHT_INSTEAD_OF_BOLD)); - fWarnOnExit->SetValue(PrefHandler::Default()->getBool(PREF_WARN_ON_EXIT)); + Revert(); BTextControl* redInput = (BTextControl*)fColorControl->ChildAt(0); BTextControl* greenInput = (BTextControl*)fColorControl->ChildAt(1); @@ -192,12 +183,12 @@ AppearancePrefView::Revert() fTabTitle->SetText(pref->getString(PREF_TAB_TITLE)); fWindowTitle->SetText(pref->getString(PREF_WINDOW_TITLE)); - fWarnOnExit->SetValue(pref->getBool( - PREF_WARN_ON_EXIT)); + fBlinkCursor->SetValue(pref->getBool(PREF_BLINK_CURSOR)); + fBrightInsteadOfBold->SetValue(pref->getBool(PREF_BRIGHT_INSTEAD_OF_BOLD)); + fWarnOnExit->SetValue(pref->getBool(PREF_WARN_ON_EXIT)); - fColorSchemeField->Menu()->ItemAt(0)->SetMarked(true); - fColorControl->SetValue(pref-> - getRGB(PREF_TEXT_FORE_COLOR)); + _SetCurrentColorScheme(); + fColorControl->SetValue(pref->getRGB(PREF_TEXT_FORE_COLOR)); const char* family = pref->getString(PREF_HALF_FONT_FAMILY); const char* style = pref->getString(PREF_HALF_FONT_STYLE); diff --git a/src/apps/terminal/PrefWindow.cpp b/src/apps/terminal/PrefWindow.cpp index ea1785e8de..4a93b6fed5 100644 --- a/src/apps/terminal/PrefWindow.cpp +++ b/src/apps/terminal/PrefWindow.cpp @@ -44,15 +44,15 @@ PrefWindow::PrefWindow(const BMessenger& messenger) BLayoutBuilder::Group<>(this, B_VERTICAL) .AddGroup(B_VERTICAL) .SetInsets(10, 10, 10, 10) - .Add(new AppearancePrefView(B_TRANSLATE("Appearance"), - fTerminalMessenger)) + .Add(fAppearanceView = new AppearancePrefView( + B_TRANSLATE("Appearance"), fTerminalMessenger)) .AddGroup(B_HORIZONTAL) .Add(fSaveAsFileButton = new BButton("savebutton", B_TRANSLATE("Save to file" B_UTF8_ELLIPSIS), new BMessage(MSG_SAVEAS_PRESSED), B_WILL_DRAW)) .AddGlue() .Add(fRevertButton = new BButton("revertbutton", - B_TRANSLATE("Cancel"), new BMessage(MSG_REVERT_PRESSED), + B_TRANSLATE("Revert"), new BMessage(MSG_REVERT_PRESSED), B_WILL_DRAW)) .Add(fSaveButton = new BButton("okbutton", B_TRANSLATE("OK"), new BMessage(MSG_SAVE_PRESSED), B_WILL_DRAW)) @@ -162,6 +162,8 @@ PrefWindow::_Revert() fTerminalMessenger.SendMessage(MSG_TAB_TITLE_SETTING_CHANGED); fTerminalMessenger.SendMessage(MSG_WINDOW_TITLE_SETTING_CHANGED); + fAppearanceView->Revert(); + fDirty = false; } } @@ -182,7 +184,6 @@ PrefWindow::MessageReceived(BMessage* msg) case MSG_REVERT_PRESSED: _Revert(); - PostMessage(B_QUIT_REQUESTED); break; case MSG_PREF_MODIFIED: diff --git a/src/apps/terminal/PrefWindow.h b/src/apps/terminal/PrefWindow.h index 3dea594989..87edcc391e 100644 --- a/src/apps/terminal/PrefWindow.h +++ b/src/apps/terminal/PrefWindow.h @@ -53,6 +53,8 @@ class PrefWindow : public BWindow *fRevertButton, *fSaveButton; + AppearancePrefView *fAppearanceView; + bool fDirty; BMessenger fTerminalMessenger; };