diff options
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 28 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 2 |
3 files changed, 18 insertions, 13 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 20ffe4ce9d..53d1acfe06 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -98,6 +98,16 @@ void Config::accept() | |||
98 | tr("You need to restart the application for the changed language to take effect.")); | 98 | tr("You need to restart the application for the changed language to take effect.")); |
99 | userSettings->setValue("defaults/lang", language); | 99 | userSettings->setValue("defaults/lang", language); |
100 | 100 | ||
101 | // mountpoint | ||
102 | QString mp = ui.mountPoint->text(); | ||
103 | if(QFileInfo(mp).isDir()) | ||
104 | userSettings->setValue("defaults/mountpoint", mp); | ||
105 | |||
106 | // platform | ||
107 | QString nplat; | ||
108 | nplat = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString(); | ||
109 | userSettings->setValue("defaults/platform", nplat); | ||
110 | |||
101 | // sync settings | 111 | // sync settings |
102 | userSettings->sync(); | 112 | userSettings->sync(); |
103 | this->close(); | 113 | this->close(); |
@@ -118,7 +128,9 @@ void Config::setUserSettings(QSettings *user) | |||
118 | // set proxy | 128 | // set proxy |
119 | QUrl proxy = userSettings->value("defaults/proxy").toString(); | 129 | QUrl proxy = userSettings->value("defaults/proxy").toString(); |
120 | 130 | ||
121 | ui.proxyPort->setText(QString("%1").arg(proxy.port())); | 131 | if(proxy.port() > 0) |
132 | ui.proxyPort->setText(QString("%1").arg(proxy.port())); | ||
133 | else ui.proxyPort->setText(""); | ||
122 | ui.proxyHost->setText(proxy.host()); | 134 | ui.proxyHost->setText(proxy.host()); |
123 | ui.proxyUser->setText(proxy.userName()); | 135 | ui.proxyUser->setText(proxy.userName()); |
124 | ui.proxyPass->setText(proxy.password()); | 136 | ui.proxyPass->setText(proxy.password()); |
@@ -225,16 +237,6 @@ void Config::setDevices(QSettings *dev) | |||
225 | ui.treeDevices->insertTopLevelItems(0, items); | 237 | ui.treeDevices->insertTopLevelItems(0, items); |
226 | if(w3 != 0) | 238 | if(w3 != 0) |
227 | ui.treeDevices->setCurrentItem(w3); // hilight old selection | 239 | ui.treeDevices->setCurrentItem(w3); // hilight old selection |
228 | connect(ui.treeDevices, SIGNAL(itemSelectionChanged()), this, SLOT(updatePlatform())); | ||
229 | } | ||
230 | |||
231 | |||
232 | void Config::updatePlatform() | ||
233 | { | ||
234 | qDebug() << "updatePlatform()"; | ||
235 | QString nplat; | ||
236 | nplat = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString(); | ||
237 | userSettings->setValue("defaults/platform", nplat); | ||
238 | } | 240 | } |
239 | 241 | ||
240 | 242 | ||
@@ -273,7 +275,9 @@ void Config::setSystemProxy(bool checked) | |||
273 | } | 275 | } |
274 | else { | 276 | else { |
275 | ui.proxyHost->setText(proxy.host()); | 277 | ui.proxyHost->setText(proxy.host()); |
276 | ui.proxyPort->setText(QString("%1").arg(proxy.port())); | 278 | if(proxy.port() > 0) |
279 | ui.proxyPort->setText(QString("%1").arg(proxy.port())); | ||
280 | else ui.proxyPort->setText(""); | ||
277 | ui.proxyUser->setText(proxy.userName()); | 281 | ui.proxyUser->setText(proxy.userName()); |
278 | ui.proxyPass->setText(proxy.password()); | 282 | ui.proxyPass->setText(proxy.password()); |
279 | } | 283 | } |
diff --git a/rbutil/rbutilqt/configure.h b/rbutil/rbutilqt/configure.h index dee1e0659a..54e76d0247 100644 --- a/rbutil/rbutilqt/configure.h +++ b/rbutil/rbutilqt/configure.h | |||
@@ -54,7 +54,6 @@ class Config : public QDialog | |||
54 | void setSystemProxy(bool); | 54 | void setSystemProxy(bool); |
55 | void updateLanguage(void); | 55 | void updateLanguage(void); |
56 | void browseFolder(void); | 56 | void browseFolder(void); |
57 | void updatePlatform(void); | ||
58 | }; | 57 | }; |
59 | 58 | ||
60 | #endif | 59 | #endif |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index da469efded..5fcfc39d18 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -207,6 +207,8 @@ void RbUtilQt::updateDevice() | |||
207 | QString brand = devices->value("brand").toString(); | 207 | QString brand = devices->value("brand").toString(); |
208 | QString name = devices->value("name").toString(); | 208 | QString name = devices->value("name").toString(); |
209 | devices->endGroup(); | 209 | devices->endGroup(); |
210 | if(name.isEmpty()) name = "<none>"; | ||
211 | if(mountpoint.isEmpty()) mountpoint = "<invalid>"; | ||
210 | ui.labelDevice->setText(tr("<b>%1 %2</b> at <b>%3</b>") | 212 | ui.labelDevice->setText(tr("<b>%1 %2</b> at <b>%3</b>") |
211 | .arg(brand, name, mountpoint)); | 213 | .arg(brand, name, mountpoint)); |
212 | } | 214 | } |