From 5211ae5d68901d91974081997fcd9cb2ee733b4b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Thu, 27 Nov 2014 10:53:16 +0100
Subject: [PATCH] Terminal: use BPopUpMenu in BMenuFields.

Using a BMenu works, but it doesn't look as good.
Thanks to Diver for noticing this.
---
 src/apps/terminal/AppearPrefView.cpp | 15 ++++++++---
 src/apps/terminal/TermWindow.cpp     | 38 ++++++++++++----------------
 src/apps/terminal/TermWindow.h       |  4 +--
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp
index bad6929ace..ceb1c05bf3 100644
--- a/src/apps/terminal/AppearPrefView.cpp
+++ b/src/apps/terminal/AppearPrefView.cpp
@@ -102,12 +102,19 @@ AppearancePrefView::AppearancePrefView(const char* name,
 		PrefHandler::Default()->getString(PREF_HALF_FONT_STYLE));
 	fFontField = new BMenuField(B_TRANSLATE("Font:"), fontMenu);
 
-	BMenu* sizeMenu = TermWindow::MakeWindowSizeMenu();
-	sizeMenu->SetLabelFromMarked(true);
+	BMenu* sizeMenu = new (std::nothrow) BPopUpMenu(
+		B_TRANSLATE_COMMENT("Custom", "Window size"));
+	if (sizeMenu != NULL) {
+		TermWindow::MakeWindowSizeMenu(sizeMenu);
+		sizeMenu->SetLabelFromMarked(true);
+	}
 	fWindowSizeField = new BMenuField(B_TRANSLATE("Window size:"), sizeMenu);
 
-	BMenu* encodingMenu = TermWindow::MakeEncodingMenu();
-	encodingMenu->SetLabelFromMarked(true);
+	BMenu* encodingMenu = new (std::nothrow) BPopUpMenu("Text encoding");
+	if (encodingMenu != NULL) {
+		TermWindow::MakeEncodingMenu(encodingMenu);
+		encodingMenu->SetLabelFromMarked(true);
+	}
 	fEncodingField = new BMenuField(B_TRANSLATE("Encoding:"), encodingMenu);
 
 	BPopUpMenu* schemesPopUp = _MakeColorSchemeMenu(MSG_COLOR_SCHEME_CHANGED,
diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index b5694c9d5a..7e1e396fd6 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -425,14 +425,9 @@ TermWindow::MenusBeginning()
 }
 
 
-/* static */
-BMenu*
-TermWindow::MakeEncodingMenu()
+/* static */ void
+TermWindow::MakeEncodingMenu(BMenu* menu)
 {
-	BMenu* menu = new (std::nothrow) BMenu(B_TRANSLATE("Text encoding"));
-	if (menu == NULL)
-		return NULL;
-
 	BCharacterSetRoster roster;
 	BCharacterSet charset;
 	while (roster.GetNextCharacterSet(&charset) == B_OK) {
@@ -457,8 +452,6 @@ TermWindow::MakeEncodingMenu()
 	}
 
 	menu->SetRadioMode(true);
-
-	return menu;
 }
 
 
@@ -475,10 +468,17 @@ TermWindow::_SetupMenu()
 	fFontSizeMenu->AddItem(fIncreaseFontSizeMenuItem);
 	fFontSizeMenu->AddItem(fDecreaseFontSizeMenuItem);
 
-	BMenu* windowSize = MakeWindowSizeMenu();
-	windowSize->AddSeparatorItem();
-	windowSize->AddItem(new BMenuItem(B_TRANSLATE("Full screen"),
-		new BMessage(FULLSCREEN), B_ENTER));
+	BMenu* windowSize = new(std::nothrow) BMenu(B_TRANSLATE("Widow size"));
+	if (windowSize != NULL) {
+		MakeWindowSizeMenu(windowSize);
+		windowSize->AddSeparatorItem();
+		windowSize->AddItem(new BMenuItem(B_TRANSLATE("Full screen"),
+			new BMessage(FULLSCREEN), B_ENTER));
+	}
+
+	fEncodingMenu = new(std::nothrow) BMenu(B_TRANSLATE("Text encoding"));
+	if (fEncodingMenu != NULL)
+		MakeEncodingMenu(fEncodingMenu);
 
 	BLayoutBuilder::Menu<>(fMenuBar = new BMenuBar(Bounds(), "mbar"))
 		// Terminal
@@ -522,7 +522,7 @@ TermWindow::_SetupMenu()
 		// Settings
 		.AddMenu(B_TRANSLATE("Settings"))
 			.AddItem(windowSize)
-			.AddItem(fEncodingMenu = MakeEncodingMenu())
+			.AddItem(fEncodingMenu)
 			.AddItem(fFontSizeMenu)
 			.AddSeparator()
 			.AddItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), MENU_PREF_OPEN)
@@ -1659,13 +1659,9 @@ TermWindow::_ResizeView(TermView *view)
 }
 
 
-/* static */ BMenu*
-TermWindow::MakeWindowSizeMenu()
+/* static */ void
+TermWindow::MakeWindowSizeMenu(BMenu* menu)
 {
-	BMenu* menu = new (std::nothrow) BMenu(B_TRANSLATE("Window size"));
-	if (menu == NULL)
-		return NULL;
-
 	const int32 windowSizes[4][2] = {
 		{ 80, 25 },
 		{ 80, 40 },
@@ -1685,8 +1681,6 @@ TermWindow::MakeWindowSizeMenu()
 		message->AddInt32("rows", rows);
 		menu->AddItem(new BMenuItem(label, message));
 	}
-
-	return menu;
 }
 
 
diff --git a/src/apps/terminal/TermWindow.h b/src/apps/terminal/TermWindow.h
index 7bae44f953..f99157b833 100644
--- a/src/apps/terminal/TermWindow.h
+++ b/src/apps/terminal/TermWindow.h
@@ -62,8 +62,8 @@ public:
 
 			void				SessionChanged();
 
-	static	BMenu*				MakeEncodingMenu();
-	static	BMenu*				MakeWindowSizeMenu();
+	static	void				MakeEncodingMenu(BMenu*);
+	static	void				MakeWindowSizeMenu(BMenu*);
 
 protected:
 	virtual bool				QuitRequested();