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

[tfry at users.sourceforge.net]

Revision: 1537
          http://svn.sourceforge.net/rkward/?rev=1537&view=rev
Author:   tfry
Date:     2007-03-04 13:23:04 -0800 (Sun, 04 Mar 2007)

Log Message:
-----------
Add shortcuts and (self-made == not-too-pretty) icons for next/prev window

Modified Paths:
--------------
    trunk/rkward/rkward/icons/Makefile.am
    trunk/rkward/rkward/rkwardui.rc
    trunk/rkward/rkward/windows/rkworkplace.cpp

Modified: trunk/rkward/rkward/icons/Makefile.am
===================================================================
--- trunk/rkward/rkward/icons/Makefile.am	2007-03-04 19:59:29 UTC (rev 1536)
+++ trunk/rkward/rkward/icons/Makefile.am	2007-03-04 21:23:04 UTC (rev 1537)
@@ -3,5 +3,5 @@
 KDE_ICON = rkward
 iconsdir = $(kde_datadir)/rkward/icons
 
-icons_DATA = rkward_logo.png function.png list.png
+icons_DATA = rkward_logo.png function.png list.png window_back.png window_forward.png
 

Modified: trunk/rkward/rkward/rkwardui.rc
===================================================================
--- trunk/rkward/rkward/rkwardui.rc	2007-03-04 19:59:29 UTC (rev 1536)
+++ trunk/rkward/rkward/rkwardui.rc	2007-03-04 21:23:04 UTC (rev 1537)
@@ -40,8 +40,8 @@
 		<Action name="window_close_all"/>
 		<Action name="close_all_editors"/>
 		<Separator/>
+		<Action name="prev_window"/>
 		<Action name="next_window"/>
-		<Action name="prev_window"/>
 		<Separator/>
 		<Action name="window_detach"/>
 	</Menu>
@@ -63,6 +63,9 @@
 		<Action name="new_command_editor"/>
 		<Action name="file_openy"/>
 		<Action name="file_open_recenty"/>
+		<Separator/>
+		<Action name="prev_window"/>
+		<Action name="next_window"/>
 </ToolBar>
 <ToolBar fullWidth="true" name="runToolBar">
 </ToolBar>

Modified: trunk/rkward/rkward/windows/rkworkplace.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkworkplace.cpp	2007-03-04 19:59:29 UTC (rev 1536)
+++ trunk/rkward/rkward/windows/rkworkplace.cpp	2007-03-04 21:23:04 UTC (rev 1537)
@@ -22,6 +22,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 
+#include <qimage.h>
+
 #include "detachedwindowcontainer.h"
 #include "rkcommandeditorwindow.h"
 #include "rkhtmlwindow.h"
@@ -37,6 +39,7 @@
 #include "../rbackend/rinterface.h"
 #include "../windows/rkwindowcatcher.h"
 #include "../rbackend/rcommand.h"
+#include "../misc/rkcommonfunctions.h"
 #include "../rkglobals.h"
 #include "../rkward.h"
 
@@ -419,8 +422,8 @@
 void RKMDIWindowHistory::addActions (KActionCollection *ac, const char *prev_id, const char *next_id) {
 	RK_TRACE (APP);
 
-	prev_action = new KAction (i18n ("Previous Window"), 0, 0, this, SLOT (prev ()), ac, prev_id);
-	next_action = new KAction (i18n ("Next Window"), 0, 0, this, SLOT (next ()), ac, next_id);
+	prev_action = new KAction (i18n ("Previous Window"), QIconSet (QPixmap (QImage (RKCommonFunctions::getRKWardDataDir () + "icons/window_back.png"))), KShortcut ("Ctrl+<"), this, SLOT (prev ()), ac, prev_id);
+	next_action = new KAction (i18n ("Next Window"), QIconSet (QPixmap (QImage (RKCommonFunctions::getRKWardDataDir () + "icons/window_forward.png"))), KShortcut ("Ctrl+>"), this, SLOT (next ()), ac, next_id);
 	updateActions ();
 }
 


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