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

[tfry at users.sourceforge.net]

Revision: 2585
          http://rkward.svn.sourceforge.net/rkward/?rev=2585&view=rev
Author:   tfry
Date:     2009-07-29 19:33:48 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Yet another attempt at shortcut syncing. Previous solutions appears to be crashy, at least with kdelibs 4.2.2

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
    trunk/rkward/rkward/resource.ver
    trunk/rkward/rkward/rkward.cpp
    trunk/rkward/rkward/version.h
    trunk/rkward/rkward/windows/detachedwindowcontainer.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2009-07-29 09:10:13 UTC (rev 2584)
+++ trunk/rkward/ChangeLog	2009-07-29 19:33:48 UTC (rev 2585)
@@ -1,4 +1,4 @@
---- Version 0.5.1 - ???-??-2009
+--- Version 0.5.1 - Aug-04-2009
 - New command line option "--evaluate <Rcode>" mostly for the purpose of automated testing
 - Remove support for R 2.6.x and earlier
 - Add basic checks for a correct installation of the RKWard resource files

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2009-07-29 09:10:13 UTC (rev 2584)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2009-07-29 19:33:48 UTC (rev 2585)
@@ -1 +1 @@
-".rk.app.version" <- "0.5.1-pre4"
+".rk.app.version" <- "0.5.1-rc1"

Modified: trunk/rkward/rkward/resource.ver
===================================================================
--- trunk/rkward/rkward/resource.ver	2009-07-29 09:10:13 UTC (rev 2584)
+++ trunk/rkward/rkward/resource.ver	2009-07-29 19:33:48 UTC (rev 2585)
@@ -1 +1 @@
-0.5.1-pre4
+0.5.1-rc1

Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp	2009-07-29 09:10:13 UTC (rev 2584)
+++ trunk/rkward/rkward/rkward.cpp	2009-07-29 19:33:48 UTC (rev 2585)
@@ -387,12 +387,17 @@
 void RKWardMainWindow::changeEvent (QEvent *e) {
 	RK_TRACE (APP);
 
-#if KDE_VERSION >= KDE_MAKE_VERSION(4,2,0)
 	// see RKWardMainWindow::partChanged() for a detailed comment
 	if ((e->type () == QEvent::ActivationChange) && isActiveWindow () && isVisible ()) {
-		if (factory ()) factory ()->refreshActionProperties ();
+		RKMDIWindow *active = RKWorkplace::mainWorkplace ()->activeWindow (RKMDIWindow::Attached);
+		toplevel_actions->reloadXML ();
+		createGUI (0);
+		if (active) {
+			active->fixupPartGUI (true);
+			createGUI (active->getPart ());
+		}
+		// NOTE: KXMLGUIFactory::refreshActionProperties(), which would be a simple repalcement for the above, seems to cause crashes, at least with KDElibs 4.2.2: http://sourceforge.net/tracker/?func=detail&atid=459007&aid=2828002&group_id=50231
 	}
-#endif
 
 	KParts::MainWindow::changeEvent (e);
 }

Modified: trunk/rkward/rkward/version.h
===================================================================
--- trunk/rkward/rkward/version.h	2009-07-29 09:10:13 UTC (rev 2584)
+++ trunk/rkward/rkward/version.h	2009-07-29 19:33:48 UTC (rev 2585)
@@ -1,2 +1,2 @@
 /* Version number of package */
-#define VERSION "0.5.1-pre4"
+#define VERSION "0.5.1-rc1"

Modified: trunk/rkward/rkward/windows/detachedwindowcontainer.cpp
===================================================================
--- trunk/rkward/rkward/windows/detachedwindowcontainer.cpp	2009-07-29 09:10:13 UTC (rev 2584)
+++ trunk/rkward/rkward/windows/detachedwindowcontainer.cpp	2009-07-29 19:33:48 UTC (rev 2585)
@@ -130,11 +130,11 @@
 
 	// see RKWardMainWindow::partChanged() for a detailed comment
 	if ((e->type () == QEvent::ActivationChange) && isActiveWindow () && isVisible ()) {
-		// why do we need both in this place? No idea, but without the first line, the shortcut is not refreshed, when it was changed via RMB from this window, and without the second line, the shortcut is not refreshed, when it was changed elsewhere.
 		captured->fixupPartGUI (true);
-#if KDE_VERSION >= KDE_MAKE_VERSION(4,2,0)
-		if (factory ()) factory ()->refreshActionProperties ();
-#endif
+		toplevel_actions->reloadXML ();
+		createGUI (0);
+		createGUI (captured->getPart ());
+		// see RKWardMainWindow::changeEvent() for why KXMLGUIFactory::refreshActionProperties () is not used, instead.
 	}
 
 	KParts::MainWindow::changeEvent (e);


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