[rkward-cvs] SF.net SVN: rkward: [2049] branches/KDE4_port/rkward/windows
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Fri Oct 12 16:10:00 UTC 2007
Revision: 2049
http://rkward.svn.sourceforge.net/rkward/?rev=2049&view=rev
Author: tfry
Date: 2007-10-12 09:10:00 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
Some more progress
Modified Paths:
--------------
branches/KDE4_port/rkward/windows/CMakeLists.txt
branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
branches/KDE4_port/rkward/windows/rkmdiwindow.cpp
branches/KDE4_port/rkward/windows/rktoolwindowbar.h
branches/KDE4_port/rkward/windows/rkworkplaceview.cpp
Modified: branches/KDE4_port/rkward/windows/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/windows/CMakeLists.txt 2007-10-12 15:08:41 UTC (rev 2048)
+++ branches/KDE4_port/rkward/windows/CMakeLists.txt 2007-10-12 16:10:00 UTC (rev 2049)
@@ -4,21 +4,22 @@
########### next target ###############
SET(windows_STAT_SRCS
- rkcommandeditorwindow.cpp
- rkcommandeditorwindowpart.cpp
- rkhtmlwindow.cpp
- rcontrolwindow.cpp
- detachedwindowcontainer.cpp
- rkmdiwindow.cpp
- rkworkplaceview.cpp
- rkworkplace.cpp
- qxembedcopy.cpp
- rkwindowcatcher.cpp
- rkcommandlog.cpp
- rkhelpsearchwindow.cpp
- rktoplevelwindowgui.cpp
- rkfilebrowser.cpp
- )
+ rkcommandeditorwindow.cpp
+ rkcommandeditorwindowpart.cpp
+ rkhtmlwindow.cpp
+ rcontrolwindow.cpp
+ detachedwindowcontainer.cpp
+ rkmdiwindow.cpp
+ rkworkplaceview.cpp
+ rkworkplace.cpp
+ qxembedcopy.cpp
+ rkwindowcatcher.cpp
+ rkcommandlog.cpp
+ rkhelpsearchwindow.cpp
+ rktoplevelwindowgui.cpp
+ rkfilebrowser.cpp
+ rktoolwindowbar.cpp
+)
QT4_AUTOMOC(${windows_STAT_SRCS})
@@ -27,23 +28,12 @@
########### install files ###############
-INSTALL(FILES rkcommandeditorwindowpart.rc rkoutputwindow.rc rkhelpwindow.rc detachedwindowcontainer.rc rkcatchedx11windowpart.rc rkcommandlogpart.rc rktoplevelwindowgui.rc DESTINATION /share/apps/rkward )
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = $(all_includes)
-#METASOURCES = AUTO
-#noinst_LIBRARIES = libwindows.a
-#noinst_HEADERS = rkcommandeditorwindow.h rkcommandeditorwindowpart.h \
-# rkhtmlwindow.h rcontrolwindow.h detachedwindowcontainer.h rkmdiwindow.h \
-# rkworkplaceview.h rkworkplace.h qxembedcopy.h rkwindowcatcher.h rkcommandlog.h \
-# rkhelpsearchwindow.h rktoplevelwindowgui.h rkfilebrowser.h
-#libwindows_a_SOURCES = rkcommandeditorwindow.cpp rkcommandeditorwindowpart.cpp \
-# rkhtmlwindow.cpp rcontrolwindow.cpp detachedwindowcontainer.cpp rkmdiwindow.cpp \
-# rkworkplaceview.cpp rkworkplace.cpp qxembedcopy.cpp rkwindowcatcher.cpp rkcommandlog.cpp \
-# rkhelpsearchwindow.cpp rktoplevelwindowgui.cpp rkfilebrowser.cpp
-#rcdir = $(kde_datadir)/rkward
-#rc_DATA = rkcommandeditorwindowpart.rc rkoutputwindow.rc rkhelpwindow.rc detachedwindowcontainer.rc \
-# rkcatchedx11windowpart.rc rkcommandlogpart.rc rktoplevelwindowgui.rc
+INSTALL(FILES
+ rkcommandeditorwindowpart.rc
+ rkoutputwindow.rc
+ rkhelpwindow.rc
+ detachedwindowcontainer.rc
+ rkcatchedx11windowpart.rc
+ rkcommandlogpart.rc
+ rktoplevelwindowgui.rc
+ DESTINATION /share/apps/rkward)
Modified: branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp 2007-10-12 15:08:41 UTC (rev 2048)
+++ branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp 2007-10-12 16:10:00 UTC (rev 2049)
@@ -18,7 +18,7 @@
#include "detachedwindowcontainer.h"
#include <klocale.h>
-#include <kstandardaction.h>
+#include <kactioncollection.h>
#include <kstatusbar.h>
#include <qlayout.h>
@@ -39,8 +39,11 @@
setHelpMenuEnabled (false);
// create own GUI
setXMLFile ("detachedwindowcontainer.rc");
- KStandardAction::close (this, SLOT (close ()), actionCollection (), "dwindow_close");
- new KAction (i18n ("Attach to main window"), 0, this, SLOT (slotReattach ()), actionCollection (), "dwindow_attach");
+ actionCollection ()->addAction (KStandardAction::Close, "dwindow_close", this, SLOT(close()));
+
+ QAction *reattach = actionCollection ()->addAction ("dwindow_attach", this, SLOT(slotReattach()));
+ reattach->setText (i18n ("Attach to main window"));
+
RKTopLevelWindowGUI *toplevel_actions = new RKTopLevelWindowGUI (this);
insertChildClient (toplevel_actions);
connect (toplevel_actions->actionCollection (), SIGNAL (actionStatusText (const QString &)), this, SLOT (slotSetStatusBarText (const QString &)));
Modified: branches/KDE4_port/rkward/windows/rkmdiwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkmdiwindow.cpp 2007-10-12 15:08:41 UTC (rev 2048)
+++ branches/KDE4_port/rkward/windows/rkmdiwindow.cpp 2007-10-12 16:10:00 UTC (rev 2049)
@@ -26,9 +26,11 @@
#include <QPaintEvent>
#include <kparts/event.h>
+#include <kactioncollection.h>
#include "rkworkplace.h"
#include "rkworkplaceview.h"
+#include "rktoolwindowbar.h"
#include "../debug.h"
@@ -171,7 +173,6 @@
RK_ASSERT (getPart ());
getPart ()->installEventFilter (this);
- getPart ()->actionCollection ()->setHighlightingEnabled (true);
}
void RKMDIWindow::paintEvent (QPaintEvent *e) {
Modified: branches/KDE4_port/rkward/windows/rktoolwindowbar.h
===================================================================
--- branches/KDE4_port/rkward/windows/rktoolwindowbar.h 2007-10-12 15:08:41 UTC (rev 2048)
+++ branches/KDE4_port/rkward/windows/rktoolwindowbar.h 2007-10-12 16:10:00 UTC (rev 2049)
@@ -20,7 +20,7 @@
#ifndef RKTOOLWINDOWBAR_H
#define RKTOOLWINDOWBAR_H
-#include <KMultiTabBar>
+#include <kmultitabbar.h>
#include <QMap>
Modified: branches/KDE4_port/rkward/windows/rkworkplaceview.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkworkplaceview.cpp 2007-10-12 15:08:41 UTC (rev 2048)
+++ branches/KDE4_port/rkward/windows/rkworkplaceview.cpp 2007-10-12 16:10:00 UTC (rev 2049)
@@ -19,6 +19,9 @@
#include <ktabbar.h>
#include <klocale.h>
+#include <kshortcut.h>
+#include <kactioncollection.h>
+#include <kaction.h>
#include <q3widgetstack.h>
#include <qapplication.h>
@@ -38,7 +41,7 @@
Q3VBoxLayout *vbox = new Q3VBoxLayout (this);
tabs = new KTabBar (this);
tabs->setHoverCloseButton (true);
- tabs->setFocusPolicy (QWidget::NoFocus);
+ tabs->setFocusPolicy (Qt::NoFocus);
tabs->hide ();
connect (tabs, SIGNAL (selected (int)), this, SLOT (setPage (int)));
connect (tabs, SIGNAL (closeRequest (int)), this, SLOT (closePage (int)));
@@ -55,13 +58,13 @@
void RKWorkplaceView::initActions (KActionCollection *ac, const char *id_left, const char *id_right) {
RK_TRACE (APP);
- KShortcut left_short (KKey ("Ctrl+<"));
- left_short.append (KKey (Qt::CTRL | Qt::Key_Comma));
- action_page_left = new KAction (i18n ("Window Left"), 0, left_short, this, SLOT (pageLeft ()), ac, id_left);
+ action_page_left = (KAction*) ac->addAction (id_left, this, SLOT (pageLeft()));
+ action_page_left->setText (i18n ("Window Left"));
+ action_page_left->setShortcut (KShortcut (Qt::ControlModifier + Qt::Key_Less, Qt::ControlModifier + Qt::Key_Comma));
- KShortcut right_short (KKey ("Ctrl+>"));
- right_short.append (KKey (Qt::CTRL | Qt::Key_Period));
- action_page_right = new KAction (i18n ("Window Right"), 0, right_short, this, SLOT (pageRight ()), ac, id_right);
+ action_page_right = (KAction*) ac->addAction (id_right, this, SLOT (pageRight()));
+ action_page_right->setText (i18n ("Window Right"));
+ action_page_right->setShortcut (KShortcut (Qt::ControlModifier + Qt::Key_Greater, Qt::ControlModifier + Qt::Key_Period));
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