Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GH-1886 warn users about proxy settings not applying to the game

Browse Source
This commit is contained in:
Petr Mrázek 2017-05-08 23:37:36 +02:00
parent 01058b1db1
commit 0f311e12ee
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
application/pages/global/ProxyPage.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>607</width> <width>598</width>
<height>632</height> <height>617</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -31,11 +31,24 @@
</property> </property>
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<widget class="QWidget" name="tabWidgetPage1" native="true"> <widget class="QWidget" name="tabWidgetPage1">
<attribute name="title"> <attribute name="title">
<string notr="true"></string> <string notr="true"/>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="proxyPlainTextWarningLabel_2">
<property name="text">
<string>This only applies to MultiMC. Minecraft does not accept proxy settings.</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="proxyTypeBox"> <widget class="QGroupBox" name="proxyTypeBox">
<property name="title"> <property name="title">
@ -48,7 +61,7 @@
<string>Uses your system's default proxy settings.</string> <string>Uses your system's default proxy settings.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Default</string> <string>&amp;Default</string>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">proxyGroup</string> <string notr="true">proxyGroup</string>
@ -58,7 +71,7 @@
<item> <item>
<widget class="QRadioButton" name="proxyNoneBtn"> <widget class="QRadioButton" name="proxyNoneBtn">
<property name="text"> <property name="text">
<string>None</string> <string>&amp;None</string>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">proxyGroup</string> <string notr="true">proxyGroup</string>
@ -68,7 +81,7 @@
<item> <item>
<widget class="QRadioButton" name="proxySOCKS5Btn"> <widget class="QRadioButton" name="proxySOCKS5Btn">
<property name="text"> <property name="text">
<string>SOCKS5</string> <string>SOC&amp;KS5</string>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">proxyGroup</string> <string notr="true">proxyGroup</string>
@ -78,7 +91,7 @@
<item> <item>
<widget class="QRadioButton" name="proxyHTTPBtn"> <widget class="QRadioButton" name="proxyHTTPBtn">
<property name="text"> <property name="text">
<string>HTTP</string> <string>H&amp;TTP</string>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">proxyGroup</string> <string notr="true">proxyGroup</string>