[Knode-devel] kdepim/knode

[Volker Krause]

CVS commit by vkrause: 

Use the status bar item provided by kontact. 
This mostly fixes the messed up knode status bar in kontact.


  M +3 -5      knmainwidget.cpp   1.45
  M +0 -2      knmainwidget.h   1.17
  M +2 -1      knode.cpp   1.130
  M +0 -1      knode_part.cpp   1.12


--- kdepim/knode/knmainwidget.cpp  #1.44:1.45
@@ -327,6 +327,4 @@ void KNMainWidget::initStatusBar()
   KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
-  s_tatusMain = new KStatusBarLabel( QString::null, SB_MAIN, sb );
-  s_tatusMain->setAlignment( AlignLeft | AlignVCenter );
   s_tatusFilter = new KStatusBarLabel( QString::null, SB_FILTER, sb );
   s_tatusFilter->setAlignment( AlignLeft | AlignVCenter );
@@ -346,7 +344,7 @@ void KNMainWidget::setStatusMsg(const QS
   if (text.isEmpty() && (id==SB_MAIN))
     if (knGlobals.netAccess()->currentMsg().isEmpty())
-      s_tatusMain->setText(i18n(" Ready"));
+      bar->changeItem(i18n(" Ready"), 1);
     else
-      s_tatusMain->setText(knGlobals.netAccess()->currentMsg());
+      bar->changeItem(knGlobals.netAccess()->currentMsg(), 1);
   else if ( id == SB_GROUP ) {
     int statusWidth = s_tatusGroup->width();
@@ -360,5 +358,5 @@ void KNMainWidget::setStatusMsg(const QS
     switch(id) {
       case SB_MAIN:
-        s_tatusMain->setText(text); break;
+        bar->changeItem(text, 1); break;
       case SB_GROUP:
         s_tatusGroup->setText(text); break;

--- kdepim/knode/knmainwidget.h  #1.16:1.17
@@ -92,5 +92,4 @@ public:
   KNListView*       headerView()const      { return h_drView; }
   KNArticleWidget*  articleView()const     { return a_rtView; }
-  KStatusBarLabel*  statusBarLabelMain() const { return s_tatusMain; }
   KStatusBarLabel*  statusBarLabelGroup() const { return s_tatusGroup; }
   KStatusBarLabel*  statusBarLabelFilter() const { return s_tatusFilter; }
@@ -410,5 +409,4 @@ protected slots:
 private:
   KStatusBarLabel *s_tatusGroup; // widget used in the statusBar() for the group status
-  KStatusBarLabel *s_tatusMain;
   KStatusBarLabel *s_tatusFilter;
   KXMLGUIClient *m_GUIClient;

--- kdepim/knode/knode.cpp  #1.129:1.130
@@ -108,5 +108,6 @@ void KNMainWindow::setupStatusBar() {
   statusBar()->addWidget( mLittleProgress, 0 , true );
 
-  statusBar()->addWidget(m_mainWidget->statusBarLabelMain(), 2);
+  statusBar()->insertItem("", 1 /* item id equal to kontact */, 2);
+  statusBar()->setItemAlignment(1, AlignLeft | AlignVCenter);
   statusBar()->addWidget(m_mainWidget->statusBarLabelFilter(), 2);
   statusBar()->addWidget(m_mainWidget->statusBarLabelGroup(), 3);

--- kdepim/knode/knode_part.cpp  #1.11:1.12
@@ -82,5 +82,4 @@ KNodePart::KNodePart(QWidget *parentWidg
 
   KParts::StatusBarExtension* statusBar = new KParts::StatusBarExtension(this);
-  statusBar->addStatusBarItem(mainWidget->statusBarLabelMain(), 2, false);
   statusBar->addStatusBarItem(mainWidget->statusBarLabelFilter(), 2, false);
   statusBar->addStatusBarItem(mainWidget->statusBarLabelGroup(), 3, false);