[rkward-cvs] rkward/rkward rkward.cpp,1.97,1.98 rkward.h,1.46,1.47

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.cpp rkward.h 
Log Message:
And some more small cleanups

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** rkward.cpp	17 Sep 2005 17:00:04 -0000	1.97
--- rkward.cpp	17 Sep 2005 17:16:37 -0000	1.98
***************
*** 91,96 ****
  	RKSettings::settings_tracker = new RKSettingsTracker (this);
  	
- 	config=kapp->config();
- 	
  	KGlobal::dirs()->addResourceType("plugins", KStandardDirs::kde_default("data") + "rkward/plugins/");
  	
--- 91,94 ----
***************
*** 339,345 ****
  }
  
! void RKwardApp::saveOptions()
! {	
  	RK_TRACE (APP);
  	config->setGroup("General Options");
  	config->writeEntry("Geometry", size());
--- 337,344 ----
  }
  
! void RKwardApp::saveOptions () {	
  	RK_TRACE (APP);
+ 	KConfig *config = kapp->config ();
+ 
  	config->setGroup("General Options");
  	config->writeEntry("Geometry", size());
***************
*** 350,389 ****
  	config->writeEntry("RunBarPos", (int) toolBar("runToolBar")->barPos());
  
- 
  	RKSettings::saveSettings (config);
  	
! 	fileOpenRecentWorkspace->saveEntries(config,"Recent Files");
! 	fileOpenRecent->saveEntries(config,"Recent Command Files");
  }
  
  
! void RKwardApp::readOptions ()
! {
  	RK_TRACE (APP);
  	
  	config->setGroup("General Options");
  	
  	// bar status settings
! 	bool bViewToolbar = config->readBoolEntry("Show Toolbar", true);
! 	viewToolBar->setChecked(bViewToolbar);
! 	slotViewToolBar();
! 	
! 	bool bViewStatusbar = config->readBoolEntry("Show Statusbar", true);
! 	viewStatusBar->setChecked(bViewStatusbar);
  	slotViewStatusBar();
! 	
! 	
  	// bar position settings
! 	KToolBar::BarPosition toolBarPos;
! 	toolBarPos=(KToolBar::BarPosition) config->readNumEntry("ToolBarPos", KToolBar::Top);
! 	toolBar("mainToolBar")->setBarPos(toolBarPos);
! 	
! 	KToolBar::BarPosition editBarPos;
! 	editBarPos=(KToolBar::BarPosition) config->readNumEntry("EditBarPos", KToolBar::Top);
! 	toolBar("editToolBar")->setBarPos(editBarPos);
! 	
! 	KToolBar::BarPosition runBarPos;
! 	runBarPos=(KToolBar::BarPosition) config->readNumEntry("RunBarPos", KToolBar::Top);
! 	toolBar("runToolBar")->setBarPos(runBarPos);
  	
  	QSize size=config->readSizeEntry("Geometry");
--- 349,376 ----
  	config->writeEntry("RunBarPos", (int) toolBar("runToolBar")->barPos());
  
  	RKSettings::saveSettings (config);
  	
! 	fileOpenRecentWorkspace->saveEntries(config, "Recent Files");
! 	fileOpenRecent->saveEntries(config, "Recent Command Files");
  }
  
  
! void RKwardApp::readOptions () {
  	RK_TRACE (APP);
+ 	KConfig *config = kapp->config ();
  	
  	config->setGroup("General Options");
  	
  	// bar status settings
! 	viewToolBar->setChecked (config->readBoolEntry ("Show Toolbar", true));
! 	slotViewToolBar ();
! 
! 	viewStatusBar->setChecked (config->readBoolEntry ("Show Statusbar", true));
  	slotViewStatusBar();
! 
  	// bar position settings
! 	toolBar("mainToolBar")->setBarPos ((KToolBar::BarPosition) config->readNumEntry ("ToolBarPos", KToolBar::Top));
! 	toolBar("editToolBar")->setBarPos ((KToolBar::BarPosition) config->readNumEntry ("EditBarPos", KToolBar::Top));
! 	toolBar("runToolBar")->setBarPos ((KToolBar::BarPosition) config->readNumEntry("RunBarPos", KToolBar::Top));
  	
  	QSize size=config->readSizeEntry("Geometry");
***************
*** 393,401 ****
  	
  	// initialize the recent file list
! 	fileOpenRecentWorkspace->loadEntries(config,"Recent Files");
! 	fileOpenRecent->loadEntries(config,"Recent Command Files");
  	
  	// do this last, since we may be setting some different config-group(s) in the process
! 	RKSettings::loadSettings (config);  
  }
  
--- 380,388 ----
  	
  	// initialize the recent file list
! 	fileOpenRecentWorkspace->loadEntries (config,"Recent Files");
! 	fileOpenRecent->loadEntries (config,"Recent Command Files");
  	
  	// do this last, since we may be setting some different config-group(s) in the process
! 	RKSettings::loadSettings (config);
  }
  

Index: rkward.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** rkward.h	17 Sep 2005 17:00:05 -0000	1.46
--- rkward.h	17 Sep 2005 17:16:37 -0000	1.47
***************
*** 46,55 ****
  
  // forward declaration of the RKward classes
- class RKwardDoc;
- class RKwardView;
  class RSettings;
  class RKMenu;
  class QTimer;
- //class RKOutputWindow;
  class RObjectBrowser;
  class RKSettingsModule;
--- 46,52 ----
***************
*** 58,67 ****
  class RKEditorManager;
  class RKMenuList;
- class RKDocManager;
  class RKCommandEditorWindow;
  class KHelpDlg;
- class RKKonsole;
  class RKConsole;
- class QSplitter;
  
  /**
--- 55,61 ----
***************
*** 217,229 ****
  	void slotOutputShow ();
  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;
--- 211,214 ----