[rkward-cvs] SF.net SVN: rkward: [2212] branches/KDE4_port
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Nov 12 23:26:12 UTC 2007
Revision: 2212
http://rkward.svn.sourceforge.net/rkward/?rev=2212&view=rev
Author: tfry
Date: 2007-11-12 15:26:12 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
More icons
Modified Paths:
--------------
branches/KDE4_port/doc/en/CMakeLists.txt
branches/KDE4_port/rkward/misc/rkstandardicons.cpp
branches/KDE4_port/rkward/misc/rkstandardicons.h
branches/KDE4_port/rkward/rkward.cpp
branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp
Modified: branches/KDE4_port/doc/en/CMakeLists.txt
===================================================================
--- branches/KDE4_port/doc/en/CMakeLists.txt 2007-11-12 23:17:56 UTC (rev 2211)
+++ branches/KDE4_port/doc/en/CMakeLists.txt 2007-11-12 23:26:12 UTC (rev 2212)
@@ -1,5 +1,3 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
KDE4_CREATE_HANDBOOK( index.docbook )
#KDE4_CREATE_HANDBOOK( writing_plugins_introduction.docbook )
Modified: branches/KDE4_port/rkward/misc/rkstandardicons.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkstandardicons.cpp 2007-11-12 23:17:56 UTC (rev 2211)
+++ branches/KDE4_port/rkward/misc/rkstandardicons.cpp 2007-11-12 23:26:12 UTC (rev 2212)
@@ -47,6 +47,9 @@
icons[ActionDeleteVar] = icons[ActionDeleteRow];
icons[ActionInsertVar] = icons[ActionInsertRow];
+ icons[ActionDetachWindow] = KIcon ("view-fullscreen");
+ icons[ActionAttachWindow] = KIcon ("view-restore");
+
#warning TODO add further action icons here
// objects
Modified: branches/KDE4_port/rkward/misc/rkstandardicons.h
===================================================================
--- branches/KDE4_port/rkward/misc/rkstandardicons.h 2007-11-12 23:17:56 UTC (rev 2211)
+++ branches/KDE4_port/rkward/misc/rkstandardicons.h 2007-11-12 23:26:12 UTC (rev 2212)
@@ -47,6 +47,9 @@
ActionDeleteVar,
ActionInsertVar,
+ ActionDetachWindow,
+ ActionAttachWindow,
+
ObjectList,
ObjectFunction,
ObjectEnvironment,
Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp 2007-11-12 23:17:56 UTC (rev 2211)
+++ branches/KDE4_port/rkward/rkward.cpp 2007-11-12 23:26:12 UTC (rev 2212)
@@ -370,14 +370,13 @@
close_all_editors->setText (i18n ("Close All Data"));
close_all_editors->setStatusTip (i18n ("Closes all open data editors"));
- action = actionCollection ()->addAction ("window_close", this, SLOT (slotCloseWindow()));
- action->setText (i18n ("Close"));
- action->setShortcut (Qt::ControlModifier + Qt::Key_W);
+ action = actionCollection ()->addAction (KStandardAction::Close, "window_close", this, SLOT (slotCloseWindow()));
window_close_all = actionCollection ()->addAction ("window_close_all", this, SLOT (slotCloseAllWindows()));
window_close_all->setText (i18n ("Close All"));
window_detach = actionCollection ()->addAction ("window_detach", this, SLOT (slotDetachWindow()));
+ window_detach->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionDetachWindow));
window_detach->setText (i18n ("Detach"));
configure = actionCollection ()->addAction ("configure", this, SLOT (slotConfigure()));
Modified: branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp 2007-11-12 23:17:56 UTC (rev 2211)
+++ branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp 2007-11-12 23:26:12 UTC (rev 2212)
@@ -27,6 +27,7 @@
#include "rktoplevelwindowgui.h"
#include "../rkward.h"
+#include "../misc/rkstandardicons.h"
#include "rkworkplace.h"
#include "../rkglobals.h"
#include "../debug.h"
@@ -42,6 +43,7 @@
QAction *reattach = actionCollection ()->addAction ("dwindow_attach", this, SLOT(slotReattach()));
reattach->setText (i18n ("Attach to main window"));
+ reattach->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionAttachWindow));
RKTopLevelWindowGUI *toplevel_actions = new RKTopLevelWindowGUI (this);
insertChildClient (toplevel_actions);
Modified: branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp 2007-11-12 23:17:56 UTC (rev 2211)
+++ branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp 2007-11-12 23:26:12 UTC (rev 2212)
@@ -246,6 +246,8 @@
RK_TRACE (APP);
type = RKMDIWindow::OutputWindow;
+ // for this window, we need to set it explicitely, as the logic in RKHTMLWindow though we are an RKHTMLWindow, only
+ setWindowIcon (RKStandardIcons::getIcon (RKStandardIcons::WindowOutput));
// strip down the khtmlpart's GUI. remove some stuff we definitely don't need.
RKCommonFunctions::removeContainers (khtmlpart, QStringList::split (',', "tools,security,extraToolBar,saveBackground,saveFrame,printFrame,kget_menu"), true);
Modified: branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp 2007-11-12 23:17:56 UTC (rev 2211)
+++ branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp 2007-11-12 23:26:12 UTC (rev 2212)
@@ -31,6 +31,7 @@
#include "rkworkplace.h"
#include "rkworkplaceview.h"
#include "rkmdiwindow.h"
+#include "../misc/rkstandardicons.h"
#include "../debug.h"
@@ -267,11 +268,11 @@
if (widget) {
KMenu *p = new KMenu (this);
- p->addTitle (SmallIcon("view_remove"), i18n("Attachment"));
+ p->addTitle (i18n("Attachment"));
- p->addAction (widget->isAttached () ? KIcon("view-restore") : KIcon("view-fullscreen"), widget->isAttached () ? i18n("Detach") : i18n("Attach"))->setData (CHANGE_ATTACHMENT_ACTION_ID);
+ p->addAction (RKStandardIcons::getIcon (widget->isAttached () ? RKStandardIcons::ActionDetachWindow : RKStandardIcons::ActionAttachWindow), widget->isAttached () ? i18n("Detach") : i18n("Attach"))->setData (CHANGE_ATTACHMENT_ACTION_ID);
- p->addTitle (SmallIcon("move"), i18n("Move To"));
+ p->addTitle (i18n("Move To"));
if (position () != KMultiTabBar::Left) p->addAction(KIcon("go-previous"), i18n("Left Sidebar"))->setData(KMultiTabBar::Left);
Modified: branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp 2007-11-12 23:17:56 UTC (rev 2211)
+++ branches/KDE4_port/rkward/windows/rktoplevelwindowgui.cpp 2007-11-12 23:26:12 UTC (rev 2212)
@@ -97,6 +97,7 @@
action = actionCollection ()->addAction ("output_show", this, SLOT (slotOutputShow()));
action->setText (i18n ("Show &Output"));
+ action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::WindowOutput));
}
RKTopLevelWindowGUI::~RKTopLevelWindowGUI () {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list