[rkward-cvs] rkward/rkward/settings rksettings.cpp,1.6,1.7 rksettingsmodule.h,1.4,1.5 rksettingsmodulelogfiles.cpp,1.5,1.6 rksettingsmoduleobjectbrowser.cpp,1.3,1.4 rksettingsmoduleoutput.cpp,1.3,1.4 rksettingsmodulephp.cpp,1.6,1.7 rksettingsmoduler.cpp,1.8,1.9 rksettingsmodulewatch.cpp,1.5,1.6
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Sun Oct 2 13:29:47 UTC 2005
- Previous message: [rkward-cvs] rkward configure,1.23,1.24 configure.files,1.5,1.6 configure.in,1.23,1.24 subdirs,1.7,1.8
- Next message: [rkward-cvs] rkward/rkward debug.h,1.11,1.12 rkward.cpp,1.100,1.101
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/rkward/rkward/rkward/settings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21788/rkward/settings
Modified Files:
rksettings.cpp rksettingsmodule.h rksettingsmodulelogfiles.cpp
rksettingsmoduleobjectbrowser.cpp rksettingsmoduleoutput.cpp
rksettingsmodulephp.cpp rksettingsmoduler.cpp
rksettingsmodulewatch.cpp
Log Message:
Write config changes to disk in saveOptions. Added RK_TRACEs in the settings-modules
Index: rksettingsmodulelogfiles.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulelogfiles.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rksettingsmodulelogfiles.cpp 29 Sep 2005 16:02:51 -0000 1.5
--- rksettingsmodulelogfiles.cpp 2 Oct 2005 13:29:44 -0000 1.6
***************
*** 28,31 ****
--- 28,32 ----
#include "../misc/getfilenamewidget.h"
#include "../rkglobals.h"
+ #include "../debug.h"
// static members
***************
*** 33,36 ****
--- 34,39 ----
RKSettingsModuleLogfiles::RKSettingsModuleLogfiles (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
+ RK_TRACE (SETTINGS);
+
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);
***************
*** 46,72 ****
--- 49,83 ----
RKSettingsModuleLogfiles::~RKSettingsModuleLogfiles() {
+ RK_TRACE (SETTINGS);
}
void RKSettingsModuleLogfiles::pathChanged () {
+ RK_TRACE (SETTINGS);
change ();
}
QString RKSettingsModuleLogfiles::caption () {
+ RK_TRACE (SETTINGS);
return (i18n ("Logfiles"));
}
bool RKSettingsModuleLogfiles::hasChanges () {
+ RK_TRACE (SETTINGS);
return changed;
}
void RKSettingsModuleLogfiles::applyChanges () {
+ RK_TRACE (SETTINGS);
files_path = files_choser->getLocation ();
}
void RKSettingsModuleLogfiles::save (KConfig *config) {
+ RK_TRACE (SETTINGS);
saveSettings (config);
}
void RKSettingsModuleLogfiles::saveSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("Logfiles");
config->writeEntry ("logfile dir", files_path);
***************
*** 74,77 ****
--- 85,90 ----
void RKSettingsModuleLogfiles::loadSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("Logfiles");
files_path = config->readEntry ("logfile dir", QDir ().homeDirPath () + "/.rkward/");
Index: rksettingsmodule.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodule.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rksettingsmodule.h 18 Sep 2005 15:17:55 -0000 1.4
--- rksettingsmodule.h 2 Oct 2005 13:29:44 -0000 1.5
***************
*** 34,38 ****
RKSettingsModule (RKSettings *gui, QWidget *parent);
! ~RKSettingsModule ();
virtual bool hasChanges () = 0;
--- 34,38 ----
RKSettingsModule (RKSettings *gui, QWidget *parent);
! virtual ~RKSettingsModule ();
virtual bool hasChanges () = 0;
Index: rksettingsmoduleobjectbrowser.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmoduleobjectbrowser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rksettingsmoduleobjectbrowser.cpp 28 Apr 2005 22:25:45 -0000 1.3
--- rksettingsmoduleobjectbrowser.cpp 2 Oct 2005 13:29:44 -0000 1.4
***************
*** 27,30 ****
--- 27,31 ----
#include "../rkglobals.h"
#include "rksettings.h"
+ #include "../debug.h"
// static
***************
*** 32,35 ****
--- 33,38 ----
RKSettingsModuleObjectBrowser::RKSettingsModuleObjectBrowser (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
+ RK_TRACE (SETTINGS);
+
QVBoxLayout *layout = new QVBoxLayout (this, RKGlobals::marginHint ());
***************
*** 61,71 ****
--- 64,77 ----
RKSettingsModuleObjectBrowser::~RKSettingsModuleObjectBrowser () {
+ RK_TRACE (SETTINGS);
}
bool RKSettingsModuleObjectBrowser::hasChanges () {
+ RK_TRACE (SETTINGS);
return changed;
}
void RKSettingsModuleObjectBrowser::applyChanges () {
+ RK_TRACE (SETTINGS);
options = 0;
if (show_hidden_vars_box->isChecked ()) options |= ShowHiddenVars;
***************
*** 78,85 ****
--- 84,93 ----
void RKSettingsModuleObjectBrowser::save (KConfig *config) {
+ RK_TRACE (SETTINGS);
saveSettings (config);
}
QString RKSettingsModuleObjectBrowser::caption () {
+ RK_TRACE (SETTINGS);
return (i18n ("Workspace"));
}
***************
*** 87,92 ****
//static
void RKSettingsModuleObjectBrowser::saveSettings (KConfig *config) {
! config->setGroup ("Object Browser");
config->writeEntry ("show hidden vars", showHiddenVars ());
config->writeEntry ("show label field", showLabelField ());
--- 95,101 ----
//static
void RKSettingsModuleObjectBrowser::saveSettings (KConfig *config) {
! RK_TRACE (SETTINGS);
+ config->setGroup ("Object Browser");
config->writeEntry ("show hidden vars", showHiddenVars ());
config->writeEntry ("show label field", showLabelField ());
***************
*** 97,103 ****
//static
void RKSettingsModuleObjectBrowser::loadSettings (KConfig *config) {
options = 0;
config->setGroup ("Object Browser");
-
if (config->readBoolEntry ("show hidden vars", false)) options |= ShowHiddenVars;
if (config->readBoolEntry ("show label field", true)) options |= ShowLabelField;
--- 106,113 ----
//static
void RKSettingsModuleObjectBrowser::loadSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
options = 0;
config->setGroup ("Object Browser");
if (config->readBoolEntry ("show hidden vars", false)) options |= ShowHiddenVars;
if (config->readBoolEntry ("show label field", true)) options |= ShowLabelField;
***************
*** 107,110 ****
--- 117,121 ----
void RKSettingsModuleObjectBrowser::boxChanged (int) {
+ RK_TRACE (SETTINGS);
change ();
}
Index: rksettingsmoduler.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmoduler.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rksettingsmoduler.cpp 29 Sep 2005 16:02:51 -0000 1.8
--- rksettingsmoduler.cpp 2 Oct 2005 13:29:44 -0000 1.9
***************
*** 30,33 ****
--- 30,34 ----
#include "../rbackend/rinterface.h"
#include "../rkglobals.h"
+ #include "../debug.h"
// static members
***************
*** 39,42 ****
--- 40,45 ----
RKSettingsModuleR::RKSettingsModuleR (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
+ RK_TRACE (SETTINGS);
+
QVBoxLayout *main_vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
***************
*** 71,85 ****
--- 74,92 ----
RKSettingsModuleR::~RKSettingsModuleR() {
+ RK_TRACE (SETTINGS);
}
void RKSettingsModuleR::boxChanged (int) {
+ RK_TRACE (SETTINGS);
change ();
}
void RKSettingsModuleR::pathChanged () {
+ RK_TRACE (SETTINGS);
change ();
}
void RKSettingsModuleR::addRepository (QStringList *string_list) {
+ RK_TRACE (SETTINGS);
QString new_string = KInputDialog::getText (i18n ("Add repository"), i18n ("Add URL of new repository\n(Enter \"@CRAN@\" for the standard CRAN-mirror)"), QString::null, 0, this);
(*string_list).append (new_string);
***************
*** 87,98 ****
--- 94,109 ----
QString RKSettingsModuleR::caption () {
+ RK_TRACE (SETTINGS);
return (i18n ("R-Backend"));
}
bool RKSettingsModuleR::hasChanges () {
+ RK_TRACE (SETTINGS);
return changed;
}
void RKSettingsModuleR::applyChanges () {
+ RK_TRACE (SETTINGS);
+
r_nosave = nosave_box->isChecked ();
r_slave = slave_box->isChecked ();
***************
*** 111,118 ****
--- 122,133 ----
void RKSettingsModuleR::save (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
saveSettings (config);
}
void RKSettingsModuleR::saveSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("R Settings");
config->writeEntry ("R_HOME", r_home_dir);
***************
*** 124,127 ****
--- 139,144 ----
void RKSettingsModuleR::loadSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("R Settings");
r_home_dir = config->readEntry ("R_HOME", QString::null);
***************
*** 137,140 ****
--- 154,159 ----
// static
QStringList RKSettingsModuleR::getOptionList () {
+ RK_TRACE (SETTINGS);
+
QStringList ret;
if (r_nosave) {
Index: rksettings.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettings.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rksettings.cpp 18 Sep 2005 15:17:55 -0000 1.6
--- rksettings.cpp 2 Oct 2005 13:29:44 -0000 1.7
***************
*** 31,34 ****
--- 31,36 ----
#include "rksettingsmoduleobjectbrowser.h"
+ #include "../debug.h"
+
//static
RKSettings *RKSettings::settings_dialog = 0;
***************
*** 37,40 ****
--- 39,44 ----
//static
void RKSettings::configureSettings (SettingsPage page, QWidget *parent, RCommandChain *chain) {
+ RK_TRACE (SETTINGS);
+
RKSettingsModule::chain = chain;
***************
*** 50,57 ****
--- 54,63 ----
//static
void RKSettings::dialogClosed () {
+ RK_TRACE (SETTINGS);
settings_dialog = 0;
}
RKSettings::RKSettings (QWidget *parent, const char *name) : KDialogBase (KDialogBase::Tabbed, i18n ("Settings"), KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, parent, name, false) {
+ RK_TRACE (SETTINGS);
setWFlags (getWFlags () | QWidget::WDestructiveClose);
***************
*** 60,63 ****
--- 66,71 ----
RKSettings::~RKSettings() {
+ RK_TRACE (SETTINGS);
+
ModuleList::iterator it;
for (it = modules.begin (); it != modules.end (); ++it) {
***************
*** 70,73 ****
--- 78,83 ----
void RKSettings::initModules () {
+ RK_TRACE (SETTINGS);
+
modules.append (new RKSettingsModulePlugins (this, this));
modules.append (new RKSettingsModuleR (this, this));
***************
*** 91,94 ****
--- 101,106 ----
void RKSettings::raisePage (SettingsPage page) {
+ RK_TRACE (SETTINGS);
+
if (page != NoPage) {
showPage (((int) page) - 1);
***************
*** 97,100 ****
--- 109,114 ----
void RKSettings::slotApply () {
+ RK_TRACE (SETTINGS);
+
ModuleList::iterator it;
for (it = modules.begin (); it != modules.end (); ++it) {
***************
*** 108,111 ****
--- 122,127 ----
void RKSettings::slotOk () {
+ RK_TRACE (SETTINGS);
+
slotApply ();
accept ();
***************
*** 114,125 ****
--- 130,145 ----
void RKSettings::slotCancel () {
+ RK_TRACE (SETTINGS);
QDialog::reject ();
}
void RKSettings::enableApply () {
+ RK_TRACE (SETTINGS);
enableButtonApply (true);
}
void RKSettings::loadSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
RKSettingsModulePlugins::loadSettings(config);
RKSettingsModuleR::loadSettings(config);
***************
*** 132,135 ****
--- 152,157 ----
void RKSettings::saveSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
RKSettingsModulePlugins::saveSettings(config);
RKSettingsModuleR::saveSettings(config);
***************
*** 145,154 ****
--- 167,179 ----
RKSettingsTracker::RKSettingsTracker (QObject *parent) : QObject (parent) {
+ RK_TRACE (SETTINGS);
}
RKSettingsTracker::~RKSettingsTracker () {
+ RK_TRACE (SETTINGS);
}
void RKSettingsTracker::settingsChangedObjectBrowser () {
+ RK_TRACE (SETTINGS);
emit (objectBrowserSettingsChanged ());
}
Index: rksettingsmoduleoutput.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmoduleoutput.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rksettingsmoduleoutput.cpp 22 Apr 2005 13:56:18 -0000 1.3
--- rksettingsmoduleoutput.cpp 2 Oct 2005 13:29:44 -0000 1.4
***************
*** 26,29 ****
--- 26,30 ----
#include "../rkglobals.h"
+ #include "../debug.h"
// static members
***************
*** 32,35 ****
--- 33,38 ----
RKSettingsModuleOutput::RKSettingsModuleOutput (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
+ RK_TRACE (SETTINGS);
+
QVBoxLayout *main_vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
***************
*** 47,53 ****
--- 50,58 ----
RKSettingsModuleOutput::~RKSettingsModuleOutput() {
+ RK_TRACE (SETTINGS);
}
void RKSettingsModuleOutput::boxChanged (int) {
+ RK_TRACE (SETTINGS);
change ();
auto_raise_box->setEnabled (auto_show_box->isChecked ());
***************
*** 55,66 ****
--- 60,75 ----
QString RKSettingsModuleOutput::caption () {
+ RK_TRACE (SETTINGS);
return (i18n ("Output"));
}
bool RKSettingsModuleOutput::hasChanges () {
+ RK_TRACE (SETTINGS);
return changed;
}
void RKSettingsModuleOutput::applyChanges () {
+ RK_TRACE (SETTINGS);
+
auto_show = auto_show_box->isChecked ();
auto_raise = auto_raise_box->isChecked ();
***************
*** 68,75 ****
--- 77,88 ----
void RKSettingsModuleOutput::save (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
saveSettings (config);
}
void RKSettingsModuleOutput::saveSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("Output Window");
config->writeEntry ("auto_show", auto_show);
***************
*** 78,81 ****
--- 91,96 ----
void RKSettingsModuleOutput::loadSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("Output Window");
auto_show = config->readBoolEntry ("auto_show", true);
Index: rksettingsmodulephp.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulephp.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rksettingsmodulephp.cpp 29 Sep 2005 16:02:51 -0000 1.6
--- rksettingsmodulephp.cpp 2 Oct 2005 13:29:44 -0000 1.7
***************
*** 27,30 ****
--- 27,31 ----
#include "../misc/getfilenamewidget.h"
#include "../rkglobals.h"
+ #include "../debug.h"
// static members
***************
*** 33,36 ****
--- 34,39 ----
RKSettingsModulePHP::RKSettingsModulePHP (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
+ RK_TRACE (SETTINGS);
+
QVBoxLayout *main_vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
QLabel *label = new QLabel (i18n ("Changes in this section take effect the next time you start a plugin"), this);
***************
*** 52,70 ****
--- 55,78 ----
RKSettingsModulePHP::~RKSettingsModulePHP () {
+ RK_TRACE (SETTINGS);
}
void RKSettingsModulePHP::pathChanged () {
+ RK_TRACE (SETTINGS);
change ();
}
QString RKSettingsModulePHP::caption () {
+ RK_TRACE (SETTINGS);
return (i18n ("PHP backend"));
}
bool RKSettingsModulePHP::hasChanges () {
+ RK_TRACE (SETTINGS);
return changed;
}
void RKSettingsModulePHP::applyChanges () {
+ RK_TRACE (SETTINGS);
php_bin = bin_choser->getLocation ();
files_path = files_choser->getLocation ();
***************
*** 72,79 ****
--- 80,90 ----
void RKSettingsModulePHP::save (KConfig *config) {
+ RK_TRACE (SETTINGS);
saveSettings (config);
}
void RKSettingsModulePHP::saveSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("PHP Settings");
config->writeEntry ("PHP binary", php_bin);
***************
*** 82,85 ****
--- 93,98 ----
void RKSettingsModulePHP::loadSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("PHP Settings");
php_bin = config->readEntry ("PHP binary", "/usr/bin/php");
Index: rksettingsmodulewatch.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulewatch.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rksettingsmodulewatch.cpp 22 Apr 2005 13:56:19 -0000 1.5
--- rksettingsmodulewatch.cpp 2 Oct 2005 13:29:44 -0000 1.6
***************
*** 40,43 ****
--- 40,45 ----
//static
bool RKSettingsModuleWatch::shouldShowInput (RCommand *command) {
+ RK_TRACE (SETTINGS);
+
if (command->type () & RCommand::EmptyCommand) return false;
***************
*** 58,61 ****
--- 60,65 ----
//static
bool RKSettingsModuleWatch::shouldShowOutput (RCommand *command) {
+ RK_TRACE (SETTINGS);
+
if (command->type () & RCommand::EmptyCommand) return false;
***************
*** 76,79 ****
--- 80,85 ----
//static
bool RKSettingsModuleWatch::shouldShowError (RCommand *command) {
+ RK_TRACE (SETTINGS);
+
if (command->type () & RCommand::Sync) {
return (sync_filter & ShowError);
***************
*** 91,94 ****
--- 97,102 ----
bool RKSettingsModuleWatch::shouldRaiseWindow (RCommand *command) {
+ RK_TRACE (SETTINGS);
+
if (command->type () & RCommand::Sync) {
return (sync_filter & RaiseWindow);
***************
*** 106,109 ****
--- 114,119 ----
RKSettingsModuleWatch::RKSettingsModuleWatch (RKSettings *gui, QWidget *parent) : RKSettingsModule (gui, parent) {
+ RK_TRACE (SETTINGS);
+
QVBoxLayout *vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
***************
*** 135,138 ****
--- 145,150 ----
RKSettingsModuleWatch::~RKSettingsModuleWatch () {
+ RK_TRACE (SETTINGS);
+
delete user_filter_boxes;
delete plugin_filter_boxes;
***************
*** 142,145 ****
--- 154,159 ----
int RKSettingsModuleWatch::getFilterSettings (FilterBoxes *boxes) {
+ RK_TRACE (SETTINGS);
+
int ret=0;
if (boxes->input->isChecked ()) ret |= ShowInput;
***************
*** 151,154 ****
--- 165,170 ----
RKSettingsModuleWatch::FilterBoxes *RKSettingsModuleWatch::addFilterSettings (QWidget *parent, QGridLayout *layout, int row, const QString &label, int state) {
+ RK_TRACE (SETTINGS);
+
FilterBoxes *filter_boxes = new FilterBoxes;
***************
*** 179,182 ****
--- 195,199 ----
void RKSettingsModuleWatch::changedSetting (int) {
+ RK_TRACE (SETTINGS);
change ();
}
***************
*** 184,187 ****
--- 201,206 ----
//static
void RKSettingsModuleWatch::saveSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("RInterface Watch Settings");
config->writeEntry ("user command filter", user_filter);
***************
*** 193,196 ****
--- 212,217 ----
//static
void RKSettingsModuleWatch::loadSettings (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
config->setGroup ("RInterface Watch Settings");
user_filter = config->readNumEntry ("user command filter", ShowInput | ShowOutput | ShowError | RaiseWindow);
***************
*** 202,209 ****
--- 223,233 ----
bool RKSettingsModuleWatch::hasChanges () {
// TODO: move to RKSettingsModule -baseclass?
+ RK_TRACE (SETTINGS);
return changed;
}
void RKSettingsModuleWatch::applyChanges () {
+ RK_TRACE (SETTINGS);
+
user_filter = getFilterSettings (user_filter_boxes);
plugin_filter = getFilterSettings (plugin_filter_boxes);
***************
*** 213,220 ****
--- 237,248 ----
void RKSettingsModuleWatch::save (KConfig *config) {
+ RK_TRACE (SETTINGS);
+
saveSettings (config);
}
QString RKSettingsModuleWatch::caption () {
+ RK_TRACE (SETTINGS);
+
return (i18n ("Console"));
}
- Previous message: [rkward-cvs] rkward configure,1.23,1.24 configure.files,1.5,1.6 configure.in,1.23,1.24 subdirs,1.7,1.8
- Next message: [rkward-cvs] rkward/rkward debug.h,1.11,1.12 rkward.cpp,1.100,1.101
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rkward-tracker
mailing list