diff options
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 18 | ||||
-rw-r--r-- | rbutil/rbutilqt/configurefrm.ui | 13 |
2 files changed, 15 insertions, 16 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index bcb52304e4..cc8b0ff976 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -56,10 +56,6 @@ Config::Config(QWidget *parent,int index) : QDialog(parent) | |||
56 | ui.setupUi(this); | 56 | ui.setupUi(this); |
57 | ui.tabConfiguration->setCurrentIndex(index); | 57 | ui.tabConfiguration->setCurrentIndex(index); |
58 | ui.radioManualProxy->setChecked(true); | 58 | ui.radioManualProxy->setChecked(true); |
59 | QRegExpValidator *proxyValidator = new QRegExpValidator(this); | ||
60 | QRegExp validate("[0-9]*"); | ||
61 | proxyValidator->setRegExp(validate); | ||
62 | ui.proxyPort->setValidator(proxyValidator); | ||
63 | 59 | ||
64 | // build language list and sort alphabetically | 60 | // build language list and sort alphabetically |
65 | QStringList langs = findLanguageFiles(); | 61 | QStringList langs = findLanguageFiles(); |
@@ -134,7 +130,7 @@ void Config::accept() | |||
134 | proxy.setUserName(ui.proxyUser->text()); | 130 | proxy.setUserName(ui.proxyUser->text()); |
135 | proxy.setPassword(ui.proxyPass->text()); | 131 | proxy.setPassword(ui.proxyPass->text()); |
136 | proxy.setHost(ui.proxyHost->text()); | 132 | proxy.setHost(ui.proxyHost->text()); |
137 | proxy.setPort(ui.proxyPort->text().toInt()); | 133 | proxy.setPort(ui.proxyPort->value()); |
138 | } | 134 | } |
139 | 135 | ||
140 | // Encode the password using base64 before storing it to the configuration | 136 | // Encode the password using base64 before storing it to the configuration |
@@ -253,9 +249,7 @@ void Config::setUserSettings() | |||
253 | QByteArray pw = QByteArray::fromBase64(proxy.password().toUtf8()); | 249 | QByteArray pw = QByteArray::fromBase64(proxy.password().toUtf8()); |
254 | proxy.setPassword(pw); | 250 | proxy.setPassword(pw); |
255 | 251 | ||
256 | if(proxy.port() > 0) | 252 | ui.proxyPort->setValue(proxy.port()); |
257 | ui.proxyPort->setText(QString("%1").arg(proxy.port())); | ||
258 | else ui.proxyPort->setText(""); | ||
259 | ui.proxyHost->setText(proxy.host()); | 253 | ui.proxyHost->setText(proxy.host()); |
260 | ui.proxyUser->setText(proxy.userName()); | 254 | ui.proxyUser->setText(proxy.userName()); |
261 | ui.proxyPass->setText(proxy.password()); | 255 | ui.proxyPass->setText(proxy.password()); |
@@ -512,13 +506,13 @@ void Config::setSystemProxy(bool checked) | |||
512 | proxy.setUserName(ui.proxyUser->text()); | 506 | proxy.setUserName(ui.proxyUser->text()); |
513 | proxy.setPassword(ui.proxyPass->text()); | 507 | proxy.setPassword(ui.proxyPass->text()); |
514 | proxy.setHost(ui.proxyHost->text()); | 508 | proxy.setHost(ui.proxyHost->text()); |
515 | proxy.setPort(ui.proxyPort->text().toInt()); | 509 | proxy.setPort(ui.proxyPort->value()); |
516 | // show system values in input box | 510 | // show system values in input box |
517 | QUrl envproxy = System::systemProxy(); | 511 | QUrl envproxy = System::systemProxy(); |
518 | LOG_INFO() << "setting system proxy" << envproxy; | 512 | LOG_INFO() << "setting system proxy" << envproxy; |
519 | 513 | ||
520 | ui.proxyHost->setText(envproxy.host()); | 514 | ui.proxyHost->setText(envproxy.host()); |
521 | ui.proxyPort->setText(QString("%1").arg(envproxy.port())); | 515 | ui.proxyPort->setValue(envproxy.port()); |
522 | ui.proxyUser->setText(envproxy.userName()); | 516 | ui.proxyUser->setText(envproxy.userName()); |
523 | ui.proxyPass->setText(envproxy.password()); | 517 | ui.proxyPass->setText(envproxy.password()); |
524 | 518 | ||
@@ -543,9 +537,7 @@ void Config::setSystemProxy(bool checked) | |||
543 | } | 537 | } |
544 | else { | 538 | else { |
545 | ui.proxyHost->setText(proxy.host()); | 539 | ui.proxyHost->setText(proxy.host()); |
546 | if(proxy.port() > 0) | 540 | ui.proxyPort->setValue(proxy.port()); |
547 | ui.proxyPort->setText(QString("%1").arg(proxy.port())); | ||
548 | else ui.proxyPort->setText(""); | ||
549 | ui.proxyUser->setText(proxy.userName()); | 541 | ui.proxyUser->setText(proxy.userName()); |
550 | ui.proxyPass->setText(proxy.password()); | 542 | ui.proxyPass->setText(proxy.password()); |
551 | } | 543 | } |
diff --git a/rbutil/rbutilqt/configurefrm.ui b/rbutil/rbutilqt/configurefrm.ui index b0111ac940..22536de461 100644 --- a/rbutil/rbutilqt/configurefrm.ui +++ b/rbutil/rbutilqt/configurefrm.ui | |||
@@ -223,9 +223,6 @@ | |||
223 | <item row="2" column="1" colspan="2"> | 223 | <item row="2" column="1" colspan="2"> |
224 | <widget class="QLineEdit" name="proxyUser"/> | 224 | <widget class="QLineEdit" name="proxyUser"/> |
225 | </item> | 225 | </item> |
226 | <item row="1" column="1" colspan="2"> | ||
227 | <widget class="QLineEdit" name="proxyPort"/> | ||
228 | </item> | ||
229 | <item row="0" column="1" colspan="2"> | 226 | <item row="0" column="1" colspan="2"> |
230 | <widget class="QLineEdit" name="proxyHost"> | 227 | <widget class="QLineEdit" name="proxyHost"> |
231 | <property name="frame"> | 228 | <property name="frame"> |
@@ -233,6 +230,16 @@ | |||
233 | </property> | 230 | </property> |
234 | </widget> | 231 | </widget> |
235 | </item> | 232 | </item> |
233 | <item row="1" column="1" colspan="2"> | ||
234 | <widget class="QSpinBox" name="proxyPort"> | ||
235 | <property name="buttonSymbols"> | ||
236 | <enum>QAbstractSpinBox::NoButtons</enum> | ||
237 | </property> | ||
238 | <property name="maximum"> | ||
239 | <number>65535</number> | ||
240 | </property> | ||
241 | </widget> | ||
242 | </item> | ||
236 | </layout> | 243 | </layout> |
237 | </widget> | 244 | </widget> |
238 | </item> | 245 | </item> |