diff options
| author | Kali Kaneko <kali@leap.se> | 2014-09-24 13:32:54 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-09-24 13:32:54 -0500 |
| commit | f7da7ebb24e1a1c1f65cd257e949c0aa7ff23781 (patch) | |
| tree | 93f6a81820d0d868dd7a086145db5ce3971cf509 /src/leap/bitmask/gui/ui/mainwindow.ui | |
| parent | cb5f07a8bac7afbbb0c43622d6c831295b6889cb (diff) | |
| parent | c1fa3959fbffb381e067dcd619d528412e235401 (diff) | |
Merge branch 'develop' into deb-0.7.0-rc1
Conflicts:
docs/man/bitmask-root.1.rst
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 17 |
1 files changed, 7 insertions, 10 deletions
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&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> |