1 files changed, 75 insertions, 96 deletions
diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h
index 339c835d4a..341577abc8 100644
--- a/rbutil/rbutilqt/rbsettings.h
+++ b/rbutil/rbutilqt/rbsettings.h
@@ -46,118 +46,97 @@ class RbSettings : public QObject
            MapError,
            MapIncompatible,
        };
+        enum UserSettings {
+            RbutilVersion,
+            CurrentPlatform,
+            Mountpoint,
+            CachePath,
+            Build,
+            ProxyType,
+            Proxy,
+            OfPath,
+            Platform,
+            Language,
+            Tts,
+            LastTalkedFolder,
+            VoiceLanguage,
+            TtsLanguage,
+            TtsOptions,
+            TtsPath,
+            TtsVoice,
+            EncoderPath,
+            EncoderOptions,
+            WavtrimThreshold,
+            EncoderComplexity,
+            TtsSpeed,
+            CacheOffline,
+            CacheDisabled,
+            TtsUseSapi4,
+            EncoderNarrowBand,
+            EncoderQuality,
+            EncoderVolume,
+        };
+        enum SystemSettings {
+            ManualUrl,
+            BleedingUrl,
+            BootloaderUrl,
+            BootloaderInfoUrl,
+            FontUrl,
+            VoiceUrl,
+            DoomUrl,
+            ReleaseUrl,
+            DailyUrl,
+            ServerConfUrl,
+            GenlangUrl,
+            ThemesUrl,
+            BleedingInfo,
+            CurPlatformName,
+            CurManual,
+            CurBootloaderMethod,
+            CurBootloaderName,
+            CurBootloaderFile,
+            CurEncoder,
+            CurResolution,
+            CurBrand,
+            CurName,
+            CurBuildserverModel,
+            CurConfigureModel,
+            CurTargetId,
+        };
+        QVariant value(enum SystemSettings setting);
+        // generic and "current selection" values -- getters
+        QVariant value(enum UserSettings setting)
+            { QString empty; return subValue(empty, setting); }
+        void setValue(enum UserSettings setting , QVariant value)
+            { QString empty; return setSubValue(empty, setting, value); }
-        //! access functions for the settings
+        QVariant subValue(QString& sub, enum UserSettings setting);
-        QString curVersion();
+        QVariant subValue(const char* sub, enum UserSettings setting)
-        bool cacheOffline();
+            { QString s = sub; return subValue(s, setting); }
-        bool cacheDisabled();
+        void setSubValue(QString& sub, enum UserSettings setting, QVariant value);
-        QString mountpoint();
+        void setSubValue(const char* sub, enum UserSettings setting, QVariant value)
-        QString manualUrl();
+            { QString s = sub; return setSubValue(s, setting, value); }
-        QString bleedingUrl();
-        QString cachePath();
+        QStringList platforms(void);
-        QString build(void);
+        QStringList languages(void);
-        QString bootloaderUrl();
-        QString bootloaderInfoUrl();
-        QString fontUrl();
-        QString voiceUrl();
-        QString doomUrl();
-        QString releaseUrl();
-        QString dailyUrl();
-        QString serverConfUrl();
-        QString themeUrl();
-        QString genlangUrl();
-        QString proxyType();
-        QString proxy();
-        QString bleedingInfo();
-        QString ofPath();
-        QString lastTalkedFolder();
-        QString voiceLanguage();
-        int wavtrimTh();
-        QString ttsPath(QString tts);
-        QString ttsOptions(QString tts);
-        QString ttsVoice(QString tts);
-        int ttsSpeed(QString tts);
-        QString ttsLang(QString tts);
-        bool ttsUseSapi4();
-        QString encoderPath(QString enc);
-        QString encoderOptions(QString enc);
-        double encoderQuality(QString enc);
-        int encoderComplexity(QString enc);
-        double encoderVolume(QString enc);
-        bool encoderNarrowband(QString enc);
-        QStringList allPlatforms(void);
-        QStringList allLanguages(void);
        QString name(QString plattform);
        QString brand(QString plattform);
        QMap<int, QString> usbIdMap(enum MapType);
