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

[tfry at users.sourceforge.net]

Revision: 2113
          http://rkward.svn.sourceforge.net/rkward/?rev=2113&view=rev
Author:   tfry
Date:     2007-10-23 03:21:41 -0700 (Tue, 23 Oct 2007)

Log Message:
-----------
Port about dialog and whats this

Modified Paths:
--------------
    branches/KDE4_port/rkward/rkward.cpp
    branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp
    branches/KDE4_port/rkward/windows/rktoplevelwindowgui.h

Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp	2007-10-23 09:32:22 UTC (rev 2112)
+++ branches/KDE4_port/rkward/rkward.cpp	2007-10-23 10:21:41 UTC (rev 2113)
@@ -25,11 +25,9 @@
 #include <QDBusConnection>
 #include <QDesktopWidget>
 #include <QLabel>
-//Added by qt3to4:
 #include <QCloseEvent>
 
 // include files for KDE
-#include <k3aboutapplication.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
@@ -41,7 +39,6 @@
 #include <kstandarddirs.h>
 #include <kstandardaction.h>
 #include <kinputdialog.h>
-#include <k3dockwidget.h>
 #include <kmultitabbar.h>
 #include <ksqueezedtextlabel.h>
 #include <kparts/partmanager.h>
@@ -436,9 +433,6 @@
 	statusbar_r_status->setFixedHeight (statusBar ()->fontMetrics ().height () + 2);
 	statusBar ()->addPermanentWidget (statusbar_r_status, 0);
 	setRStatus (Starting);
-
-	connect (actionCollection (), SIGNAL (actionStatusText (const QString &)), this, SLOT (slotSetStatusBarText (const QString &)));
-	connect (actionCollection (), SIGNAL (clearStatusText ()), this, SLOT (slotSetStatusReady ()));
 }
 
 void RKWardMainWindow::openWorkspace (const KUrl &url) {

Modified: branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp	2007-10-23 09:32:22 UTC (rev 2112)
+++ branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp	2007-10-23 10:21:41 UTC (rev 2113)
@@ -19,9 +19,12 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <k3aboutapplication.h>
+#include <kaboutapplicationdialog.h>
+#include <kcmdlineargs.h>
 #include <kactioncollection.h>
 
+#include <QWhatsThis>
+
 #include "../rkconsole.h"
 #include "../robjectbrowser.h"
 #include "../windows/rkfilebrowser.h"
@@ -54,7 +57,7 @@
 	show_rkward_help->setText (i18n ("Help on RKWard"));
 
 	actionCollection ()->addAction (KStandardAction::AboutApp, "about_app", this, SLOT (showAboutApplication()));
-	actionCollection ()->addAction (KStandardAction::WhatsThis, "whats_this", for_window, SLOT (whatsThis()));
+	actionCollection ()->addAction (KStandardAction::WhatsThis, "whats_this", this, SLOT (startWhatsThis()));
 	actionCollection ()->addAction (KStandardAction::ReportBug, "report_bug", this, SLOT (reportRKWardBug()));
 
 	help_invoke_r_help->setStatusTip (i18n ("Shows the R help index"));
@@ -102,6 +105,12 @@
 	RKWardMainWindow::getMain ()->topLevelWidget ()->raise ();
 }
 
+void RKTopLevelWindowGUI::startWhatsThis () {
+	RK_TRACE (APP);
+
+	QWhatsThis::enterWhatsThisMode ();
+}
+
 void RKTopLevelWindowGUI::reportRKWardBug () {
 	RK_TRACE (APP);
 
@@ -112,7 +121,7 @@
 void RKTopLevelWindowGUI::showAboutApplication () {
 	RK_TRACE (APP);
 
-	K3AboutApplication *about = new K3AboutApplication ();
+	KAboutApplicationDialog *about = new KAboutApplicationDialog (KCmdLineArgs::aboutData ());
 	about->exec ();
 	delete about;
 }

Modified: branches/KDE4_port/rkward/windows/rktoplevelwindowgui.h
===================================================================
--- branches/KDE4_port/rkward/windows/rktoplevelwindowgui.h	2007-10-23 09:32:22 UTC (rev 2112)
+++ branches/KDE4_port/rkward/windows/rktoplevelwindowgui.h	2007-10-23 10:21:41 UTC (rev 2113)
@@ -55,6 +55,8 @@
 	// help menu
 	/** Show the starting page of RKWard help */
 	void showRKWardHelp ();
+	/** enter "what's this" mode */
+	void startWhatsThis ();
 	/** Invokes R help (help.start ()) */
 	void invokeRHelp ();
 	/** show instructions on reporting bugs in rkward */


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