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

[tfry at users.sourceforge.net]

Revision: 2258
          http://rkward.svn.sourceforge.net/rkward/?rev=2258&view=rev
Author:   tfry
Date:     2007-11-20 05:12:11 -0800 (Tue, 20 Nov 2007)

Log Message:
-----------
Some more icons moved to RKStandardIcons

Modified Paths:
--------------
    branches/KDE4_port/rkward/misc/multistringselector.cpp
    branches/KDE4_port/rkward/misc/rkstandardicons.cpp
    branches/KDE4_port/rkward/misc/rkstandardicons.h
    branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp

Modified: branches/KDE4_port/rkward/misc/multistringselector.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/multistringselector.cpp	2007-11-20 12:57:00 UTC (rev 2257)
+++ branches/KDE4_port/rkward/misc/multistringselector.cpp	2007-11-20 13:12:11 UTC (rev 2258)
@@ -25,7 +25,7 @@
 
 #include <klocale.h>
 
-#include "../rkglobals.h"
+#include "rkstandardicons.h"
 #include "../debug.h"
 
 MultiStringSelector::MultiStringSelector (const QString& label, QWidget* parent) : QWidget (parent) {
@@ -61,11 +61,11 @@
 
 	button_box->addSpacing (10);
 
-	up_button = new QPushButton (i18n ("Up"), this);
+	up_button = new QPushButton (RKStandardIcons::getIcon (RKStandardIcons::ActionMoveUp), i18n ("Up"), this);
 	connect (up_button, SIGNAL (clicked ()), this, SLOT (upButtonClicked ()));
 	button_box->addWidget (up_button);
 
-	down_button = new QPushButton (i18n ("Down"), this);
+	down_button = new QPushButton (RKStandardIcons::getIcon (RKStandardIcons::ActionMoveDown), i18n ("Down"), this);
 	connect (down_button, SIGNAL (clicked ()), this, SLOT (downButtonClicked ()));
 	button_box->addWidget (down_button);
 

Modified: branches/KDE4_port/rkward/misc/rkstandardicons.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkstandardicons.cpp	2007-11-20 12:57:00 UTC (rev 2257)
+++ branches/KDE4_port/rkward/misc/rkstandardicons.cpp	2007-11-20 13:12:11 UTC (rev 2258)
@@ -50,6 +50,11 @@
 	icons[ActionAddRight] = KIcon ("arrow-right");
 	icons[ActionRemoveLeft] = KIcon ("arrow-left");
 
+	icons[ActionMoveLeft] = KIcon("go-previous");
+	icons[ActionMoveRight] = KIcon("go-next");
+	icons[ActionMoveUp] = KIcon("go-up");
+	icons[ActionMoveDown] = KIcon("go-down");
+
 	icons[ActionDetachWindow] = KIcon ("view-fullscreen");
 	icons[ActionAttachWindow] = KIcon ("view-restore");
 

Modified: branches/KDE4_port/rkward/misc/rkstandardicons.h
===================================================================
--- branches/KDE4_port/rkward/misc/rkstandardicons.h	2007-11-20 12:57:00 UTC (rev 2257)
+++ branches/KDE4_port/rkward/misc/rkstandardicons.h	2007-11-20 13:12:11 UTC (rev 2258)
@@ -50,6 +50,11 @@
 		ActionAddRight,
 		ActionRemoveLeft,
 
+		ActionMoveLeft,
+		ActionMoveRight,
+		ActionMoveUp,
+		ActionMoveDown,
+
 		ActionDetachWindow,
 		ActionAttachWindow,
 

Modified: branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp	2007-11-20 12:57:00 UTC (rev 2257)
+++ branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp	2007-11-20 13:12:11 UTC (rev 2258)
@@ -22,8 +22,6 @@
 #include <khbox.h>
 #include <kmenu.h>
 #include <klocale.h>
-#include <kiconloader.h>
-#include <kicon.h>
 
 #include <QSplitter>
 #include <QContextMenuEvent>
@@ -274,12 +272,11 @@
 
 				p->addTitle (i18n("Move To"));
 	
-				if (position () != KMultiTabBar::Left) p->addAction(KIcon("go-previous"), i18n("Left Sidebar"))->setData(KMultiTabBar::Left);
+				if (position () != KMultiTabBar::Left) p->addAction(RKStandardIcons::getIcon (RKStandardIcons::ActionMoveLeft), i18n("Left Sidebar"))->setData(KMultiTabBar::Left);
+				if (position () != KMultiTabBar::Right) p->addAction(RKStandardIcons::getIcon (RKStandardIcons::ActionMoveRight), i18n("Right Sidebar"))->setData(KMultiTabBar::Right);
+				if (position () != KMultiTabBar::Top) p->addAction(RKStandardIcons::getIcon (RKStandardIcons::ActionMoveUp), i18n("Top Sidebar"))->setData(KMultiTabBar::Top);
+				if (position () != KMultiTabBar::Bottom) p->addAction(RKStandardIcons::getIcon (RKStandardIcons::ActionMoveDown), i18n("Bottom Sidebar"))->setData(KMultiTabBar::Bottom);
 	
-				if (position () != KMultiTabBar::Right) p->addAction(KIcon("go-next"), i18n("Right Sidebar"))->setData(KMultiTabBar::Right);
-				if (position () != KMultiTabBar::Top) p->addAction(KIcon("go-up"), i18n("Top Sidebar"))->setData(KMultiTabBar::Top);
-				if (position () != KMultiTabBar::Bottom) p->addAction(KIcon("go-down"), i18n("Bottom Sidebar"))->setData(KMultiTabBar::Bottom);
-	
 				connect (p, SIGNAL (triggered(QAction *)), this, SLOT (buttonPopupActivate(QAction *)));
 				p->exec (e->globalPos());
 				delete p;


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