-        QString curBrand();
-        QString curName();
-        QString curPlatform();              // rbutil internal target name.
-        QString curBuildserver_Modelname(); // modelnames used by the buildserver 
-        QString curManual();
-        QString curBootloaderMethod();
-        QString curBootloaderName();
-        QString curConfigure_Modelname();   // modelname from configure (used for themes, voice, rockbox-info comparing. 
-        QString curLang();
-        QString curEncoder();
-        QString curTTS();
-        QString curResolution();
-        QString curBootloaderFile();
-        int curTargetId();
-        //! Set Functions
-        void setCurVersion(QString version);
-        void setOfPath(QString path);
-        void setCachePath(QString path);
-        void setBuild(QString build);
-        void setLastTalkedDir(QString dir);
-        void setVoiceLanguage(QString lang);
-        void setWavtrimTh(int th);
-        void setProxy(QString proxy);
-        void setProxyType(QString proxytype);
-        void setLang(QString lang);
-        void setMountpoint(QString mp);
-        void setCurPlatform(QString platt);
-        void setCacheDisable(bool on);
-        void setCacheOffline(bool on);
-        void setCurTTS(QString tts);
-        void setTTSPath(QString tts, QString path);
-        void setTTSOptions(QString tts, QString options);
-        void setTTSSpeed(QString tts, int speed);
-        void setTTSVoice(QString tts, QString voice);
-        void setTTSLang(QString tts, QString lang);
-        void setTTSUseSapi4(bool value);
-        void setEncoderPath(QString enc, QString path);
-        void setEncoderOptions(QString enc, QString options);
-        void setEncoderQuality(QString enc, double q);
-        void setEncoderComplexity(QString enc, int c);
-        void setEncoderVolume(QString enc,double v);
-        void setEncoderNarrowband(QString enc,bool nb);
    private:
-        //! helper function to get an entry in the current platform section
-        QVariant deviceSettingCurGet(QString entry,QString def="");
-        //! helper function to get an entry out of a group in the userSettings
-        QVariant userSettingsGroupGet(QString group,QString entry,QVariant def="");
-        //! helper function to set an entry in a group in the userSettings
-        void userSettingsGroupSet(QString group,QString entry,QVariant value);
        //! private copy constructors to prvent copying
        RbSettings&  operator= (const RbSettings& other)
            { (void)other; return *this; }
        RbSettings(const RbSettings& other) :QObject()
            { (void)other; }
+        QString constructSettingPath(QString path, QString substitute = QString());
        //! pointers to our setting objects
-        QSettings *devices;
+        QSettings *systemSettings;
        QSettings *userSettings;
 };
 #endif

diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index 339c835d4a..341577abc8 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h
@@ -46,118 +46,97 @@ class RbSettings : public QObject
46	MapError,	46	MapError,
47	MapIncompatible,	47	MapIncompatible,
48	};	48	};
		49	enum UserSettings {
		50	RbutilVersion,
		51	CurrentPlatform,
		52	Mountpoint,
		53	CachePath,
		54	Build,
		55	ProxyType,
		56	Proxy,
		57	OfPath,
		58	Platform,
		59	Language,
		60	Tts,
		61	LastTalkedFolder,
		62	VoiceLanguage,
		63	TtsLanguage,
		64	TtsOptions,
		65	TtsPath,
		66	TtsVoice,
		67	EncoderPath,
		68	EncoderOptions,
		69	WavtrimThreshold,
		70	EncoderComplexity,
		71	TtsSpeed,
		72	CacheOffline,
		73	CacheDisabled,
		74	TtsUseSapi4,
		75	EncoderNarrowBand,
		76	EncoderQuality,
		77	EncoderVolume,
		78	};
		79	enum SystemSettings {
		80	ManualUrl,
		81	BleedingUrl,
		82	BootloaderUrl,
		83	BootloaderInfoUrl,
		84	FontUrl,
		85	VoiceUrl,
		86	DoomUrl,
		87	ReleaseUrl,
		88	DailyUrl,
		89	ServerConfUrl,
		90	GenlangUrl,
		91	ThemesUrl,
		92	BleedingInfo,
		93	CurPlatformName,
		94	CurManual,
		95	CurBootloaderMethod,
		96	CurBootloaderName,
		97	CurBootloaderFile,
		98	CurEncoder,
		99	CurResolution,
		100	CurBrand,
		101	CurName,
		102	CurBuildserverModel,
		103	CurConfigureModel,
		104	CurTargetId,
		105	};
		106
		107	QVariant value(enum SystemSettings setting);
		108	// generic and "current selection" values -- getters
		109	QVariant value(enum UserSettings setting)
		110	{ QString empty; return subValue(empty, setting); }
		111	void setValue(enum UserSettings setting , QVariant value)
		112	{ QString empty; return setSubValue(empty, setting, value); }
