[rkward-cvs] rkward/rkward debug.h,1.9,1.10 rkward.cpp,1.80,1.81 rkward.h,1.34,1.35 robjectbrowser.cpp,1.13,1.14 robjectbrowser.h,1.7,1.8

[Thomas Friedrichsmeier]

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

Modified Files:
	debug.h rkward.cpp rkward.h robjectbrowser.cpp 
	robjectbrowser.h 
Log Message:
Added global config options for RKObjectListView. Still TODO: context menus

Index: rkward.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** rkward.h	20 Apr 2005 12:34:56 -0000	1.34
--- rkward.h	22 Apr 2005 13:56:16 -0000	1.35
***************
*** 267,271 ****
  	friend class RKSettingsModulePlugins;
  	friend class RKSettings;
! 	
  /** Does pasting (called from the respective slots) */
  	void doPaste ();
--- 267,271 ----
  	friend class RKSettingsModulePlugins;
  	friend class RKSettings;
! 
  /** Does pasting (called from the respective slots) */
  	void doPaste ();

Index: robjectbrowser.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/robjectbrowser.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** robjectbrowser.cpp	3 Nov 2004 14:53:42 -0000	1.13
--- robjectbrowser.cpp	22 Apr 2005 13:56:16 -0000	1.14
***************
*** 59,63 ****
  	connect (list_view, SIGNAL (doubleClicked ( QListViewItem *, const QPoint &, int )), this, SLOT (slotListDoubleClicked (QListViewItem *, const QPoint &, int)));
  	
- 	
  	resize (minimumSizeHint ().expandedTo (QSize (400, 480)));
  }
--- 59,62 ----
***************
*** 112,119 ****
  }
  
! 
! 
! 
! void RObjectBrowser::slotListDoubleClicked(QListViewItem *item, const QPoint &pos, int)
  {
  	RObject *object = list_view->findItemObject (item);
--- 111,115 ----
  }
  
! void RObjectBrowser::slotListDoubleClicked (QListViewItem *item, const QPoint &, int)
  {
  	RObject *object = list_view->findItemObject (item);
***************
*** 121,137 ****
  	if (!object) return;
  	if (object == RKGlobals::rObjectList ()) return;
! 	
! 	menu->setItemEnabled (Edit, RKGlobals::editorManager ()->canEditObject (object));
! 	menu_object = object;
! 	
! 	if (item==0)
! 		return;
! 	
  	if ( (RKGlobals::rkApp()->activeWindow())->inherits("RKCommandEditorWindow") ) {
! 		( (RKCommandEditorWindow*)RKGlobals::rkApp()->activeWindow() )->insertText(menu_object->getFullName());
  	}
  }
  
- 
  #include "robjectbrowser.moc"
  
--- 117,126 ----
  	if (!object) return;
  	if (object == RKGlobals::rObjectList ()) return;
! 
  	if ( (RKGlobals::rkApp()->activeWindow())->inherits("RKCommandEditorWindow") ) {
! 		( (RKCommandEditorWindow*)RKGlobals::rkApp()->activeWindow() )->insertText(object->getFullName());
  	}
  }
  
  #include "robjectbrowser.moc"
  

Index: debug.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/debug.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** debug.h	2 Sep 2004 15:08:50 -0000	1.9
--- debug.h	22 Apr 2005 13:56:15 -0000	1.10
***************
*** 51,57 ****
  #else
  
! #define RK_DO(expr,flags,level)
! #define RK_ASSERT(x)
! #define RK_TRACE(flags)
  
  #endif
--- 51,57 ----
  #else
  
! #define RK_DO(expr,flags,level) ;
! #define RK_ASSERT(x) ;
! #define RK_TRACE(flags) ;
  
  #endif

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** rkward.cpp	20 Apr 2005 12:34:56 -0000	1.80
--- rkward.cpp	22 Apr 2005 13:56:15 -0000	1.81
***************
*** 91,94 ****
--- 91,95 ----
  	RKGlobals::rinter = 0;
  	RKGlobals::list = 0;
+ 	RKSettings::settings_tracker = new RKSettingsTracker (this);
  	
  	config=kapp->config();
***************
*** 1198,1199 ****
--- 1199,1201 ----
  	return(result);
  }
+ 

Index: robjectbrowser.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/robjectbrowser.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** robjectbrowser.h	3 Nov 2004 14:53:42 -0000	1.7
--- robjectbrowser.h	22 Apr 2005 13:56:16 -0000	1.8
***************
*** 51,54 ****
--- 51,55 ----
  	void popupDelete ();
  	void popupRename ();
+ /** when an object in the list is double clicked, insert its name in the current RKCommandEditor windo */
      void slotListDoubleClicked(QListViewItem *item, const QPoint &pos, int);
  private: