diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index e768439a0d..57510596d0 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -47,16 +47,8 @@ | |||
47 | RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | 47 | RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) |
48 | { | 48 | { |
49 | absolutePath = qApp->applicationDirPath(); | 49 | absolutePath = qApp->applicationDirPath(); |
50 | // use built-in rbutil.ini if no external file in binary folder | 50 | // only use built-in rbutil.ini |
51 | QString iniFile = absolutePath + "/rbutil.ini"; | 51 | devices = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0); |
52 | if(QFileInfo(iniFile).isFile()) { | ||
53 | qDebug() << "using external rbutil.ini"; | ||
54 | devices = new QSettings(iniFile, QSettings::IniFormat, 0); | ||
55 | } | ||
56 | else { | ||
57 | qDebug() << "using built-in rbutil.ini"; | ||
58 | devices = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0); | ||
59 | } | ||
60 | 52 | ||
61 | ui.setupUi(this); | 53 | ui.setupUi(this); |
62 | 54 | ||
@@ -817,7 +809,8 @@ void RbUtilQt::downloadManual(void) | |||
817 | 809 | ||
818 | devices->beginGroup(userSettings->value("platform").toString()); | 810 | devices->beginGroup(userSettings->value("platform").toString()); |
819 | QString manual; | 811 | QString manual; |
820 | manual = devices->value("manualname", "rockbox-" + devices->value("platform").toString()).toString(); | 812 | manual = devices->value("manualname", "rockbox-" + |
813 | devices->value("platform").toString()).toString(); | ||
821 | devices->endGroup(); | 814 | devices->endGroup(); |
822 | 815 | ||
823 | QString date = (info.value("dailies/date").toString()); | 816 | QString date = (info.value("dailies/date").toString()); |
@@ -973,7 +966,8 @@ QUrl RbUtilQt::proxy() | |||
973 | DWORD buflen = 80; | 966 | DWORD buflen = 80; |
974 | long ret; | 967 | long ret; |
975 | 968 | ||
976 | ret = RegOpenKeyEx(HKEY_CURRENT_USER, _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"), | 969 | ret = RegOpenKeyEx(HKEY_CURRENT_USER, |
970 | _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"), | ||
977 | 0, KEY_QUERY_VALUE, &hk); | 971 | 0, KEY_QUERY_VALUE, &hk); |
978 | if(ret != ERROR_SUCCESS) return QUrl(""); | 972 | if(ret != ERROR_SUCCESS) return QUrl(""); |
979 | 973 | ||