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

[tfry at users.sourceforge.net]

Revision: 949
          http://svn.sourceforge.net/rkward/?rev=949&view=rev
Author:   tfry
Date:     2006-11-27 07:53:58 -0800 (Mon, 27 Nov 2006)

Log Message:
-----------
prettifications

Modified Paths:
--------------
    trunk/rkward/rkward/windows/rkwindowcatcher.cpp
    trunk/rkward/rkward/windows/rkwindowcatcher.h

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2006-11-27 15:16:55 UTC (rev 948)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2006-11-27 15:53:58 UTC (rev 949)
@@ -114,8 +114,6 @@
 	capture->embed (window_to_embed);
 
 	RKWardApplication::getApp ()->registerNameWatcher (window_to_embed, this);
-
-	show ();
 }
 
 RKCatchedX11Window::~RKCatchedX11Window () {
@@ -135,7 +133,7 @@
 	RK_TRACE (MISC);
 
 	dynamic_size_action->setChecked (false);
-	toggleFixedSize ();
+	fixedSizeToggled ();
 	dynamic_size_action->setEnabled (false);
 }
 
@@ -145,7 +143,7 @@
 	dynamic_size_action->setEnabled (true);
 }
 
-void RKCatchedX11Window::toggleFixedSize () {
+void RKCatchedX11Window::fixedSizeToggled () {
 	RK_TRACE (MISC);
 
 	if (dynamic_size == dynamic_size_action->isChecked ()) return;
@@ -171,7 +169,7 @@
 	RK_TRACE (MISC);
 
 	dynamic_size_action->setChecked (false);
-	toggleFixedSize ();		// apparently KToggleAction::setChecked () does not invoke the slot!
+	fixedSizeToggled ();		// apparently KToggleAction::setChecked () does not invoke the slot!
 	xembed_container->setFixedSize (500, 500);
 }
 
@@ -179,7 +177,7 @@
 	RK_TRACE (MISC);
 
 	dynamic_size_action->setChecked (false);
-	toggleFixedSize ();		// see setFixedSize1 () above
+	fixedSizeToggled ();		// see setFixedSize1 () above
 	xembed_container->setFixedSize (1000, 1000);
 }
 
@@ -187,7 +185,7 @@
 	RK_TRACE (MISC);
 
 	dynamic_size_action->setChecked (false);
-	toggleFixedSize ();		// see setFixedSize1 () above
+	fixedSizeToggled ();		// see setFixedSize1 () above
 	xembed_container->setFixedSize (2000, 2000);
 }
 
@@ -209,7 +207,7 @@
 
 	if (dialog->result () == QDialog::Accepted) {
 		dynamic_size_action->setChecked (false);
-		toggleFixedSize ();		// see setFixedSize1 () above
+		fixedSizeToggled ();		// see setFixedSize1 () above
 
 		xembed_container->setFixedSize (width->value (), height->value ());
 	}
@@ -274,7 +272,7 @@
 }
 
 
-///////////////////////////////// END RKWindowCatchedWindow ////////////////////////////
+///////////////////////////////// END RKCatchedX11Window ///////////////////////////////
 /**************************************************************************************/
 //////////////////////////////// BEGIN RKCatchedX11WindowPart //////////////////////////
 
@@ -290,7 +288,7 @@
 
 	setXMLFile ("rkcatchedx11windowpart.rc");
 
-	window->dynamic_size_action = new KToggleAction (i18n ("Draw area follows size of window"), 0, window, SLOT (toggleFixedSize ()), actionCollection (), "toggle_fixed_size");
+	window->dynamic_size_action = new KToggleAction (i18n ("Draw area follows size of window"), 0, window, SLOT (fixedSizeToggled ()), actionCollection (), "toggle_fixed_size");
 
 	new KAction (i18n ("Set fixed size 500x500"), 0, window, SLOT (setFixedSize1 ()), actionCollection (), "set_fixed_size_1");
 	new KAction (i18n ("Set fixed size 1000x1000"), 0, window, SLOT (setFixedSize2 ()), actionCollection (), "set_fixed_size_2");
@@ -300,8 +298,8 @@
 	new KAction (i18n ("Make active"), 0, window, SLOT (activateDevice ()), actionCollection (), "device_activate");
 	new KAction (i18n ("Copy to output"), 0, window, SLOT (copyDeviceToOutput ()), actionCollection (), "device_copy_to_output");
 	new KAction (i18n ("Print"), 0, window, SLOT (printDevice ()), actionCollection (), "device_print");
-	new KAction (i18n ("Store as R object"), 0, window, SLOT (copyDeviceToRObject ()), actionCollection (), "device_copy_to_r_object");
-	new KAction (i18n ("Export"), 0, window, SLOT (copyDeviceToFile ()), actionCollection (), "device_copy_to_file");
+	new KAction (i18n ("Store as R object..."), 0, window, SLOT (copyDeviceToRObject ()), actionCollection (), "device_copy_to_r_object");
+	new KAction (i18n ("Export..."), 0, window, SLOT (copyDeviceToFile ()), actionCollection (), "device_copy_to_file");
 	new KAction (i18n ("Duplicate"), 0, window, SLOT (duplicateDevice ()), actionCollection (), "device_duplicate");
 }
 

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.h
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.h	2006-11-27 15:16:55 UTC (rev 948)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.h	2006-11-27 15:53:58 UTC (rev 949)
@@ -104,8 +104,8 @@
 /** see prepareToBeAttached (). Reenable the dynamic_size_action */
 	void prepareToBeDetached ();
 public slots:
-/** Do not invoke directly. Meant to be called from the toggle action */
-	void toggleFixedSize ();
+/** Fixed size action was (potentially) toggled. Update to the new state */
+	void fixedSizeToggled ();
 /** Switch to fixed size mode, and set size1 (currently 500*500) */
 	void setFixedSize1 ();
 /** Switch to fixed size mode, and set size2 (currently 1000*1000) */


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