diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-05-08 23:37:36 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-05-08 23:37:36 +0200 |
| commit | 0f311e12eea395a65f9173df90a5cc557989d2a3 (patch) | |
| tree | df1ed5f9409fa74efa5d30900f7218c8343ac5dd /application/pages/global | |
| parent | 01058b1db114f0cd31c5415c09c263c317df568d (diff) | |
| download | MultiMC-0f311e12eea395a65f9173df90a5cc557989d2a3.tar MultiMC-0f311e12eea395a65f9173df90a5cc557989d2a3.tar.gz MultiMC-0f311e12eea395a65f9173df90a5cc557989d2a3.tar.lz MultiMC-0f311e12eea395a65f9173df90a5cc557989d2a3.tar.xz MultiMC-0f311e12eea395a65f9173df90a5cc557989d2a3.zip | |
GH-1886 warn users about proxy settings not applying to the game
Diffstat (limited to 'application/pages/global')
| -rw-r--r-- | application/pages/global/ProxyPage.ui | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/application/pages/global/ProxyPage.ui b/application/pages/global/ProxyPage.ui index 1330a82e..69fcef1e 100644 --- a/application/pages/global/ProxyPage.ui +++ b/application/pages/global/ProxyPage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>607</width> - <height>632</height> + <width>598</width> + <height>617</height> </rect> </property> <property name="sizePolicy"> @@ -31,12 +31,25 @@ </property> <item> <widget class="QTabWidget" name="tabWidget"> - <widget class="QWidget" name="tabWidgetPage1" native="true"> + <widget class="QWidget" name="tabWidgetPage1"> <attribute name="title"> - <string notr="true"></string> + <string notr="true"/> </attribute> <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> <widget class="QGroupBox" name="proxyTypeBox"> <property name="title"> <string>Type</string> @@ -48,7 +61,7 @@ <string>Uses your system's default proxy settings.</string> </property> <property name="text"> - <string>Default</string> + <string>&Default</string> </property> <attribute name="buttonGroup"> <string notr="true">proxyGroup</string> @@ -58,7 +71,7 @@ <item> <widget class="QRadioButton" name="proxyNoneBtn"> <property name="text"> - <string>None</string> + <string>&None</string> </property> <attribute name="buttonGroup"> <string notr="true">proxyGroup</string> @@ -68,7 +81,7 @@ <item> <widget class="QRadioButton" name="proxySOCKS5Btn"> <property name="text"> - <string>SOCKS5</string> + <string>SOC&KS5</string> </property> <attribute name="buttonGroup"> <string notr="true">proxyGroup</string> @@ -78,7 +91,7 @@ <item> <widget class="QRadioButton" name="proxyHTTPBtn"> <property name="text"> - <string>HTTP</string> + <string>H&TTP</string> </property> <attribute name="buttonGroup"> <string notr="true">proxyGroup</string> |