summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-03 21:43:38 +0200
committerKali Kaneko <kali@leap.se>2013-09-03 21:43:38 +0200
commit247242b4fe3845fce89f66aaad11e27270024243 (patch)
treea9dca0bc697201327d0ea47a5e7a2c0cd0c6517d
parent778798b4cbb297d7cab5a504e79a5b8924939253 (diff)
parent7511d3ffe98602c979a80972e0ba67b2a0e54310 (diff)
Merge remote-tracking branch 'ivan-github/feature/3616_remove-last-page-from-wizard' into develop
-rw-r--r--LICENSE6
-rw-r--r--changes/feature-3616_remove-last-page-from-wizard1
-rw-r--r--data/images/Globe.pngbin22470 -> 0 bytes
-rw-r--r--src/leap/bitmask/gui/ui/wizard.ui91
-rw-r--r--src/leap/bitmask/gui/wizard.py3
5 files changed, 2 insertions, 99 deletions
diff --git a/LICENSE b/LICENSE
index bfd516bd..bca70598 100644
--- a/LICENSE
+++ b/LICENSE
@@ -686,12 +686,6 @@ License: GNU General Public License - http://en.wikipedia.org/wiki/GNU_General_P
WebSite: http://wefunction.com/
IconPackage: WooFunction icon pack - http://www.iconspedia.com/pack/woofunction-icons-4136/
---
-data/images/Globe.png
-
-Author: Everaldo Coelho
-License: LGPL - http://www.gnu.org/licenses/lgpl.html
-WebSite: http://www.everaldo.com/
----
data/images/oxygen-icons/
The following icons were created based on 'mail-unread.png' from oxygen:
diff --git a/changes/feature-3616_remove-last-page-from-wizard b/changes/feature-3616_remove-last-page-from-wizard
new file mode 100644
index 00000000..cc02c02c
--- /dev/null
+++ b/changes/feature-3616_remove-last-page-from-wizard
@@ -0,0 +1 @@
+ o Remove last page from wizard. Closes #3616.
diff --git a/data/images/Globe.png b/data/images/Globe.png
deleted file mode 100644
index 7549433b..00000000
--- a/data/images/Globe.png
+++ /dev/null
Binary files differ
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 570c01a9..2a412784 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -740,97 +740,6 @@
</item>
</layout>
</widget>
- <widget class="QWizardPage" name="finish_page">
- <property name="title">
- <string>Congratulations!</string>
- </property>
- <property name="subTitle">
- <string>You have successfully configured Bitmask.</string>
- </property>
- <attribute name="pageId">
- <string notr="true">6</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_10">
- <item row="1" column="0">
- <spacer name="horizontalSpacer_4">
- <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 row="0" column="1">
- <spacer name="verticalSpacer_9">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="label_23">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/mask-icon.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QLabel" name="label_25">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap resource="../../../../../data/resources/mainwindow.qrc">:/images/Globe.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <spacer name="verticalSpacer_10">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="3">
- <spacer name="horizontalSpacer_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
</widget>
<customwidgets>
<customwidget>
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index ac0f032f..e004e6cf 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -52,7 +52,6 @@ class Wizard(QtGui.QWizard):
SETUP_PROVIDER_PAGE = 3
REGISTER_USER_PAGE = 4
SERVICES_PAGE = 5
- FINISH_PAGE = 6
WEAK_PASSWORDS = ("123456", "qweasd", "qwerty",
"password")
@@ -144,7 +143,7 @@ class Wizard(QtGui.QWizard):
self.page(self.REGISTER_USER_PAGE).setButtonText(
QtGui.QWizard.CommitButton, self.tr("&Next >"))
- self.page(self.FINISH_PAGE).setButtonText(
+ self.page(self.SERVICES_PAGE).setButtonText(
QtGui.QWizard.FinishButton, self.tr("Connect"))
# XXX: Temporary removal for enrollment policy