len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't check for external rbutil.ini anymore -- doing so didn't gave a real benefit but caused trouble instead. The file is built-in anyway.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15174 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2007-10-17 22:32:31 +00:00
parent 3674af6441
commit 7bcfa84c4a
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -47,16 +47,8 @@
RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
{ {
absolutePath = qApp->applicationDirPath(); absolutePath = qApp->applicationDirPath();
// use built-in rbutil.ini if no external file in binary folder // only use built-in rbutil.ini
QString iniFile = absolutePath + "/rbutil.ini"; devices = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0);
if(QFileInfo(iniFile).isFile()) {
qDebug() << "using external rbutil.ini";
devices = new QSettings(iniFile, QSettings::IniFormat, 0);
}
else {
qDebug() << "using built-in rbutil.ini";
devices = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0);
}
ui.setupUi(this); ui.setupUi(this);
@ -817,7 +809,8 @@ void RbUtilQt::downloadManual(void)
devices->beginGroup(userSettings->value("platform").toString()); devices->beginGroup(userSettings->value("platform").toString());
QString manual; QString manual;
manual = devices->value("manualname", "rockbox-" + devices->value("platform").toString()).toString(); manual = devices->value("manualname", "rockbox-" +
devices->value("platform").toString()).toString();
devices->endGroup(); devices->endGroup();
QString date = (info.value("dailies/date").toString()); QString date = (info.value("dailies/date").toString());
@ -973,7 +966,8 @@ QUrl RbUtilQt::proxy()
DWORD buflen = 80; DWORD buflen = 80;
long ret; long ret;
ret = RegOpenKeyEx(HKEY_CURRENT_USER, _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"), ret = RegOpenKeyEx(HKEY_CURRENT_USER,
_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"),
0, KEY_QUERY_VALUE, &hk); 0, KEY_QUERY_VALUE, &hk);
if(ret != ERROR_SUCCESS) return QUrl(""); if(ret != ERROR_SUCCESS) return QUrl("");