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

apps/opencs/model/settings/usersettings.cpp

@@ -120,6 +120,11 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         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.");
 
+        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",
             "Maximum number of subviews per top-level window");
         maxSubView->setDefaultValue (256);

apps/opencs/view/doc/view.cpp

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

apps/opencs/view/doc/viewmanager.cpp

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