diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-14 22:36:54 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-14 22:54:30 +0200 |
commit | 537dfe482fc0378151406ee37a98c99283b5a3f0 (patch) | |
tree | ecbc4c0915092ad4ca76bf03364562449695876a /rbutil/rbutilqt/base | |
parent | a9217bde2749df65d2f59fb63bf1622096263e4f (diff) | |
download | rockbox-537dfe482fc0378151406ee37a98c99283b5a3f0.tar.gz rockbox-537dfe482fc0378151406ee37a98c99283b5a3f0.zip |
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
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.h | 13 |
2 files changed, 18 insertions, 4 deletions
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 { | |||
48 | { RbSettings::Tts, "tts", "espeak" }, | 48 | { RbSettings::Tts, "tts", "espeak" }, |
49 | #endif | 49 | #endif |
50 | { RbSettings::UseTtsCorrections, "use_tts_corrections", "true" }, | 50 | { RbSettings::UseTtsCorrections, "use_tts_corrections", "true" }, |
51 | { RbSettings::LastTalkedFolder, "last_talked_folder", "" }, | 51 | { RbSettings::TalkFolders, "talk_folders", "" }, |
52 | { RbSettings::TalkProcessFiles, "talk_process_files", "true" }, | ||
53 | { RbSettings::TalkProcessFolders, "talk_process_folders", "true" }, | ||
54 | { RbSettings::TalkRecursive, "talk_recursive", "true" }, | ||
55 | { RbSettings::TalkSkipExisting, "talk_skip_existing", "true" }, | ||
56 | { RbSettings::TalkStripExtensions, "talk_strip_extensions","true" }, | ||
57 | { RbSettings::TalkIgnoreFiles, "talk_ignore_files", "false" }, | ||
58 | { RbSettings::TalkIgnoreWildcards, "talk_ignore_wildcards","" }, | ||
52 | { RbSettings::VoiceLanguage, "voicelanguage", "" }, | 59 | { RbSettings::VoiceLanguage, "voicelanguage", "" }, |
53 | { RbSettings::TtsLanguage, ":tts:/language", "" }, | 60 | { RbSettings::TtsLanguage, ":tts:/language", "" }, |
54 | { RbSettings::TtsOptions, ":tts:/options", "" }, | 61 | { 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 | |||
27 | { | 27 | { |
28 | Q_OBJECT | 28 | Q_OBJECT |
29 | public: | 29 | public: |
30 | 30 | ||
31 | //! All user settings | 31 | //! All user settings |
32 | enum UserSettings { | 32 | enum UserSettings { |
33 | RbutilVersion, | 33 | RbutilVersion, |
@@ -42,7 +42,14 @@ class RbSettings : public QObject | |||
42 | Language, | 42 | Language, |
43 | Tts, | 43 | Tts, |
44 | UseTtsCorrections, | 44 | UseTtsCorrections, |
45 | LastTalkedFolder, | 45 | TalkFolders, |
46 | TalkProcessFiles, | ||
47 | TalkProcessFolders, | ||
48 | TalkRecursive, | ||
49 | TalkSkipExisting, | ||
50 | TalkStripExtensions, | ||
51 | TalkIgnoreFiles, | ||
52 | TalkIgnoreWildcards, | ||
46 | VoiceLanguage, | 53 | VoiceLanguage, |
47 | TtsLanguage, | 54 | TtsLanguage, |
48 | TtsOptions, | 55 | TtsOptions, |
@@ -61,7 +68,7 @@ class RbSettings : public QObject | |||
61 | EncoderQuality, | 68 | EncoderQuality, |
62 | EncoderVolume, | 69 | EncoderVolume, |
63 | }; | 70 | }; |
64 | 71 | ||
65 | //! call this to flush the user Settings | 72 | //! call this to flush the user Settings |
66 | static void sync(); | 73 | static void sync(); |
67 | //! returns the filename of the usersettings file | 74 | //! returns the filename of the usersettings file |