devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix manual download using the wrong filename if the manual name differs from the target name.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21296 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-06-15 19:06:03 +00:00
parent e8c825fc29
commit 7533dcb6eb
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rbutil/rbutilqt/base/rbsettings.cpp
View file

@ -46,7 +46,7 @@ const static struct {
{ RbSettings::ThemesUrl, "themes_url", "" }, { RbSettings::ThemesUrl, "themes_url", "" },
{ RbSettings::BleedingInfo, "bleeding_info", "" }, { RbSettings::BleedingInfo, "bleeding_info", "" },
{ RbSettings::CurPlatformName, ":platform:/name", "" }, { RbSettings::CurPlatformName, ":platform:/name", "" },
{ RbSettings::CurManual, ":platform:/manual", "rockbox-:platform:" }, { RbSettings::CurManual, ":platform:/manualname","rockbox-:platform:" },
{ RbSettings::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, { RbSettings::CurBootloaderMethod, ":platform:/bootloadermethod", "none" },
{ RbSettings::CurBootloaderName, ":platform:/bootloadername", "" }, { RbSettings::CurBootloaderName, ":platform:/bootloadername", "" },
{ RbSettings::CurBootloaderFile, ":platform:/bootloaderfile", "" }, { RbSettings::CurBootloaderFile, ":platform:/bootloaderfile", "" },
@ -107,7 +107,7 @@ void RbSettings::ensureRbSettingsExists()
// only use built-in rbutil.ini // only use built-in rbutil.ini
systemSettings = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0); systemSettings = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0);
} }
if(userSettings == NULL) if(userSettings == NULL)
{ {
// portable installation: // portable installation:
@ -132,7 +132,7 @@ void RbSettings::ensureRbSettingsExists()
void RbSettings::sync() void RbSettings::sync()
{ {
ensureRbSettingsExists(); ensureRbSettingsExists();
userSettings->sync(); userSettings->sync();
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
@ -160,13 +160,13 @@ void RbSettings::sync()
QString RbSettings::userSettingFilename() QString RbSettings::userSettingFilename()
{ {
ensureRbSettingsExists(); ensureRbSettingsExists();
return userSettings->fileName(); return userSettings->fileName();
} }
QVariant RbSettings::value(enum SystemSettings setting) QVariant RbSettings::value(enum SystemSettings setting)
{ {
ensureRbSettingsExists(); ensureRbSettingsExists();
// locate setting item // locate setting item
int i = 0; int i = 0;
@ -181,14 +181,14 @@ QVariant RbSettings::value(enum SystemSettings setting)
} }
QVariant RbSettings::value(enum UserSettings setting) QVariant RbSettings::value(enum UserSettings setting)
{ {
QString empty; QString empty;
return subValue(empty, setting); return subValue(empty, setting);
} }
QVariant RbSettings::subValue(QString sub, enum UserSettings setting) QVariant RbSettings::subValue(QString sub, enum UserSettings setting)
{ {
ensureRbSettingsExists(); ensureRbSettingsExists();
// locate setting item // locate setting item
int i = 0; int i = 0;
@ -202,13 +202,13 @@ QVariant RbSettings::subValue(QString sub, enum UserSettings setting)
void RbSettings::setValue(enum UserSettings setting , QVariant value) void RbSettings::setValue(enum UserSettings setting , QVariant value)
{ {
QString empty; QString empty;
return setSubValue(empty, setting, value); return setSubValue(empty, setting, value);
} }
void RbSettings::setSubValue(QString sub, enum UserSettings setting, QVariant value) void RbSettings::setSubValue(QString sub, enum UserSettings setting, QVariant value)
{ {
ensureRbSettingsExists(); ensureRbSettingsExists();
// locate setting item // locate setting item
int i = 0; int i = 0;