summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/ui
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-28 14:35:24 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-28 14:35:24 -0300
commit8a94537a66275950d6b9fb986ca1ae3970fd9232 (patch)
tree3c8ca8df4a2d291cb20e24bbc6d9f5a11c0ab2ab /src/leap/bitmask/gui/ui
parent5b6b878289737e72ba7156ec320d2e811358327c (diff)
parenta3d229bd52405146e188905ec1d37c7bfb30320f (diff)
Merge remote-tracking branch 'ivan/feature/preferences-select-services' into develop
Conflicts: src/leap/bitmask/gui/mainwindow.py src/leap/bitmask/gui/preferenceswindow.py
Diffstat (limited to 'src/leap/bitmask/gui/ui')
-rw-r--r--src/leap/bitmask/gui/ui/mainwindow.ui2
-rw-r--r--src/leap/bitmask/gui/ui/preferences.ui3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 834a562e..17837642 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -217,7 +217,7 @@
<item>
<widget class="QPushButton" name="btnPreferences">
<property name="enabled">
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="text">
<string>Preferences</string>
diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui
index 1f9ef4c4..b59990b1 100644
--- a/src/leap/bitmask/gui/ui/preferences.ui
+++ b/src/leap/bitmask/gui/ui/preferences.ui
@@ -20,6 +20,9 @@
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QGroupBox" name="gbPasswordChange">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="title">
<string>Password Change</string>
</property>