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

List:       kde-commits
Subject:    [calligra/frameworks] krita/ui: enabled Krita statusbar again
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2015-04-05 21:25:44
Message-ID: E1Yes36-00062f-OC () scm ! kde ! org
[Download RAW message or body]

Git commit 3f35b354b4626400fb0cd2a52c55c415572a6367 by Sven Langkamp.
Committed on 05/04/2015 at 21:25.
Pushed by langkamp into branch 'frameworks'.

enabled Krita statusbar again

M  +40   -46   krita/ui/KisView.cpp
M  +19   -21   krita/ui/KisViewManager.cpp

http://commits.kde.org/calligra/3f35b354b4626400fb0cd2a52c55c415572a6367

diff --git a/krita/ui/KisView.cpp b/krita/ui/KisView.cpp
index b3618d2..6784d9a 100644
--- a/krita/ui/KisView.cpp
+++ b/krita/ui/KisView.cpp
@@ -187,7 +187,7 @@ public:
             return m_widget;
         }
 
-        void ensureItemShown(KStatusBar * sb) {
+        void ensureItemShown(QStatusBar * sb) {
             Q_ASSERT(m_widget);
             if (!m_connected) {
                 if (m_permanent)
@@ -201,7 +201,7 @@ public:
                 m_connected = true;
             }
         }
-        void ensureItemHidden(KStatusBar * sb) {
+        void ensureItemHidden(QStatusBar * sb) {
             if (m_connected) {
                 m_hidden = m_widget->isHidden();
                 sb->removeWidget(m_widget);
@@ -236,14 +236,13 @@ KisView::KisView(KisDocument *document, KoCanvasResourceManager *resourceManager
     d->undo = new KisUndoStackAction(d->document->undoStack(), KisUndoStackAction::UNDO);
     d->redo = new KisUndoStackAction(d->document->undoStack(), KisUndoStackAction::RED0);
 
-//     QT5PORT
-//     KStatusBar * sb = statusBar();
-//     if (sb) { // No statusbar in e.g. konqueror
-//         connect(d->document, SIGNAL(statusBarMessage(const QString&)),
-//                 this, SLOT(slotActionStatusText(const QString&)));
-//         connect(d->document, SIGNAL(clearStatusBarMessage()),
-//                 this, SLOT(slotClearStatusText()));
-//     }
+    QStatusBar * sb = statusBar();
+    if (sb) { // No statusbar in e.g. konqueror
+        connect(d->document, SIGNAL(statusBarMessage(const QString&)),
+                this, SLOT(slotActionStatusText(const QString&)));
+        connect(d->document, SIGNAL(clearStatusBarMessage()),
+                this, SLOT(slotClearStatusText()));
+    }
 
     d->viewConverter = new KisCoordinatesConverter();
 
@@ -512,14 +511,13 @@ void KisView::setDocument(KisDocument *document)
 {
     d->document->disconnect(this);
     d->document = document;
-// QT5PORT
-//     KStatusBar *sb = statusBar();
-//     if (sb) { // No statusbar in e.g. konqueror
-//         connect(d->document, SIGNAL(statusBarMessage(const QString&)),
-//                 this, SLOT(slotActionStatusText(const QString&)));
-//         connect(d->document, SIGNAL(clearStatusBarMessage()),
-//                 this, SLOT(slotClearStatusText()));
-//     }
+    QStatusBar *sb = statusBar();
+    if (sb) { // No statusbar in e.g. konqueror
+        connect(d->document, SIGNAL(statusBarMessage(const QString&)),
+                this, SLOT(slotActionStatusText(const QString&)));
+        connect(d->document, SIGNAL(clearStatusBarMessage()),
+                this, SLOT(slotClearStatusText()));
+    }
 }
 
 void KisView::setDocumentDeleted()
@@ -530,30 +528,28 @@ void KisView::setDocumentDeleted()
 void KisView::addStatusBarItem(QWidget * widget, int stretch, bool permanent)
 {
     Private::StatusBarItem item(widget, stretch, permanent);
-// QT5PORT
-    //     KStatusBar * sb = statusBar();
-//     if (sb) {
-//         item.ensureItemShown(sb);
-//     }
-//     d->statusBarItems.append(item);
+    QStatusBar * sb = statusBar();
+    if (sb) {
+        item.ensureItemShown(sb);
+    }
+    d->statusBarItems.append(item);
 }
 
 void KisView::removeStatusBarItem(QWidget *widget)
 {
-//     QT5PORT
-//     KStatusBar *sb = statusBar();
-// 
-//     int itemCount = d->statusBarItems.count();
-//     for (int i = itemCount-1; i >= 0; --i) {
-//         Private::StatusBarItem &sbItem = d->statusBarItems[i];
-//         if (sbItem.widget() == widget) {
-//             if (sb) {
-//                 sbItem.ensureItemHidden(sb);
-//             }
-//             d->statusBarItems.removeOne(sbItem);
-//             break;
-//         }
-//     }
+    QStatusBar *sb = statusBar();
+
+    int itemCount = d->statusBarItems.count();
+    for (int i = itemCount-1; i >= 0; --i) {
+        Private::StatusBarItem &sbItem = d->statusBarItems[i];
+        if (sbItem.widget() == widget) {
+            if (sb) {
+                sbItem.ensureItemHidden(sb);
+            }
+            d->statusBarItems.removeOne(sbItem);
+            break;
+        }
+    }
 }
 
 
@@ -585,18 +581,16 @@ QStatusBar * KisView::statusBar() const
 
 void KisView::slotActionStatusText(const QString &text)
 {
-//     QT5PORT
-//     KStatusBar *sb = statusBar();
-//     if (sb)
-//         sb->showMessage(text);
+    QStatusBar *sb = statusBar();
+    if (sb)
+        sb->showMessage(text);
 }
 
 void KisView::slotClearStatusText()
 {
-//     QT5PORT
-//     KStatusBar *sb = statusBar();
-//     if (sb)
-//         sb->clearMessage();
+    QStatusBar *sb = statusBar();
+    if (sb)
+        sb->clearMessage();
 }
 
 QList<QAction*> KisView::createChangeUnitActions(bool addPixelUnit)
diff --git a/krita/ui/KisViewManager.cpp b/krita/ui/KisViewManager.cpp
index dc50a54..68dde17 100644
--- a/krita/ui/KisViewManager.cpp
+++ b/krita/ui/KisViewManager.cpp
@@ -158,7 +158,7 @@ public:
         return m_widget;
     }
 
-    void ensureItemShown(KStatusBar * sb) {
+    void ensureItemShown(QStatusBar * sb) {
         Q_ASSERT(m_widget);
         if (!m_connected) {
             if (m_permanent)
@@ -172,7 +172,7 @@ public:
             m_connected = true;
         }
     }
-    void ensureItemHidden(KStatusBar * sb) {
+    void ensureItemHidden(QStatusBar * sb) {
         if (m_connected) {
             m_hidden = m_widget->isHidden();
             sb->removeWidget(m_widget);
@@ -523,30 +523,28 @@ void KisViewManager::addStatusBarItem(QWidget * widget, int stretch, bool perman
     if (!mainWindow()) return;
 
     StatusBarItem item(widget, stretch, permanent);
-//     QT5PORT
-//     KStatusBar * sb = mainWindow()->statusBar();
-//     if (sb) {
-//         item.ensureItemShown(sb);
-//     }
+    QStatusBar * sb = mainWindow()->statusBar();
+    if (sb) {
+        item.ensureItemShown(sb);
+    }
     d->statusBarItems.append(item);
 }
 
 void KisViewManager::removeStatusBarItem(QWidget * widget)
 {
-//     QT5PORT
-//     KStatusBar *sb = mainWindow()->statusBar();
-// 
-//     int itemCount = d->statusBarItems.count();
-//     for (int i = itemCount-1; i >= 0; --i) {
-//         StatusBarItem &sbItem = d->statusBarItems[i];
-//         if (sbItem.widget() == widget) {
-//             if (sb) {
-//                 sbItem.ensureItemHidden(sb);
-//             }
-//             d->statusBarItems.removeOne(sbItem);
-//             break;
-//         }
-//     }
+    QStatusBar *sb = mainWindow()->statusBar();
+
+    int itemCount = d->statusBarItems.count();
+    for (int i = itemCount-1; i >= 0; --i) {
+        StatusBarItem &sbItem = d->statusBarItems[i];
+        if (sbItem.widget() == widget) {
+            if (sb) {
+                sbItem.ensureItemHidden(sb);
+            }
+            d->statusBarItems.removeOne(sbItem);
+            break;
+        }
+    }
 }
 
 KisPaintopBox* KisViewManager::paintOpBox() const
[prev in list] [next in list] [prev in thread] [next in thread]