From a7d5e69b0fafb2fde3c24de320dc03f8dd137745 Mon Sep 17 00:00:00 2001
From: Sven Radej <radej@kde.org>
Date: Fri, 17 Mar 2000 11:31:16 +0000
Subject: [PATCH] sven: Few cleanups related to statusbar

svn path=/trunk/kdenetwork/kmail/; revision=43763
---
 kmmainwin.cpp | 34 ++++++++++++----------------------
 kmmainwin.h   |  7 +++----
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/kmmainwin.cpp b/kmmainwin.cpp
index f32d5a0c4..57c0e05d4 100644
--- a/kmmainwin.cpp
+++ b/kmmainwin.cpp
@@ -304,28 +304,15 @@ void KMMainWin::activatePanners(void)
 
 
 //-----------------------------------------------------------------------------
-int KMMainWin::statusBarAddItem(const char* aText)
-{
-  return mStatusBar->insertItem(aText, -1);
-}
-
-
-//-----------------------------------------------------------------------------
-void KMMainWin::statusBarChangeItem(int aId, const char* aText)
-{
-  mStatusBar->changeItem(aText, aId);
-}
-
-
-//-----------------------------------------------------------------------------
-void KMMainWin::statusMsg(const QString& aText)
-{
-  mStatusBar->changeItem(aText, mMessageStatusId);
+//void KMMainWin::statusMsg(const QString& aText)
+//{
+  //mStatusBar->message(aText);
+  //mStatusBar->changeItem(aText, mMessageStatusId);
   /* Just causes to much trouble with event driven repainting.
   kapp->flushX();
   kapp->processEvents(100);
   */
-}
+//}
 
 
 //-----------------------------------------------------------------------------
@@ -1323,11 +1310,13 @@ void KMMainWin::setupStatusBar()
   mStatusBar = new KStatusBar(this);
 
   littleProgress = new KMLittleProgressDlg( mStatusBar );
-#warning rwilliams:  fix status bar
-//  mStatusBar->insertWidget( littleProgress, littleProgress->width()+20 , 0 );
-  mMessageStatusId = statusBarAddItem(i18n("Initializing..."));
-//  mStatusBar->enable(KStatusBar::Show);
+  littleProgress->setFixedWidth(littleProgress->width());
+  mStatusBar->addWidget( littleProgress,0, true );
+  
+  statusMsg(i18n("Initializing..."));
+  
   littleProgress->show();
+  
   connect( KMBroadcastStatus::instance(), SIGNAL(statusProgressEnable( bool )),
 	   littleProgress, SLOT(slotEnable( bool )));
   connect( KMBroadcastStatus::instance(),
@@ -1339,6 +1328,7 @@ void KMMainWin::setupStatusBar()
   connect( KMBroadcastStatus::instance(), SIGNAL(statusMsg( const QString& )),
 	   this, SLOT(statusMsg( const QString& )));
   setStatusBar(mStatusBar);
+  mStatusBar->message(i18n("Initializing..."));
 }
 
 void KMMainWin::quit()
diff --git a/kmmainwin.h b/kmmainwin.h
index aeaeca5e7..b06c9a845 100644
--- a/kmmainwin.h
+++ b/kmmainwin.h
@@ -44,10 +44,10 @@ public:
   virtual void writeConfig(void);
 
   /** Insert a text field to the status bar and return ID of this field. */
-  virtual int statusBarAddItem(const char* text);
+  //virtual int statusBarAddItem(const char* text);
 
   /** Change contents of a text field. */
-  virtual void statusBarChangeItem(int id, const char* text);
+  //virtual void statusBarChangeItem(int id, const char* text);
 
   /** Easy access to main components of the window. */
   KMReaderWin* messageView(void) const { return mMsgView; }
@@ -74,7 +74,7 @@ public slots:
   void slotAtmMsg(KMMessage *msg); //sven: called from reader
 
   /** Output given message in the statusbar message field. */
-  void statusMsg(const QString& text);
+  inline void statusMsg(const QString& text) {mStatusBar->message(text);}
 
 protected:
   void setupMenuBar();
@@ -167,7 +167,6 @@ protected:
   bool          mSendOnCheck;
   bool          mBeepOnNew, mBoxOnNew, mExecOnNew;
   QString       mNewMailCmd;
-  int		mMessageStatusId;
   QValueList<int> *mHorizPannerSep, *mVertPannerSep;
   QString       mUrlCurrent;
   QPopupMenu	*actMenu;