[rkward-cvs] SF.net SVN: rkward: [945] trunk/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Nov 27 12:39:56 UTC 2006
Revision: 945
http://svn.sourceforge.net/rkward/?rev=945&view=rev
Author: tfry
Date: 2006-11-27 04:39:56 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
Fix help menu for detached windows
Modified Paths:
--------------
trunk/rkward/ChangeLog
trunk/rkward/TODO
trunk/rkward/rkward/rkward.cpp
trunk/rkward/rkward/rkward.h
trunk/rkward/rkward/windows/detachedwindowcontainer.cpp
trunk/rkward/rkward/windows/detachedwindowcontainer.rc
Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog 2006-11-27 12:08:10 UTC (rev 944)
+++ trunk/rkward/ChangeLog 2006-11-27 12:39:56 UTC (rev 945)
@@ -1,3 +1,4 @@
+- fix help menu for detached windows
- R X11 device windows are now managed by rkward, with the following initial features:
- R X11 device windows: attach to / detach from workplace (they start detached)
- R X11 device windows: toggle between normal resize mode and (settable) fixed size with scrollbars
Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO 2006-11-27 12:08:10 UTC (rev 944)
+++ trunk/rkward/TODO 2006-11-27 12:39:56 UTC (rev 945)
@@ -29,7 +29,6 @@
- Output window should gain some sort of auto-update functionality:
- After user commands, should check, whether the output file was modified. If so, reload
- Option to save workplace per session instead of per workspace
- - Fix help menu on RKMDIWindows
"First-run wizard"
- pre-install R packages
- Check for existence of php binary on startup, not only when loading a plugin
Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp 2006-11-27 12:08:10 UTC (rev 944)
+++ trunk/rkward/rkward/rkward.cpp 2006-11-27 12:39:56 UTC (rev 945)
@@ -304,13 +304,8 @@
window_detach = new KAction (i18n ("Detach"), 0, 0, this, SLOT (slotDetachWindow ()), actionCollection (), "window_detach");
outputShow= new KAction (i18n ("Show &Output"), 0, 0, this, SLOT (slotOutputShow ()), actionCollection (), "output_show");
configure = new KAction (i18n ("Configure RKWard"), 0, 0, this, SLOT (slotConfigure ()), actionCollection (), "configure");
- help_invoke_r_help = new KAction (i18n ("Help on R"), 0, 0, this, SLOT (invokeRHelp ()), actionCollection (), "invoke_r_help");
- KAction *show_help_search = new KAction (i18n ("Search R Help"), 0, 0, this, SLOT (showHelpSearch ()), actionCollection (), "show_help_search");
- KStdAction::helpContents (this, SLOT (appHelpActivated ()), actionCollection ());
- KStdAction::aboutApp (this, SLOT (showAboutApplication ()), actionCollection ());
- KStdAction::whatsThis (this, SLOT (whatsThis ()), actionCollection ());
- KStdAction::reportBug (this, SLOT (reportRKWardBug ()), actionCollection ());
+ makeRKWardHelpMenu (this, actionCollection ());
new_data_frame->setStatusText (i18n ("Creates new empty dataset and opens it for editing"));
fileOpenWorkspace->setStatusText(i18n("Opens an existing document"));
@@ -319,12 +314,23 @@
fileSaveWorkspaceAs->setStatusText(i18n("Saves the actual document as..."));
close_all_editors->setStatusText (i18n ("Closes all open data editors"));
fileQuit->setStatusText(i18n("Quits the application"));
- help_invoke_r_help->setStatusText (i18n ("Shows the R help index"));
- show_help_search->setStatusText (i18n ("Shows/raises the R Help Search window"));
actionCollection ()->setHighlightingEnabled (true);
}
+void RKWardMainWindow::makeRKWardHelpMenu (QWidget *for_window, KActionCollection *ac) {
+ KAction *help_invoke_r_help = new KAction (i18n ("Help on R"), 0, 0, this, SLOT (invokeRHelp ()), ac, "invoke_r_help");
+ KAction *show_help_search = new KAction (i18n ("Search R Help"), 0, 0, this, SLOT (showHelpSearch ()), ac, "show_help_search");
+
+ KStdAction::helpContents (this, SLOT (appHelpActivated ()), ac);
+ KStdAction::aboutApp (this, SLOT (showAboutApplication ()), ac);
+ KStdAction::whatsThis (for_window, SLOT (whatsThis ()), ac);
+ KStdAction::reportBug (this, SLOT (reportRKWardBug ()), ac);
+
+ help_invoke_r_help->setStatusText (i18n ("Shows the R help index"));
+ show_help_search->setStatusText (i18n ("Shows/raises the R Help Search window"));
+}
+
void RKWardMainWindow::partAdded (KParts::Part *part) {
RK_TRACE (APP);
@@ -508,6 +514,7 @@
RK_TRACE (APP);
RKGlobals::rInterface ()->issueCommand ("help.start ()", RCommand::App);
+ topLevelWidget ()->raise ();
}
void RKWardMainWindow::reportRKWardBug () {
@@ -529,6 +536,7 @@
RK_TRACE (APP);
search_help_view->show ();
+ search_help_view->wrapperWidget ()->topLevelWidget ()->raise ();
}
void RKWardMainWindow::slotNewDataFrame () {
Modified: trunk/rkward/rkward/rkward.h
===================================================================
--- trunk/rkward/rkward/rkward.h 2006-11-27 12:08:10 UTC (rev 944)
+++ trunk/rkward/rkward/rkward.h 2006-11-27 12:39:56 UTC (rev 945)
@@ -88,6 +88,8 @@
KParts::PartManager *partManager () { return part_manager; };
static RKWardMainWindow *getMain () { return rkward_mainwin; };
+
+ void makeRKWardHelpMenu (QWidget *for_window, KActionCollection *ac);
protected:
void openWorkspace (const KURL &url);
/** save Options/Settings. Includes general Options like all bar positions and status as well as the geometry and the recent file list */
@@ -215,8 +217,6 @@
KAction* window_close;
KAction* window_close_all;
KAction* window_detach;
-
- KAction* help_invoke_r_help;
KAction* configure;
Modified: trunk/rkward/rkward/windows/detachedwindowcontainer.cpp
===================================================================
--- trunk/rkward/rkward/windows/detachedwindowcontainer.cpp 2006-11-27 12:08:10 UTC (rev 944)
+++ trunk/rkward/rkward/windows/detachedwindowcontainer.cpp 2006-11-27 12:39:56 UTC (rev 945)
@@ -31,10 +31,12 @@
DetachedWindowContainer::DetachedWindowContainer (RKMDIWindow *widget_to_capture) : KParts::MainWindow (RKWardMainWindow::getMain ()) {
RK_TRACE (APP);
+ setHelpMenuEnabled (false);
// create own GUI
setXMLFile ("detachedwindowcontainer.rc");
KStdAction::close (this, SLOT (close ()), actionCollection (), "dwindow_close");
new KAction (i18n ("Attach to main window"), 0, this, SLOT (slotReattach ()), actionCollection (), "dwindow_attach");
+ RKWardMainWindow::getMain ()->makeRKWardHelpMenu (this, actionCollection ());
createShellGUI ();
// capture widget
Modified: trunk/rkward/rkward/windows/detachedwindowcontainer.rc
===================================================================
--- trunk/rkward/rkward/windows/detachedwindowcontainer.rc 2006-11-27 12:08:10 UTC (rev 944)
+++ trunk/rkward/rkward/windows/detachedwindowcontainer.rc 2006-11-27 12:39:56 UTC (rev 945)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.3.4">
+<kpartgui name="rkward" version="0.4.2">
<MenuBar>
<Merge/>
<Menu name="window"><text>&Window</text>
@@ -8,6 +8,8 @@
<Action name="dwindow_attach"/>
</Menu>
<Menu name="help">
+ <Action name="invoke_r_help"/>
+ <Action name="show_help_search"/>
<Merge/>
</Menu>
</MenuBar>
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