diff options
| -rw-r--r-- | src/leap/bitmask/gui/preferences_email_page.py | 7 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/qt_browser.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/ui/preferences_email_page.ui | 54 |
3 files changed, 32 insertions, 31 deletions
diff --git a/src/leap/bitmask/gui/preferences_email_page.py b/src/leap/bitmask/gui/preferences_email_page.py index b8633f07..f6d6f036 100644 --- a/src/leap/bitmask/gui/preferences_email_page.py +++ b/src/leap/bitmask/gui/preferences_email_page.py @@ -71,9 +71,10 @@ class PreferencesEmailPage(PreferencesPage): self.ui.webmail_label.setText(self.tr( "This distribution of Bitmask ships an experimental integration " - "of the <a href='https://pixelated-project.org/'>Pixelated " - "Webmail</a>. It is not stable yet, but you can enable it to help " - "beta-testing it. (Needs restart!)")) + "of <a href='https://pixelated-project.org/'>Pixelated " + "Mail</a>. Note: at the current state, anyone with access to " + "your device can read your mail without authentication, " + "by opening a browser pointing to http://localhost:9090 ")) webmail_enabled = self.settings.get_pixelmail_enabled() self.ui.webmail_checkbox.setChecked(webmail_enabled) if not HAS_PIXELATED: diff --git a/src/leap/bitmask/gui/qt_browser.py b/src/leap/bitmask/gui/qt_browser.py index b75bfb64..c62e7770 100644 --- a/src/leap/bitmask/gui/qt_browser.py +++ b/src/leap/bitmask/gui/qt_browser.py @@ -33,7 +33,7 @@ class PixelatedWindow(QtGui.QDialog): layout.setContentsMargins(0, 0, 0, 0) layout.addWidget(self.view) self.setLayout(layout) - self.setWindowTitle('Bitmask/Pixelated WebMail') + self.setWindowTitle('Bitmask Mail') def load_app(self): self.view.load(QtCore.QUrl(PIXELATED_URI)) diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui index 22d690d9..87e7121d 100644 --- a/src/leap/bitmask/gui/ui/preferences_email_page.ui +++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui @@ -37,6 +37,32 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_7"> <item> + <widget class="QGroupBox" name="webmail_box"> + <property name="title"> + <string>Bitmask Mail Configuration</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="QCheckBox" name="webmail_checkbox"> + <property name="text"> + <string>Enable Bitmask Mail (needs restart)</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="webmail_label"> + <property name="text"> + <string>webmail info</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="thunderbird_box"> <property name="title"> <string>Thunderbird Configuration</string> @@ -64,7 +90,7 @@ </sizepolicy> </property> <property name="title"> - <string>Mail Client Configuration</string> + <string>Other Mail Clients Configuration</string> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> @@ -333,32 +359,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="webmail_box"> - <property name="title"> - <string>Webmail Configuration</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> - <widget class="QCheckBox" name="webmail_checkbox"> - <property name="text"> - <string>Enable Bitmask Webmail (beta)</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="webmail_label"> - <property name="text"> - <string>webmail info</string> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> |