summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-08 11:32:43 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-08 11:32:43 -0300
commit4447976dfb46345925c258481071495d9cc0bb64 (patch)
treed41b676a0640cd5775abdda12b9af904dc6c58f9
parentd0cfccafc156e7f51e30ca77ec3928256d22f345 (diff)
parent348c9ae94213e8717f891f38083e32611a87b6e5 (diff)
Merge remote-tracking branch 'ivan/bug/4058_spacer-policy-problem' into develop
-rw-r--r--changes/bug-4058_spacer-policy-problem1
-rw-r--r--data/images/mask-icon.pngbin16575 -> 8907 bytes
-rw-r--r--src/leap/bitmask/gui/ui/wizard.ui8
3 files changed, 5 insertions, 4 deletions
diff --git a/changes/bug-4058_spacer-policy-problem b/changes/bug-4058_spacer-policy-problem
new file mode 100644
index 00000000..b4759c7b
--- /dev/null
+++ b/changes/bug-4058_spacer-policy-problem
@@ -0,0 +1 @@
+ o Widget squashing problem in wizard cheking a new provider. Closes #4058.
diff --git a/data/images/mask-icon.png b/data/images/mask-icon.png
index 3504bae9..97c5d7ec 100644
--- a/data/images/mask-icon.png
+++ b/data/images/mask-icon.png
Binary files differ
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 0f6eef6e..cf591470 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -7,19 +7,19 @@
<x>0</x>
<y>0</y>
<width>536</width>
- <height>490</height>
+ <height>510</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>536</width>
- <height>490</height>
+ <height>510</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>536</width>
- <height>490</height>
+ <height>510</height>
</size>
</property>
<property name="windowTitle">
@@ -124,7 +124,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>