[rkward-cvs] SF.net SVN: rkward:[3035] trunk/rkward/rkward/windows

[tfry at users.sourceforge.net]

Revision: 3035
          http://rkward.svn.sourceforge.net/rkward/?rev=3035&view=rev
Author:   tfry
Date:     2010-09-14 11:22:04 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
Use the new window specific standard actions for output window, and script editor, too.

Modified Paths:
--------------
    trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp
    trunk/rkward/rkward/windows/rkcommandeditorwindow.h
    trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc
    trunk/rkward/rkward/windows/rkhtmlwindow.cpp
    trunk/rkward/rkward/windows/rkstandardactions.rc

Modified: trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp	2010-09-14 11:13:24 UTC (rev 3034)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindow.cpp	2010-09-14 11:22:04 UTC (rev 3035)
@@ -103,6 +103,7 @@
 	part->insertChildClient (m_view);
 	setPart (part);
 	fixupPartGUI ();
+	setMetaInfo (i18n ("Script Editor"), QString (), RKSettings::PageCommandEditor);
 	initializeActions (part->actionCollection ());
 	initializeActivationSignals ();
 	RKXMLGUISyncer::self()->registerChangeListener (m_view, this, SLOT (fixupPartGUI()));
@@ -196,9 +197,6 @@
 	action_setwd_to_script->setHelpText (i18n ("Change the working directory to the directory of this script"));
 #endif
 	action_setwd_to_script->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionCDToScript));
-
-	KAction* action_configure = ac->addAction ("configure_commandeditor", this, SLOT (configure()));
-	action_configure->setText (i18n ("Configure Script Editor"));
 }
 
 void RKCommandEditorWindow::initBlocks () {
@@ -750,12 +748,6 @@
 	}
 }
 
-void RKCommandEditorWindow::configure () {
-	RK_TRACE (COMMANDEDITOR);
-
-	RKSettings::configureSettings (RKSettings::PageCommandEditor, this);
-}
-
 //////////////////////// RKFunctionArgHinter //////////////////////////////
 
 #include "../core/rfunctionobject.h"

Modified: trunk/rkward/rkward/windows/rkcommandeditorwindow.h
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindow.h	2010-09-14 11:13:24 UTC (rev 3034)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindow.h	2010-09-14 11:22:04 UTC (rev 3035)
@@ -183,8 +183,6 @@
 	void runLine ();
 /** run the entire script */
 	void runAll ();
-/** invoke the settings page for the command editor */
-	void configure ();
 
 /** selection has changed. Enable / disable actions accordingly */
 	void selectionChanged (KTextEditor::View* view);

Modified: trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc	2010-09-14 11:13:24 UTC (rev 3034)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc	2010-09-14 11:22:04 UTC (rev 3035)
@@ -36,7 +36,5 @@
 		</Menu>
 		<Separator/>
 		<DefineGroup name="ktexteditor_popup_merge2"/>
-		<Separator/>
-		<Action name="configure_commandeditor"/>
 	</Menu>
 </kpartgui>
\ No newline at end of file

Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2010-09-14 11:13:24 UTC (rev 3034)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2010-09-14 11:22:04 UTC (rev 3035)
@@ -370,6 +370,7 @@
 		else RK_ASSERT (false);		// we should know about this
 
 		setXMLFile ("rkoutputwindow.rc");
+		setMetaInfo (i18n ("Output Window"), "rkward://page/rkward_output", RKSettings::PageOutput);
 		run_selection->setVisible (false);
 	} else {
 		RK_ASSERT (new_mode == HTMLHelpWindow);

Modified: trunk/rkward/rkward/windows/rkstandardactions.rc
===================================================================
--- trunk/rkward/rkward/windows/rkstandardactions.rc	2010-09-14 11:13:24 UTC (rev 3034)
+++ trunk/rkward/rkward/windows/rkstandardactions.rc	2010-09-14 11:22:04 UTC (rev 3035)
@@ -39,6 +39,8 @@
 			<Action name="run_all" group="run_actions_merge"/>
 		</Menu>
 		<Action name="function_reference" group="ktexteditor_popup_merge2"/>
+		<Separator group="ktexteditor_popup_merge2"/>
+		<Action name="window_configure" group="ktexteditor_popup_merge2"/>
 	</Menu>
 	<Menu name="rkconsole_context_menu">
 		<Action name="paste_special" group="rkconsole_context_merge_paste"/>


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