[rkward-cvs] rkward/rkward/dataeditor rkeditordataframepart.cpp,1.1,1.2 rkeditordataframepart.h,1.1,1.2 rkeditordataframepart.rc,1.1,1.2

[Thomas Friedrichsmeier]

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

Modified Files:
	rkeditordataframepart.cpp rkeditordataframepart.h 
	rkeditordataframepart.rc 
Log Message:
Added a Window-menu with Window->Close, etc. No everything working properly so far.

Index: rkeditordataframepart.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/rkeditordataframepart.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkeditordataframepart.cpp	15 Sep 2005 19:03:47 -0000	1.1
--- rkeditordataframepart.cpp	16 Sep 2005 16:08:11 -0000	1.2
***************
*** 57,60 ****
--- 57,61 ----
  	editPasteToSelection = new KAction(i18n("Paste inside Selection"), 0, 0, this, SLOT(slotEditPasteToSelection()), actionCollection(), "paste_to_selection");
  	editPasteToSelection->setIcon("frame_edit");
+ 	//windowClose = new KAction (i18n("Close"), 0, KShortcut ("Ctrl+W"), this, SLOT (slotCloseWindow()), actionCollection(), "window_close");
  
  	editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard"));
***************
*** 122,125 ****
--- 123,132 ----
  	RKGlobals::rkApp ()->slotStatusMsg(i18n("Ready."));
  }
+ /*
+ void RKEditorDataFramePart::slotCloseWindow () {
+ 	RK_TRACE (EDITOR);
+ 
+ 	RKGlobals::rkApp ()->closeWindow (editor);
+ }*/
  
  #include "rkeditordataframepart.moc"

Index: rkeditordataframepart.rc
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/rkeditordataframepart.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkeditordataframepart.rc	15 Sep 2005 19:03:47 -0000	1.1
--- rkeditordataframepart.rc	16 Sep 2005 16:08:11 -0000	1.2
***************
*** 11,14 ****
--- 11,17 ----
  			<Merge/> 
  		</Menu>
+ <!--		<Menu name="windows"><text>&Windows</text>
+ 			<Action name="window_close"/>
+ 		</Menu>-->
  	<ToolBar fullWidth="true" name="editToolBar">
  		<Action name="cut"/>

Index: rkeditordataframepart.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/rkeditordataframepart.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkeditordataframepart.h	15 Sep 2005 19:03:47 -0000	1.1
--- rkeditordataframepart.h	16 Sep 2005 16:08:11 -0000	1.2
***************
*** 45,48 ****
--- 45,51 ----
  /** paste the clipboard into the table, but not beyond selection boundaries	*/
  	void slotEditPasteToSelection();
+ /** closes the window. Note: Actually this should be handled in rkwardapp, but somehow that does not work. Therefore, we override the close-window
+ 	function and do this from here */
+ //	void slotCloseWindow ();
  private:
  	KAction* editCut;
***************
*** 51,54 ****
--- 54,58 ----
  	KAction* editPasteToSelection;
  	KAction* editPasteToTable;
+ //	KAction* windowClose;
  
  	RKEditorDataFrame *editor;