[rkward-cvs] SF.net SVN: rkward: [2048] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2048
          http://rkward.svn.sourceforge.net/rkward/?rev=2048&view=rev
Author:   tfry
Date:     2007-10-12 08:08:41 -0700 (Fri, 12 Oct 2007)

Log Message:
-----------
Another file compiles

Modified Paths:
--------------
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/rkward/rkward.h
    branches/KDE4_port/rkward/settings/rksettings.cpp
    branches/KDE4_port/rkward/settings/rksettings.h
    branches/KDE4_port/rkward/windows/rcontrolwindow.cpp

Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-10-12 14:58:19 UTC (rev 2047)
+++ branches/KDE4_port/TODO_KDE4	2007-10-12 15:08:41 UTC (rev 2048)
@@ -5,6 +5,7 @@
 - need to replace hard-coded "share/apps"?
 - icons
 - rkward.desktop
+- use Configure-File-Makro for wrapperscript
 - test
 	- configuration
 		- R
@@ -30,3 +31,5 @@
 	- does closing windows work
 	- does updating captions work (when switching windows / window url changes)?
 
+output window
+	- does it reload all changed images?

Modified: branches/KDE4_port/rkward/rkward.h
===================================================================
--- branches/KDE4_port/rkward/rkward.h	2007-10-12 14:58:19 UTC (rev 2047)
+++ branches/KDE4_port/rkward/rkward.h	2007-10-12 15:08:41 UTC (rev 2048)
@@ -64,6 +64,7 @@
 class RKMDIWindow;
 class Q3HBox;
 class RKTopLevelWindowGUI;
+class KRecentFilesAction;
 
 struct RKWardStartupOptions {
 	KUrl *initial_url;	/**< The workspace file to load on startup. If 0, show a dialog asking what to do. **/

Modified: branches/KDE4_port/rkward/settings/rksettings.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettings.cpp	2007-10-12 14:58:19 UTC (rev 2047)
+++ branches/KDE4_port/rkward/settings/rksettings.cpp	2007-10-12 15:08:41 UTC (rev 2048)
@@ -64,8 +64,14 @@
 	settings_dialog = 0;
 }
 
-RKSettings::RKSettings (QWidget *parent, const char *name) : KDialogBase (KDialogBase::Tabbed, i18n ("Settings"), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok, parent, name, false) {
+RKSettings::RKSettings (QWidget *parent) : KPageDialog (parent) {
 	RK_TRACE (SETTINGS);
+
+	setFaceType (KPageDialog::Tabbed);
+	setCaption (i18n ("Settings"));
+	setButtons (KDialog::Ok | KDialog::Apply | KDialog::Cancel | KDialog::Help);
+// KDE4: is this needed?	setModal (false);
+
 	setWFlags (getWFlags () | QWidget::WDestructiveClose);
 
 	initModules ();

Modified: branches/KDE4_port/rkward/settings/rksettings.h
===================================================================
--- branches/KDE4_port/rkward/settings/rksettings.h	2007-10-12 14:58:19 UTC (rev 2047)
+++ branches/KDE4_port/rkward/settings/rksettings.h	2007-10-12 15:08:41 UTC (rev 2048)
@@ -17,7 +17,7 @@
 #ifndef RKSETTINGS_H
 #define RKSETTINGS_H
 
-#include <kdialogbase.h>
+#include <kpagedialog.h>
 
 #include <q3valuelist.h>
 
@@ -32,7 +32,7 @@
 
 @author Thomas Friedrichsmeier
 */
-class RKSettings : public KDialogBase {
+class RKSettings : public KPageDialog {
 	Q_OBJECT
 public:
 	enum SettingsPage { NoPage=0, Plugins=1, R=2, RPackages=3, PHP=4, General=5, Output=6, Watch=7, Console=8, ObjectBrowser=9 };
@@ -53,7 +53,7 @@
 	void slotCancel ();
 	void slotHelp ();
 protected:
-	RKSettings (QWidget *parent = 0, const char *name = 0);
+	RKSettings (QWidget *parent = 0);
 	~RKSettings ();
 private:
 	void initModules ();

Modified: branches/KDE4_port/rkward/windows/rcontrolwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rcontrolwindow.cpp	2007-10-12 14:58:19 UTC (rev 2047)
+++ branches/KDE4_port/rkward/windows/rcontrolwindow.cpp	2007-10-12 15:08:41 UTC (rev 2048)
@@ -42,7 +42,7 @@
 	RK_TRACE (APP);
 	setPart (new RControlWindowPart (this));
 	initializeActivationSignals ();
-	setFocusPolicy (QWidget::ClickFocus);
+	setFocusPolicy (Qt::ClickFocus);
 
 	Q3VBoxLayout *main_vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
 	Q3HBoxLayout *button_hbox = new Q3HBoxLayout (main_vbox, RKGlobals::spacingHint ());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.