diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-14 16:30:29 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-14 16:30:29 -0300 |
| commit | d2893b4ad78a573bb0cdc001530d40b6c5f7dd01 (patch) | |
| tree | b2454ae8a7df84b1a2be50ac94bb2247f57f684c /src/leap/bitmask/gui/ui/mainwindow.ui | |
| parent | 65eff7efadec6a88d3f55bbd3f6448f3dd5e7641 (diff) | |
| parent | 07600853819d65959e9e2c9b96d62578442d3ae0 (diff) | |
Merge remote-tracking branch 'ivan/feature/advanced_key_management' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index badd291d..3b83788e 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>636</height> + <height>651</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -380,7 +380,7 @@ background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgb <x>0</x> <y>0</y> <width>524</width> - <height>22</height> + <height>21</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -388,6 +388,7 @@ background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgb <string>&Bitmask</string> </property> <addaction name="action_create_new_account"/> + <addaction name="action_advanced_key_management"/> <addaction name="separator"/> <addaction name="action_quit"/> </widget> @@ -439,6 +440,14 @@ background-color: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgb <string>Create a new account...</string> </property> </action> + <action name="action_advanced_key_management"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Advanced Key Management</string> + </property> + </action> </widget> <resources> <include location="../../../../../data/resources/mainwindow.qrc"/> |