From 537dfe482fc0378151406ee37a98c99283b5a3f0 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Thu, 14 Jun 2012 22:36:54 +0200
Subject: Save all settings in talkfile dialog.

Save settings that haven't been and rename the configuration file value for the
talked folder. Since the folder was replaced with a list we can't use the old
value anymore so there's no need to keep a name that's not really suitable
anymore.

Solves FS#12634.

Change-Id: I8db2a536409b94c45f28db9418a11f11f57dfacb
---
 rbutil/rbutilqt/base/rbsettings.cpp |  9 ++++++++-
 rbutil/rbutilqt/base/rbsettings.h   | 13 ++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'rbutil/rbutilqt/base')

diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp
index a74b167e92..f584c6808c 100644
--- a/rbutil/rbutilqt/base/rbsettings.cpp
+++ b/rbutil/rbutilqt/base/rbsettings.cpp
@@ -48,7 +48,14 @@ const static struct {
     { RbSettings::Tts,                  "tts",                  "espeak" },
 #endif
     { RbSettings::UseTtsCorrections,    "use_tts_corrections",  "true" },
-    { RbSettings::LastTalkedFolder,     "last_talked_folder",   "" },
+    { RbSettings::TalkFolders,          "talk_folders",         "" },
+    { RbSettings::TalkProcessFiles,     "talk_process_files",   "true" },
+    { RbSettings::TalkProcessFolders,   "talk_process_folders", "true" },
+    { RbSettings::TalkRecursive,        "talk_recursive",       "true" },
+    { RbSettings::TalkSkipExisting,     "talk_skip_existing",   "true" },
+    { RbSettings::TalkStripExtensions,  "talk_strip_extensions","true" },
+    { RbSettings::TalkIgnoreFiles,      "talk_ignore_files",    "false" },
+    { RbSettings::TalkIgnoreWildcards,  "talk_ignore_wildcards","" },
     { RbSettings::VoiceLanguage,        "voicelanguage",        "" },
     { RbSettings::TtsLanguage,          ":tts:/language",       "" },
     { RbSettings::TtsOptions,           ":tts:/options",        "" },
diff --git a/rbutil/rbutilqt/base/rbsettings.h b/rbutil/rbutilqt/base/rbsettings.h
index ba4a63cb3b..45ec7092e2 100644
--- a/rbutil/rbutilqt/base/rbsettings.h
+++ b/rbutil/rbutilqt/base/rbsettings.h
@@ -27,7 +27,7 @@ class RbSettings : public QObject
 {
     Q_OBJECT
     public:
-        
+
         //! All user settings
         enum UserSettings {
             RbutilVersion,
@@ -42,7 +42,14 @@ class RbSettings : public QObject
             Language,
             Tts,
             UseTtsCorrections,
-            LastTalkedFolder,
+            TalkFolders,
+            TalkProcessFiles,
+            TalkProcessFolders,
+            TalkRecursive,
+            TalkSkipExisting,
+            TalkStripExtensions,
+            TalkIgnoreFiles,
+            TalkIgnoreWildcards,
             VoiceLanguage,
             TtsLanguage,
             TtsOptions,
@@ -61,7 +68,7 @@ class RbSettings : public QObject
             EncoderQuality,
             EncoderVolume,
         };
- 
+
         //! call this to flush the user Settings
         static void sync();
         //! returns the filename of the usersettings file
-- 
cgit v1.2.3