[rkward-cvs] rkward/rkward/windows rkcommandeditorwindow.cpp,1.28,1.29 rkcommandeditorwindow.h,1.20,1.21 rkcommandeditorwindowpart.cpp,1.4,1.5 rkcommandeditorwindowpart.rc,1.4,1.5

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4781/rkward/windows

Modified Files:
	rkcommandeditorwindow.cpp rkcommandeditorwindow.h 
	rkcommandeditorwindowpart.cpp rkcommandeditorwindowpart.rc 
Log Message:
Make Ctrl+C copy work for code display in plugins

Index: rkcommandeditorwindowpart.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindowpart.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rkcommandeditorwindowpart.cpp	29 Sep 2005 16:02:51 -0000	1.4
--- rkcommandeditorwindowpart.cpp	20 Apr 2006 14:33:54 -0000	1.5
***************
*** 52,56 ****
  	runSelection->setIcon("player_play");
  	runLine = new KAction (i18n ("Run current line"), KShortcut ("Ctrl+L"), this, SLOT (slotRunLine ()), actionCollection (), "run_line");
- 	runLine->setIcon("player_play");
  
  	helpFunction = new KAction (i18n ("&Function reference"), KShortcut ("F2"), this, SLOT (slotFunctionReference ()), actionCollection (), "function_reference");
--- 52,55 ----

Index: rkcommandeditorwindow.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindow.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** rkcommandeditorwindow.cpp	20 Apr 2006 14:02:12 -0000	1.28
--- rkcommandeditorwindow.cpp	20 Apr 2006 14:33:54 -0000	1.29
***************
*** 93,97 ****
  void RKCommandEditorWindow::closeEvent (QCloseEvent *e) {
  	if (isModified ()) {
! 		int status = KMessageBox::warningYesNo (this, i18n ("The document \"%1\" has been modified. Close it anyway?").arg (tabCaption ()),i18n ("File not saved"));
  	
  		if (status != KMessageBox::Yes) {
--- 93,97 ----
  void RKCommandEditorWindow::closeEvent (QCloseEvent *e) {
  	if (isModified ()) {
! 		int status = KMessageBox::warningYesNo (this, i18n ("The document \"%1\" has been modified. Close it anyway?").arg (tabCaption ()), i18n ("File not saved"));
  	
  		if (status != KMessageBox::Yes) {
***************
*** 137,140 ****
--- 137,146 ----
  }
  
+ void RKCommandEditorWindow::copy () {
+ 	RK_TRACE (COMMANDEDITOR);
+ 
+ 	m_view->copy ();
+ }
+ 
  bool RKCommandEditorWindow::openURL (const KURL &url, bool use_r_highlighting, bool read_only){
  	RK_TRACE (COMMANDEDITOR);

Index: rkcommandeditorwindowpart.rc
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindowpart.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rkcommandeditorwindowpart.rc	10 Apr 2006 13:12:09 -0000	1.4
--- rkcommandeditorwindowpart.rc	20 Apr 2006 14:33:54 -0000	1.5
***************
*** 1,4 ****
  <!DOCTYPE kpartgui>
! <kpartgui name="rkward" version="0.3.3">
  	<MenuBar>
  		<Menu name="edit" noMerge="1"><text>&Edit</text>
--- 1,4 ----
  <!DOCTYPE kpartgui>
! <kpartgui name="rkward" version="0.3.6">
  	<MenuBar>
  		<Menu name="edit" noMerge="1"><text>&Edit</text>
***************
*** 6,9 ****
--- 6,10 ----
  				<Merge/>
  			</Menu>
+ 			<Action name="copy"/>
  			<Merge/>
  		</Menu>

Index: rkcommandeditorwindow.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindow.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** rkcommandeditorwindow.h	20 Apr 2006 14:02:12 -0000	1.20
--- rkcommandeditorwindow.h	20 Apr 2006 14:33:54 -0000	1.21
***************
*** 26,35 ****
  #include <kmdichildview.h>
  
- class RKCommandEditor;
- class KAction;
- class KToggleAction;
- class RKwardApp; 
- class RCommandChain;
- 
  /**
  	\brief Provides an editor window for R-commands, as well as a text-editor window in general.
--- 26,29 ----
***************
*** 66,69 ****
--- 60,65 ----
  /** set the current text (clear all previous text, and sets new text) */
  	void setText (const QString &text);
+ /** copy current selection. Wrapper for use by external classes */
+ 	void copy ();
  public slots:
  /** update Tab caption according to the current url. Display the filename-component of the URL, or - if not available - a more elaborate description of the url. Also appends a "[modified]" if approriate */