0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix proxy settings radio buttons not triggering updates of the proxy settings.

Browse Source
This commit is contained in:
Petr Mrázek 2014-01-07 02:19:26 +01:00
parent 267f18ca81
commit 28c35ea0db
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/dialogs/SettingsDialog.cpp
View File

@ -61,6 +61,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Se
{ {
MMC->updateChecker()->updateChanList(); MMC->updateChecker()->updateChanList();
} }
connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
} }
SettingsDialog::~SettingsDialog() SettingsDialog::~SettingsDialog()
@ -215,9 +216,8 @@ void SettingsDialog::on_buttonBox_rejected()
MMC->settings()->set("SettingsGeometry", saveGeometry().toBase64()); MMC->settings()->set("SettingsGeometry", saveGeometry().toBase64());
} }
void SettingsDialog::on_proxyNoneBtn_toggled(bool checked) void SettingsDialog::proxyChanged(int)
{ {
Q_UNUSED(checked);
updateCheckboxStuff(); updateCheckboxStuff();
} }

3
gui/dialogs/SettingsDialog.h
View File

@ -75,8 +75,6 @@ slots:
void checkFinished(JavaCheckResult result); void checkFinished(JavaCheckResult result);
void on_proxyNoneBtn_toggled(bool checked);
/*! /*!
* Updates the list of update channels in the combo box. * Updates the list of update channels in the combo box.
*/ */
@ -88,6 +86,7 @@ slots:
void refreshUpdateChannelDesc(); void refreshUpdateChannelDesc();
void updateChannelSelectionChanged(int index); void updateChannelSelectionChanged(int index);
void proxyChanged(int);
private: private:
Ui::SettingsDialog *ui; Ui::SettingsDialog *ui;

17
gui/dialogs/SettingsDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>526</width> <width>526</width>
<height>683</height> <height>723</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -33,7 +33,7 @@
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="generalTab"> <widget class="QWidget" name="generalTab">
<attribute name="title"> <attribute name="title">
@ -452,6 +452,9 @@
<property name="text"> <property name="text">
<string>Default</string> <string>Default</string>
</property> </property>
<attribute name="buttonGroup">
<string notr="true">proxyGroup</string>
</attribute>
</widget> </widget>
</item> </item>
<item> <item>
@ -459,6 +462,9 @@
<property name="text"> <property name="text">
<string>None</string> <string>None</string>
</property> </property>
<attribute name="buttonGroup">
<string notr="true">proxyGroup</string>
</attribute>
</widget> </widget>
</item> </item>
<item> <item>
@ -466,6 +472,9 @@
<property name="text"> <property name="text">
<string>SOCKS5</string> <string>SOCKS5</string>
</property> </property>
<attribute name="buttonGroup">
<string notr="true">proxyGroup</string>
</attribute>
</widget> </widget>
</item> </item>
<item> <item>
@ -473,6 +482,9 @@
<property name="text"> <property name="text">
<string>HTTP</string> <string>HTTP</string>
</property> </property>
<attribute name="buttonGroup">
<string notr="true">proxyGroup</string>
</attribute>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -884,5 +896,6 @@
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="sortingModeGroup"/> <buttongroup name="sortingModeGroup"/>
<buttongroup name="proxyGroup"/>
</buttongroups> </buttongroups>
</ui> </ui>