[rkward-cvs] rkward/rkward/plugin rkcomponentproperties.cpp,1.17,1.18 rkpluginspinbox.cpp,1.11,1.12 rkstandardcomponent.cpp,1.19,1.20 rkstandardcomponent.h,1.10,1.11

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4705/rkward/plugin

Modified Files:
	rkcomponentproperties.cpp rkpluginspinbox.cpp 
	rkstandardcomponent.cpp rkstandardcomponent.h 
Log Message:
Ported old depends-statements

Index: rkstandardcomponent.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugin/rkstandardcomponent.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rkstandardcomponent.h	20 Mar 2006 12:41:43 -0000	1.10
--- rkstandardcomponent.h	20 Mar 2006 14:03:43 -0000	1.11
***************
*** 59,62 ****
--- 59,64 ----
  /** RTTI */
  	int type () { return ComponentStandard; };
+ /** reimplemented from QWidget to hide the gui if applicable */
+ 	void hide ();
  public slots:
  /** this gets called by the script-backend, when it's done. Might enable the

Index: rkpluginspinbox.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugin/rkpluginspinbox.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rkpluginspinbox.cpp	19 Mar 2006 16:41:26 -0000	1.11
--- rkpluginspinbox.cpp	20 Mar 2006 14:03:43 -0000	1.12
***************
*** 33,37 ****
  
  	// first question: int or real
! 	intmode = (xml->getMultiChoiceAttribute (element, "type", "integer;real", 0, DL_INFO) == 0);
  
  	// create and add properties
--- 33,37 ----
  
  	// first question: int or real
! 	intmode = (xml->getMultiChoiceAttribute (element, "type", "integer;real", 1, DL_INFO) == 0);
  
  	// create and add properties

Index: rkstandardcomponent.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugin/rkstandardcomponent.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** rkstandardcomponent.cpp	20 Mar 2006 12:41:43 -0000	1.19
--- rkstandardcomponent.cpp	20 Mar 2006 14:03:43 -0000	1.20
***************
*** 83,86 ****
--- 83,87 ----
  //	connect (backend, SIGNAL (requestRCall (const QString&)), this, SLOT (doRCall (const QString&)));
  //	connect (backend, SIGNAL (requestRVector (const QString&)), this, SLOT (getRVector (const QString&)));
+ 	connect (backend, SIGNAL (haveError ()), this, SLOT (hide ()));
  	connect (backend, SIGNAL (haveError ()), this, SLOT (deleteLater ()));
  	if (!backend->initialize (dummy, code)) return;
***************
*** 124,127 ****
--- 125,135 ----
  }
  
+ void RKStandardComponent::hide () {
+ 	RK_TRACE (PLUGIN);
+ 
+ 	if (gui) gui->hide ();
+ 	RKComponent::hide ();
+ }
+ 
  bool RKStandardComponent::createTopLevel (const QDomElement &doc_element, int force_mode) {
  	RK_TRACE (PLUGIN);

Index: rkcomponentproperties.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugin/rkcomponentproperties.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** rkcomponentproperties.cpp	20 Mar 2006 12:41:43 -0000	1.17
--- rkcomponentproperties.cpp	20 Mar 2006 14:03:43 -0000	1.18
***************
*** 1078,1082 ****
  			} case Or: {
  				if ((source.property->type () == PropertyBool) || (source.property->type () == PropertyLogic)) {
! 					if (!(static_cast<RKComponentPropertyBool *>(source.property)->boolValue ())) {
  						setBoolValue (true);
  						return;
--- 1078,1082 ----
  			} case Or: {
  				if ((source.property->type () == PropertyBool) || (source.property->type () == PropertyLogic)) {
! 					if (static_cast<RKComponentPropertyBool *>(source.property)->boolValue ()) {
  						setBoolValue (true);
  						return;