[rkward-cvs] rkward/rkward/dataeditor Makefile.am,1.7,1.8 rkeditor.cpp,1.1,1.2 rkeditor.h,1.4,1.5 rkeditordataframe.cpp,1.25,1.26

[Thomas Friedrichsmeier]

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

Modified Files:
	Makefile.am rkeditor.cpp rkeditor.h rkeditordataframe.cpp 
Log Message:
RKEditorDataFrame is a KMdiChildView, now, and wrapped in a Part.

Index: rkeditordataframe.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/rkeditordataframe.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** rkeditordataframe.cpp	21 Oct 2004 16:34:42 -0000	1.25
--- rkeditordataframe.cpp	14 Sep 2005 21:07:07 -0000	1.26
***************
*** 28,31 ****
--- 28,32 ----
  #include "../rkeditormanager.h"
  #include "../core/rkmodificationtracker.h"
+ #include "rkeditordataframepart.h"
  
  #include "../debug.h"
***************
*** 38,41 ****
--- 39,45 ----
  RKEditorDataFrame::RKEditorDataFrame (QWidget *parent) : TwinTable (parent) {
  	RK_TRACE (EDITOR);
+ 
+ 	part = new RKEditorDataFramePart (parent, this);
+ 
  	open_chain = 0;
  }

Index: rkeditor.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/rkeditor.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkeditor.cpp	20 Aug 2004 15:31:01 -0000	1.1
--- rkeditor.cpp	14 Sep 2005 21:07:07 -0000	1.2
***************
*** 17,21 ****
  #include "rkeditor.h"
  
! RKEditor::RKEditor (QWidget *parent) : QWidget (parent) {
  }
  
--- 17,21 ----
  #include "rkeditor.h"
  
! RKEditor::RKEditor (QWidget *parent) : KMdiChildView (parent) {
  }
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	1 Oct 2004 16:37:59 -0000	1.7
--- Makefile.am	14 Sep 2005 21:07:07 -0000	1.8
***************
*** 4,9 ****
  libdataeditor_a_SOURCES = twintable.cpp twintablemember.cpp rkdrag.cpp \
  	rkeditor.cpp rkeditordataframe.cpp twintabledatamember.cpp twintablemetamember.cpp \
! 	celleditor.cpp editlabelsdialog.cpp editformatdialog.cpp
  noinst_HEADERS = rkdrag.h twintable.h twintablemember.h rkeditor.h \
! 	rkeditordataframe.h twintabledatamember.h twintablemetamember.h celleditor.h \
! 	editlabelsdialog.h editformatdialog.h
--- 4,12 ----
  libdataeditor_a_SOURCES = twintable.cpp twintablemember.cpp rkdrag.cpp \
  	rkeditor.cpp rkeditordataframe.cpp twintabledatamember.cpp twintablemetamember.cpp \
! 	celleditor.cpp editlabelsdialog.cpp editformatdialog.cpp rkeditordataframepart.cpp
  noinst_HEADERS = rkdrag.h twintable.h twintablemember.h rkeditor.h \
! 		rkeditordataframe.h twintabledatamember.h twintablemetamember.h celleditor.h \
! 		editlabelsdialog.h editformatdialog.h rkeditordataframepart.h
! 
! rcdir = $(kde_datadir)/rkward
! rc_DATA = rkeditordataframepart.rc

Index: rkeditor.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dataeditor/rkeditor.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rkeditor.h	2 Sep 2004 10:50:24 -0000	1.4
--- rkeditor.h	14 Sep 2005 21:07:07 -0000	1.5
***************
*** 22,25 ****
--- 22,28 ----
  #include "../core/robject.h"
  
+ #include <kparts/part.h>
+ #include <kmdichildview.h>
+ 
  class RCommandChain;
  class RKDrag;
***************
*** 30,35 ****
  @author Thomas Friedrichsmeier
  */
! class RKEditor : public QWidget
! {
  Q_OBJECT
  protected:
--- 33,37 ----
  @author Thomas Friedrichsmeier
  */
! class RKEditor : public KMdiChildView {
  Q_OBJECT
  protected:
***************
*** 62,65 ****
--- 64,69 ----
  /** Tell the editor to (unconditionally) update its representation of the object data (in the range given in the ChangeSet) */
  	virtual void updateObjectData (RObject *object, RObject::ChangeSet *changes) = 0;
+ 
+ 	KParts::ReadWritePart *getPart () { return part; };
  protected:
  friend class RKEditorManager;
***************
*** 68,71 ****
--- 72,77 ----
  
  	RObject *object;
+ 
+ 	KParts::ReadWritePart *part;
  };