[rkward-cvs] rkward/rkward/settings rksettings.cpp,1.2,1.3 rksettings.h,1.2,1.3

[Thomas Friedrichsmeier]

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

Modified Files:
	rksettings.cpp rksettings.h 
Log Message:
RKSettings inherits KDialogBase. Compile fix in RInterface

Index: rksettings.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettings.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rksettings.h	26 Aug 2004 15:44:02 -0000	1.2
--- rksettings.h	21 Apr 2005 22:10:57 -0000	1.3
***************
*** 18,22 ****
  #define RKSETTINGS_H
  
! #include <qdialog.h>
  
  #include <qvaluelist.h>
--- 18,22 ----
  #define RKSETTINGS_H
  
! #include <kdialogbase.h>
  
  #include <qvaluelist.h>
***************
*** 33,38 ****
  @author Thomas Friedrichsmeier
  */
! class RKSettings : public QDialog {
! 	Q_OBJECT
  public:
  	enum SettingsPage { NoPage=0, Plugins=1, R=2, PHP=3, LogFiles=4, Output=5, Watch=6 };
--- 33,37 ----
  @author Thomas Friedrichsmeier
  */
! class RKSettings : public KDialogBase {
  public:
  	enum SettingsPage { NoPage=0, Plugins=1, R=2, PHP=3, LogFiles=4, Output=5, Watch=6 };
***************
*** 44,51 ****
  	
  	void enableApply ();
! public slots:
! 	void apply ();
! 	void ok ();
! 	void cancel ();
  protected:
  	RKSettings (QWidget *parent = 0, const char *name = 0);
--- 43,50 ----
  	
  	void enableApply ();
! protected:
! 	void slotApply ();
! 	void slotOk ();
! 	void slotCancel ();
  protected:
  	RKSettings (QWidget *parent = 0, const char *name = 0);
***************
*** 56,68 ****
  	static void dialogClosed ();
  	
- 	QTabWidget *tabs;
- 	
  	typedef QValueList<RKSettingsModule *> ModuleList;
  	ModuleList modules;
  	
- 	QPushButton *okbutton;
- 	QPushButton *applybutton;
- 	QPushButton *cancelbutton;
- 	
  	static RKSettings *settings_dialog;
  };
--- 55,61 ----

Index: rksettings.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettings.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rksettings.cpp	26 Aug 2004 15:44:02 -0000	1.2
--- rksettings.cpp	21 Apr 2005 22:10:57 -0000	1.3
***************
*** 18,23 ****
  
  #include <qlayout.h>
- #include <qtabwidget.h>
- #include <qpushbutton.h>
  
  #include <klocale.h>
--- 18,21 ----
***************
*** 53,78 ****
  }
  
! RKSettings::RKSettings (QWidget *parent, const char *name) : QDialog (parent, name,false, QWidget::WDestructiveClose) {
! 	setCaption (i18n ("Settings"));
! 	
! 	QGridLayout *grid = new QGridLayout (this, 2, 1, 11, 6);
! 	tabs = new QTabWidget (this);
! 	grid->addWidget (tabs, 0, 0);
! 	
! 	QHBoxLayout *button_layout = new QHBoxLayout (0, 0, 6);
! 	grid->addLayout (button_layout, 1, 0);
! 	
! 	okbutton = new QPushButton (i18n ("Ok"), this);
! 	connect (okbutton, SIGNAL (clicked ()), this, SLOT (ok ()));
! 	applybutton = new QPushButton (i18n ("Apply"), this);
! 	applybutton->setEnabled (false);
! 	connect (applybutton, SIGNAL (clicked ()), this, SLOT (apply ()));
! 	cancelbutton = new QPushButton (i18n ("Cancel"), this);
! 	connect (cancelbutton, SIGNAL (clicked ()), this, SLOT (cancel ()));
! 	
! 	button_layout->addWidget (okbutton);
! 	button_layout->addWidget (applybutton);
! 	button_layout->addStretch ();
! 	button_layout->addWidget (cancelbutton);
  
  	initModules ();
--- 51,56 ----
  }
  
! RKSettings::RKSettings (QWidget *parent, const char *name) : KDialogBase (KDialogBase::Tabbed, i18n ("Settings"), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, parent, name, false) {
! 	setWFlags (getWFlags () | QWidget::WDestructiveClose);
  
  	initModules ();
***************
*** 98,103 ****
  	
  	ModuleList::iterator it;
  	for (it = modules.begin (); it != modules.end (); ++it) {
! 		tabs->addTab (*it, (*it)->caption ());
  	}
  }
--- 76,87 ----
  	
  	ModuleList::iterator it;
+ 	QFrame *page;
+ 	QVBoxLayout *layout;
  	for (it = modules.begin (); it != modules.end (); ++it) {
! 		page = addPage ((*it)->caption ());
! 		layout = new QVBoxLayout (page);
! // this is somewhat ugly, but works fine
! 		(*it)->reparent (page, QPoint (0,0), true);
! 		layout->addWidget (*it);
  	}
  }
***************
*** 105,113 ****
  void RKSettings::raisePage (SettingsPage page) {
  	if (page != NoPage) {
! 		tabs->setCurrentPage (((int) page) - 1);
  	}
  }
  
! void RKSettings::apply () {
  	ModuleList::iterator it;
  	for (it = modules.begin (); it != modules.end (); ++it) {
--- 89,97 ----
  void RKSettings::raisePage (SettingsPage page) {
  	if (page != NoPage) {
! 		showPage (((int) page) - 1);
  	}
  }
  
! void RKSettings::slotApply () {
  	ModuleList::iterator it;
  	for (it = modules.begin (); it != modules.end (); ++it) {
***************
*** 117,135 ****
  		}
  	}
! 	applybutton->setEnabled (false);
  }
  
! void RKSettings::ok () {
! 	apply ();
  	accept ();
  	close ();
  }
  
! void RKSettings::cancel () {
! 	close ();
  }
  
  void RKSettings::enableApply () {
! 	applybutton->setEnabled (true);
  }
  
--- 101,119 ----
  		}
  	}
! 	enableButtonApply (false);
  }
  
! void RKSettings::slotOk () {
! 	slotApply ();
  	accept ();
  	close ();
  }
  
! void RKSettings::slotCancel () {
! 	QDialog::reject ();
  }
  
  void RKSettings::enableApply () {
! 	enableButtonApply (true);
  }