[rkward-cvs] rkward/rkward/settings rksettingsmodulelogfiles.cpp,1.6,1.7 rksettingsmodulelogfiles.h,1.3,1.4

[Thomas Friedrichsmeier]

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

Modified Files:
	rksettingsmodulelogfiles.cpp rksettingsmodulelogfiles.h 
Log Message:
Make changing logfile path less dangerous

Index: rksettingsmodulelogfiles.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulelogfiles.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rksettingsmodulelogfiles.cpp	2 Oct 2005 13:29:44 -0000	1.6
--- rksettingsmodulelogfiles.cpp	20 Oct 2005 19:22:52 -0000	1.7
***************
*** 32,35 ****
--- 32,36 ----
  // static members
  QString RKSettingsModuleLogfiles::files_path;
+ QString RKSettingsModuleLogfiles::new_files_path;
  
  RKSettingsModuleLogfiles::RKSettingsModuleLogfiles (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
***************
*** 37,41 ****
  
  	QVBoxLayout *main_vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
! 	QLabel *label = new QLabel (i18n ("For now, when you change the setting for the location of the logfiles, RKWard will not function properly until you restart the application!"), this);
  	label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
  	main_vbox->addWidget (label);
--- 38,42 ----
  
  	QVBoxLayout *main_vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
! 	QLabel *label = new QLabel (i18n ("Settings marked with (*) do not take effect until you restart RKWard"), this);
  	label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
  	main_vbox->addWidget (label);
***************
*** 43,47 ****
  	main_vbox->addStretch ();
  	
! 	files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, i18n ("Directory where the logfiles should be kept"), QString::null, files_path);
  	connect (files_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
  	main_vbox->addWidget (files_choser);
--- 44,48 ----
  	main_vbox->addStretch ();
  	
! 	files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, i18n ("Directory where the logfiles should be kept (*)"), QString::null, new_files_path);
  	connect (files_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
  	main_vbox->addWidget (files_choser);
***************
*** 69,73 ****
  void RKSettingsModuleLogfiles::applyChanges () {
  	RK_TRACE (SETTINGS);
! 	files_path = files_choser->getLocation ();
  }
  
--- 70,74 ----
  void RKSettingsModuleLogfiles::applyChanges () {
  	RK_TRACE (SETTINGS);
! 	new_files_path = files_choser->getLocation ();
  }
  
***************
*** 81,85 ****
  
  	config->setGroup ("Logfiles");
! 	config->writeEntry ("logfile dir", files_path);
  }
  
--- 82,86 ----
  
  	config->setGroup ("Logfiles");
! 	config->writeEntry ("logfile dir", new_files_path);
  }
  
***************
*** 88,92 ****
  
  	config->setGroup ("Logfiles");
! 	files_path = config->readEntry ("logfile dir", QDir ().homeDirPath () + "/.rkward/");
  }
  
--- 89,93 ----
  
  	config->setGroup ("Logfiles");
! 	files_path = new_files_path = config->readEntry ("logfile dir", QDir ().homeDirPath () + "/.rkward/");
  }
  

Index: rksettingsmodulelogfiles.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulelogfiles.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rksettingsmodulelogfiles.h	24 Aug 2004 15:04:57 -0000	1.3
--- rksettingsmodulelogfiles.h	20 Oct 2005 19:22:52 -0000	1.4
***************
*** 49,52 ****
--- 49,54 ----
  	
  	static QString files_path;
+ /** since changing the files_path can not easily be done while in an active session, the setting should only take effect on the next start. This string stores a changed setting, while keeping the old one intact as long as RKWard is running */
+ 	static QString new_files_path;
  };