diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-06-13 19:56:36 +0200 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-06-13 19:56:36 +0200 |
| commit | e34da61362c0a64b8fd932c3363421c766595d4a (patch) | |
| tree | a1e71824e9e94eafd791c0c005b78371fa7dc1e5 /qt-ui/mainwindow.ui | |
| parent | 863c48593949e91beb6b7ff02a1385b9977182f5 (diff) | |
| parent | 7e9d6e28297432d4a15721a49a9dd0c0d067ce7e (diff) | |
| download | subsurface-e34da61362c0a64b8fd932c3363421c766595d4a.tar.gz | |
Merge branch 'linusDiveList' of https://github.com/tcanabrava/subsurface
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/mainwindow.ui')
| -rw-r--r-- | qt-ui/mainwindow.ui | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui index a91b96133..1a985f812 100644 --- a/qt-ui/mainwindow.ui +++ b/qt-ui/mainwindow.ui @@ -14,8 +14,8 @@ <string>MainWindow</string> </property> <widget class="QWidget" name="centralwidget"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> <widget class="QSplitter" name="mainSplitter"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -92,7 +92,7 @@ </widget> </widget> </item> - <item> + <item row="1" column="0"> <widget class="KMessageWidget" name="mainErrorMessage" native="true"/> </item> </layout> @@ -147,8 +147,9 @@ <addaction name="actionViewList"/> <addaction name="actionViewProfile"/> <addaction name="actionViewInfo"/> - <addaction name="actionViewAll"/> <addaction name="actionViewGlobe"/> + <addaction name="actionViewAll"/> + <addaction name="separator"/> <addaction name="actionPreviousDC"/> <addaction name="actionNextDC"/> </widget> @@ -317,7 +318,7 @@ <string>View All</string> </property> <property name="shortcut"> - <string>Ctrl+4</string> + <string>Ctrl+5</string> </property> </action> <action name="actionPreviousDC"> @@ -363,11 +364,8 @@ <property name="text"> <string>View Globe</string> </property> - <property name="toolTip"> - <string>View Globe</string> - </property> <property name="shortcut"> - <string>Ctrl+5</string> + <string>Ctrl+4</string> </property> </action> </widget> |