diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-07 02:19:26 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-07 02:19:26 +0100 |
| commit | 28c35ea0db3b38a050f18c8aa868061202f931da (patch) | |
| tree | 910e275e2a52ef9558d5378d35cc7cbdfab460ec | |
| parent | 267f18ca814cbe96e9581dfbf79b744543d1e8b8 (diff) | |
| download | MultiMC-28c35ea0db3b38a050f18c8aa868061202f931da.tar MultiMC-28c35ea0db3b38a050f18c8aa868061202f931da.tar.gz MultiMC-28c35ea0db3b38a050f18c8aa868061202f931da.tar.lz MultiMC-28c35ea0db3b38a050f18c8aa868061202f931da.tar.xz MultiMC-28c35ea0db3b38a050f18c8aa868061202f931da.zip | |
Fix proxy settings radio buttons not triggering updates of the proxy settings.
| -rw-r--r-- | gui/dialogs/SettingsDialog.cpp | 4 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.h | 3 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.ui | 17 |
3 files changed, 18 insertions, 6 deletions
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp index 091ffb1c..00b3b1fd 100644 --- a/gui/dialogs/SettingsDialog.cpp +++ b/gui/dialogs/SettingsDialog.cpp @@ -61,6 +61,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Se { MMC->updateChecker()->updateChanList(); } + connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int))); } SettingsDialog::~SettingsDialog() @@ -215,9 +216,8 @@ void SettingsDialog::on_buttonBox_rejected() MMC->settings()->set("SettingsGeometry", saveGeometry().toBase64()); } -void SettingsDialog::on_proxyNoneBtn_toggled(bool checked) +void SettingsDialog::proxyChanged(int) { - Q_UNUSED(checked); updateCheckboxStuff(); } diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h index 6039ecab..d7bbbeb3 100644 --- a/gui/dialogs/SettingsDialog.h +++ b/gui/dialogs/SettingsDialog.h @@ -75,8 +75,6 @@ slots: void checkFinished(JavaCheckResult result); - void on_proxyNoneBtn_toggled(bool checked); - /*! * Updates the list of update channels in the combo box. */ @@ -88,6 +86,7 @@ slots: void refreshUpdateChannelDesc(); void updateChannelSelectionChanged(int index); + void proxyChanged(int); private: Ui::SettingsDialog *ui; diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui index 756e2a1f..e7671cce 100644 --- a/gui/dialogs/SettingsDialog.ui +++ b/gui/dialogs/SettingsDialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>526</width> - <height>683</height> + <height>723</height> </rect> </property> <property name="sizePolicy"> @@ -33,7 +33,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>2</number> + <number>0</number> </property> <widget class="QWidget" name="generalTab"> <attribute name="title"> @@ -452,6 +452,9 @@ <property name="text"> <string>Default</string> </property> + <attribute name="buttonGroup"> + <string notr="true">proxyGroup</string> + </attribute> </widget> </item> <item> @@ -459,6 +462,9 @@ <property name="text"> <string>None</string> </property> + <attribute name="buttonGroup"> + <string notr="true">proxyGroup</string> + </attribute> </widget> </item> <item> @@ -466,6 +472,9 @@ <property name="text"> <string>SOCKS5</string> </property> + <attribute name="buttonGroup"> + <string notr="true">proxyGroup</string> + </attribute> </widget> </item> <item> @@ -473,6 +482,9 @@ <property name="text"> <string>HTTP</string> </property> + <attribute name="buttonGroup"> + <string notr="true">proxyGroup</string> + </attribute> </widget> </item> </layout> @@ -884,5 +896,6 @@ </connections> <buttongroups> <buttongroup name="sortingModeGroup"/> + <buttongroup name="proxyGroup"/> </buttongroups> </ui> |