[rkward-cvs] SF.net SVN: rkward: [956] trunk/rkward/rkward/windows
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Nov 27 18:52:03 UTC 2006
Revision: 956
http://svn.sourceforge.net/rkward/?rev=956&view=rev
Author: tfry
Date: 2006-11-27 10:52:03 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
RKCatchedX11... -> RKCaughtX11...
Modified Paths:
--------------
trunk/rkward/rkward/windows/rkwindowcatcher.cpp
trunk/rkward/rkward/windows/rkwindowcatcher.h
trunk/rkward/rkward/windows/rkworkplace.cpp
Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp 2006-11-27 18:16:22 UTC (rev 955)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp 2006-11-27 18:52:03 UTC (rev 956)
@@ -56,7 +56,7 @@
if (w) {
RKWorkplace::mainWorkplace ()->newX11Window (w, new_cur_device);
- //new RKCatchedX11Window (w, new_cur_device);
+ //new RKCaughtX11Window (w, new_cur_device);
} else {
KMessageBox::information (0, i18n ("You have created a new X11 device window in R. Usually, RKWard tries to detect such windows, to take control of them, and add a menu-bar to them. This time, however, RKWard failed to detect, which window was created, and so can not embed it.\nIf you created the window on a different screen or X11 display, that is to be expected. You might want to consider changing options(\"display\"), then.\nIf you can see the X11 window on the same screen as this message, then RKWard should do better. In this case, please contact us at rkward-devel at lists.sourceforge.net with details on your setup, so we can try to fix this in future versions of RKWard."), i18n ("Could not embed R X11 window"), "failure_to_detect_x11_device");
}
@@ -66,7 +66,7 @@
///////////////////////////////// END RKWindowCatcher //////////////////////////////////
/**************************************************************************************/
-//////////////////////////////// BEGIN RKCatchedX11Window //////////////////////////////
+//////////////////////////////// BEGIN RKCaughtX11Window //////////////////////////////
#include <qscrollview.h>
@@ -83,15 +83,15 @@
#include "../misc/rkerrordialog.h"
#include "../misc/rksaveobjectchooser.h"
-RKCatchedX11Window::RKCatchedX11Window (WId window_to_embed, int device_number) : RKMDIWindow (0, X11Window) {
+RKCaughtX11Window::RKCaughtX11Window (WId window_to_embed, int device_number) : RKMDIWindow (0, X11Window) {
RK_TRACE (MISC);
error_dialog = new RKRErrorDialog (i18n ("An error occurred"), i18n ("An error occurred"));
- part = new RKCatchedX11WindowPart (this);
+ part = new RKCaughtX11WindowPart (this);
setFocusPolicy (QWidget::ClickFocus);
embedded = window_to_embed;
- RKCatchedX11Window::device_number = device_number;
+ RKCaughtX11Window::device_number = device_number;
QVBoxLayout *layout = new QVBoxLayout (this);
box_widget = new QVBox (this);
@@ -116,20 +116,20 @@
RKWardApplication::getApp ()->registerNameWatcher (window_to_embed, this);
}
-RKCatchedX11Window::~RKCatchedX11Window () {
+RKCaughtX11Window::~RKCaughtX11Window () {
RK_TRACE (MISC);
RKWardApplication::getApp ()->unregisterNameWatcher (embedded);
error_dialog->autoDeleteWhenDone ();
}
-KParts::Part *RKCatchedX11Window::getPart () {
+KParts::Part *RKCaughtX11Window::getPart () {
RK_TRACE (MISC);
return part;
}
-void RKCatchedX11Window::prepareToBeAttached () {
+void RKCaughtX11Window::prepareToBeAttached () {
RK_TRACE (MISC);
dynamic_size_action->setChecked (false);
@@ -137,13 +137,13 @@
dynamic_size_action->setEnabled (false);
}
-void RKCatchedX11Window::prepareToBeDetached () {
+void RKCaughtX11Window::prepareToBeDetached () {
RK_TRACE (MISC);
dynamic_size_action->setEnabled (true);
}
-void RKCatchedX11Window::fixedSizeToggled () {
+void RKCaughtX11Window::fixedSizeToggled () {
RK_TRACE (MISC);
if (dynamic_size == dynamic_size_action->isChecked ()) return;
@@ -165,7 +165,7 @@
}
}
-void RKCatchedX11Window::setFixedSize1 () {
+void RKCaughtX11Window::setFixedSize1 () {
RK_TRACE (MISC);
dynamic_size_action->setChecked (false);
@@ -173,7 +173,7 @@
xembed_container->setFixedSize (500, 500);
}
-void RKCatchedX11Window::setFixedSize2 () {
+void RKCaughtX11Window::setFixedSize2 () {
RK_TRACE (MISC);
dynamic_size_action->setChecked (false);
@@ -181,7 +181,7 @@
xembed_container->setFixedSize (1000, 1000);
}
-void RKCatchedX11Window::setFixedSize3 () {
+void RKCaughtX11Window::setFixedSize3 () {
RK_TRACE (MISC);
dynamic_size_action->setChecked (false);
@@ -189,7 +189,7 @@
xembed_container->setFixedSize (2000, 2000);
}
-void RKCatchedX11Window::setFixedSizeManual () {
+void RKCaughtX11Window::setFixedSizeManual () {
RK_TRACE (MISC);
// TODO: not very pretty, yet
@@ -215,25 +215,25 @@
delete dialog;
}
-void RKCatchedX11Window::activateDevice () {
+void RKCaughtX11Window::activateDevice () {
RK_TRACE (MISC);
RKGlobals::rInterface ()->issueCommand ("dev.set (" + QString::number (device_number) + ")", RCommand::App, i18n ("Activate graphics device number %1").arg (QString::number (device_number)), error_dialog);
}
-void RKCatchedX11Window::copyDeviceToOutput () {
+void RKCaughtX11Window::copyDeviceToOutput () {
RK_TRACE (MISC);
RKGlobals::rInterface ()->issueCommand ("dev.set (" + QString::number (device_number) + ")\ndev.copy (device=rk.graph.on)\nrk.graph.off ()", RCommand::App | RCommand::DirectToOutput, i18n ("Copy contents of graphics device number %1 to output").arg (QString::number (device_number)), error_dialog);
}
-void RKCatchedX11Window::printDevice () {
+void RKCaughtX11Window::printDevice () {
RK_TRACE (MISC);
RKGlobals::rInterface ()->issueCommand ("dev.set (" + QString::number (device_number) + ")\ndev.print ()", RCommand::App, i18n ("Print contents of graphics device number %1").arg (QString::number (device_number)), error_dialog);
}
-void RKCatchedX11Window::copyDeviceToRObject () {
+void RKCaughtX11Window::copyDeviceToRObject () {
RK_TRACE (MISC);
// TODO: not very pretty, yet
@@ -257,26 +257,26 @@
delete dialog;
}
-void RKCatchedX11Window::duplicateDevice () {
+void RKCaughtX11Window::duplicateDevice () {
RK_TRACE (MISC);
RKGlobals::rInterface ()->issueCommand ("dev.set (" + QString::number (device_number) + ")\ndev.copy (device=x11)", RCommand::App, i18n ("Duplicate graphics device number %1").arg (QString::number (device_number)), error_dialog);
}
-///////////////////////////////// END RKCatchedX11Window ///////////////////////////////
+///////////////////////////////// END RKCaughtX11Window ///////////////////////////////
/**************************************************************************************/
-//////////////////////////////// BEGIN RKCatchedX11WindowPart //////////////////////////
+//////////////////////////////// BEGIN RKCaughtX11WindowPart //////////////////////////
-RKCatchedX11WindowPart::RKCatchedX11WindowPart (RKCatchedX11Window *window) : KParts::Part (0) {
+RKCaughtX11WindowPart::RKCaughtX11WindowPart (RKCaughtX11Window *window) : KParts::Part (0) {
RK_TRACE (MISC);
KInstance* instance = new KInstance ("rkward");
setInstance (instance);
setWidget (window);
- RKCatchedX11WindowPart::window = window;
+ RKCaughtX11WindowPart::window = window;
setXMLFile ("rkcatchedx11windowpart.rc");
@@ -294,7 +294,7 @@
new KAction (i18n ("Duplicate"), 0, window, SLOT (duplicateDevice ()), actionCollection (), "device_duplicate");
}
-RKCatchedX11WindowPart::~RKCatchedX11WindowPart () {
+RKCaughtX11WindowPart::~RKCaughtX11WindowPart () {
RK_TRACE (MISC);
}
Modified: trunk/rkward/rkward/windows/rkwindowcatcher.h
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.h 2006-11-27 18:16:22 UTC (rev 955)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.h 2006-11-27 18:52:03 UTC (rev 956)
@@ -65,7 +65,7 @@
/** call this function to start looking out for new R X11 device windows.
@param prev_cur_device the device number that was active before a new device window was (potentially) created */
void start (int prev_cur_device);
-/** end looking out for new R X11 windows. If a new window was in fact created, this is captured by creating an RKCatchedX11Window
+/** end looking out for new R X11 windows. If a new window was in fact created, this is captured by creating an RKCaughtX11Window
@param new_cur_device the new active device number, i.e. the device number of the created window */
void stop (int new_cur_device);
private:
@@ -75,23 +75,23 @@
#include "rkmdiwindow.h"
-class RKCatchedX11WindowPart;
+class RKCaughtX11WindowPart;
class KToggleAction;
class QXEmbedCopy;
class QScrollView;
class QVBox;
class RKRErrorDialog;
-/** An R X11 device window managed by rkward. Should actually be called RKCaughtX11Window... */
-class RKCatchedX11Window : public RKMDIWindow {
+/** An R X11 device window managed by rkward. */
+class RKCaughtX11Window : public RKMDIWindow {
Q_OBJECT
public:
/** ctor
@param window_to_embed the Window id of the R X11 device window to embed
@param device_number the device number corresponding to that window */
- RKCatchedX11Window (WId window_to_embed, int device_number);
+ RKCaughtX11Window (WId window_to_embed, int device_number);
/** dtor */
- ~RKCatchedX11Window ();
+ ~RKCaughtX11Window ();
KParts::Part *getPart ();
/** TODO */
@@ -121,10 +121,10 @@
void copyDeviceToRObject ();
void duplicateDevice ();
private:
- friend class RKCatchedX11WindowPart; // needs access to the actions
+ friend class RKCaughtX11WindowPart; // needs access to the actions
int device_number;
WId embedded;
- RKCatchedX11WindowPart *part;
+ RKCaughtX11WindowPart *part;
QVBox *xembed_container;
QScrollView *scroll_widget;
QVBox *box_widget;
@@ -134,16 +134,16 @@
KToggleAction *dynamic_size_action;
};
-/** Provides a KPart interface for RKCatchedX11Window. */
-class RKCatchedX11WindowPart : public KParts::Part {
+/** Provides a KPart interface for RKCaughtX11Window. */
+class RKCaughtX11WindowPart : public KParts::Part {
public:
/** constructor.
@param window The RKCatehdX11Window for this part */
- RKCatchedX11WindowPart (RKCatchedX11Window *window);
+ RKCaughtX11WindowPart (RKCaughtX11Window *window);
/** destructor */
- ~RKCatchedX11WindowPart ();
+ ~RKCaughtX11WindowPart ();
private:
- RKCatchedX11Window *window;
+ RKCaughtX11Window *window;
};
#endif //DISABLE_RKWINDOWCATCHER
Modified: trunk/rkward/rkward/windows/rkworkplace.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkworkplace.cpp 2006-11-27 18:16:22 UTC (rev 955)
+++ trunk/rkward/rkward/windows/rkworkplace.cpp 2006-11-27 18:52:03 UTC (rev 956)
@@ -162,7 +162,7 @@
void RKWorkplace::newX11Window (WId window_to_embed, int device_number) {
RK_TRACE (APP);
- RKCatchedX11Window *window = new RKCatchedX11Window (window_to_embed, device_number);
+ RKCaughtX11Window *window = new RKCaughtX11Window (window_to_embed, device_number);
window->state = RKMDIWindow::Detached;
addWindow (window, false);
}
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