[rkward-cvs] rkward/rkward main.cpp,1.15,1.16 rkward.cpp,1.83,1.84 rkward.desktop,1.2,1.3 rkward.h,1.35,1.36 rkwardui.rc,1.20,1.21
Pierre
ecoch at users.sourceforge.net
Fri Apr 29 16:47:32 UTC 2005
Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17874/rkward
Modified Files:
main.cpp rkward.cpp rkward.desktop rkward.h rkwardui.rc
Log Message:
Adding the new icon, plus other modifications.
Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** rkward.cpp 28 Apr 2005 22:25:45 -0000 1.83
--- rkward.cpp 29 Apr 2005 16:47:30 -0000 1.84
***************
*** 212,218 ****
console->setName("terminal");
addToolWindow(konsole,KDockWidget::DockBottom, getMainDockWidget(), 10);
-
- // just to initialize the window-actions according to whether they're shown on startup or not
- //slotToggleWindowClosed ();
}
--- 212,215 ----
***************
*** 365,374 ****
showRObjectBrowser = new KToggleAction (i18n ("Workspace"), 0, 0, this, SLOT(slotShowRObjectBrowser ()), actionCollection(), "windows_robjectbrowser");
! runAll = new KAction (i18n ("Run All"), KShortcut ("F9"), this, SLOT (slotRunAll ()), actionCollection (), "run_all");
runAll->setIcon("player_fwd");
! runSelection = new KAction (i18n ("Run Selection"), KShortcut ("F8"), this, SLOT (slotRunSelection ()), actionCollection (), "run_selection");
runSelection->setIcon("player_play");
interruptCommand = new KAction (i18n ("Interrupt running command"), 0, 0, this, SLOT (slotInterruptCommand ()), actionCollection (), "interrupt");
interruptCommand->setIcon("player_stop");
file_load_libs = new KAction (i18n ("Configure Packages"), 0, 0, this, SLOT (slotFileLoadLibs ()), actionCollection (), "file_load_libs");
configure = new KAction (i18n ("Configure RKWard"), 0, 0, this, SLOT(slotConfigure ()), actionCollection(), "configure");
--- 362,376 ----
showRObjectBrowser = new KToggleAction (i18n ("Workspace"), 0, 0, this, SLOT(slotShowRObjectBrowser ()), actionCollection(), "windows_robjectbrowser");
! runAll = new KAction (i18n ("Run all"), KShortcut ("F9"), this, SLOT (slotRunAll ()), actionCollection (), "run_all");
runAll->setIcon("player_fwd");
! runSelection = new KAction (i18n ("Run selection"), KShortcut ("F8"), this, SLOT (slotRunSelection ()), actionCollection (), "run_selection");
runSelection->setIcon("player_play");
+ runLine = new KAction (i18n ("Run current line"), KShortcut ("Ctrl+L"), this, SLOT (slotRunLine ()), actionCollection (), "run_line");
+ runLine->setIcon("player_play");
interruptCommand = new KAction (i18n ("Interrupt running command"), 0, 0, this, SLOT (slotInterruptCommand ()), actionCollection (), "interrupt");
interruptCommand->setIcon("player_stop");
+
+
+
file_load_libs = new KAction (i18n ("Configure Packages"), 0, 0, this, SLOT (slotFileLoadLibs ()), actionCollection (), "file_load_libs");
configure = new KAction (i18n ("Configure RKWard"), 0, 0, this, SLOT(slotConfigure ()), actionCollection(), "configure");
***************
*** 1040,1043 ****
--- 1042,1054 ----
}
+ void RKwardApp::slotRunLine() {
+ if (! activeWindow()->inherits("RKCommandEditorWindow"))
+ return;
+
+ if(((RKCommandEditorWindow*) activeWindow())->getLine().isEmpty() || ((RKCommandEditorWindow*) activeWindow())->getLine().isNull())
+ return;
+
+ RKGlobals::rInterface ()->issueCommand (new RCommand ( ((RKCommandEditorWindow*) activeWindow())->getLine(), RCommand::User, ""));
+ }
***************
*** 1077,1080 ****
--- 1088,1092 ----
}
setEnabledActions((QString) activeWindow()->name()=="dataeditor");
+ setCaption(window->caption());
}
***************
*** 1105,1108 ****
--- 1117,1121 ----
runAll->setEnabled(false);
runSelection->setEnabled(false);
+ runLine->setEnabled(false);
interruptCommand->setEnabled(false);
}
***************
*** 1117,1120 ****
--- 1130,1134 ----
runAll->setEnabled(true);
runSelection->setEnabled(true);
+ runLine->setEnabled(true);
interruptCommand->setEnabled(true);
}
Index: rkward.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** rkward.h 22 Apr 2005 13:56:16 -0000 1.35
--- rkward.h 29 Apr 2005 16:47:30 -0000 1.36
***************
*** 1,22 ****
/***************************************************************************
! rkward.h - description
! -------------------
! begin : Tue Oct 29 20:06:08 CET 2002
! copyright : (C) 2002 by Thomas Friedrichsmeier
! email : tfry at users.sourceforge.net
! ***************************************************************************/
/***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef RKWARD_H
#define RKWARD_H
!
#ifdef HAVE_CONFIG_H
--- 1,22 ----
/***************************************************************************
! rkward.h - description
! -------------------
! begin : Tue Oct 29 20:06:08 CET 2002
! copyright : (C) 2002 by Thomas Friedrichsmeier
! email : tfry at users.sourceforge.net
! ***************************************************************************/
/***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! ***************************************************************************/
#ifndef RKWARD_H
#define RKWARD_H
!
#ifdef HAVE_CONFIG_H
***************
*** 54,80 ****
/**
! * The base class for RKward application windows. It sets up the main
! * window and reads the config file as well as providing a menubar, toolbar
! * and statusbar. An instance of RKwardView creates your center view, which is connected
! * to the window's Doc object.
! * RKwardApp reimplements the methods that KMainWindow provides for main window handling and supports
! * full session management as well as using KActions.
! * @see KMainWindow
! * @see KApplication
! * @see KConfig
! *
! * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
! * @version KDevelop version 1.2 code generation
! */
!
! //KMdiMainFrm( 0, "KMDITest_MainWindow", KMdi::IDEAlMode )
class RKwardApp : public KMdiMainFrm, virtual public KParts::PartBase
{
! Q_OBJECT
! public:
! /** construtor of RKwardApp, calls all init functions to create the application.
! */
! RKwardApp(KURL *load_url=0, QWidget* parent=0, const char* name=0);
! ~RKwardApp();
void startR ();
--- 54,80 ----
/**
! * The base class for RKward application windows. It sets up the main
! * window and reads the config file as well as providing a menubar, toolbar
! * and statusbar. An instance of RKwardView creates your center view, which is connected
! * to the window's Doc object.
! * RKwardApp reimplements the methods that KMainWindow provides for main window handling and supports
! * full session management as well as using KActions.
! * @see KMainWindow
! * @see KApplication
! * @see KConfig
! *
! * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
! * @version KDevelop version 1.2 code generation
! */
!
!
class RKwardApp : public KMdiMainFrm, virtual public KParts::PartBase
{
! Q_OBJECT
! public:
! /** construtor of RKwardApp, calls all init functions to create the application.
! */
! RKwardApp(KURL *load_url=0, QWidget* parent=0, const char* name=0);
! ~RKwardApp();
void startR ();
***************
*** 89,140 ****
protected:
void openWorkspace (const KURL &url);
! /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
! * file
! */
! void saveOptions();
! /** read general Options again and initialize all variables like the recent file list
! */
! void readOptions();
! /** initializes the KActions of the application */
! void initActions();
! /** sets up the statusbar for the main window by initialzing a statuslabel.
! */
! void initStatusBar();
! /** queryClose is called by KTMainWindow on each closeEvent of a window. Against the
! * default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall
! * be saved if Modified; on cancel the closeEvent is rejected.
! * @see KTMainWindow#queryClose
! * @see KTMainWindow#closeEvent
! */
! virtual bool queryClose();
! /** queryExit is called by KTMainWindow when the last window of the application is going to be closed during the closeEvent().
! * Against the default implementation that just returns true, this calls saveOptions() to save the settings of the last window's
! * properties.
! * @see KTMainWindow#queryExit
! * @see KTMainWindow#closeEvent
! */
! virtual bool queryExit();
! /** saves the window properties for each open window during session end to the session config file, including saving the currently
! * opened file by a temporary filename provided by KApplication.
! * @see KTMainWindow#saveProperties
! */
! virtual void saveProperties(KConfig *_cfg);
! /** reads the session config file and restores the application's state including the last opened files and documents by reading the
! * temporary files saved by saveProperties()
! * @see KTMainWindow#readProperties
! */
! virtual void readProperties(KConfig *_cfg);
! public slots:
/** creates a new (empty) data.frame */
void slotNewDataFrame ();
! /** open a file and load it into the document*/
! void slotFileOpenWorkspace();
! /** opens a file from the recent files menu */
! void slotFileOpenRecentWorkspace(const KURL& url);
! /** save a document */
! void slotFileSaveWorkspace();
! /** save a document by a new filename*/
! void slotFileSaveWorkspaceAs();
/** shows the dialog to install/load/unload packages */
void slotFileLoadLibs ();
--- 89,140 ----
protected:
void openWorkspace (const KURL &url);
! /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
! * file
! */
! void saveOptions();
! /** read general Options again and initialize all variables like the recent file list
! */
! void readOptions();
! /** initializes the KActions of the application */
! void initActions();
! /** sets up the statusbar for the main window by initialzing a statuslabel.
! */
! void initStatusBar();
! /** queryClose is called by KTMainWindow on each closeEvent of a window. Against the
! * default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall
! * be saved if Modified; on cancel the closeEvent is rejected.
! * @see KTMainWindow#queryClose
! * @see KTMainWindow#closeEvent
! */
! virtual bool queryClose();
! /** queryExit is called by KTMainWindow when the last window of the application is going to be closed during the closeEvent().
! * Against the default implementation that just returns true, this calls saveOptions() to save the settings of the last window's
! * properties.
! * @see KTMainWindow#queryExit
! * @see KTMainWindow#closeEvent
! */
! virtual bool queryExit();
! /** saves the window properties for each open window during session end to the session config file, including saving the currently
! * opened file by a temporary filename provided by KApplication.
! * @see KTMainWindow#saveProperties
! */
! virtual void saveProperties(KConfig *_cfg);
! /** reads the session config file and restores the application's state including the last opened files and documents by reading the
! * temporary files saved by saveProperties()
! * @see KTMainWindow#readProperties
! */
! virtual void readProperties(KConfig *_cfg);
! public slots:
/** creates a new (empty) data.frame */
void slotNewDataFrame ();
! /** open a file and load it into the document*/
! void slotFileOpenWorkspace();
! /** opens a file from the recent files menu */
! void slotFileOpenRecentWorkspace(const KURL& url);
! /** save a document */
! void slotFileSaveWorkspace();
! /** save a document by a new filename*/
! void slotFileSaveWorkspaceAs();
/** shows the dialog to install/load/unload packages */
void slotFileLoadLibs ();
***************
*** 143,178 ****
/** close all editors */
void slotCloseAllEditors ();
! /** print the actual file */
! void slotFilePrint();
! /** closes all open windows by calling close() on each memberList item until the list is empty, then quits the application.
! * If queryClose() returns false because the user canceled the saveModified() dialog, the closing breaks.
! */
! void slotFileQuit();
! /** put the marked text/object into the clipboard and remove
! * it from the document
! */
! void slotEditCut();
! /** put the marked text/object into the clipboard
! */
! void slotEditCopy();
! /** paste the clipboard into the document
! */
! void slotEditPaste();
! /** paste the clipboard into the document, but not beyond table boundaries
! */
! void slotEditPasteToTable();
! /** paste the clipboard into the document, but not beyond selection boundaries
! */
! void slotEditPasteToSelection();
! /** toggles the toolbar
! */
! void slotViewToolBar();
! /** toggles the statusbar
! */
! void slotViewStatusBar();
! /** changes the statusbar contents for the standard label permanently, used to indicate current actions.
! * @param text the text that is displayed in the statusbar
! */
! void slotStatusMsg(const QString &text);
/** shows/hides the RKWatch-window */
--- 143,178 ----
/** close all editors */
void slotCloseAllEditors ();
! /** print the actual file */
! void slotFilePrint();
! /** closes all open windows by calling close() on each memberList item until the list is empty, then quits the application.
! * If queryClose() returns false because the user canceled the saveModified() dialog, the closing breaks.
! */
! void slotFileQuit();
! /** put the marked text/object into the clipboard and remove
! * it from the document
! */
! void slotEditCut();
! /** put the marked text/object into the clipboard
! */
! void slotEditCopy();
! /** paste the clipboard into the document
! */
! void slotEditPaste();
! /** paste the clipboard into the document, but not beyond table boundaries
! */
! void slotEditPasteToTable();
! /** paste the clipboard into the document, but not beyond selection boundaries
! */
! void slotEditPasteToSelection();
! /** toggles the toolbar
! */
! void slotViewToolBar();
! /** toggles the statusbar
! */
! void slotViewStatusBar();
! /** changes the statusbar contents for the standard label permanently, used to indicate current actions.
! * @param text the text that is displayed in the statusbar
! */
! void slotStatusMsg(const QString &text);
/** shows/hides the RKWatch-window */
***************
*** 204,207 ****
--- 204,208 ----
void slotChildWindowCloseRequest (KMdiChildView * window);
void slotRunSelection();
+ void slotRunLine();
void slotInterruptCommand();
void slotRunAll();
***************
*** 211,237 ****
void slotOpenRecentCommandEditor(const KURL&);
void slotFunctionReference();
! private:
! /** the configuration object of the application */
! KConfig *config;
! /** doc represents your actual document and is created only once. It keeps
! * information such as filename and does the serialization of your files.
! */
! RKwardDoc *doc;
!
! RKDocManager *m_docManager;
!
! // KAction pointers to enable/disable actions
! KAction* fileOpen;
! KRecentFilesAction* fileOpenRecent;
! KAction* fileSave;
! KAction* fileSaveAs;
!
! KAction* fileOpenWorkspace;
! KRecentFilesAction* fileOpenRecentWorkspace;
! KAction* fileSaveWorkspace;
! KAction* fileSaveWorkspaceAs;
! KAction* filePrint;
! KAction* fileQuit;
! KAction* file_load_libs;
KAction* close_editor;
KAction* close_all_editors;
--- 212,238 ----
void slotOpenRecentCommandEditor(const KURL&);
void slotFunctionReference();
! private:
! /** the configuration object of the application */
! KConfig *config;
! /** doc represents your actual document and is created only once. It keeps
! * information such as filename and does the serialization of your files.
! */
! RKwardDoc *doc;
!
! RKDocManager *m_docManager;
!
! // KAction pointers to enable/disable actions
! KAction* fileOpen;
! KRecentFilesAction* fileOpenRecent;
! KAction* fileSave;
! KAction* fileSaveAs;
!
! KAction* fileOpenWorkspace;
! KRecentFilesAction* fileOpenRecentWorkspace;
! KAction* fileSaveWorkspace;
! KAction* fileSaveWorkspaceAs;
! KAction* filePrint;
! KAction* fileQuit;
! KAction* file_load_libs;
KAction* close_editor;
KAction* close_all_editors;
***************
*** 242,249 ****
KAction* editRedo;
KAction* editCut;
! KAction* editCopy;
! KAction* editPaste;
! KAction* editPasteToSelection;
! KAction* editPasteToTable;
KAction* outputShow;
--- 243,250 ----
KAction* editRedo;
KAction* editCut;
! KAction* editCopy;
! KAction* editPaste;
! KAction* editPasteToSelection;
! KAction* editPasteToTable;
KAction* outputShow;
***************
*** 251,256 ****
KAction* outputRefresh;
! KToggleAction* viewToolBar;
! KToggleAction* viewStatusBar;
KToggleAction* showRKWatch;
KToggleAction* showRKOutput;
--- 252,257 ----
KAction* outputRefresh;
! KToggleAction* viewToolBar;
! KToggleAction* viewStatusBar;
KToggleAction* showRKWatch;
KToggleAction* showRKOutput;
***************
*** 259,262 ****
--- 260,264 ----
KAction* runAll;
KAction* runSelection;
+ KAction* runLine;
KAction* interruptCommand;
KAction* configure;
***************
*** 268,281 ****
friend class RKSettings;
! /** Does pasting (called from the respective slots) */
void doPaste ();
! /** Finds plugins and inserts them into the menu-structure */
void initPlugins ();
! /** recursively initialize the plugins in this directory */
int initPluginDir (const QString & dirname, RKMenu *parent);
! /** Used to receive a signal during startup AFTER the exec loop was entered */
QTimer *startup_timer;
--- 270,283 ----
friend class RKSettings;
! /** Does pasting (called from the respective slots) */
void doPaste ();
! /** Finds plugins and inserts them into the menu-structure */
void initPlugins ();
! /** recursively initialize the plugins in this directory */
int initPluginDir (const QString & dirname, RKMenu *parent);
! /** Used to receive a signal during startup AFTER the exec loop was entered */
QTimer *startup_timer;
***************
*** 294,322 ****
bool getFilenameAndPath(const KURL &url,QString *fname);
void saveAsProcedure(RKCommandEditorWindow *editor);
! void setEnabledActions(bool commandEditor);
! KMdiChildView* outputView();
!
!
!
!
!
!
!
! KParts::ReadOnlyPart *m_gvpart;
! KParts::ReadOnlyPart *m_notepadpart;
!
! QSplitter *m_splitter;
!
! /** refreshes the output.
@param show if set to true, the output-window will be shown / raised. If set to false, the visibility will not be changed
@param raise like show. If set to true, the output-window - if already shown - will additionally be raised */
void refreshOutput (bool show, bool raise);
signals:
! void childWindowCloseRequest(KMdiChildView * window);
private slots:
! void slotOutputShow();
! void slotOutputFlush();
};
!
#endif // RKWARD_H
--- 296,312 ----
bool getFilenameAndPath(const KURL &url,QString *fname);
void saveAsProcedure(RKCommandEditorWindow *editor);
! void setEnabledActions(bool commandEditor);
! KMdiChildView* outputView();
! /** refreshes the output.
@param show if set to true, the output-window will be shown / raised. If set to false, the visibility will not be changed
@param raise like show. If set to true, the output-window - if already shown - will additionally be raised */
void refreshOutput (bool show, bool raise);
signals:
! void childWindowCloseRequest(KMdiChildView * window);
private slots:
! void slotOutputShow();
! void slotOutputFlush();
};
!
#endif // RKWARD_H
Index: main.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/main.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** main.cpp 28 Apr 2005 21:29:12 -0000 1.15
--- main.cpp 29 Apr 2005 16:47:29 -0000 1.16
***************
*** 87,94 ****
{
! KAboutData aboutData( "rkward", I18N_NOOP ("RKWard"), version, description, KAboutData::License_GPL, "(c) 2002, 2004", 0, "http://rkward.sf.net", "");
aboutData.addAuthor ("Thomas Friedrichsmeier", i18n("Project leader"), "");
! aboutData.addAuthor ("Pierre Ecochard", i18n("Coder since 0.29"), "");
aboutData.addCredit ("Adrien d'Hardemare", i18n("Plugins and patches"), "");
aboutData.addCredit ("Daniele Medri", i18n("RKWard logo, many suggestions, help on wording"), "");
aboutData.addCredit ("David Sibai", i18n("Several valuable comments, hints and patches"), "");
--- 87,95 ----
{
! KAboutData aboutData( "rkward", I18N_NOOP ("RKWard"), version, description, KAboutData::License_GPL, "(c) 2002, 2005", 0, "http://rkward.sf.net", "");
aboutData.addAuthor ("Thomas Friedrichsmeier", i18n("Project leader"), "");
! aboutData.addAuthor ("Pierre Ecochard", i18n("Core coder since 0.29"), "");
aboutData.addCredit ("Adrien d'Hardemare", i18n("Plugins and patches"), "");
+ aboutData.addCredit ("Marco Martin", i18n("A cool icon"), "");
aboutData.addCredit ("Daniele Medri", i18n("RKWard logo, many suggestions, help on wording"), "");
aboutData.addCredit ("David Sibai", i18n("Several valuable comments, hints and patches"), "");
Index: rkward.desktop
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rkward.desktop 15 Sep 2004 15:02:30 -0000 1.2
--- rkward.desktop 29 Apr 2005 16:47:30 -0000 1.3
***************
*** 5,8 ****
--- 5,9 ----
Comment=GUI for the R-project
Comment[pl]=Graficzny interfejs dla projektu R
+ Comment[fr]=Interface graphique pour R
Icon=rkward.png
Exec=rkward -caption "%c" %i %m
Index: rkwardui.rc
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwardui.rc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** rkwardui.rc 7 Apr 2005 06:01:19 -0000 1.20
--- rkwardui.rc 29 Apr 2005 16:47:30 -0000 1.21
***************
*** 46,51 ****
<Menu name="run"><text>&Run</text>
<Separator/>
! <Action name="run_all"/>
<Action name="run_selection"/>
<Separator/>
<Action name="interrupt"/>
--- 46,52 ----
<Menu name="run"><text>&Run</text>
<Separator/>
! <Action name="run_line"/>
<Action name="run_selection"/>
+ <Action name="run_all"/>
<Separator/>
<Action name="interrupt"/>
More information about the rkward-tracker
mailing list