[rkward-cvs] rkward/rkward rkward.cpp,1.128,1.129 rkward.h,1.55,1.56

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7676/rkward

Modified Files:
	rkward.cpp rkward.h 
Log Message:
Change R engine status bar label color according to state

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** rkward.cpp	2 May 2006 11:55:39 -0000	1.128
--- rkward.cpp	17 May 2006 14:14:07 -0000	1.129
***************
*** 76,81 ****
  #include "debug.h"
  
- #define ID_R_STATUS_MSG 2
- 
  #include "agents/showedittextfileagent.h"	// TODO: see below: needed purely for linking!
  
--- 76,79 ----
***************
*** 341,345 ****
  	RK_TRACE (APP);
  
! 	statusBar()->insertItem (i18n ("starting R engine"), ID_R_STATUS_MSG, 0, true);
  
  	connect (actionCollection (), SIGNAL (actionStatusText (const QString &)), this, SLOT (slotSetStatusBarText (const QString &)));
--- 339,345 ----
  	RK_TRACE (APP);
  
! 	r_status_label = new QLabel (i18n ("starting R engine"), statusBar ());
! 	r_status_label->setPaletteBackgroundColor (QColor (255, 255, 0));
! 	statusBar ()->addWidget (r_status_label, 0, true);
  
  	connect (actionCollection (), SIGNAL (actionStatusText (const QString &)), this, SLOT (slotSetStatusBarText (const QString &)));
***************
*** 638,644 ****
  	RK_TRACE (APP);
  	if (busy) {
! 		statusBar ()->changeItem(i18n ("R engine busy"), ID_R_STATUS_MSG);
  	} else {
! 		statusBar ()->changeItem (i18n ("R engine idle"), ID_R_STATUS_MSG);
  	}
  }
--- 638,646 ----
  	RK_TRACE (APP);
  	if (busy) {
! 		r_status_label->setText (i18n ("R engine busy"));
! 		r_status_label->setPaletteBackgroundColor (QColor (255, 0, 0));
  	} else {
! 		r_status_label->setText (i18n ("R engine idle"));
! 		r_status_label->setPaletteBackgroundColor (QColor (0, 255, 0));
  	}
  }

Index: rkward.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** rkward.h	29 Mar 2006 14:36:28 -0000	1.55
--- rkward.h	17 May 2006 14:14:07 -0000	1.56
***************
*** 45,52 ****
  #include <kparts/partmanager.h>
  
  // forward declaration of the RKward classes
  class RSettings;
  class RKMenu;
- class QTimer;
  class RObjectBrowser;
  class RKSettingsModule;
--- 45,53 ----
  #include <kparts/partmanager.h>
  
+ class QTimer;
+ class QLabel;
  // forward declaration of the RKward classes
  class RSettings;
  class RKMenu;
  class RObjectBrowser;
  class RKSettingsModule;
***************
*** 202,205 ****
--- 203,208 ----
  	void partRemoved (KParts::Part *part);
  private:
+ 	QLabel* r_status_label;
+ 
  	// KAction pointers to enable/disable actions
  	KAction* fileOpen;