Terminal preferences: replace "Cancel" with "Revert"

This is the standard way in Haiku preference panels.

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));
+	Revert();
-	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));
 
 	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(
+	fBlinkCursor->SetValue(pref->getBool(PREF_BLINK_CURSOR));
-		PREF_WARN_ON_EXIT));
+	fBrightInsteadOfBold->SetValue(pref->getBool(PREF_BRIGHT_INSTEAD_OF_BOLD));
+	fWarnOnExit->SetValue(pref->getBool(PREF_WARN_ON_EXIT));
 
-	fColorSchemeField->Menu()->ItemAt(0)->SetMarked(true);
+	_SetCurrentColorScheme();
-	fColorControl->SetValue(pref->
+	fColorControl->SetValue(pref->getRGB(PREF_TEXT_FORE_COLOR));
-		getRGB(PREF_TEXT_FORE_COLOR));
 
 	const char* family = pref->getString(PREF_HALF_FONT_FAMILY);
 	const char* style = pref->getString(PREF_HALF_FONT_STYLE);

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"),
+			.Add(fAppearanceView = new AppearancePrefView(
-				fTerminalMessenger))
+				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:

src/apps/terminal/PrefWindow.h

@@ -53,6 +53,8 @@ class PrefWindow : public BWindow
 						*fRevertButton,
 						*fSaveButton;
 
+		AppearancePrefView	*fAppearanceView;
+
 		bool			fDirty;
 		BMessenger		fTerminalMessenger;
 };