[rkward-cvs] SF.net SVN: rkward: [1578] trunk/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Wed Mar 14 16:01:31 UTC 2007
Revision: 1578
http://svn.sourceforge.net/rkward/?rev=1578&view=rev
Author: tfry
Date: 2007-03-14 09:01:30 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
Add custom icons for the run actions.
These are not pretty. If you think you can do better, please go ahead.
Modified Paths:
--------------
trunk/rkward/ChangeLog
trunk/rkward/rkward/icons/Makefile.am
trunk/rkward/rkward/rkconsole.cpp
trunk/rkward/rkward/windows/rkcommandeditorwindowpart.cpp
trunk/rkward/rkward/windows/rkcommandlog.cpp
trunk/rkward/rkward/windows/rkworkplace.cpp
Added Paths:
-----------
trunk/rkward/rkward/icons/run_all.png
trunk/rkward/rkward/icons/run_line.png
trunk/rkward/rkward/icons/run_selection.png
Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog 2007-03-14 13:23:26 UTC (rev 1577)
+++ trunk/rkward/ChangeLog 2007-03-14 16:01:30 UTC (rev 1578)
@@ -1,3 +1,4 @@
+- add custom icons for run line/selection/all
- make sure not to run parts of an incomplete user command. It would lead to all sorts of subtle problems
- if an incomplete command was piped through the console, the console does not become blocked for piping
- make "run current line" advance the cursor to next line after running
Modified: trunk/rkward/rkward/icons/Makefile.am
===================================================================
--- trunk/rkward/rkward/icons/Makefile.am 2007-03-14 13:23:26 UTC (rev 1577)
+++ trunk/rkward/rkward/icons/Makefile.am 2007-03-14 16:01:30 UTC (rev 1578)
@@ -3,5 +3,5 @@
KDE_ICON = rkward
iconsdir = $(kde_datadir)/rkward/icons
-icons_DATA = rkward_logo.png function.png list.png window_back.png window_forward.png
+icons_DATA = rkward_logo.png function.png list.png window_back.png window_forward.png run_line.png run_selection.png run_all.png
Added: trunk/rkward/rkward/icons/run_all.png
===================================================================
(Binary files differ)
Property changes on: trunk/rkward/rkward/icons/run_all.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rkward/rkward/icons/run_line.png
===================================================================
(Binary files differ)
Property changes on: trunk/rkward/rkward/icons/run_line.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rkward/rkward/icons/run_selection.png
===================================================================
(Binary files differ)
Property changes on: trunk/rkward/rkward/icons/run_selection.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/rkward/rkward/rkconsole.cpp
===================================================================
--- trunk/rkward/rkward/rkconsole.cpp 2007-03-14 13:23:26 UTC (rev 1577)
+++ trunk/rkward/rkward/rkconsole.cpp 2007-03-14 16:01:30 UTC (rev 1578)
@@ -739,8 +739,7 @@
RK_TRACE (APP);
context_help_action = new KAction (i18n ("&Function reference"), KShortcut ("F2"), this, SLOT (showContextHelp ()), ac, "function_reference");
- run_selection_action = new KAction (i18n ("Run selection"), KShortcut ("F8"), this, SLOT (runSelection ()), ac, "run_selection");
- run_selection_action->setIcon ("player_play");
+ run_selection_action = new KAction (i18n ("Run selection"), QIconSet (RKCommonFunctions::getRKWardDataDir () + "icons/run_selection.png"), KShortcut ("F8"), this, SLOT (runSelection ()), ac, "run_selection");
interrupt_command_action = new KAction (i18n ("Interrupt running command"), KShortcut ("Ctrl+C"), this, SLOT (slotInterruptCommand ()), ac, "interrupt");
interrupt_command_action->setIcon ("player_stop");
Modified: trunk/rkward/rkward/windows/rkcommandeditorwindowpart.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindowpart.cpp 2007-03-14 13:23:26 UTC (rev 1577)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindowpart.cpp 2007-03-14 16:01:30 UTC (rev 1578)
@@ -25,6 +25,7 @@
#include <qpopupmenu.h>
#include "rkcommandeditorwindow.h"
+#include "../misc/rkcommonfunctions.h"
#include "../debug.h"
RKCommandEditorWindowPart::RKCommandEditorWindowPart (QWidget *parent, RKCommandEditorWindow *editor_widget) : KParts::Part (parent) {
@@ -47,9 +48,9 @@
void RKCommandEditorWindowPart::initializeActions () {
RK_TRACE (COMMANDEDITOR);
- runAll = new KAction (i18n ("Run all"), "player_fwd", KShortcut ("F9"), command_editor, SLOT (runAll()), actionCollection (), "run_all");
- runSelection = new KAction (i18n ("Run selection"), "player_play", KShortcut ("F8"), command_editor, SLOT (runSelection()), actionCollection (), "run_selection");
- runLine = new KAction (i18n ("Run current line"), "player_end", KShortcut ("Ctrl+L"), command_editor, SLOT (runLine()), actionCollection (), "run_line");
+ runAll = new KAction (i18n ("Run all"), QIconSet (RKCommonFunctions::getRKWardDataDir () + "icons/run_all.png"), KShortcut ("F9"), command_editor, SLOT (runAll()), actionCollection (), "run_all");
+ runSelection = new KAction (i18n ("Run selection"), QIconSet (RKCommonFunctions::getRKWardDataDir () + "icons/run_selection.png"), KShortcut ("F8"), command_editor, SLOT (runSelection()), actionCollection (), "run_selection");
+ runLine = new KAction (i18n ("Run current line"), QIconSet (RKCommonFunctions::getRKWardDataDir () + "icons/run_line.png"), KShortcut ("Ctrl+L"), command_editor, SLOT (runLine()), actionCollection (), "run_line");
helpFunction = new KAction (i18n ("&Function reference"), KShortcut ("F2"), command_editor, SLOT (showHelp()), actionCollection (), "function_reference");
}
Modified: trunk/rkward/rkward/windows/rkcommandlog.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlog.cpp 2007-03-14 13:23:26 UTC (rev 1577)
+++ trunk/rkward/rkward/windows/rkcommandlog.cpp 2007-03-14 16:01:30 UTC (rev 1578)
@@ -22,6 +22,7 @@
#include "../rkconsole.h"
#include "../settings/rksettingsmodulewatch.h"
#include "../settings/rksettings.h"
+#include "../misc/rkcommonfunctions.h"
#include "rkcommandeditorwindow.h"
#include <qpushbutton.h>
@@ -283,8 +284,7 @@
KStdAction::clear (log, SLOT (clearLog ()), actionCollection (), "log_clear");
KStdAction::selectAll (log->getView (), SLOT (selectAll ()), actionCollection (), "log_select_all");
new KAction (i18n ("Configure"), 0, log, SLOT (configureLog ()), actionCollection (), "log_configure");
- run_selection = new KAction (i18n ("Run selection"), KShortcut ("F8"), log, SLOT (runSelection ()), actionCollection (), "log_run_selection");
- run_selection->setIcon("player_play");
+ run_selection = new KAction (i18n ("Run selection"), QIconSet (RKCommonFunctions::getRKWardDataDir () + "icons/run_selection.png"), KShortcut ("F8"), log, SLOT (runSelection ()), actionCollection (), "log_run_selection");
connect (log->getView (), SIGNAL (popupMenuRequest (const QPoint &)), this, SLOT (doPopupMenu (const QPoint &)));
}
Modified: trunk/rkward/rkward/windows/rkworkplace.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkworkplace.cpp 2007-03-14 13:23:26 UTC (rev 1577)
+++ trunk/rkward/rkward/windows/rkworkplace.cpp 2007-03-14 16:01:30 UTC (rev 1578)
@@ -22,8 +22,6 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <qimage.h>
-
#include "detachedwindowcontainer.h"
#include "rkcommandeditorwindow.h"
#include "rkhtmlwindow.h"
@@ -424,11 +422,11 @@
KShortcut prev_short ("Alt+<");
prev_short.append (KKey (Qt::ALT | Qt::Key_Comma)); // "Alt+," does not work, as "," has a special meaning.
- prev_action = new KAction (i18n ("Previous Window"), QIconSet (QPixmap (QImage (RKCommonFunctions::getRKWardDataDir () + "icons/window_back.png"))), prev_short, this, SLOT (prev ()), ac, prev_id);
+ prev_action = new KAction (i18n ("Previous Window"), QIconSet (RKCommonFunctions::getRKWardDataDir () + "icons/window_back.png"), prev_short, this, SLOT (prev ()), ac, prev_id);
KShortcut next_short ("Alt+>");
next_short.append ("Alt+.");
- next_action = new KAction (i18n ("Next Window"), QIconSet (QPixmap (QImage (RKCommonFunctions::getRKWardDataDir () + "icons/window_forward.png"))), next_short, this, SLOT (next ()), ac, next_id);
+ next_action = new KAction (i18n ("Next Window"), QIconSet (RKCommonFunctions::getRKWardDataDir () + "icons/window_forward.png"), next_short, 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.
More information about the rkward-tracker
mailing list