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

List:       kde-commits
Subject:    kdesdk/cervisia
From:       Christian Loose <christian.loose () hamburg ! de>
Date:       2005-03-04 18:43:15
Message-ID: 20050304184315.1CB22157B9 () office ! kde ! org
[Download RAW message or body]

CVS commit by cloose: 

Fix BR #97664: 
Fix statusbar when embedded as view in Konqueror. 

BUG: 97664


  M +5 -0      ChangeLog   1.149
  M +20 -15    cervisiapart.cpp   1.160
  M +3 -12     cervisiapart.h   1.36


--- kdesdk/cervisia/cervisiapart.cpp  #1.159:1.160
@@ -2,5 +2,5 @@
  *  Copyright (C) 1999-2002 Bernd Gehrmann
  *                          bernd@mail.berlios.de
- *  Copyright (c) 2002-2004 Christian Loose <christian.loose@kdemail.net>
+ *  Copyright (c) 2002-2005 Christian Loose <christian.loose@kdemail.net>
  *
  * This program may be distributed under the terms of the Q Public
@@ -89,5 +89,5 @@ CervisiaPart::CervisiaPart( QWidget *par
     , recent( 0 )
     , cvsService( 0 )
-    , statusBar( 0 )
+    , m_statusBar(new KParts::StatusBarExtension(this))
     , m_browserExt( 0 )
     , filterLabel( 0 )
@@ -146,16 +146,4 @@ CervisiaPart::CervisiaPart( QWidget *par
                              parentWidget));
 
-    statusBar = new CervisiaStatusBarExtension(this);
-
-    // create the active filter indicator and add it to the statusbar
-    filterLabel = new QLabel("UR", statusBar->statusBar());
-    filterLabel->setFixedSize(filterLabel->sizeHint());
-    filterLabel->setText("");
-    QToolTip::add(filterLabel,
-                  i18n("F - All files are hidden, the tree shows only folders\n"
-                       "N - All up-to-date files are hidden\n"
-                       "R - All removed files are hidden"));
-    statusBar->addStatusBarItem(filterLabel, 0, true);
-
     if( cvsService )
     {
@@ -166,4 +154,6 @@ CervisiaPart::CervisiaPart( QWidget *par
 
     setXMLFile( "cervisiaui.rc" );
+
+    QTimer::singleShot(0, this, SLOT(slotSetupStatusBar()));
 }
 
@@ -208,4 +198,18 @@ bool CervisiaPart::openURL( const KURL &
 }
 
+
+void CervisiaPart::slotSetupStatusBar()
+{
+    // create the active filter indicator and add it to the statusbar
+    filterLabel = new QLabel("UR", m_statusBar->statusBar());
+    filterLabel->setFixedSize(filterLabel->sizeHint());
+    filterLabel->setText("");
+    QToolTip::add(filterLabel,
+                  i18n("F - All files are hidden, the tree shows only folders\n"
+                       "N - All up-to-date files are hidden\n"
+                       "R - All removed files are hidden"));
+    m_statusBar->addStatusBarItem(filterLabel, 0, true);
+}
+
 void CervisiaPart::setupActions()
 {
@@ -1735,4 +1739,5 @@ void CervisiaPart::setFilter()
         }
 
+    if( filterLabel )
     filterLabel->setText(str);
 }

--- kdesdk/cervisia/cervisiapart.h  #1.35:1.36
@@ -2,5 +2,5 @@
  *  Copyright (C) 1999-2002 Bernd Gehrmann
  *                          bernd@mail.berlios.de
- *  Copyright (c) 2002-2004 Christian Loose <christian.loose@kdemail.net>
+ *  Copyright (c) 2002-2005 Christian Loose <christian.loose@kdemail.net>
  *
  * This program may be distributed under the terms of the Q Public
@@ -42,14 +42,4 @@ class CervisiaBrowserExtension;
 
 
-class CervisiaStatusBarExtension : public KParts::StatusBarExtension
-{
-public:
-    CervisiaStatusBarExtension(KParts::ReadOnlyPart* parent)
-        : KParts::StatusBarExtension(parent, "CervisiaStatusBarExtension")
-    {
-    }
-};
-
-
 /**
  * An embeddable Cervisia viewer.
@@ -147,4 +137,5 @@ private slots:
     // called by menu action "Open Sandbox..."
     void slotOpenSandbox();
+    void slotSetupStatusBar();
 
 protected:
@@ -186,5 +177,5 @@ private:
 
     CvsService_stub*            cvsService;
-    CervisiaStatusBarExtension* statusBar;
+    KParts::StatusBarExtension* m_statusBar;
     CervisiaBrowserExtension*   m_browserExt;
     QLabel*                     filterLabel;

--- kdesdk/cervisia/ChangeLog  #1.148:1.149
@@ -1,2 +1,7 @@
+2005-03-04  Christian Loose <christian.loose@kdemail.net>
+
+        * Fix BR #97664:
+          Fix statusbar when embedded in Konqueror.
+
 2005-01-31  Christian Loose  <christian.loose@kdemail.net>
 


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