From fba4e002b1a89bb281a266f7b64c1c27db62bc1b Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Sun, 8 Nov 2009 12:30:01 +0000 Subject: [PATCH] Also set a default style in the preferences. Mark the menuitem with the default family/style. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33947 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/terminal/AppearPrefView.cpp | 9 ++++++--- src/apps/terminal/AppearPrefView.h | 3 ++- src/apps/terminal/PrefHandler.cpp | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp index c39415d592..882e72e0a2 100644 --- a/src/apps/terminal/AppearPrefView.cpp +++ b/src/apps/terminal/AppearPrefView.cpp @@ -61,7 +61,8 @@ AppearancePrefView::AppearancePrefView(BRect frame, const char *name, BRect r(5, 5, 261, 25); BMenu *menu = _MakeFontMenu(MSG_HALF_FONT_CHANGED, - PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY)); + PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY), + PrefHandler::Default()->getString(PREF_HALF_FONT_STYLE)); fFont = new BMenuField(r, "font", "Font:", menu); fFont->SetDivider(colorDividerSize); fFont->SetAlignment(B_ALIGN_RIGHT); @@ -227,7 +228,8 @@ IsFontUsable(const BFont &font) BMenu * -AppearancePrefView::_MakeFontMenu(uint32 command, const char *defaultFontName) +AppearancePrefView::_MakeFontMenu(uint32 command, + const char *defaultFamily, const char *defaultStyle) { BPopUpMenu *menu = new BPopUpMenu(""); int32 numFamilies = count_font_families(); @@ -252,7 +254,8 @@ AppearancePrefView::_MakeFontMenu(uint32 command, const char *defaultFontName) BMenuItem *item = new BMenuItem(itemLabel, message); menu->AddItem(item); - if (!strcmp(defaultFontName, family)) + if (!strcmp(defaultFamily, family) + && !strcmp(defaultStyle, style)) item->SetMarked(true); } } diff --git a/src/apps/terminal/AppearPrefView.h b/src/apps/terminal/AppearPrefView.h index 950417fbdb..238bf90e96 100644 --- a/src/apps/terminal/AppearPrefView.h +++ b/src/apps/terminal/AppearPrefView.h @@ -29,7 +29,8 @@ class AppearancePrefView : public PrefView { virtual void GetPreferredSize(float *_width, float *_height); private: - BMenu* _MakeFontMenu(uint32 command, const char *defaultFont); + BMenu* _MakeFontMenu(uint32 command, const char *defaultFamily, + const char *defaultStyle); BMenu* _MakeSizeMenu(uint32 command, uint8 defaultSize); BMenuField *fFont; diff --git a/src/apps/terminal/PrefHandler.cpp b/src/apps/terminal/PrefHandler.cpp index 6518585b58..804585e5cf 100644 --- a/src/apps/terminal/PrefHandler.cpp +++ b/src/apps/terminal/PrefHandler.cpp @@ -35,6 +35,7 @@ static const pref_defaults kTermDefaults[] = { { PREF_ROWS, "25" }, { PREF_HALF_FONT_FAMILY, "Courier10 BT" }, + { PREF_HALF_FONT_STYLE, "Regular" }, { PREF_HALF_FONT_SIZE, "12" }, { PREF_TEXT_FORE_COLOR, " 0, 0, 0" },