[Kst] kdeextragear-2/kst/kst

[Rick Chern]

CVS commit by rchern: 

Move databar to the left and maximize it, so it doesn't keep on resizing, and the curve/image name doens't keep on moving.  Also "Ready" makes more sense next to "360MB Available"
I will change it back if this is less desireable...


  M +10 -10    kst.cpp   1.223
  M +1 -1      kst.h   1.105


--- kdeextragear-2/kst/kst/kst.h  #1.104:1.105
@@ -453,5 +453,5 @@ class KstApp : public KMdiMainFrm {
     KToggleAction *viewStatusBar;
 
-    QLabel *_dataBar, *_memoryBar, *_progressMsg;
+    QLabel *_dataBar, *_memoryBar, *_progressMsg, *_readyBar;
     QProgressBar *_progressBar;
     bool _stopping;

--- kdeextragear-2/kst/kst/kst.cpp  #1.222:1.223
@@ -661,12 +661,8 @@ bool KstApp::getTieZoom() {
 void KstApp::initStatusBar() {
   _dataBar = new QLabel(QString::null, statusBar());
-  statusBar()->addWidget(_dataBar, 0, true);
+  statusBar()->addWidget(_dataBar, 1, true);
 
-#ifdef HAVE_LINUX
-  _memoryBar = new QLabel(i18n("0 MB available"), statusBar());
-  statusBar()->addWidget(_memoryBar, 0, true);
-  connect(&_memTimer, SIGNAL(timeout()), this, SLOT(updateMemoryStatus()));
-  _memTimer.start(5000);
-#endif
+  _readyBar = new QLabel(i18n("Almost Ready"), statusBar());
+  statusBar()->addWidget(_readyBar, 0, true);
 
   _progressMsg = new QLabel(QString::null, statusBar());
@@ -680,5 +675,10 @@ void KstApp::initStatusBar() {
   _progressMsg->hide();
 
-  statusBar()->insertItem(i18n("Almost Ready"), KST_STATUSBAR_STATUS);
+#ifdef HAVE_LINUX
+  _memoryBar = new QLabel(i18n("0 MB available"), statusBar());
+  statusBar()->addWidget(_memoryBar, 0, true);
+  connect(&_memTimer, SIGNAL(timeout()), this, SLOT(updateMemoryStatus()));
+  _memTimer.start(5000);
+#endif
 
   statusBar()->show();
@@ -1134,5 +1134,5 @@ void KstApp::slotViewStatusBar() {
 
 void KstApp::slotUpdateStatusMsg(const QString& msg) {
-  statusBar()->changeItem(msg, KST_STATUSBAR_STATUS);
+  _readyBar->setText(msg);
 }