Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Terminal: use BPopUpMenu in BMenuFields.

Browse Source 
Using a BMenu works, but it doesn't look as good.
Thanks to Diver for noticing this.
This commit is contained in:
Adrien Destugues 2014-11-27 10:53:16 +01:00
parent f4e8886fae
commit 5211ae5d68
3 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/apps/terminal/AppearPrefView.cpp
View File

@ -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,

38
src/apps/terminal/TermWindow.cpp
View File

@ -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;
}

4
src/apps/terminal/TermWindow.h
View File

@ -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();