[Kst] kdeextragear-2/kst/kst
George Staikos
staikos at kde.org
Tue Jan 11 21:08:51 CET 2005
CVS commit by staikos:
hook in kconf_update and eliminate kstautosaverc
A kstautosave11.upd 1.1
M +4 -0 Makefile.am 1.169
M +1 -0 kst.cpp 1.276
M +3 -7 kstgraphfiledialog_i.cpp 1.23
M +6 -0 kstsettings.cpp 1.15
M +1 -0 kstsettings.h 1.11
--- kdeextragear-2/kst/kst/Makefile.am #1.168:1.169
@@ -234,2 +234,6 @@
METASOURCES=AUTO
+
+update_DATA = kstautosave11.upd
+updatedir = $(kde_datadir)/kconf_update
+
--- kdeextragear-2/kst/kst/kst.cpp #1.275:1.276
@@ -246,4 +246,5 @@ KstApp::~KstApp() {
void KstApp::initialize() {
+ KstSettings::checkUpdates();
kConfigObject = new KConfig("kstdatarc", false, false);
KstDataSource::setupOnStartup(kConfigObject);
--- kdeextragear-2/kst/kst/kstgraphfiledialog_i.cpp #1.22:1.23
@@ -115,5 +115,5 @@ void KstGraphFileDialogI::setURL(const Q
void KstGraphFileDialogI::saveProperties() {
- KConfig cfg("kstautosaverc", false, false);
+ KConfig cfg("kstrc", false, false);
cfg.setGroup("AutoSaveImages");
@@ -126,9 +126,5 @@ void KstGraphFileDialogI::saveProperties
cfg.writeEntry("YSize", _h);
cfg.writeEntry("Display", _displayOption);
- if (_displayOption == 1) {
- cfg.writeEntry("Square", true);
- } else {
- cfg.writeEntry("Square", false);
- }
+ cfg.writeEntry("Square", _displayOption == 1);
cfg.writeEntry("All", _allWindows);
cfg.writeEntry("Format", _format);
@@ -138,5 +134,5 @@ void KstGraphFileDialogI::saveProperties
void KstGraphFileDialogI::loadProperties() {
- KConfig cfg("kstautosaverc");
+ KConfig cfg("kstrc");
bool isSquare;
--- kdeextragear-2/kst/kst/kstsettings.cpp #1.14:1.15
@@ -180,3 +180,9 @@ void KstSettings::reload() {
+void KstSettings::checkUpdates() {
+ KConfig cfg("kstrc");
+ cfg.checkUpdate("kstautosave1.1", "kstautosave11.upd");
+}
+
+
// vim: ts=2 sw=2 et
--- kdeextragear-2/kst/kst/kstsettings.h #1.10:1.11
@@ -47,4 +47,5 @@ class KstSettings {
static KstSettings *globalSettings();
static void setGlobalSettings(const KstSettings *settings);
+ static void checkUpdates();
void save();
void reload();
More information about the Kst
mailing list