[rkward-cvs] SF.net SVN: rkward: [2076] branches/KDE4_port/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Oct 15 23:49:58 UTC 2007
Revision: 2076
http://rkward.svn.sourceforge.net/rkward/?rev=2076&view=rev
Author: tfry
Date: 2007-10-15 16:49:57 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Some icons and show events
Modified Paths:
--------------
branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp
branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.h
branches/KDE4_port/rkward/rkward.cpp
branches/KDE4_port/rkward/robjectbrowser.cpp
branches/KDE4_port/rkward/robjectbrowser.h
branches/KDE4_port/rkward/windows/rcontrolwindow.cpp
branches/KDE4_port/rkward/windows/rcontrolwindow.h
branches/KDE4_port/rkward/windows/rkfilebrowser.cpp
branches/KDE4_port/rkward/windows/rkfilebrowser.h
branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
Modified: branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp 2007-10-15 23:49:57 UTC (rev 2076)
@@ -135,10 +135,10 @@
}
}
-void RKStandardComponentGUI::show () {
+void RKStandardComponentGUI::showEvent (QShowEvent *e) {
RK_TRACE (PLUGIN);
- QWidget::show ();
+ QWidget::showEvent (e);
if (toggle_code_button) { // this is a dialog, not wizard
QTimer::singleShot (0, this, SLOT (toggleCode ()));
Modified: branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.h
===================================================================
--- branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.h 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.h 2007-10-15 23:49:57 UTC (rev 2076)
@@ -87,7 +87,7 @@
virtual void enableSubmit (bool enable);
virtual void updateCode ();
/** reimplemented from QWidget to take care of showing the code display if needed */
- void show ();
+ void showEvent (QShowEvent *e);
public slots:
void ok ();
void cancel ();
Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/rkward.cpp 2007-10-15 23:49:57 UTC (rev 2076)
@@ -206,7 +206,7 @@
RControlWindow::control_window = new RControlWindow (0, true, "rcontrol"); // the control window needs to be initialized before startR () is called.
RKCommandLog *log = new RKCommandLog (0, true, "Command log");
- log->setIcon (SmallIcon ("text_block"));
+ log->setWindowIcon (SmallIcon ("format-justify-left"));
RKWorkplace::mainWorkplace ()->registerToolWindow (log);
RKWorkplace::mainWorkplace ()->placeInToolWindowBar (log, KMultiTabBar::Bottom);
RKCommandLog::rkcommand_log = log;
@@ -218,29 +218,30 @@
initPlugins ();
- RObjectBrowser::mainBrowser ()->setIcon(SmallIcon("view_tree"));
+ RObjectBrowser::mainBrowser ()->setWindowIcon(SmallIcon("fileview-detailed"));
RObjectBrowser::mainBrowser ()->setCaption (i18n ("Workspace"));
RKWorkplace::mainWorkplace ()->registerToolWindow (RObjectBrowser::mainBrowser ());
RKWorkplace::mainWorkplace ()->placeInToolWindowBar (RObjectBrowser::mainBrowser (), KMultiTabBar::Left);
RKFileBrowser::main_browser = new RKFileBrowser (0, true, "file_browser");
- RKFileBrowser::main_browser->setIcon (SmallIcon ("fileopen"));
+ RKFileBrowser::main_browser->setWindowIcon (SmallIcon ("document-open"));
RKFileBrowser::main_browser->setCaption (i18n ("Files"));
RKWorkplace::mainWorkplace ()->registerToolWindow (RKFileBrowser::main_browser);
RKWorkplace::mainWorkplace ()->placeInToolWindowBar (RKFileBrowser::main_browser, KMultiTabBar::Left);
RControlWindow::getControl ()->setCaption (i18n ("Pending Jobs"));
+ RControlWindow::getControl ()->setWindowIcon (SmallIcon ("system-run"));
RKWorkplace::mainWorkplace ()->registerToolWindow (RControlWindow::getControl ());
RKWorkplace::mainWorkplace ()->placeInToolWindowBar (RControlWindow::getControl (), KMultiTabBar::Bottom);
RKConsole *console = new RKConsole (0, true, "r_console");
- console->setIcon (SmallIcon ("konsole"));
+ console->setWindowIcon (SmallIcon ("konsole"));
RKWorkplace::mainWorkplace ()->registerToolWindow (console);
RKConsole::setMainConsole (console);
RKWorkplace::mainWorkplace ()->placeInToolWindowBar (console, KMultiTabBar::Bottom);
RKHelpSearchWindow *help_search = new RKHelpSearchWindow (0, true, "r_help");
- help_search->setIcon (SmallIcon ("help"));
+ help_search->setWindowIcon (SmallIcon ("help-contents"));
RKWorkplace::mainWorkplace ()->registerToolWindow (help_search);
RKHelpSearchWindow::main_help_search = help_search;
RKWorkplace::mainWorkplace ()->placeInToolWindowBar (help_search, KMultiTabBar::Bottom);
Modified: branches/KDE4_port/rkward/robjectbrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/robjectbrowser.cpp 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/robjectbrowser.cpp 2007-10-15 23:49:57 UTC (rev 2076)
@@ -80,11 +80,11 @@
}
}
-void RObjectBrowser::show () {
+void RObjectBrowser::showEvent (QShowEvent *e) {
RK_TRACE (APP);
initialize ();
- RKMDIWindow::show ();
+ RKMDIWindow::showEvent (e);
}
void RObjectBrowser::initialize () {
Modified: branches/KDE4_port/rkward/robjectbrowser.h
===================================================================
--- branches/KDE4_port/rkward/robjectbrowser.h 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/robjectbrowser.h 2007-10-15 23:49:57 UTC (rev 2076)
@@ -50,7 +50,7 @@
void unlock ();
static RObjectBrowser *mainBrowser () { return object_browser; };
/** reimplemented to create the real file browser widget only when the file browser is shown for the first time */
- void show ();
+ void showEvent (QShowEvent *e);
private:
RObjectBrowserInternal *internal;
Q3VBox *layout_widget;
Modified: branches/KDE4_port/rkward/windows/rcontrolwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rcontrolwindow.cpp 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/windows/rcontrolwindow.cpp 2007-10-15 23:49:57 UTC (rev 2076)
@@ -91,10 +91,10 @@
if (isShown ()) show (); // refreshes the commands
}
-void RControlWindow::show () {
+void RControlWindow::showEvent (QShowEvent *e) {
RK_TRACE (APP);
- RKMDIWindow::show ();
+ RKMDIWindow::showEvent (e);
if (!initialized) return;
MUTEX_LOCK;
refreshCommands ();
Modified: branches/KDE4_port/rkward/windows/rcontrolwindow.h
===================================================================
--- branches/KDE4_port/rkward/windows/rcontrolwindow.h 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/windows/rcontrolwindow.h 2007-10-15 23:49:57 UTC (rev 2076)
@@ -69,7 +69,7 @@
void setCommandRunning (RCommand *command);
/** reimplemented to refresh list of commands when showing. This is needed, as the RControlWindow is only kept up to date as long as it is shown. Hence, if it was hidden, and then gets shown, it will have to update the entire list. */
- void show ();
+ void showEvent (QShowEvent *e);
/** Call this once, when the RInterface is ready, and it is ok to try showing commands */
void initialize ();
/** Static reference to the control window */
Modified: branches/KDE4_port/rkward/windows/rkfilebrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkfilebrowser.cpp 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/windows/rkfilebrowser.cpp 2007-10-15 23:49:57 UTC (rev 2076)
@@ -61,7 +61,7 @@
hide ();
}
-void RKFileBrowser::show () {
+void RKFileBrowser::showEvent (QShowEvent *e) {
RK_TRACE (APP);
if (!real_widget) {
@@ -71,7 +71,7 @@
layout_widget->setFocusProxy (real_widget);
}
- RKMDIWindow::show ();
+ RKMDIWindow::showEvent (e);
}
void RKFileBrowser::currentWDChanged () {
Modified: branches/KDE4_port/rkward/windows/rkfilebrowser.h
===================================================================
--- branches/KDE4_port/rkward/windows/rkfilebrowser.h 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/windows/rkfilebrowser.h 2007-10-15 23:49:57 UTC (rev 2076)
@@ -37,7 +37,7 @@
~RKFileBrowser ();
/** reimplemented to create the real file browser widget only when the file browser is shown for the first time */
- void show ();
+ void showEvent (QShowEvent *e);
static RKFileBrowser *getMainBrowser() { return main_browser; };
public slots:
void currentWDChanged ();
Modified: branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp 2007-10-15 22:53:11 UTC (rev 2075)
+++ branches/KDE4_port/rkward/windows/rktoolwindowbar.cpp 2007-10-15 23:49:57 UTC (rev 2076)
@@ -38,6 +38,8 @@
RKToolWindowBar::RKToolWindowBar (KMultiTabBarPosition position, QWidget *parent) : KMultiTabBar (position, parent),
container (0) {
RK_TRACE (APP);
+
+ setStyle (KMultiTabBar::KDEV3ICON);
}
RKToolWindowBar::~RKToolWindowBar () {
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