[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita] /: Save visibility status of the statusbar
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2016-06-05 19:42:24
Message-ID: E1b9dwG-0006AJ-54 () scm ! kde ! org
[Download RAW message or body]

Git commit a9708f28399791018e51f035e305163c40073d5b by Sven Langkamp.
Committed on 05/06/2016 at 19:27.
Pushed by langkamp into branch 'master'.

Save visibility status of the statusbar
BUG:338931

M  +1    -1    krita/kritamenu.action
M  +12   -7    libs/ui/KisViewManager.cpp
M  +1    -1    libs/ui/KisViewManager.h
M  +10   -0    libs/ui/kis_config.cc
M  +3    -0    libs/ui/kis_config.h

http://commits.kde.org/krita/a9708f28399791018e51f035e305163c40073d5b

diff --git a/krita/kritamenu.action b/krita/kritamenu.action
index 1b644d6..41fdecd 100644
--- a/krita/kritamenu.action
+++ b/krita/kritamenu.action
@@ -676,7 +676,7 @@
       <whatsThis></whatsThis>
       <toolTip>Show or hide the status bar</toolTip>
       <iconText>Show Status Bar</iconText>
-      <activationFlags>1</activationFlags>
+      <activationFlags>0</activationFlags>
       <activationConditions>0</activationConditions>
       <shortcut></shortcut>
       <isCheckable>true</isCheckable>
diff --git a/libs/ui/KisViewManager.cpp b/libs/ui/KisViewManager.cpp
index 953af3e..6a96841 100644
--- a/libs/ui/KisViewManager.cpp
+++ b/libs/ui/KisViewManager.cpp
@@ -260,7 +260,7 @@ KisViewManager::KisViewManager(QWidget *parent, KActionCollection *_actionCollec
     QScopedPointer<KoDummyCanvasController> dummy(new KoDummyCanvasController(actionCollection()));
     KoToolManager::instance()->registerToolActions(actionCollection(), dummy.data());
 
-    QTimer::singleShot(0, this, SLOT(makeStatusBarVisible()));
+    QTimer::singleShot(0, this, SLOT(initializeStatusBarVisibility()));
 
     connect(KoToolManager::instance(), SIGNAL(inputDeviceChanged(KoInputDevice)),
             d->controlFrame.paintopBox(), SLOT(slotInputDeviceChanged(KoInputDevice)));
@@ -573,6 +573,8 @@ KisUndoAdapter * KisViewManager::undoAdapter()
 
 void KisViewManager::createActions()
 {
+    KisConfig cfg;
+
     d->saveIncremental = actionManager()->createAction("save_incremental_version");
     connect(d->saveIncremental, SIGNAL(triggered()), this, SLOT(slotSaveIncremental()));
 
@@ -603,7 +605,7 @@ void KisViewManager::createActions()
     d->levelOfDetailAction = actionManager()->createAction("level_of_detail_mode");
 
     KisAction *tAction = actionManager()->createAction("showStatusBar");
-    tAction->setChecked(true);
+    tAction->setChecked(cfg.showStatusBar());
     connect(tAction, SIGNAL(toggled(bool)), this, SLOT(showStatusBar(bool)));
 
     tAction = actionManager()->createAction("view_show_canvas_only");
@@ -619,7 +621,6 @@ void KisViewManager::createActions()
     a = actionManager()->createAction("edit_blacklist_cleanup");
     connect(a, SIGNAL(triggered()), this, SLOT(slotBlacklistCleanup()));
 
-    KisConfig cfg;
     d->showRulersAction = actionManager()->createAction("view_ruler");
     d->showRulersAction->setChecked(cfg.showRulers());
     connect(d->showRulersAction, SIGNAL(toggled(bool)), SLOT(slotSaveShowRulersState(bool)));
@@ -995,8 +996,11 @@ void KisViewManager::enableControls()
 
 void KisViewManager::showStatusBar(bool toggled)
 {
-    if (d->currentImageView && d->currentImageView->statusBar()) {
-        d->currentImageView->statusBar()->setVisible(toggled);
+    KisMainWindow *mw = mainWindow();
+    if(mw && mw->statusBar()) {
+        mw->statusBar()->setVisible(toggled);
+        KisConfig cfg;
+        cfg.setShowStatusBar(toggled);
     }
 }
 
@@ -1124,9 +1128,10 @@ void KisViewManager::updateIcons()
         }
     }
 }
-void KisViewManager::makeStatusBarVisible()
+void KisViewManager::initializeStatusBarVisibility()
 {
-    d->mainWindow->statusBar()->setVisible(true);
+    KisConfig cfg;
+    d->mainWindow->statusBar()->setVisible(cfg.showStatusBar());
 }
 
 void KisViewManager::guiUpdateTimeout()
diff --git a/libs/ui/KisViewManager.h b/libs/ui/KisViewManager.h
index 0a35575..add5dc8 100644
--- a/libs/ui/KisViewManager.h
+++ b/libs/ui/KisViewManager.h
@@ -224,7 +224,7 @@ private Q_SLOTS:
     void showStatusBar(bool toggled);
     void toggleTabletLogger();
     void openResourcesDirectory();
-    void makeStatusBarVisible();
+    void initializeStatusBarVisibility();
     void guiUpdateTimeout();
     void changeAuthorProfile(const QString &profileName);
     void slotUpdateAuthorProfileActions();
diff --git a/libs/ui/kis_config.cc b/libs/ui/kis_config.cc
index 064e25e..ecdf9be 100644
--- a/libs/ui/kis_config.cc
+++ b/libs/ui/kis_config.cc
@@ -1072,6 +1072,16 @@ void KisConfig::setShowDockerTitleBars(const bool value) const
     m_cfg.writeEntry("showDockerTitleBars", value);
 }
 
+bool KisConfig::showStatusBar(bool defaultValue) const
+{
+    return (defaultValue ? true : m_cfg.readEntry("showStatusBar", true));
+}
+
+void KisConfig::setShowStatusBar(const bool value) const
+{
+    m_cfg.writeEntry("showStatusBar", value);
+}
+
 bool KisConfig::hideMenuFullscreen(bool defaultValue) const
 {
     return (defaultValue ? true: m_cfg.readEntry("hideMenuFullScreen", true));
diff --git a/libs/ui/kis_config.h b/libs/ui/kis_config.h
index 3776859..fc02b31 100644
--- a/libs/ui/kis_config.h
+++ b/libs/ui/kis_config.h
@@ -285,6 +285,9 @@ public:
     bool showDockerTitleBars(bool defaultValue = false) const;
     void setShowDockerTitleBars(const bool value) const;
 
+    bool showStatusBar(bool defaultValue = false) const;
+    void setShowStatusBar(const bool value) const;
+
     bool hideMenuFullscreen(bool defaultValue = false) const;
     void setHideMenuFullscreen(const bool value) const;
 
[prev in list] [next in list] [prev in thread] [next in thread]