summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui/components/Preferences.qml22
-rw-r--r--gui/main.cpp1
2 files changed, 13 insertions, 10 deletions
diff --git a/gui/components/Preferences.qml b/gui/components/Preferences.qml
index 31e1bc6..4de2f95 100644
--- a/gui/components/Preferences.qml
+++ b/gui/components/Preferences.qml
@@ -54,7 +54,7 @@ ThemedPage {
Label {
text: qsTr("These techniques can bypass censorship, but are slower. Use them only when needed.")
- color: "gray"
+ color: Material.foreground
visible: true
wrapMode: Text.Wrap
font.pixelSize: Theme.fontSize - 3
@@ -94,14 +94,15 @@ ThemedPage {
Label {
text: qsTr("Traffic is obfuscated to bypass blocks")
- color: "gray"
+ color: useBridgesCheckBox.enabled ? Material.foreground : Material.hintTextColor
visible: true
wrapMode: Text.Wrap
- font.pixelSize: Theme.fontSize - 4
- Layout.leftMargin: 35
+ font.pixelSize: Theme.fontSize - 5
+ Layout.leftMargin: 36
Layout.rightMargin: 15
Layout.bottomMargin: 5
- Layout.preferredWidth: 240
+ Layout.topMargin: -5
+ Layout.preferredWidth: 220
}
MaterialCheckBox {
@@ -122,14 +123,15 @@ ThemedPage {
Label {
text: qsTr("Snowflake needs Tor installed in your system")
- color: "gray"
+ color: useSnowflake.enabled ? Material.foreground : Material.hintTextColor
visible: true
wrapMode: Text.Wrap
- font.pixelSize: Theme.fontSize - 4
- Layout.leftMargin: 35
+ font.pixelSize: Theme.fontSize - 5
+ Layout.leftMargin: 36
Layout.rightMargin: 15
Layout.bottomMargin: 5
- Layout.preferredWidth: 240
+ Layout.topMargin: -5
+ Layout.preferredWidth: 220
}
Label {
@@ -143,7 +145,7 @@ ThemedPage {
Label {
text: qsTr("UDP can make the VPN faster. It might be blocked on some networks.")
width: parent.width
- color: "gray"
+ color: Material.foreground
visible: true
wrapMode: Text.Wrap
font.pixelSize: Theme.fontSize - 3
diff --git a/gui/main.cpp b/gui/main.cpp
index 7983c39..993ec2d 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -116,6 +116,7 @@ int main(int argc, char **argv) {
});
QCommandLineOption webPortOption("web-port", QApplication::translate("main", "Web API port (default: 8080)"), "port", "8080");
parser.addOption(webPortOption);
+ // FIXME need to add note for the translation, on/off shouldn't be translated.
QCommandLineOption startVPNOption("start-vpn", QApplication::translate("main", "Start the VPN, either 'on' or 'off'."), "status", "");
parser.addOption(startVPNOption);
parser.process(app);