summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst28
-rw-r--r--Makefile30
-rw-r--r--changes/bug-5815_eip-preferences-issues2
-rw-r--r--changes/bug-5866_bitmask-lock-not-removed1
-rw-r--r--changes/bug-5945_not-adding-helper-files1
-rw-r--r--changes/bug-5995_save-provider-on-change1
-rw-r--r--changes/bug-5996_update-eip-status-on-change1
-rw-r--r--changes/bug-5997_get-ready-provider-on-change1
-rw-r--r--changes/bug-6048_python2-bitmask-root1
-rw-r--r--changes/bug-remove-dict-comprenhension1
-rw-r--r--changes/bug_5994_do-not-wait-for-eip-if-cannot-start1
-rw-r--r--changes/bug_6146_handle_removals_release1
-rw-r--r--changes/bug_use_token_for_eip1
-rw-r--r--changes/code-and-logging-cleanup1
-rw-r--r--changes/feature-6040-email-firewall1
-rw-r--r--data/images/countries/xx.pngbin0 -> 254 bytes
-rwxr-xr-xdata/make_project_file.py3
-rw-r--r--data/resources/flags.qrc1
-rw-r--r--data/ts/en_US.ts419
-rwxr-xr-xpkg/linux/bitmask-root4
-rw-r--r--pkg/requirements-dev.pip10
-rw-r--r--pkg/requirements.pip7
-rwxr-xr-xpkg/tuf/release.py23
-rw-r--r--relnotes.txt24
-rw-r--r--src/leap/bitmask/gui/account.py49
-rw-r--r--src/leap/bitmask/gui/app.py66
-rw-r--r--src/leap/bitmask/gui/flashable.py76
-rw-r--r--src/leap/bitmask/gui/mail_status.py2
-rw-r--r--src/leap/bitmask/gui/mainwindow.py117
-rw-r--r--src/leap/bitmask/gui/passwordwindow.py273
-rw-r--r--src/leap/bitmask/gui/preferences_account_page.py139
-rw-r--r--src/leap/bitmask/gui/preferences_email_page.py35
-rw-r--r--src/leap/bitmask/gui/preferences_vpn_page.py143
-rw-r--r--src/leap/bitmask/gui/preferenceswindow.py505
-rw-r--r--src/leap/bitmask/gui/ui/eippreferences.ui102
-rw-r--r--src/leap/bitmask/gui/ui/mainwindow.ui17
-rw-r--r--src/leap/bitmask/gui/ui/password_change.ui182
-rw-r--r--src/leap/bitmask/gui/ui/preferences.ui234
-rw-r--r--src/leap/bitmask/gui/ui/preferences_account_page.ui104
-rw-r--r--src/leap/bitmask/gui/ui/preferences_email_page.ui32
-rw-r--r--src/leap/bitmask/gui/ui/preferences_vpn_page.ui69
-rw-r--r--src/leap/bitmask/gui/wizard.py4
-rw-r--r--src/leap/bitmask/services/eip/conductor.py6
-rw-r--r--src/leap/bitmask/services/eip/eipconfig.py43
-rw-r--r--src/leap/bitmask/util/credentials.py24
45 files changed, 1806 insertions, 979 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c47e531a..3c863657 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,34 @@ History
2014
====
+0.7.0 September 26 -- the "one time download, all time updates" release:
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+- Select current provider on EIP preferences. Closes #5815.
+- Handle logout correctly when we stop_services to launch the
+ wizard. Related to #5815.
+- Properly remove /tmp/bitmask.lock. Closes #5866.
+- Hide EIP Start button and display correct warning on missing helpers
+ files. Closes #5945.
+- Save default provider if changed on the combo box. Closes #5995.
+- Update the EIP status on provider change. Closes #5996.
+- Update and get ready to start a provider on change. Closes #5997.
+- Use python2 to run bitmask-root to work fine on systems with python3
+ as default. Closes #6048.
+- Use python2.7 in bitmask-root shebang since is the common name for
+ python 2 in Ubuntu, Debian, Arch. Related to #6048.
+- Remove dict comprenension in util, for 2.6 compat.
+- Login shall not wait for eip to finish if eip is not able to
+ start. Closes #5994
+- Properly send the token for querying the EIP certificate. Fixes
+ #6060.
+- Code cleanup and logging improvements.
+- Add email firewall blocking other users to access bitmask imap &
+ smtp. Closes #6040
+- Remove the Advanced Key Management since we don't support stable
+ mail yet. Closes #6087.
+- Single combined preferences window. Closes #4704, #4119, #5885.
+
0.6.1 August 15 -- the "knock knock knocking on beta's door" release:
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/Makefile b/Makefile
index 0008cb39..e7173c80 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,19 @@ TRANSLAT_DIR = data/translations
#Project file, used for translations
PROJFILE = data/bitmask.pro
-#UI files to compile
-UI_FILES = loggerwindow.ui mainwindow.ui wizard.ui login.ui preferences.ui eip_status.ui mail_status.ui eippreferences.ui advanced_key_management.ui
-#Qt resource files to compile
+# UI files to compile
+UI_FILES = \
+ loggerwindow.ui \
+ wizard.ui \
+ mainwindow.ui login.ui eip_status.ui mail_status.ui \
+ preferences.ui \
+ preferences_account_page.ui \
+ preferences_vpn_page.ui \
+ preferences_email_page.ui \
+ password_change.ui \
+ advanced_key_management.ui
+
+# Qt resource files to compile
RESOURCES = icons.qrc flags.qrc locale.qrc loggerwindow.qrc
#pyuic4 and pyrcc4 binaries
@@ -95,5 +105,19 @@ resource_graph:
./pkg/scripts/monitor_resource.zsh `pgrep bitmask` $(RESOURCE_TIME)
display bitmask-resources.png
+get_wheels:
+ pip install --upgrade setuptools
+ pip install --upgrade pip
+ pip install wheel
+
+gather_wheels:
+ pip wheel --wheel-dir=../wheelhouse pyzmq --build-option "--zmq=bundled"
+ # because fuck u1db externals, that's why...
+ pip wheel --wheel-dir=../wheelhouse --allow-external dirspec --allow-unverified dirspec --allow-external u1db --allow-unverified u1db -r pkg/requirements.pip
+
+install_wheel:
+ # if it's the first time, you'll need to get_wheels first
+ pip install --pre --use-wheel --no-index --find-links=../wheelhouse -r pkg/requirements.pip
+
clean :
$(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc)
diff --git a/changes/bug-5815_eip-preferences-issues b/changes/bug-5815_eip-preferences-issues
deleted file mode 100644
index 013fe03d..00000000
--- a/changes/bug-5815_eip-preferences-issues
+++ /dev/null
@@ -1,2 +0,0 @@
-- Select current provider on EIP preferences. Closes #5815.
-- Handle logout correctly when we stop_services to launch the wizard. Related to #5815.
diff --git a/changes/bug-5866_bitmask-lock-not-removed b/changes/bug-5866_bitmask-lock-not-removed
deleted file mode 100644
index d68c1122..00000000
--- a/changes/bug-5866_bitmask-lock-not-removed
+++ /dev/null
@@ -1 +0,0 @@
-- /tmp/bitmask.lock not removed. Closes #5866.
diff --git a/changes/bug-5945_not-adding-helper-files b/changes/bug-5945_not-adding-helper-files
deleted file mode 100644
index 94e41c25..00000000
--- a/changes/bug-5945_not-adding-helper-files
+++ /dev/null
@@ -1 +0,0 @@
-- Hide button and display correct warning on missing helpers files. Closes #5945.
diff --git a/changes/bug-5995_save-provider-on-change b/changes/bug-5995_save-provider-on-change
deleted file mode 100644
index e0f86d75..00000000
--- a/changes/bug-5995_save-provider-on-change
+++ /dev/null
@@ -1 +0,0 @@
-- Save default provider if changed on the combo box. Closes #5995.
diff --git a/changes/bug-5996_update-eip-status-on-change b/changes/bug-5996_update-eip-status-on-change
deleted file mode 100644
index 665092f0..00000000
--- a/changes/bug-5996_update-eip-status-on-change
+++ /dev/null
@@ -1 +0,0 @@
-- Update the EIP status on provider change. Closes #5996.
diff --git a/changes/bug-5997_get-ready-provider-on-change b/changes/bug-5997_get-ready-provider-on-change
deleted file mode 100644
index e6b3f7f1..00000000
--- a/changes/bug-5997_get-ready-provider-on-change
+++ /dev/null
@@ -1 +0,0 @@
-- Update and get ready to start a provider on change. Closes #5997.
diff --git a/changes/bug-6048_python2-bitmask-root b/changes/bug-6048_python2-bitmask-root
deleted file mode 100644
index 038196b0..00000000
--- a/changes/bug-6048_python2-bitmask-root
+++ /dev/null
@@ -1 +0,0 @@
-- Use python2 to run bitmask-root to work fine on systems with python3 as default. Closes #6048.
diff --git a/changes/bug-remove-dict-comprenhension b/changes/bug-remove-dict-comprenhension
deleted file mode 100644
index 4e9468d8..00000000
--- a/changes/bug-remove-dict-comprenhension
+++ /dev/null
@@ -1 +0,0 @@
-- Remove dict comprenension in util, for 2.6 compat.
diff --git a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start b/changes/bug_5994_do-not-wait-for-eip-if-cannot-start
deleted file mode 100644
index 7ada612a..00000000
--- a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start
+++ /dev/null
@@ -1 +0,0 @@
-- Login shall not wait for eip to finish if eip is not able to start. Closes: #5994
diff --git a/changes/bug_6146_handle_removals_release b/changes/bug_6146_handle_removals_release
new file mode 100644
index 00000000..6fe67d62
--- /dev/null
+++ b/changes/bug_6146_handle_removals_release
@@ -0,0 +1 @@
+- Make pkg/tuf/release.py handle removals in the repo
diff --git a/changes/bug_use_token_for_eip b/changes/bug_use_token_for_eip
deleted file mode 100644
index b10368ad..00000000
--- a/changes/bug_use_token_for_eip
+++ /dev/null
@@ -1 +0,0 @@
-- Properly send the token for querying the EIP certificate. Fixes #6060. \ No newline at end of file
diff --git a/changes/code-and-logging-cleanup b/changes/code-and-logging-cleanup
deleted file mode 100644
index 3a381e68..00000000
--- a/changes/code-and-logging-cleanup
+++ /dev/null
@@ -1 +0,0 @@
-- Code cleanup and logging improvements.
diff --git a/changes/feature-6040-email-firewall b/changes/feature-6040-email-firewall
deleted file mode 100644
index 5ef70d28..00000000
--- a/changes/feature-6040-email-firewall
+++ /dev/null
@@ -1 +0,0 @@
-- Add email firewall blocking other users to access bitmask imap & smtp. Closes #6040
diff --git a/data/images/countries/xx.png b/data/images/countries/xx.png
new file mode 100644
index 00000000..abd36d39
--- /dev/null
+++ b/data/images/countries/xx.png
Binary files differ
diff --git a/data/make_project_file.py b/data/make_project_file.py
index d1567837..5519e128 100755
--- a/data/make_project_file.py
+++ b/data/make_project_file.py
@@ -52,7 +52,8 @@ if __name__ == '__main__':
# Source files
includes = ["*.py"]
- excludes = ['__init__.py', '_version.py', 'ui_*.py', '*_rc.py']
+ excludes = ['__init__.py', '_version.py', 'ui_*.py', '*_rc.py',
+ 'pinned*.py', 'tests']
sources = list_files(includes, excludes, SOURCE_ROOT)
sources = " \\\n".join(["../{0}".format(f) for f in sources])
diff --git a/data/resources/flags.qrc b/data/resources/flags.qrc
index 8bdc9c4c..aeecc54f 100644
--- a/data/resources/flags.qrc
+++ b/data/resources/flags.qrc
@@ -58,6 +58,7 @@
<file>../images/countries/us.png</file>
<file>../images/countries/ve.png</file>
<file>../images/countries/vn.png</file>
+ <file>../images/countries/xx.png</file>
<file>../images/countries/za.png</file>
</qresource>
</RCC> \ No newline at end of file
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
index 041cdc44..87aaf0e3 100644
--- a/data/ts/en_US.ts
+++ b/data/ts/en_US.ts
@@ -170,53 +170,23 @@ Export canceled.</source>
</message>
</context>
<context>
- <name>ComplainDialog</name>
+ <name>App</name>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="414"/>
- <source>Ok, thanks</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>EIPPreferences</name>
- <message>
- <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="27"/>
- <source>Select gateway for provider</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="47"/>
- <source>&lt;Select provider&gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="62"/>
- <source>&lt; Providers Gateway Status &gt;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="83"/>
- <source>Automatic</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="14"/>
- <source>Encrypted Internet Preferences</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="36"/>
- <source>Select &amp;provider:</source>
+ <location filename="../src/leap/bitmask/gui/app.py" line="63"/>
+ <source>Application error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="55"/>
- <source>&amp;Save this provider settings</source>
+ <location filename="../src/leap/bitmask/gui/app.py" line="65"/>
+ <source>There is a problem contacting the backend, please restart Bitmask.</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>ComplainDialog</name>
<message>
- <location filename="../src/leap/bitmask/gui/ui/eippreferences.ui" line="72"/>
- <source>Select &amp;gateway:</source>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="417"/>
+ <source>Ok, thanks</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -751,11 +721,6 @@ Export canceled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mail_status.py" line="232"/>
- <source>Starting&#xe2;&#x80;&#xa6;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../src/leap/bitmask/gui/mail_status.py" line="308"/>
<source>Initial sync in progress, please wait...</source>
<translation type="unfinished"></translation>
@@ -774,53 +739,53 @@ Export canceled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="932"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="889"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="351"/>
+ <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="345"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="361"/>
+ <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="355"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="366"/>
+ <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="360"/>
<source>&amp;Wizard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="787"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="744"/>
<source> The following components will be updated:
%s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="790"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="747"/>
<source>Updates available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="244"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="236"/>
<source>Show Main Window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1718"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1650"/>
<source>Starting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1742"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1674"/>
<source>Not supported</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1746"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1678"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -830,47 +795,47 @@ Export canceled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="356"/>
+ <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="350"/>
<source>About &amp;Bitmask</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="238"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="230"/>
<source>Mail is OFF</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="778"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="735"/>
<source>The Bitmask app is ready to update, please restart the application.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1050"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1007"/>
<source>About Bitmask - %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1206"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1163"/>
<source>Unable to login: Problem with provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1385"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1342"/>
<source>Log in cancelled by the user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1764"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1696"/>
<source>There was a problem with the provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1819"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1751"/>
<source>Something went wrong with the logout.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1786"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1718"/>
<source>Unable to connect: Problem with provider</source>
<translation type="unfinished"></translation>
</message>
@@ -880,319 +845,399 @@ Export canceled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="371"/>
+ <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="365"/>
<source>Show &amp;Log</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="376"/>
+ <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="370"/>
<source>Create a new account...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="228"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="223"/>
<source>File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="341"/>
- <source>Account Preferences...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="346"/>
- <source>Internet Preferences...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="384"/>
+ <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="378"/>
<source>Advanced Key Management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="940"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="897"/>
<source>OFF</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1064"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1021"/>
<source>Version: &lt;b&gt;%s&lt;/b&gt; (%s)&lt;br&gt;&lt;br&gt;%sBitmask is the Desktop client application for the LEAP platform, supporting encrypted internet proxy, secure email, and secure chat (coming soon).&lt;br&gt;&lt;br&gt;LEAP is a non-profit dedicated to giving all internet users access to secure communication. Our focus is on adapting encryption technology to make it easy to use and widely available. &lt;br&gt;&lt;br&gt;&lt;a href=&apos;https://leap.se&apos;&gt;More about LEAP&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1111"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1068"/>
<source>Bitmask Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1123"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1080"/>
<source>The current client version is not supported by this provider.&lt;br&gt;Please update to latest version.&lt;br&gt;&lt;br&gt;You can get the latest version from &lt;a href=&apos;{0}&apos;&gt;{1}&lt;/a&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1124"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1081"/>
<source>Update Needed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1134"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1091"/>
<source>This provider is not compatible with the client.&lt;br&gt;&lt;br&gt;Error: API version incompatible.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1134"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1091"/>
<source>Incompatible Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="359"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="307"/>
<source>Application error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="323"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="309"/>
<source>You are trying to do an operation that requires logging in first.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="398"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="367"/>
<source>Unknown error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="402"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="371"/>
<source>There was a server problem with authentication.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="406"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="375"/>
<source>Could not establish a connection.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="410"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="379"/>
<source>Invalid username or password.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="959"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="916"/>
<source>Hello!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="960"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="917"/>
<source>Bitmask has started in the tray.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1419"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1376"/>
<source>Succeeded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1672"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1604"/>
<source>The server at {0} can&apos;t be found, because the DNS lookup failed. DNS is the network service that translates a website&apos;s name to its Internet address. Either your computer is having trouble connecting to the network, or you are missing some helper files that are needed to securely use DNS while {1} is active. To install these helper files, quit this application and start it again.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1674"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1606"/>
<source>Connection Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1932"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1863"/>
<source>Quitting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1933"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1864"/>
<source>Bitmask is quitting, please wait.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="361"/>
- <source>There is a problem contacting the backend, please restart Bitmask.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1078"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1035"/>
<source>bitmask.net/help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1086"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1043"/>
<source>Email quick reference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1090"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1047"/>
<source>For Thunderbird, you can use the Bitmask extension. Search for &quot;Bitmask&quot; in the add-on manager or download it from &lt;a href=&apos;{0}&apos;&gt;addons.mozilla.org&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1094"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/>
<source>Alternately, you can manually configure your mail client to use Bitmask Email with these options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1094"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1051"/>
<source>IMAP: localhost, port {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1095"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1052"/>
<source>SMTP: localhost, port {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1097"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1054"/>
<source>Username: your full email address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1099"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1056"/>
<source>Password: any non-empty text</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1108"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1065"/>
<source>&lt;p&gt;&lt;strong&gt;{0}&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;&lt;p&gt;{2}&lt;ul&gt;&lt;li&gt;&amp;nbsp;{3}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{4}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{5}&lt;/li&gt;&lt;li&gt;&amp;nbsp;{6}&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1273"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1230"/>
<source>Stop services</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1273"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1230"/>
<source>Do you want to stop all services?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1277"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1234"/>
<source>In order to change the provider, the running services needs to be stopped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1741"/>
+ <location filename="../src/leap/bitmask/gui/mainwindow.py" line="1673"/>
<source>Disabled: missing helper files</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/mainwindow.ui" line="340"/>
+ <source>Pr&amp;eferences...</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
- <name>Preferences</name>
+ <name>PasswordChange</name>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="14"/>
- <source>Preferences</source>
+ <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="20"/>
+ <source>Change Password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="28"/>
+ <source>Username:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="35"/>
+ <source>New password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="40"/>
- <source>Password Change</source>
+ <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="52"/>
+ <source>Re-enter new password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="49"/>
- <source>&amp;Current password:</source>
+ <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="62"/>
+ <source>Current password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="66"/>
- <source>&amp;New password:</source>
+ <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="112"/>
+ <source>&lt;flash_label&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="83"/>
- <source>&amp;Re-enter new password:</source>
+ <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="150"/>
+ <source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="100"/>
- <source>Change</source>
+ <location filename="../src/leap/bitmask/gui/ui/password_change.ui" line="160"/>
+ <source>OK</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PasswordWindow</name>
+ <message>
+ <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="72"/>
+ <source>Please log in to change your password.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="107"/>
- <source>&lt;Password change status&gt;</source>
+ <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="78"/>
+ <source>Please wait for data storage to be ready.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="120"/>
- <source>Enabled services</source>
+ <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="107"/>
+ <source>Changing password...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="126"/>
- <source>Save this provider settings</source>
+ <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="122"/>
+ <source>Password changed successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="133"/>
+ <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="167"/>
+ <source>Password is empty.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="222"/>
+ <source>There was a problem changing the password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/passwordwindow.py" line="235"/>
+ <source>You did not enter a correct current password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Preferences</name>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="14"/>
+ <source>Preferences</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="33"/>
+ <source>user@example.org</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="106"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PreferencesAccountPage</name>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="14"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="20"/>
<source>Services</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="149"/>
- <source>&lt;Select provider&gt;</source>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="32"/>
+ <source>&lt;provider_services_label&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="61"/>
+ <source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="157"/>
- <source>Select provider:</source>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="73"/>
+ <source>Change Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/ui/preferences.ui" line="164"/>
- <source>&lt; Providers Services Status &gt;</source>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_account_page.ui" line="80"/>
+ <source>&lt;change_password_label&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/preferences_account_page.py" line="62"/>
+ <source>You must be logged in to change your password.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>PreferencesWindow</name>
+ <name>PreferencesEmailPage</name>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="60"/>
- <source>Automatic</source>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_email_page.ui" line="14"/>
+ <source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="170"/>
- <source>Changing password...</source>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_email_page.ui" line="26"/>
+ <source>PushButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PreferencesVpnPage</name>
+ <message>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="14"/>
+ <source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="252"/>
- <source>Password changed successfully.</source>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="20"/>
+ <source>&lt;flash_label&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="436"/>
- <source>There was a problem changing the password.</source>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="30"/>
+ <source>Default VPN Gateway:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="440"/>
- <source>You did not enter a correct current password.</source>
+ <location filename="../src/leap/bitmask/gui/ui/preferences_vpn_page.ui" line="50"/>
+ <source>You must reconnect for changes to take effect.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="420"/>
- <source>Services settings for provider &apos;{0}&apos; saved.</source>
+ <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="47"/>
+ <source>Automatic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="129"/>
+ <source>Error loading configuration file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/leap/bitmask/gui/preferences_vpn_page.py" line="142"/>
+ <source>This is an uninitialized provider, please log in first.</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>PreferencesWindow</name>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="116"/>
- <source>You need to enable {0} in order to change the password.</source>
+ <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="88"/>
+ <source>Account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="124"/>
- <source>You need to wait until {0} is ready in order to change the password.</source>
+ <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="99"/>
+ <source>VPN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="103"/>
- <source>In order to change your password you need to be logged in.</source>
+ <location filename="../src/leap/bitmask/gui/preferenceswindow.py" line="109"/>
+ <source>Email</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1335,47 +1380,47 @@ Export canceled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="136"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="132"/>
<source>&amp;Next &gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="138"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="134"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="328"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="325"/>
<source>Starting registration...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="373"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="370"/>
<source>User %s successfully registered.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="543"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="539"/>
<source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Non-existent provider&lt;/b&gt;&lt;/font&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="562"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="558"/>
<source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/font&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="590"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="586"/>
<source>Unable to load provider configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="596"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="592"/>
<source>&lt;font color=&apos;red&apos;&gt;&lt;b&gt;Not a valid provider&lt;/b&gt;&lt;/font&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="701"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="698"/>
<source>Something went wrong while trying to load service %s</source>
<translation type="unfinished"></translation>
</message>
@@ -1405,22 +1450,22 @@ Export canceled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="400"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="397"/>
<source>Something has gone wrong. Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="414"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="411"/>
<source>The requested username is taken, choose another.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="682"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="677"/>
<source>Services by {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/gui/wizard.py" line="743"/>
+ <location filename="../src/leap/bitmask/gui/wizard.py" line="739"/>
<source>Register a new user with {0}</source>
<translation type="unfinished"></translation>
</message>
@@ -1473,37 +1518,37 @@ Export canceled.</source>
<context>
<name>msg</name>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="219"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="222"/>
<source>TAP Driver</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="226"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="229"/>
<source>Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="344"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="347"/>
<source>TUN Driver</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="352"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="355"/>
<source>Encrypted Internet uses VPN, which needs a kernel extension for a TUN device installed, and none has been found. This will ask for administrative privileges.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="153"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="156"/>
<source>Problem installing files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="154"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="157"/>
<source>Some of the files could not be copied.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="347"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="350"/>
<source>Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed?</source>
<translation type="unfinished"></translation>
</message>
@@ -1513,7 +1558,7 @@ Export canceled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="427"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="430"/>
<source>Missing Bitmask helpers</source>
<translation type="unfinished"></translation>
</message>
@@ -1521,12 +1566,12 @@ Export canceled.</source>
<context>
<name>msgstr</name>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="396"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="399"/>
<source>Some essential helper files are missing in your system.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/platform_init/initializers.py" line="399"/>
+ <location filename="../src/leap/bitmask/platform_init/initializers.py" line="402"/>
<source>Reinstall your debian packages, or make sure you place them by hand.</source>
<translation type="unfinished"></translation>
</message>
@@ -1534,17 +1579,17 @@ Export canceled.</source>
<context>
<name>self._eip_status</name>
<message>
- <location filename="../src/leap/bitmask/services/eip/conductor.py" line="196"/>
+ <location filename="../src/leap/bitmask/services/eip/conductor.py" line="202"/>
<source>{0} is restarting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/services/eip/conductor.py" line="307"/>
+ <location filename="../src/leap/bitmask/services/eip/conductor.py" line="313"/>
<source>{0} could not be launched because you did not authenticate properly.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/leap/bitmask/services/eip/conductor.py" line="321"/>
+ <location filename="../src/leap/bitmask/services/eip/conductor.py" line="327"/>
<source>{0} finished in an unexpected manner!</source>
<translation type="unfinished"></translation>
</message>
diff --git a/pkg/linux/bitmask-root b/pkg/linux/bitmask-root
index ba262a2c..ee195e3b 100755
--- a/pkg/linux/bitmask-root
+++ b/pkg/linux/bitmask-root
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python2.7
# -*- coding: utf-8 -*-
#
# Copyright (C) 2014 LEAP
@@ -51,7 +51,7 @@ cmdcheck = subprocess.check_output
# CONSTANTS
#
-VERSION = "2"
+VERSION = "3"
SCRIPT = "bitmask-root"
NAMESERVER = "10.42.0.1"
BITMASK_CHAIN = "bitmask"
diff --git a/pkg/requirements-dev.pip b/pkg/requirements-dev.pip
index 8b5a8d85..799376d2 100644
--- a/pkg/requirements-dev.pip
+++ b/pkg/requirements-dev.pip
@@ -10,8 +10,12 @@
# NOTE: you have to run pip install -r pkg/requirements.pip for pip
# to install it. (do it after python setup.py develop and it
# will only install this)
-
+#
+wheel
sphinx
+ipdb
--e git+https://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common
--e git+https://github.com/leapcode/soledad.git@develop#egg=leap.soledad
+# in case you want to install a package from a git source, you can use this:
+# Useful to test pre-release branches together.
+#-e git+https://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common
+#-e git+https://github.com/leapcode/soledad.git@develop#egg=leap.soledad
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index bf05aa28..9f49bf03 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -9,7 +9,10 @@ argparse
requests>=1.1.0
srp>=1.0.2
pyopenssl
-python-dateutil
+
+# This won't be needed after we refactor leap.common.events
+# to use zmq.
+python-dateutil==1.4 # See https://leap.se/code/issues/6099
psutil
@@ -19,6 +22,8 @@ python-daemon # this should not be needed for Windows.
keyring
zope.proxy
+# You will want to install this bundled if you don't have sodium in your system:
+# pip install pyzmq --install-option="--zmq=bundled"
pyzmq
leap.common>=0.3.7
diff --git a/pkg/tuf/release.py b/pkg/tuf/release.py
index c4abcd0d..0e1c989c 100755
--- a/pkg/tuf/release.py
+++ b/pkg/tuf/release.py
@@ -29,7 +29,6 @@ import sys
from tuf.repository_tool import load_repository
from tuf.repository_tool import import_rsa_privatekey_from_file
-from tuf.repository_tool import import_rsa_publickey_from_file
"""
Days until the expiration of targets.json and snapshot.json. After this ammount
@@ -102,6 +101,8 @@ class Targets(object):
recursive_walk=True,
followlinks=True)
+ self._remove_obsolete_targets(target_list)
+
for target in target_list:
octal_file_permissions = oct(os.stat(target).st_mode)[3:]
custom_file_permissions = {
@@ -109,6 +110,26 @@ class Targets(object):
}
self._repo.targets.add_target(target, custom_file_permissions)
+ def _remove_obsolete_targets(self, target_list):
+ """
+ Remove obsolete targets from TUF targets
+
+ :param target_list: list of targets on full path comming from TUF
+ get_filepaths_in_directory
+ :type target_list: list(str)
+ """
+ targets_path = os.path.join(self._repo_path, 'targets')
+ relative_path_list = map(lambda t: t.split("/targets")[1], target_list)
+ removed_targets = (set(self._repo.targets.target_files.keys())
+ - set(relative_path_list))
+
+ for target in removed_targets:
+ target_rel_path = target
+ if target[0] == '/':
+ target_rel_path = target[1:]
+ target_path = os.path.join(targets_path, target_rel_path)
+ self._repo.targets.remove_target(target_path)
+
if __name__ == "__main__":
main()
diff --git a/relnotes.txt b/relnotes.txt
index f2d28413..02e53ee6 100644
--- a/relnotes.txt
+++ b/relnotes.txt
@@ -1,8 +1,8 @@
-ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.6.1
+ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.7.0
The LEAP team is pleased to announce the immediate availability of
version 0.6.1 of Bitmask, the Internet Encryption Toolkit, codename
-"knock knock knocking on beta's door".
+"one time download, all time updates".
https://downloads.leap.se/client/
@@ -34,16 +34,14 @@ NOT trust your life to it.
WHAT CAN THIS VERSION OF BITMASK DO FOR ME?
-Bitmask 0.6.1 is the new stable version of the client after the big
-refactor, with a little face lift of the UI while we were at
-it. Encrypted Email is still not stable though, so don't use it for
-high security. Encrypted Internet is the first service we are calling
-stable, although its security level is just a bit higher than plain
-OpenVPN, so use accordingly. You can refer to the CHANGELOG for the
-meat.
+Bitmask 0.7.0 brings with tremendous joy automatic and secure updates
+through The Update Framework. Right beside TUF there are some bug
+fixes and a new settings panel.
-Encrypted Internet on Linux now avoids leaking traffic outside of
-the secure connection it establishes. This will be added to other
+You can read more about TUF in http://theupdateframework.com/
+
+Encrypted Internet on Linux avoids leaking traffic outside of the
+secure connection it establishes. This will be added to other
platforms in the future.
The Encrypted Mail services will run local SMTP and IMAP proxies that,
@@ -90,7 +88,7 @@ You can send the bugs our way by pointing your telnet session to port
our intensive bug-reeducation program.
-LINUX ONLY: If you ever run into the situation where you cannot
+LINUX ONLY: If you ever run into the situation where you cannot
access internet, open the terminal and run the following command:
$ pkexec /usr/local/sbin/bitmask-root firewall stop
@@ -109,6 +107,6 @@ beyond any border.
The LEAP team,
-August 15, 2014
+Setptember 26, 2014
Somewhere in the middle of the intertubes.
EOF
diff --git a/src/leap/bitmask/gui/account.py b/src/leap/bitmask/gui/account.py
new file mode 100644
index 00000000..c941c3fa
--- /dev/null
+++ b/src/leap/bitmask/gui/account.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+"""
+A frontend GUI object to hold the current username and domain.
+"""
+
+from leap.bitmask.util import make_address
+from leap.bitmask.config.leapsettings import LeapSettings
+from leap.bitmask.services import EIP_SERVICE, MX_SERVICE
+
+
+class Account():
+
+ def __init__(self, username, domain):
+ self._settings = LeapSettings()
+ self.username = username
+ self.domain = domain
+
+ if self.username is not None:
+ self.address = make_address(self.username, self.domain)
+ else:
+ self.address = self.domain
+
+ def services(self):
+ """
+ returns a list of service name strings
+
+ TODO: this should depend not just on the domain
+ """
+ return self._settings.get_enabled_services(self.domain)
+
+ def is_email_enabled(self):
+ MX_SERVICE in self.services()
+
+ def is_eip_enabled(self):
+ EIP_SERVICE in self.services()
diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py
new file mode 100644
index 00000000..eb1a58d5
--- /dev/null
+++ b/src/leap/bitmask/gui/app.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+"""
+A single App instances holds the signals that are shared among different
+frontend UI components. The App also keeps a reference to the backend object
+and the signaler get signals from the backend.
+"""
+import logging
+
+from functools import partial
+from PySide import QtCore, QtGui
+
+from leap.bitmask.config.leapsettings import LeapSettings
+from leap.bitmask.backend.backend_proxy import BackendProxy
+from leap.bitmask.backend.leapsignaler import LeapSignaler
+
+logger = logging.getLogger(__name__)
+
+
+class App(QtGui.QWidget):
+
+ # the user has changed which services are enabled for a particular account
+ # args: account (Account), active services (list of str)
+ service_selection_changed = QtCore.Signal(object, list)
+
+ def __init__(self):
+ QtGui.QWidget.__init__(self)
+
+ self.settings = LeapSettings()
+ self.backend = BackendProxy()
+ self.signaler = LeapSignaler()
+ self.signaler.start()
+
+ # periodically check if the backend is alive
+ self._backend_checker = QtCore.QTimer(self)
+ self._backend_checker.timeout.connect(self._check_backend_status)
+ self._backend_checker.start(2000)
+
+ @QtCore.Slot()
+ def _check_backend_status(self):
+ """
+ TRIGGERS:
+ self._backend_checker.timeout
+
+ Check that the backend is running. Otherwise show an error to the user.
+ """
+ if not self.backend.online:
+ logger.critical("Backend is not online.")
+ QtGui.QMessageBox.critical(
+ self, self.tr("Application error"),
+ self.tr("There is a problem contacting the backend, please "
+ "restart Bitmask."))
+ self._backend_checker.stop()
diff --git a/src/leap/bitmask/gui/flashable.py b/src/leap/bitmask/gui/flashable.py
new file mode 100644
index 00000000..a26d1ec6
--- /dev/null
+++ b/src/leap/bitmask/gui/flashable.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+class Flashable(object):
+
+ """
+ An abstract super class to give a QWidget handy methods for diplaying
+ alert messages inline. The widget inheriting from this class must have
+ label named 'flash_label' available at self.ui.flash_label, or pass
+ the QLabel object in the constructor.
+ """
+
+ def __init__(self, widget=None):
+ self._setup(widget)
+
+ def _setup(self, widget=None):
+ if not hasattr(self, 'widget'):
+ if widget:
+ self.widget = widget
+ else:
+ self.widget = self.ui.flash_label
+ self.widget.setVisible(False)
+
+ def flash_error(self, message):
+ """
+ Sets string for the flash message.
+
+ :param message: the text to be displayed
+ :type message: str
+ """
+ self._setup()
+ message = "<font color='red'><b>%s</b></font>" % (message,)
+ self.widget.setVisible(True)
+ self.widget.setText(message)
+
+ def flash_success(self, message):
+ """
+ Sets string for the flash message.
+
+ :param message: the text to be displayed
+ :type message: str
+ """
+ self._setup()
+ message = "<font color='green'><b>%s</b></font>" % (message,)
+ self.widget.setVisible(True)
+ self.widget.setText(message)
+
+ def flash_message(self, message):
+ """
+ Sets string for the flash message.
+
+ :param message: the text to be displayed
+ :type message: str
+ """
+ self._setup()
+ message = "<b>%s</b>" % (message,)
+ self.widget.setVisible(True)
+ self.widget.setText(message)
+
+ def hide_flash(self):
+ self._setup()
+ self.widget.setVisible(False)
diff --git a/src/leap/bitmask/gui/mail_status.py b/src/leap/bitmask/gui/mail_status.py
index d523f449..92e1e4c4 100644
--- a/src/leap/bitmask/gui/mail_status.py
+++ b/src/leap/bitmask/gui/mail_status.py
@@ -228,7 +228,7 @@ class MailStatusWidget(QtGui.QWidget):
self._service_name))
elif ready == 1:
icon = self.CONNECTING_ICON
- self._mx_status = self.tr('Starting…')
+ self._mx_status = self.tr('Starting...')
tray_status = self.tr('Mail is starting')
elif ready >= 2:
icon = self.CONNECTED_ICON
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 4e11c979..cc4ede09 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -37,7 +37,6 @@ from leap.bitmask.config import flags
from leap.bitmask.config.leapsettings import LeapSettings
from leap.bitmask.gui.advanced_key_management import AdvancedKeyManagement
-from leap.bitmask.gui.eip_preferenceswindow import EIPPreferencesWindow
from leap.bitmask.gui.eip_status import EIPStatusWidget
from leap.bitmask.gui.loggerwindow import LoggerWindow
from leap.bitmask.gui.login import LoginWidget
@@ -46,6 +45,8 @@ from leap.bitmask.gui.preferenceswindow import PreferencesWindow
from leap.bitmask.gui.systray import SysTray
from leap.bitmask.gui.wizard import Wizard
from leap.bitmask.gui.providers import Providers
+from leap.bitmask.gui.account import Account
+from leap.bitmask.gui.app import App
from leap.bitmask.platform_init import IS_WIN, IS_MAC, IS_LINUX
from leap.bitmask.platform_init import locks
@@ -124,19 +125,10 @@ class MainWindow(QtGui.QMainWindow):
self.ui.setupUi(self)
self.menuBar().setNativeMenuBar(not IS_LINUX)
- self._backend = BackendProxy()
-
- # periodically check if the backend is alive
- self._backend_checker = QtCore.QTimer(self)
- self._backend_checker.timeout.connect(self._check_backend_status)
- self._backend_checker.start(2000)
-
- self._leap_signaler = LeapSignaler()
- self._leap_signaler.start()
-
- self._settings = LeapSettings()
- # gateway = self._settings.get_selected_gateway(provider)
- # self._backend.settings_set_selected_gateway(provider, gateway)
+ self.app = App()
+ self._backend = self.app.backend
+ self._leap_signaler = self.app.signaler
+ self._settings = self.app.settings
# Login Widget
self._login_widget = LoginWidget(self._settings, self)
@@ -152,6 +144,7 @@ class MainWindow(QtGui.QMainWindow):
# Qt Signal Connections #####################################
# TODO separate logic from ui signals.
+ self.app.service_selection_changed.connect(self._update_eip_enabled_status)
self._login_widget.login.connect(self._login)
self._login_widget.cancel_login.connect(self._cancel_login)
self._login_widget.logout.connect(self._logout)
@@ -213,8 +206,6 @@ class MainWindow(QtGui.QMainWindow):
self._backend_connect()
self.ui.action_preferences.triggered.connect(self._show_preferences)
- self.ui.action_eip_preferences.triggered.connect(
- self._show_eip_preferences)
self.ui.action_about_leap.triggered.connect(self._about)
self.ui.action_quit.triggered.connect(self.quit)
self.ui.action_wizard.triggered.connect(self._launch_wizard)
@@ -224,8 +215,9 @@ class MainWindow(QtGui.QMainWindow):
self.ui.action_create_new_account.triggered.connect(
self._on_provider_changed)
- self.ui.action_advanced_key_management.triggered.connect(
- self._show_AKM)
+ # Action item hidden since we don't provide stable mail yet.
+ # self.ui.action_advanced_key_management.triggered.connect(
+ # self._show_AKM)
if IS_MAC:
self.ui.menuFile.menuAction().setText(self.tr("File"))
@@ -244,10 +236,6 @@ class MainWindow(QtGui.QMainWindow):
self._action_visible = QtGui.QAction(self.tr("Show Main Window"), self)
self._action_visible.triggered.connect(self._ensure_visible)
- # disable buttons for now, may come back later.
- # self.ui.btnPreferences.clicked.connect(self._show_preferences)
- # self.ui.btnEIPPreferences.clicked.connect(self._show_eip_preferences)
-
self._enabled_services = []
self._ui_mx_visible = True
self._ui_eip_visible = True
@@ -342,23 +330,6 @@ class MainWindow(QtGui.QMainWindow):
logger.error("Bad call to the backend:")
logger.error(data)
- @QtCore.Slot()
- def _check_backend_status(self):
- """
- TRIGGERS:
- self._backend_checker.timeout
-
- Check that the backend is running. Otherwise show an error to the user.
- """
- online = self._backend.online
- if not online:
- logger.critical("Backend is not online.")
- QtGui.QMessageBox.critical(
- self, self.tr("Application error"),
- self.tr("There is a problem contacting the backend, please "
- "restart Bitmask."))
- self._backend_checker.stop()
-
def _backend_connect(self, only_tracked=False):
"""
Connect to backend signals.
@@ -598,24 +569,16 @@ class MainWindow(QtGui.QMainWindow):
Display the preferences window.
"""
- user = self._logged_user
- domain = self._providers.get_selected_provider()
- mx_provided = False
- if self._provider_details is not None:
- mx_provided = MX_SERVICE in self._provider_details['services']
- preferences = PreferencesWindow(self, user, domain, self._backend,
- self._soledad_started, mx_provided,
- self._leap_signaler)
+ account = Account(self._logged_user,
+ self._providers.get_selected_provider())
+ pref_win = PreferencesWindow(self, account, self.app)
+ pref_win.show()
- self.soledad_ready.connect(preferences.set_soledad_ready)
- preferences.show()
- preferences.preferences_saved.connect(self._update_eip_enabled_status)
-
- @QtCore.Slot()
- def _update_eip_enabled_status(self):
+ @QtCore.Slot(object, list)
+ def _update_eip_enabled_status(self, account=None, services=None):
"""
TRIGGER:
- PreferencesWindow.preferences_saved
+ App.service_selection_changed
Enable or disable the EIP start/stop actions and stop EIP if the user
disabled that service.
@@ -623,24 +586,35 @@ class MainWindow(QtGui.QMainWindow):
:returns: if the eip actions were enabled or disabled
:rtype: bool
"""
- settings = self._settings
- default_provider = settings.get_defaultprovider()
+ if account is not None:
+ domain = account.domain
+ else:
+ # I am not sure why, but asking for the currently selected
+ # provider here give you the WRONG provider
+ domain = self.app.settings.get_defaultprovider()
- if default_provider is None:
+ if domain is None:
logger.warning("Trying to update eip enabled status but there's no"
" default provider. Disabling EIP for the time"
" being...")
self._backend_cannot_start_eip()
return
- self._trying_to_start_eip = settings.get_autostart_eip()
- self._backend.eip_can_start(domain=default_provider)
+ if not EIP_SERVICE in self.app.settings.get_enabled_services(domain):
+ self._eip_conductor.terminate()
+ def hide():
+ self.app.backend.eip_can_start(domain=domain)
+ QtDelayedCall(100, hide)
+ # ^^ VERY VERY Hacky, but with the simple state machine,
+ # there is no way to signal 'disconnect and then disable'
+
+ else:
+ self._trying_to_start_eip = self.app.settings.get_autostart_eip()
+ if not self._trying_to_start_eip:
+ self._backend.eip_setup(provider=domain, skip_network=True)
+ # check if EIP can start (will trigger widget update)
+ self.app.backend.eip_can_start(domain=domain)
- # If we don't want to start eip, we leave everything
- # initialized to quickly start it
- if not self._trying_to_start_eip:
- self._backend.eip_setup(provider=default_provider,
- skip_network=True)
def _backend_can_start_eip(self):
"""
@@ -660,7 +634,6 @@ class MainWindow(QtGui.QMainWindow):
enabled_services = []
if default_provider is not None:
enabled_services = settings.get_enabled_services(default_provider)
-
eip_enabled = False
if EIP_SERVICE in enabled_services:
eip_enabled = True
@@ -717,20 +690,6 @@ class MainWindow(QtGui.QMainWindow):
"""
self._eip_status.missing_helpers = True
- @QtCore.Slot()
- def _show_eip_preferences(self):
- """
- TRIGGERS:
- self.ui.btnEIPPreferences.clicked
- self.ui.action_eip_preferences (disabled for now)
-
- Display the EIP preferences window.
- """
- domain = self._providers.get_selected_provider()
- pref = EIPPreferencesWindow(self, domain,
- self._backend, self._leap_signaler)
- pref.show()
-
#
# updates
#
diff --git a/src/leap/bitmask/gui/passwordwindow.py b/src/leap/bitmask/gui/passwordwindow.py
new file mode 100644
index 00000000..f7ef079e
--- /dev/null
+++ b/src/leap/bitmask/gui/passwordwindow.py
@@ -0,0 +1,273 @@
+# -*- coding: utf-8 -*-
+# passwordwindow.py
+# Copyright (C) 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Change password dialog window
+"""
+
+from PySide import QtCore, QtGui
+from leap.bitmask.util.credentials import password_checks
+
+from leap.bitmask.gui.ui_password_change import Ui_PasswordChange
+from leap.bitmask.gui.flashable import Flashable
+
+import logging
+logger = logging.getLogger(__name__)
+
+
+class PasswordWindow(QtGui.QDialog, Flashable):
+
+ _current_window = None # currently visible password window
+
+ def __init__(self, parent, account, app):
+ """
+ :param parent: parent object of the PreferencesWindow.
+ :parent type: QWidget
+
+ :param account: the user set in the login widget
+ :type account: Account
+
+ :param app: App instance
+ :type app: App
+ """
+ QtGui.QDialog.__init__(self, parent)
+
+ self.account = account
+ self.app = app
+ self._backend_connect()
+
+ self.ui = Ui_PasswordChange()
+ self.ui.setupUi(self)
+
+ self.hide_flash()
+ self.ui.ok_button.clicked.connect(self._change_password)
+ self.ui.cancel_button.clicked.connect(self.close)
+ self.ui.username_lineedit.setText(account.address)
+
+ if PasswordWindow._current_window is not None:
+ PasswordWindow._current_window.close()
+ PasswordWindow._current_window = self
+
+ self._disabled = False # if set to True, never again enable widgets.
+
+ if account.username is None:
+ # should not ever happen, but just in case
+ self._disabled = True
+ self._enable_password_widgets(False)
+ self.ui.cancel_button.setEnabled(True)
+ self.flash_error(self.tr("Please log in to change your password."))
+
+ if self.is_soledad_needed() and not self._soledad_ready:
+ self._enable_password_widgets(False)
+ self.ui.cancel_button.setEnabled(True)
+ self.flash_message(
+ self.tr("Please wait for data storage to be ready."))
+
+ def is_soledad_needed(self):
+ """
+ Returns true if the current account needs to change the soledad
+ password as well as the SRP password.
+ """
+ return self.account.is_email_enabled()
+
+ #
+ # MANAGE WIDGETS
+ #
+
+ def _enable_password_widgets(self, enabled):
+ """
+ Enables or disables the widgets in the password change group box.
+
+ :param enabled: True if the widgets should be enabled.
+ False if widgets should be disabled and
+ display the status label that shows that is
+ changing the password.
+ :type enabled: bool
+ """
+ if self._disabled:
+ return
+
+ if enabled:
+ self.hide_flash()
+ else:
+ self.flash_message(self.tr("Changing password..."))
+
+ self.ui.current_password_lineedit.setEnabled(enabled)
+ self.ui.new_password_lineedit.setEnabled(enabled)
+ self.ui.new_password_confirmation_lineedit.setEnabled(enabled)
+ self.ui.ok_button.setEnabled(enabled)
+ self.ui.cancel_button.setEnabled(enabled)
+
+ def _change_password_success(self):
+ """
+ Callback used to display a successfully changed password.
+ """
+ logger.debug("Password changed successfully.")
+ self._clear_password_inputs()
+ self._enable_password_widgets(True)
+ self.flash_success(self.tr("Password changed successfully."))
+
+ def _clear_password_inputs(self):
+ """
+ Clear the contents of the inputs.
+ """
+ self.ui.current_password_lineedit.setText("")
+ self.ui.new_password_lineedit.setText("")
+ self.ui.new_password_confirmation_lineedit.setText("")
+
+ #
+ # SLOTS
+ #
+
+ def _backend_connect(self):
+ """
+ Helper to connect to backend signals
+ """
+ sig = self.app.signaler
+ sig.srp_password_change_ok.connect(self._srp_change_password_ok)
+ sig.srp_password_change_error.connect(self._srp_password_change_error)
+ sig.srp_password_change_badpw.connect(self._srp_password_change_badpw)
+ sig.soledad_password_change_ok.connect(
+ self._soledad_change_password_ok)
+ sig.soledad_password_change_error.connect(
+ self._soledad_change_password_problem)
+
+ self._soledad_ready = False
+ sig.soledad_bootstrap_finished.connect(self._on_soledad_ready)
+
+ @QtCore.Slot()
+ def _change_password(self):
+ """
+ TRIGGERS:
+ self.ui.buttonBox.accepted
+
+ Changes the user's password if the inputboxes are correctly filled.
+ """
+ current_password = self.ui.current_password_lineedit.text()
+ new_password = self.ui.new_password_lineedit.text()
+ new_password2 = self.ui.new_password_confirmation_lineedit.text()
+
+ self._enable_password_widgets(True)
+
+ if len(current_password) == 0:
+ self.flash_error(self.tr("Password is empty."))
+ self.ui.current_password_lineedit.setFocus()
+ return
+
+ ok, msg, field = password_checks(self.account.username, new_password,
+ new_password2)
+ if not ok:
+ self.flash_error(msg)
+ if field == 'new_password':
+ self.ui.new_password_lineedit.setFocus()
+ elif field == 'new_password_confirmation':
+ self.ui.new_password_confirmation_lineedit.setFocus()
+ return
+
+ self._enable_password_widgets(False)
+ self.app.backend.user_change_password(
+ current_password=current_password,
+ new_password=new_password)
+
+ def closeEvent(self, event=None):
+ """
+ TRIGGERS:
+ cancel_button (indirectly via self.close())
+ or when window is closed
+
+ Close this dialog & delete ourselves to clean up signals.
+ """
+ PasswordWindow._current_window = None
+ self.deleteLater()
+
+ @QtCore.Slot()
+ def _srp_change_password_ok(self):
+ """
+ TRIGGERS:
+ self._backend.signaler.srp_password_change_ok
+
+ Callback used to display a successfully changed password.
+ """
+ new_password = self.ui.new_password_lineedit.text()
+ logger.debug("SRP password changed successfully.")
+
+ if self.is_soledad_needed():
+ self._backend.soledad_change_password(new_password=new_password)
+ else:
+ self._change_password_success()
+
+ @QtCore.Slot()
+ def _srp_password_change_error(self):
+ """
+ TRIGGERS:
+ self._backend.signaler.srp_password_change_error
+
+ Unknown problem changing password
+ """
+ msg = self.tr("There was a problem changing the password.")
+ logger.error(msg)
+ self._enable_password_widgets(True)
+ self.flash_error(msg)
+
+ @QtCore.Slot()
+ def _srp_password_change_badpw(self):
+ """
+ TRIGGERS:
+ self._backend.signaler.srp_password_change_badpw
+
+ The password the user entered was wrong.
+ """
+ msg = self.tr("You did not enter a correct current password.")
+ logger.error(msg)
+ self._enable_password_widgets(True)
+ self.flash_error(msg)
+ self.ui.current_password_lineedit.setFocus()
+
+ @QtCore.Slot()
+ def _soledad_change_password_ok(self):
+ """
+ TRIGGERS:
+ Signaler.soledad_password_change_ok
+
+ Soledad password change went OK.
+ """
+ logger.debug("Soledad password changed successfully.")
+ self._change_password_success()
+
+ @QtCore.Slot(unicode)
+ def _soledad_change_password_problem(self, msg):
+ """
+ TRIGGERS:
+ Signaler.soledad_password_change_error
+
+ Callback used to display an error on changing password.
+
+ :param msg: the message to show to the user.
+ :type msg: unicode
+ """
+ logger.error("Error changing soledad password: %s" % (msg,))
+ self._enable_password_widgets(True)
+ self.flash_error(msg)
+
+ @QtCore.Slot()
+ def _on_soledad_ready(self):
+ """
+ TRIGGERS:
+ Signaler.soledad_bootstrap_finished
+ """
+ self._enable_password_widgets(True)
+ self._soledad_ready = True
diff --git a/src/leap/bitmask/gui/preferences_account_page.py b/src/leap/bitmask/gui/preferences_account_page.py
new file mode 100644
index 00000000..ec6a7716
--- /dev/null
+++ b/src/leap/bitmask/gui/preferences_account_page.py
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+"""
+Widget for "account" preferences
+"""
+import logging
+
+from functools import partial
+
+from PySide import QtCore, QtGui
+from leap.bitmask.gui.ui_preferences_account_page import Ui_PreferencesAccountPage
+from leap.bitmask.gui.passwordwindow import PasswordWindow
+from leap.bitmask.services import get_service_display_name
+
+logger = logging.getLogger(__name__)
+
+
+class PreferencesAccountPage(QtGui.QWidget):
+
+ def __init__(self, parent, account, app):
+ """
+ :param parent: parent object of the PreferencesWindow.
+ :parent type: QWidget
+
+ :param account: user account (user + provider or just provider)
+ :type account: Account
+
+ :param app: the current App object
+ :type app: App
+ """
+ QtGui.QWidget.__init__(self, parent)
+ self.ui = Ui_PreferencesAccountPage()
+ self.ui.setupUi(self)
+
+ self.account = account
+ self.app = app
+
+ self._selected_services = set()
+ self.ui.change_password_label.setVisible(False)
+ self.ui.provider_services_label.setVisible(False)
+
+ self.ui.change_password_button.clicked.connect(
+ self._show_change_password)
+ app.signaler.prov_get_supported_services.connect(self._load_services)
+ app.backend.provider_get_supported_services(domain=account.domain)
+
+ if account.username is None:
+ self.ui.change_password_label.setText(
+ self.tr('You must be logged in to change your password.'))
+ self.ui.change_password_label.setVisible(True)
+ self.ui.change_password_button.setEnabled(False)
+
+ @QtCore.Slot(str, int)
+ def _service_selection_changed(self, service, state):
+ """
+ TRIGGERS:
+ service_checkbox.stateChanged
+
+ Adds the service to the state if the state is checked, removes
+ it otherwise
+
+ :param service: service to handle
+ :type service: str
+ :param state: state of the checkbox
+ :type state: int
+ """
+ if state == QtCore.Qt.Checked:
+ self._selected_services = \
+ self._selected_services.union(set([service]))
+ else:
+ self._selected_services = \
+ self._selected_services.difference(set([service]))
+ services = list(self._selected_services)
+
+ # We hide the maybe-visible status label after a change
+ self.ui.provider_services_label.setVisible(False)
+
+ # write to config
+ self.app.settings.set_enabled_services(self.account.domain, services)
+
+ # emit signal alerting change
+ self.app.service_selection_changed.emit(self.account, services)
+
+ @QtCore.Slot(str)
+ def _load_services(self, services):
+ """
+ TRIGGERS:
+ prov_get_supported_services
+
+ Loads the services that the provider provides into the UI for
+ the user to enable or disable.
+
+ :param services: list of supported service names
+ :type services: list of str
+ """
+ services_conf = self.account.services()
+
+ self._selected_services = set()
+
+ # Remove existing checkboxes
+ # (the new widget is deleted when its parent is deleted.
+ # We need to loop backwards because removing things from the
+ # beginning shifts items and changes the order of items in the layout.
+ # Using `QObject.deleteLater` doesn't seem to work.)
+ layout = self.ui.provider_services_layout
+ for i in reversed(range(layout.count())):
+ layout.itemAt(i).widget().setParent(None)
+
+ # add one checkbox per service and set the current value
+ # from what is saved in settings.
+ for service in services:
+ try:
+ checkbox = QtGui.QCheckBox(
+ get_service_display_name(service), self)
+ self.ui.provider_services_layout.addWidget(checkbox)
+ checkbox.stateChanged.connect(
+ partial(self._service_selection_changed, service))
+ checkbox.setChecked(service in services_conf)
+ except ValueError:
+ logger.error("Something went wrong while trying to "
+ "load service %s" % (service,))
+
+ @QtCore.Slot()
+ def _show_change_password(self):
+ change_password_window = PasswordWindow(self, self.account, self.app)
+ change_password_window.show()
diff --git a/src/leap/bitmask/gui/preferences_email_page.py b/src/leap/bitmask/gui/preferences_email_page.py
new file mode 100644
index 00000000..80e8d93e
--- /dev/null
+++ b/src/leap/bitmask/gui/preferences_email_page.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+"""
+Widget for "email" preferences
+"""
+import logging
+
+from PySide import QtCore, QtGui
+from leap.bitmask.gui.ui_preferences_email_page import Ui_PreferencesEmailPage
+
+logger = logging.getLogger(__name__)
+
+
+class PreferencesEmailPage(QtGui.QWidget):
+
+ def __init__(self, parent, account, app):
+ QtGui.QWidget.__init__(self, parent)
+ self.ui = Ui_PreferencesEmailPage()
+ self.ui.setupUi(self)
+
+ self.account = account
+ self.app = app
diff --git a/src/leap/bitmask/gui/preferences_vpn_page.py b/src/leap/bitmask/gui/preferences_vpn_page.py
new file mode 100644
index 00000000..901116b4
--- /dev/null
+++ b/src/leap/bitmask/gui/preferences_vpn_page.py
@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+"""
+Widget for "vpn" preferences
+"""
+
+from PySide import QtCore, QtGui
+from leap.bitmask.gui.ui_preferences_vpn_page import Ui_PreferencesVpnPage
+
+from leap.bitmask.config.leapsettings import LeapSettings
+from leap.bitmask.gui.flashable import Flashable
+
+
+class PreferencesVpnPage(QtGui.QWidget, Flashable):
+
+ """
+ Page in the preferences window that shows VPN settings
+ """
+
+ def __init__(self, parent, account, app):
+ """
+ :param parent: parent object of the EIPPreferencesWindow.
+ :type parent: QWidget
+
+ :param account: the currently active account
+ :type account: Account
+
+ :param app: shared App instance
+ :type app: App
+ """
+ QtGui.QWidget.__init__(self, parent)
+ self.AUTOMATIC_GATEWAY_LABEL = self.tr("Automatic")
+
+ self.account = account
+ self.app = app
+
+ # Load UI
+ self.ui = Ui_PreferencesVpnPage()
+ self.ui.setupUi(self)
+ self.ui.flash_label.setVisible(False)
+ self.hide_flash()
+
+ # Connections
+ self.ui.gateways_list.clicked.connect(self._save_selected_gateway)
+ sig = self.app.signaler
+ sig.eip_get_gateways_list.connect(self._update_gateways_list)
+ sig.eip_get_gateways_list_error.connect(self._gateways_list_error)
+ sig.eip_uninitialized_provider.connect(
+ self._gateways_list_uninitialized)
+
+ # Trigger update
+ self.app.backend.eip_get_gateways_list(domain=self.account.domain)
+
+ @QtCore.Slot(str)
+ def _save_selected_gateway(self, index):
+ """
+ TRIGGERS:
+ self.ui.gateways_list.clicked
+
+ Saves the new gateway setting to the configuration file.
+
+ :param index: the current index of the selection.
+ :type current_item: QModelIndex
+ """
+ item = self.ui.gateways_list.currentItem()
+
+ if item.text() == self.AUTOMATIC_GATEWAY_LABEL:
+ gateway = self.app.settings.GATEWAY_AUTOMATIC
+ else:
+ gateway = item.data(QtCore.Qt.UserRole)
+ self.app.settings.set_selected_gateway(self.account.domain, gateway)
+ self.app.backend.settings_set_selected_gateway(
+ provider=self.account.domain,
+ gateway=gateway)
+
+ @QtCore.Slot(list)
+ def _update_gateways_list(self, gateways):
+ """
+ TRIGGERS:
+ Signaler.eip_get_gateways_list
+
+ :param gateways: a list of gateways
+ :type gateways: list of unicode
+
+ Add the available gateways and select the one stored in
+ configuration file.
+ """
+ self.ui.gateways_list.clear()
+ self.ui.gateways_list.addItem(self.AUTOMATIC_GATEWAY_LABEL)
+
+ selected_gateway = self.app.settings.get_selected_gateway(
+ self.account.domain)
+
+ index = 0
+ for idx, (gw_name, gw_ip, gw_country) in enumerate(gateways):
+ gateway_text = "{0} ({1})".format(gw_name, gw_ip)
+ item = QtGui.QListWidgetItem(self.ui.gateways_list)
+ item.setText(gateway_text)
+ item.setIcon(QtGui.QIcon(
+ ":/images/countries/%s.png" % (gw_country.lower(),)))
+ item.setData(QtCore.Qt.UserRole, gw_ip)
+ if gw_ip == selected_gateway:
+ index = idx + 1
+ self.ui.gateways_list.setCurrentRow(index)
+
+ @QtCore.Slot()
+ def _gateways_list_error(self):
+ """
+ TRIGGERS:
+ Signaler.eip_get_gateways_list_error
+
+ An error has occurred retrieving the gateway list
+ so we inform the user.
+ """
+ self.flash_error(
+ self.tr("Error loading configuration file."))
+ self.ui.gateways_list.setEnabled(False)
+
+ @QtCore.Slot()
+ def _gateways_list_uninitialized(self):
+ """
+ TRIGGERS:
+ Signaler.eip_uninitialized_provider
+
+ The requested provider in not initialized yet, so we give the user an
+ error msg.
+ """
+ self.flash_error(
+ self.tr("This is an uninitialized provider, please log in first."))
+ self.ui.gateways_list.setEnabled(False)
diff --git a/src/leap/bitmask/gui/preferenceswindow.py b/src/leap/bitmask/gui/preferenceswindow.py
index 3c9cd5d0..f1252301 100644
--- a/src/leap/bitmask/gui/preferenceswindow.py
+++ b/src/leap/bitmask/gui/preferenceswindow.py
@@ -20,428 +20,167 @@ Preferences window
"""
import logging
-from functools import partial
-
from PySide import QtCore, QtGui
-from leap.bitmask.config.leapsettings import LeapSettings
+from leap.bitmask.services import EIP_SERVICE, MX_SERVICE
+
from leap.bitmask.gui.ui_preferences import Ui_Preferences
-from leap.bitmask.util.credentials import password_checks
-from leap.bitmask.services import get_service_display_name, MX_SERVICE
+from leap.bitmask.gui.preferences_account_page import PreferencesAccountPage
+from leap.bitmask.gui.preferences_vpn_page import PreferencesVpnPage
+from leap.bitmask.gui.preferences_email_page import PreferencesEmailPage
logger = logging.getLogger(__name__)
class PreferencesWindow(QtGui.QDialog):
+
"""
Window that displays the preferences.
"""
- preferences_saved = QtCore.Signal()
- def __init__(self, parent, username, domain, backend, soledad_started, mx,
- leap_signaler):
+ _current_window = None # currently visible preferences window
+
+ def __init__(self, parent, account, app):
"""
:param parent: parent object of the PreferencesWindow.
:parent type: QWidget
- :param username: the user set in the login widget
- :type username: unicode
- :param domain: the selected domain in the login widget
- :type domain: unicode
- :param backend: Backend being used
- :type backend: Backend
- :param soledad_started: whether soledad has started or not
- :type soledad_started: bool
- :param mx: whether the current provider provides mx or not.
- :type mx: bool
+
+ :param account: the user or provider
+ :type account: Account
+
+ :param app: the current App object
+ :type app: App
"""
QtGui.QDialog.__init__(self, parent)
- self.AUTOMATIC_GATEWAY_LABEL = self.tr("Automatic")
-
- self._username = username
- self._domain = domain
- self._leap_signaler = leap_signaler
- self._backend = backend
- self._soledad_started = soledad_started
- self._mx_provided = mx
- self._settings = LeapSettings()
- self._backend_connect()
+ self.account = account
+ self.app = app
- # Load UI
self.ui = Ui_Preferences()
self.ui.setupUi(self)
- self.ui.lblPasswordChangeStatus.setVisible(False)
- self.ui.lblProvidersServicesStatus.setVisible(False)
- self._selected_services = set()
-
- # Connections
- self.ui.pbChangePassword.clicked.connect(self._change_password)
- self.ui.cbProvidersServices.currentIndexChanged[unicode].connect(
- self._populate_services)
-
- if not self._settings.get_configured_providers():
- self.ui.gbEnabledServices.setEnabled(False)
- else:
- self._add_configured_providers()
-
- if self._username is None:
- self._not_logged_in()
- else:
- self.ui.gbPasswordChange.setEnabled(True)
- if self._mx_provided:
- self._provides_mx()
-
- self._select_provider_by_name(domain)
-
- def _not_logged_in(self):
- """
- Actions to perform if the user is not logged in.
- """
- msg = self.tr(
- "In order to change your password you need to be logged in.")
- self._set_password_change_status(msg)
- self.ui.gbPasswordChange.setEnabled(False)
-
- def _provides_mx(self):
- """
- Actions to perform if the provider provides MX.
- """
- pw_enabled = True
- enabled_services = self._settings.get_enabled_services(self._domain)
- mx_name = get_service_display_name(MX_SERVICE)
-
- if MX_SERVICE not in enabled_services:
- msg = self.tr("You need to enable {0} in order to change "
- "the password.".format(mx_name))
- self._set_password_change_status(msg, error=True)
- pw_enabled = False
- else:
- # check if Soledad is bootstrapped
- if not self._soledad_started:
- msg = self.tr(
- "You need to wait until {0} is ready in "
- "order to change the password.".format(mx_name))
- self._set_password_change_status(msg)
- pw_enabled = False
-
- self.ui.gbPasswordChange.setEnabled(pw_enabled)
-
- @QtCore.Slot()
- def set_soledad_ready(self):
+ self.ui.close_button.clicked.connect(self.close)
+ self.ui.account_label.setText(account.address)
+
+ self.app.service_selection_changed.connect(self._update_icons)
+
+ self._add_icons()
+ self._add_pages()
+ self._update_icons(self.account, self.account.services())
+
+ # only allow a single preferences window at a time.
+ if PreferencesWindow._current_window is not None:
+ PreferencesWindow._current_window.close_window()
+ PreferencesWindow._current_window = self
+
+ def _add_icons(self):
+ """
+ Adds all the icons for the different configuration categories.
+ Icons are QListWidgetItems added to the nav_widget on the side
+ of the preferences window.
+
+ A note on sizing of QListWidgetItems
+ icon_width = list_widget.width - (2 x nav_widget.spacing) - 2
+ icon_height = 56 seems to look ok
+ """
+ account_item = QtGui.QListWidgetItem(self.ui.nav_widget)
+ account_item.setIcon(QtGui.QIcon(":/images/black/32/user.png"))
+ account_item.setText(self.tr("Account"))
+ account_item.setTextAlignment(
+ QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
+ account_item.setFlags(
+ QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+ account_item.setSizeHint(QtCore.QSize(98, 56))
+ self._account_item = account_item
+
+ vpn_item = QtGui.QListWidgetItem(self.ui.nav_widget)
+ vpn_item.setHidden(True)
+ vpn_item.setIcon(QtGui.QIcon(":/images/black/32/earth.png"))
+ vpn_item.setText(self.tr("VPN"))
+ vpn_item.setTextAlignment(
+ QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
+ vpn_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+ vpn_item.setSizeHint(QtCore.QSize(98, 56))
+ self._vpn_item = vpn_item
+
+ email_item = QtGui.QListWidgetItem(self.ui.nav_widget)
+ email_item.setHidden(True)
+ email_item.setIcon(QtGui.QIcon(":/images/black/32/email.png"))
+ email_item.setText(self.tr("Email"))
+ email_item.setTextAlignment(
+ QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
+ email_item.setFlags(
+ QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+ email_item.setSizeHint(QtCore.QSize(98, 56))
+ self._email_item = email_item
+
+ self.ui.nav_widget.currentItemChanged.connect(self._change_page)
+ self.ui.nav_widget.setCurrentRow(0)
+
+ def _add_pages(self):
+ """
+ Adds the pages for the different configuration categories.
+ """
+ self._account_page = PreferencesAccountPage(self, self.account, self.app)
+ self._vpn_page = PreferencesVpnPage(self, self.account, self.app)
+ self._email_page = PreferencesEmailPage(self, self.account, self.app)
+
+ self.ui.pages_widget.addWidget(self._account_page)
+ self.ui.pages_widget.addWidget(self._vpn_page)
+ self.ui.pages_widget.addWidget(self._email_page)
+
+ #
+ # Slots
+ #
+
+ def closeEvent(self, e):
"""
TRIGGERS:
- parent.soledad_ready
+ self.ui.close_button.clicked
+ (since self.close() will trigger closeEvent)
+ whenever the window is closed
- It notifies when the soledad object as ready to use.
+ Close this dialog and destroy it.
"""
- self.ui.lblPasswordChangeStatus.setVisible(False)
- self.ui.gbPasswordChange.setEnabled(True)
+ PreferencesWindow._current_window = None
- def _set_password_change_status(self, status, error=False, success=False):
- """
- Sets the status label for the password change.
-
- :param status: status message to display, can be HTML
- :type status: str
- """
- if error:
- status = "<font color='red'><b>%s</b></font>" % (status,)
- elif success:
- status = "<font color='green'><b>%s</b></font>" % (status,)
-
- if not self.ui.gbPasswordChange.isEnabled():
- status = "<font color='black'>%s</font>" % (status,)
-
- self.ui.lblPasswordChangeStatus.setVisible(True)
- self.ui.lblPasswordChangeStatus.setText(status)
-
- def _set_changing_password(self, disable):
- """
- Enables or disables the widgets in the password change group box.
-
- :param disable: True if the widgets should be disabled and
- it displays the status label that shows that is
- changing the password.
- False if they should be enabled.
- :type disable: bool
- """
- if disable:
- self._set_password_change_status(self.tr("Changing password..."))
-
- self.ui.leCurrentPassword.setEnabled(not disable)
- self.ui.leNewPassword.setEnabled(not disable)
- self.ui.leNewPassword2.setEnabled(not disable)
- self.ui.pbChangePassword.setEnabled(not disable)
+ # deleteLater does not seem to cascade to items in stackLayout
+ # (even with QtCore.Qt.WA_DeleteOnClose attribute).
+ # so, here we call deleteLater() explicitly:
+ self._account_page.deleteLater()
+ self._vpn_page.deleteLater()
+ self._email_page.deleteLater()
+ self.deleteLater()
@QtCore.Slot()
- def _change_password(self):
+ def _change_page(self, current, previous):
"""
TRIGGERS:
- self.ui.pbChangePassword.clicked
-
- Changes the user's password if the inputboxes are correctly filled.
- """
- username = self._username
- current_password = self.ui.leCurrentPassword.text()
- new_password = self.ui.leNewPassword.text()
- new_password2 = self.ui.leNewPassword2.text()
-
- ok, msg = password_checks(username, new_password, new_password2)
-
- if not ok:
- self._set_changing_password(False)
- self._set_password_change_status(msg, error=True)
- self.ui.leNewPassword.setFocus()
- return
-
- self._set_changing_password(True)
- self._backend.user_change_password(current_password=current_password,
- new_password=new_password)
-
- @QtCore.Slot()
- def _srp_change_password_ok(self):
- """
- TRIGGERS:
- self._backend.signaler.srp_password_change_ok
-
- Callback used to display a successfully changed password.
- """
- new_password = self.ui.leNewPassword.text()
- logger.debug("SRP password changed successfully.")
-
- if self._mx_provided:
- self._backend.soledad_change_password(new_password=new_password)
- else:
- self._change_password_success()
+ self.ui.nav_widget.currentItemChanged
- @QtCore.Slot(unicode)
- def _srp_change_password_problem(self, msg):
- """
- TRIGGERS:
- self._backend.signaler.srp_password_change_error
- self._backend.signaler.srp_password_change_badpw
+ Changes what page is displayed.
- Callback used to display an error on changing password.
+ :param current: the currently selected item (might be None?)
+ :type current: PySide.QtGui.QListWidgetItem
- :param msg: the message to show to the user.
- :type msg: unicode
+ :param previous: the previously selected item (might be None)
+ :type previous: PySide.QtGui.QListWidgetItem
"""
- logger.error("Error changing password")
- self._set_password_change_status(msg, error=True)
- self._set_changing_password(False)
+ if not current:
+ current = previous
+ self.ui.pages_widget.setCurrentIndex(self.ui.nav_widget.row(current))
- @QtCore.Slot()
- def _soledad_change_password_ok(self):
+ @QtCore.Slot(object, list)
+ def _update_icons(self, account, services):
"""
TRIGGERS:
- Signaler.soledad_password_change_ok
-
- Soledad password change went OK.
- """
- logger.debug("Soledad password changed successfully.")
- self._change_password_success()
+ self.app.service_selection_changed
- def _change_password_success(self):
+ Change which icons are visible.
"""
- Callback used to display a successfully changed password.
- """
- logger.debug("Soledad password changed successfully.")
-
- self._set_password_change_status(
- self.tr("Password changed successfully."), success=True)
- self._clear_password_inputs()
- self._set_changing_password(False)
-
- @QtCore.Slot(unicode)
- def _soledad_change_password_problem(self, msg):
- """
- TRIGGERS:
- Signaler.soledad_password_change_error
-
- Callback used to display an error on changing password.
-
- :param msg: the message to show to the user.
- :type msg: unicode
- """
- logger.error("Error changing soledad password")
- self._set_password_change_status(msg, error=True)
- self._set_changing_password(False)
-
- def _clear_password_inputs(self):
- """
- Clear the contents of the inputs.
- """
- self.ui.leCurrentPassword.setText("")
- self.ui.leNewPassword.setText("")
- self.ui.leNewPassword2.setText("")
-
- def _set_providers_services_status(self, status, success=False):
- """
- Sets the status label for the password change.
-
- :param status: status message to display, can be HTML
- :type status: str
- :param success: is set to True if we should display the
- message as green
- :type success: bool
- """
- if success:
- status = "<font color='green'><b>%s</b></font>" % (status,)
-
- self.ui.lblProvidersServicesStatus.setVisible(True)
- self.ui.lblProvidersServicesStatus.setText(status)
-
- def _add_configured_providers(self):
- """
- Add the client's configured providers to the providers combo boxes.
- """
- self.ui.cbProvidersServices.clear()
- for provider in self._settings.get_configured_providers():
- self.ui.cbProvidersServices.addItem(provider)
-
- def _select_provider_by_name(self, name):
- """
- Given a provider name/domain, selects it in the combobox.
-
- :param name: name or domain for the provider
- :type name: str
- """
- provider_index = self.ui.cbProvidersServices.findText(name)
- self.ui.cbProvidersServices.setCurrentIndex(provider_index)
-
- @QtCore.Slot(str, int)
- def _service_selection_changed(self, service, state):
- """
- TRIGGERS:
- service_checkbox.stateChanged
-
- Adds the service to the state if the state is checked, removes
- it otherwise
-
- :param service: service to handle
- :type service: str
- :param state: state of the checkbox
- :type state: int
- """
- if state == QtCore.Qt.Checked:
- self._selected_services = \
- self._selected_services.union(set([service]))
- else:
- self._selected_services = \
- self._selected_services.difference(set([service]))
-
- # We hide the maybe-visible status label after a change
- self.ui.lblProvidersServicesStatus.setVisible(False)
-
- @QtCore.Slot(str)
- def _populate_services(self, domain):
- """
- TRIGGERS:
- self.ui.cbProvidersServices.currentIndexChanged[unicode]
-
- Fill the services list with the selected provider's services.
-
- :param domain: the domain of the provider to load services from.
- :type domain: str
- """
- # We hide the maybe-visible status label after a change
- self.ui.lblProvidersServicesStatus.setVisible(False)
-
- if not domain:
+ if account != self.account:
return
- # set the proper connection for the 'save' button
- try:
- self.ui.pbSaveServices.clicked.disconnect()
- except RuntimeError:
- pass # Signal was not connected
-
- save_services = partial(self._save_enabled_services, domain)
- self.ui.pbSaveServices.clicked.connect(save_services)
-
- self._backend.provider_get_supported_services(domain=domain)
-
- @QtCore.Slot(str)
- def _load_services(self, services):
- """
- TRIGGERS:
- self.ui.cbProvidersServices.currentIndexChanged[unicode]
-
- Loads the services that the provider provides into the UI for
- the user to enable or disable.
-
- :param domain: the domain of the provider to load services from.
- :type domain: str
- """
- domain = self.ui.cbProvidersServices.currentText()
- services_conf = self._settings.get_enabled_services(domain)
-
- # discard changes if other provider is selected
- self._selected_services = set()
-
- # from: http://stackoverflow.com/a/13103617/687989
- # remove existing checkboxes
- layout = self.ui.vlServices
- for i in reversed(range(layout.count())):
- layout.itemAt(i).widget().setParent(None)
-
- # add one checkbox per service and set the current configured value
- for service in services:
- try:
- checkbox = QtGui.QCheckBox(self)
- service_label = get_service_display_name(service)
- checkbox.setText(service_label)
-
- self.ui.vlServices.addWidget(checkbox)
- checkbox.stateChanged.connect(
- partial(self._service_selection_changed, service))
-
- checkbox.setChecked(service in services_conf)
- except ValueError:
- logger.error("Something went wrong while trying to "
- "load service %s" % (service,))
-
- @QtCore.Slot(str)
- def _save_enabled_services(self, provider):
- """
- TRIGGERS:
- self.ui.pbSaveServices.clicked
-
- Saves the new enabled services settings to the configuration file.
-
- :param provider: the provider config that we need to save.
- :type provider: str
- """
- services = list(self._selected_services)
- self._settings.set_enabled_services(provider, services)
-
- msg = self.tr(
- "Services settings for provider '{0}' saved.".format(provider))
- logger.debug(msg)
- self._set_providers_services_status(msg, success=True)
- self.preferences_saved.emit()
-
- def _backend_connect(self):
- """
- Helper to connect to backend signals
- """
- sig = self._leap_signaler
-
- sig.prov_get_supported_services.connect(self._load_services)
-
- sig.srp_password_change_ok.connect(self._srp_change_password_ok)
-
- pwd_change_error = lambda: self._srp_change_password_problem(
- self.tr("There was a problem changing the password."))
- sig.srp_password_change_error.connect(pwd_change_error)
-
- pwd_change_badpw = lambda: self._srp_change_password_problem(
- self.tr("You did not enter a correct current password."))
- sig.srp_password_change_badpw.connect(pwd_change_badpw)
-
- sig.soledad_password_change_ok.connect(
- self._soledad_change_password_ok)
-
- sig.soledad_password_change_error.connect(
- self._soledad_change_password_problem)
+ self._vpn_item.setHidden(not EIP_SERVICE in services)
+ # self._email_item.setHidden(not MX_SERVICE in services)
+ # ^^ disable email for now, there is nothing there yet.
diff --git a/src/leap/bitmask/gui/ui/eippreferences.ui b/src/leap/bitmask/gui/ui/eippreferences.ui
deleted file mode 100644
index 1a5fcd24..00000000
--- a/src/leap/bitmask/gui/ui/eippreferences.ui
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>EIPPreferences</class>
- <widget class="QDialog" name="EIPPreferences">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>435</width>
- <height>144</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Encrypted Internet Preferences</string>
- </property>
- <property name="windowIcon">
- <iconset resource="../../../../../data/resources/icons.qrc">
- <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QGroupBox" name="gbGatewaySelector">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="title">
- <string>Select gateway for provider</string>
- </property>
- <property name="checkable">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="lblSelectProvider">
- <property name="text">
- <string>Select &amp;provider:</string>
- </property>
- <property name="buddy">
- <cstring>cbProvidersGateway</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <widget class="QComboBox" name="cbProvidersGateway">
- <item>
- <property name="text">
- <string>&lt;Select provider&gt;</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="7" column="2">
- <widget class="QPushButton" name="pbSaveGateway">
- <property name="text">
- <string>&amp;Save this provider settings</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" colspan="3">
- <widget class="QLabel" name="lblProvidersGatewayStatus">
- <property name="text">
- <string>&lt; Providers Gateway Status &gt;</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Select &amp;gateway:</string>
- </property>
- <property name="buddy">
- <cstring>cbGateways</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QComboBox" name="cbGateways">
- <item>
- <property name="text">
- <string>Automatic</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <tabstops>
- <tabstop>cbProvidersGateway</tabstop>
- <tabstop>cbGateways</tabstop>
- <tabstop>pbSaveGateway</tabstop>
- </tabstops>
- <resources>
- <include location="../../../../../data/resources/icons.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 92c13d15..b1d68c4a 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -75,7 +75,7 @@
<x>0</x>
<y>0</y>
<width>524</width>
- <height>540</height>
+ <height>549</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -306,7 +306,7 @@
<x>0</x>
<y>0</y>
<width>524</width>
- <height>25</height>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -317,7 +317,6 @@
<addaction name="action_advanced_key_management"/>
<addaction name="separator"/>
<addaction name="action_preferences"/>
- <addaction name="action_eip_preferences"/>
<addaction name="separator"/>
<addaction name="action_quit"/>
</widget>
@@ -338,12 +337,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>Account Preferences...</string>
- </property>
- </action>
- <action name="action_eip_preferences">
- <property name="text">
- <string>Internet Preferences...</string>
+ <string>Pr&amp;eferences...</string>
</property>
</action>
<action name="action_quit">
@@ -378,11 +372,14 @@
</action>
<action name="action_advanced_key_management">
<property name="enabled">
- <bool>true</bool>
+ <bool>false</bool>
</property>
<property name="text">
<string>Advanced Key Management</string>
</property>
+ <property name="visible">
+ <bool>false</bool>
+ </property>
</action>
</widget>
<resources>
diff --git a/src/leap/bitmask/gui/ui/password_change.ui b/src/leap/bitmask/gui/ui/password_change.ui
new file mode 100644
index 00000000..b7ceac38
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/password_change.ui
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PasswordChange</class>
+ <widget class="QDialog" name="PasswordChange">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>459</width>
+ <height>231</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>Change Password</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QGridLayout" name="grid_layout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="username_label">
+ <property name="text">
+ <string>Username:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="new_password_label">
+ <property name="text">
+ <string>New password:</string>
+ </property>
+ <property name="buddy">
+ <cstring>new_password_lineedit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="new_password_lineedit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="new_password_confirmation_label">
+ <property name="text">
+ <string>Re-enter new password:</string>
+ </property>
+ <property name="buddy">
+ <cstring>new_password_confirmation_lineedit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="current_password_label">
+ <property name="text">
+ <string>Current password:</string>
+ </property>
+ <property name="buddy">
+ <cstring>current_password_lineedit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="new_password_confirmation_lineedit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="current_password_lineedit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <spacer name="spacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>10</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="username_lineedit">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="flash_label">
+ <property name="text">
+ <string>&lt;flash_label&gt;</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="button_layout">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cancel_button">
+ <property name="text">
+ <string>Close</string>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="ok_button">
+ <property name="text">
+ <string>OK</string>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <tabstops>
+ <tabstop>username_lineedit</tabstop>
+ <tabstop>current_password_lineedit</tabstop>
+ <tabstop>new_password_lineedit</tabstop>
+ <tabstop>new_password_confirmation_lineedit</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui
index cd4d3a77..5e30ea57 100644
--- a/src/leap/bitmask/gui/ui/preferences.ui
+++ b/src/leap/bitmask/gui/ui/preferences.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>503</width>
- <height>401</height>
+ <width>520</width>
+ <height>439</height>
</rect>
</property>
<property name="windowTitle">
@@ -17,159 +17,97 @@
<iconset resource="../../../../../data/resources/icons.qrc">
<normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
</property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="4" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1,0">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="account_label">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
+ <property name="text">
+ <string>user@example.org</string>
</property>
- </spacer>
+ </widget>
</item>
- <item row="0" column="0">
- <widget class="QGroupBox" name="gbPasswordChange">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="title">
- <string>Password Change</string>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="lblCurrentPassword">
- <property name="text">
- <string>&amp;Current password:</string>
- </property>
- <property name="buddy">
- <cstring>leCurrentPassword</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="leCurrentPassword">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="lblNewPassword">
- <property name="text">
- <string>&amp;New password:</string>
- </property>
- <property name="buddy">
- <cstring>leNewPassword</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="leNewPassword">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="lblNewPassword2">
- <property name="text">
- <string>&amp;Re-enter new password:</string>
- </property>
- <property name="buddy">
- <cstring>leNewPassword2</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="leNewPassword2">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QPushButton" name="pbChangePassword">
- <property name="text">
- <string>Change</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="2">
- <widget class="QLabel" name="lblPasswordChangeStatus">
- <property name="text">
- <string>&lt;Password change status&gt;</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- </layout>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QGroupBox" name="gbEnabledServices">
- <property name="title">
- <string>Enabled services</string>
+ <item>
+ <layout class="QHBoxLayout" name="horizontal_layout" stretch="0,0">
+ <property name="spacing">
+ <number>12</number>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="3" column="1">
- <widget class="QPushButton" name="pbSaveServices">
- <property name="text">
- <string>Save this provider settings</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QGroupBox" name="gbServices">
- <property name="title">
- <string>Services</string>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <layout class="QVBoxLayout" name="vlServices"/>
- </item>
- </layout>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cbProvidersServices">
- <item>
- <property name="text">
- <string>&lt;Select provider&gt;</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Select provider:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2">
- <widget class="QLabel" name="lblProvidersServicesStatus">
- <property name="text">
- <string>&lt; Providers Services Status &gt;</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <item>
+ <widget class="QListWidget" name="nav_widget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>120</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="movement">
+ <enum>QListView::Static</enum>
+ </property>
+ <property name="spacing">
+ <number>10</number>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="uniformItemSizes">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="pages_widget"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="button_layout" stretch="0,0">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="close_button">
+ <property name="text">
+ <string>Close</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
diff --git a/src/leap/bitmask/gui/ui/preferences_account_page.ui b/src/leap/bitmask/gui/ui/preferences_account_page.ui
new file mode 100644
index 00000000..9b6d885b
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/preferences_account_page.ui
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PreferencesAccountPage</class>
+ <widget class="QWidget" name="PreferencesAccountPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>462</width>
+ <height>371</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="provider_services_box">
+ <property name="title">
+ <string>Services</string>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="1" column="0">
+ <layout class="QVBoxLayout" name="provider_services_layout"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="provider_services_label">
+ <property name="text">
+ <string>&lt;provider_services_label&gt;</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Preferred</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>15</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Password</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QPushButton" name="change_password_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Change Password</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="change_password_label">
+ <property name="text">
+ <string>&lt;change_password_label&gt;</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui
new file mode 100644
index 00000000..41b3c28d
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PreferencesEmailPage</class>
+ <widget class="QWidget" name="PreferencesEmailPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <widget class="QPushButton" name="pushButton">
+ <property name="geometry">
+ <rect>
+ <x>250</x>
+ <y>210</y>
+ <width>98</width>
+ <height>27</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>PushButton</string>
+ </property>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/leap/bitmask/gui/ui/preferences_vpn_page.ui b/src/leap/bitmask/gui/ui/preferences_vpn_page.ui
new file mode 100644
index 00000000..1bf3a060
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/preferences_vpn_page.ui
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PreferencesVpnPage</class>
+ <widget class="QWidget" name="PreferencesVpnPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>362</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="flash_label">
+ <property name="text">
+ <string>&lt;flash_label&gt;</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="heading_label">
+ <property name="text">
+ <string>Default VPN Gateway:</string>
+ </property>
+ <property name="buddy">
+ <cstring>gateways_list</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListWidget" name="gateways_list">
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="tip_label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>You must reconnect for changes to take effect.</string>
+ </property>
+ <property name="scaledContents">
+ <bool>false</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>gateways_list</cstring>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="../../../../../data/resources/flags.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 8182228d..ff9cae55 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -42,6 +42,7 @@ logger = logging.getLogger(__name__)
class Wizard(QtGui.QWizard):
+
"""
First run wizard to register a user and setup a provider
"""
@@ -317,7 +318,8 @@ class Wizard(QtGui.QWizard):
user_ok, msg = username_checks(username)
if user_ok:
- pass_ok, msg = password_checks(username, password, password2)
+ pass_ok, msg, field = password_checks(
+ username, password, password2)
if user_ok and pass_ok:
self._set_register_status(self.tr("Starting registration..."))
diff --git a/src/leap/bitmask/services/eip/conductor.py b/src/leap/bitmask/services/eip/conductor.py
index 0ee56628..01dd7449 100644
--- a/src/leap/bitmask/services/eip/conductor.py
+++ b/src/leap/bitmask/services/eip/conductor.py
@@ -124,6 +124,12 @@ class EIPConductor(object):
"""
self._backend.tear_fw_down()
+ def terminate(self):
+ """
+ Turn off VPN
+ """
+ self.qtsigs.do_disconnect_signal.emit()
+
@QtCore.Slot()
def _start_eip(self):
"""
diff --git a/src/leap/bitmask/services/eip/eipconfig.py b/src/leap/bitmask/services/eip/eipconfig.py
index 37c0c8ae..5b51d12e 100644
--- a/src/leap/bitmask/services/eip/eipconfig.py
+++ b/src/leap/bitmask/services/eip/eipconfig.py
@@ -113,39 +113,38 @@ class VPNGatewaySelector(object):
"""
Return the existing gateways, sorted by timezone proximity.
- :rtype: list of tuples (location, ip)
- (str, IPv4Address or IPv6Address object)
+ :rtype: list of tuples (label, ip, country_code)
+ (str, IPv4Address or IPv6Address object, str)
"""
gateways_timezones = []
locations = self._eipconfig.get_locations()
gateways = self._eipconfig.get_gateways()
for idx, gateway in enumerate(gateways):
- gateway_location = gateway.get('location')
- gateway_distance = 99 # if hasn't location -> should go last
-
- if gateway_location is not None:
- timezone = locations[gateway['location']]['timezone']
- gateway_name = locations[gateway['location']].get('name', None)
- if gateway_name is not None:
- gateway_location = gateway_name
-
- gw_offset = int(timezone)
- if gw_offset in self.equivalent_timezones:
- gw_offset = self.equivalent_timezones[gw_offset]
-
- gateway_distance = self._get_timezone_distance(gw_offset)
+ distance = 99 # if hasn't location -> should go last
+ location = locations.get(gateway.get('location'))
+ label = gateway.get('location', 'Unknown')
+ country = 'XX'
+ if location is not None:
+ country = location.get('country_code', 'XX')
+ label = location.get('name', label)
+ timezone = location.get('timezone')
+ if timezone is not None:
+ offset = int(timezone)
+ if offset in self.equivalent_timezones:
+ offset = self.equivalent_timezones[offset]
+ distance = self._get_timezone_distance(offset)
ip = self._eipconfig.get_gateway_ip(idx)
- gateways_timezones.append((ip, gateway_distance, gateway_location))
+ gateways_timezones.append((ip, distance, label, country))
gateways_timezones = sorted(gateways_timezones, key=lambda gw: gw[1])
- gateways = []
- for ip, distance, location in gateways_timezones:
- gateways.append((location, ip))
+ result = []
+ for ip, distance, label, country in gateways_timezones:
+ result.append((label, ip, country))
- return gateways
+ return result
def get_gateways(self):
"""
@@ -153,7 +152,7 @@ class VPNGatewaySelector(object):
:rtype: list of IPv4Address or IPv6Address object.
"""
- gateways = [ip for location, ip in self.get_gateways_list()][:4]
+ gateways = [gateway[1] for gateway in self.get_gateways_list()][:4]
return gateways
def get_gateways_country_code(self):
diff --git a/src/leap/bitmask/util/credentials.py b/src/leap/bitmask/util/credentials.py
index 757ce10c..dfc78a09 100644
--- a/src/leap/bitmask/util/credentials.py
+++ b/src/leap/bitmask/util/credentials.py
@@ -38,7 +38,7 @@ def username_checks(username):
valid = USERNAME_VALIDATOR.validate(username, 0)
valid_username = valid[0] == QtGui.QValidator.State.Acceptable
if message is None and not valid_username:
- message = _tr("Invalid username")
+ message = _tr("That username is not allowed. Try another.")
return message is None, message
@@ -54,28 +54,34 @@ def password_checks(username, password, password2):
:param password2: second password from the registration form
:type password: str
- :returns: True and empty message if all the checks pass,
- False and an error message otherwise
- :rtype: tuple(bool, str)
+ :returns: (True, None, None) if all the checks pass,
+ (False, message, field name) otherwise
+ :rtype: tuple(bool, str, str)
"""
# translation helper
_tr = QtCore.QObject().tr
message = None
+ field = None
if message is None and password != password2:
message = _tr("Passwords don't match")
+ field = 'new_password_confirmation'
if message is None and not password:
- message = _tr("You can't use an empty password")
+ message = _tr("Password is empty")
+ field = 'new_password'
if message is None and len(password) < 8:
- message = _tr("Password too short")
+ message = _tr("Password is too short")
+ field = 'new_password'
if message is None and password in WEAK_PASSWORDS:
- message = _tr("Password too easy")
+ message = _tr("Password is too easy")
+ field = 'new_password'
if message is None and username == password:
- message = _tr("Password equal to username")
+ message = _tr("Password can't be the same as username")
+ field = 'new_password'
- return message is None, message
+ return message is None, message, field