49		113
50	//! access functions for the settings	114	QVariant subValue(QString& sub, enum UserSettings setting);
51	QString curVersion();	115	QVariant subValue(const char* sub, enum UserSettings setting)
52	bool cacheOffline();	116	{ QString s = sub; return subValue(s, setting); }
53	bool cacheDisabled();	117	void setSubValue(QString& sub, enum UserSettings setting, QVariant value);
54	QString mountpoint();	118	void setSubValue(const char* sub, enum UserSettings setting, QVariant value)
55	QString manualUrl();	119	{ QString s = sub; return setSubValue(s, setting, value); }
56	QString bleedingUrl();	120
57	QString cachePath();	121	QStringList platforms(void);
58	QString build(void);	122	QStringList languages(void);
59	QString bootloaderUrl();
60	QString bootloaderInfoUrl();
61	QString fontUrl();
62	QString voiceUrl();
63	QString doomUrl();
64	QString releaseUrl();
65	QString dailyUrl();
66	QString serverConfUrl();
67	QString themeUrl();
68	QString genlangUrl();
69	QString proxyType();
70	QString proxy();
71	QString bleedingInfo();
72	QString ofPath();
73	QString lastTalkedFolder();
74	QString voiceLanguage();
75	int wavtrimTh();
76	QString ttsPath(QString tts);
77	QString ttsOptions(QString tts);
78	QString ttsVoice(QString tts);
79	int ttsSpeed(QString tts);
80	QString ttsLang(QString tts);
81	bool ttsUseSapi4();
82	QString encoderPath(QString enc);
83	QString encoderOptions(QString enc);
84	double encoderQuality(QString enc);
85	int encoderComplexity(QString enc);
86	double encoderVolume(QString enc);
87	bool encoderNarrowband(QString enc);
88
89	QStringList allPlatforms(void);
90	QStringList allLanguages(void);
91		123
92	QString name(QString plattform);	124	QString name(QString plattform);
93	QString brand(QString plattform);	125	QString brand(QString plattform);
94		126
95	QMap<int, QString> usbIdMap(enum MapType);	127	QMap<int, QString> usbIdMap(enum MapType);
96		128
97	QString curBrand();
98	QString curName();
99	QString curPlatform(); // rbutil internal target name.
100	QString curBuildserver_Modelname(); // modelnames used by the buildserver
101	QString curManual();
102	QString curBootloaderMethod();
103	QString curBootloaderName();
104	QString curConfigure_Modelname(); // modelname from configure (used for themes, voice, rockbox-info comparing.
105	QString curLang();
106	QString curEncoder();
107	QString curTTS();
108	QString curResolution();
109	QString curBootloaderFile();
110	int curTargetId();
111
112	//! Set Functions
113	void setCurVersion(QString version);
114	void setOfPath(QString path);
115	void setCachePath(QString path);
116	void setBuild(QString build);
117	void setLastTalkedDir(QString dir);
118	void setVoiceLanguage(QString lang);
119	void setWavtrimTh(int th);
120	void setProxy(QString proxy);
121	void setProxyType(QString proxytype);
122	void setLang(QString lang);
123	void setMountpoint(QString mp);
124	void setCurPlatform(QString platt);
125	void setCacheDisable(bool on);
126	void setCacheOffline(bool on);
127	void setCurTTS(QString tts);
128	void setTTSPath(QString tts, QString path);
129	void setTTSOptions(QString tts, QString options);
130	void setTTSSpeed(QString tts, int speed);
131	void setTTSVoice(QString tts, QString voice);
132	void setTTSLang(QString tts, QString lang);
133	void setTTSUseSapi4(bool value);
134	void setEncoderPath(QString enc, QString path);
135	void setEncoderOptions(QString enc, QString options);
136	void setEncoderQuality(QString enc, double q);
137	void setEncoderComplexity(QString enc, int c);
138	void setEncoderVolume(QString enc,double v);
139	void setEncoderNarrowband(QString enc,bool nb);
140
141	private:	129	private:
142
143	//! helper function to get an entry in the current platform section
144	QVariant deviceSettingCurGet(QString entry,QString def="");
145	//! helper function to get an entry out of a group in the userSettings
146	QVariant userSettingsGroupGet(QString group,QString entry,QVariant def="");
147	//! helper function to set an entry in a group in the userSettings
148	void userSettingsGroupSet(QString group,QString entry,QVariant value);
149
150
151	//! private copy constructors to prvent copying	130	//! private copy constructors to prvent copying
152	RbSettings& operator= (const RbSettings& other)	131	RbSettings& operator= (const RbSettings& other)
153	{ (void)other; return *this; }	132	{ (void)other; return *this; }
154	RbSettings(const RbSettings& other) :QObject()	133	RbSettings(const RbSettings& other) :QObject()
155	{ (void)other; }	134	{ (void)other; }
		135	QString constructSettingPath(QString path, QString substitute = QString());
156		136
157	//! pointers to our setting objects	137	//! pointers to our setting objects
158	QSettings *devices;	138	QSettings *systemSettings;
159	QSettings *userSettings;	139	QSettings *userSettings;
160
161	};	140	};
162		141
163	#endif	142	#endif