mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 09:53:50 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'cc9cii/status-bar'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-10-27 07:20:50 +01:00
commit 5114eee40d
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/model/settings/usersettings.cpp
View file

@ -120,6 +120,11 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
reuse->setToolTip ("When a new subview is requested and a matching subview already " reuse->setToolTip ("When a new subview is requested and a matching subview already "
" exist, do not open a new subview and use the existing one instead."); " exist, do not open a new subview and use the existing one instead.");
Setting *statusBar = createSetting (Type_CheckBox, "show-statusbar", "Show Status Bar");
statusBar->setDefaultValue ("true");
statusBar->setToolTip ("If a newly open top level window is showing status bars or not. "
" Note that this does not affect existing windows.");
Setting *maxSubView = createSetting (Type_SpinBox, "max-subviews", Setting *maxSubView = createSetting (Type_SpinBox, "max-subviews",
"Maximum number of subviews per top-level window"); "Maximum number of subviews per top-level window");
maxSubView->setDefaultValue (256); maxSubView->setDefaultValue (256);

2
apps/opencs/view/doc/view.cpp
View file

@ -105,7 +105,7 @@ void CSVDoc::View::setupViewMenu()
mShowStatusBar->setCheckable (true); mShowStatusBar->setCheckable (true);
connect (mShowStatusBar, SIGNAL (toggled (bool)), this, SLOT (toggleShowStatusBar (bool))); connect (mShowStatusBar, SIGNAL (toggled (bool)), this, SLOT (toggleShowStatusBar (bool)));
std::string showStatusBar = std::string showStatusBar =
CSMSettings::UserSettings::instance().settingValue("Display/show statusbar").toStdString(); CSMSettings::UserSettings::instance().settingValue("window/show-statusbar").toStdString();
if(showStatusBar == "true") if(showStatusBar == "true")
mShowStatusBar->setChecked(true); mShowStatusBar->setChecked(true);
view->addAction (mShowStatusBar); view->addAction (mShowStatusBar);

2
apps/opencs/view/doc/viewmanager.cpp
View file

@ -144,7 +144,7 @@ CSVDoc::View *CSVDoc::ViewManager::addView (CSMDoc::Document *document)
mViews.push_back (view); mViews.push_back (view);
std::string showStatusBar = std::string showStatusBar =
CSMSettings::UserSettings::instance().settingValue("Display/show statusbar").toStdString(); CSMSettings::UserSettings::instance().settingValue("window/show-statusbar").toStdString();
view->toggleStatusBar (showStatusBar == "true"); view->toggleStatusBar (showStatusBar == "true");
view->show(); view->show();