mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add fifth view mode "Globe" for main window

Browse source 
For consistency I didn't change the meaning of Ctrl-1/2/3/4 and added
this as Ctrl-5 - but one could just as easily make the argument that
"ViewGlobe" should be Ctrl-4 and "ViewAll" should be Ctrl-5.

This ensures that only one of the four widgets is shown in the
individual modes, but it doesn't address the drawing issues with the
profile.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-06-12 14:53:23 -04:00
parent ee3bf421e1
commit 863c485939
3 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qt-ui/mainwindow.cpp
View file

@ -245,6 +245,7 @@ void MainWindow::on_actionViewList_triggered()
ui->InfoWidget->setVisible(false); ui->InfoWidget->setVisible(false);
ui->ListWidget->setVisible(true); ui->ListWidget->setVisible(true);
ui->ProfileWidget->setVisible(false); ui->ProfileWidget->setVisible(false);
ui->globe->setVisible(false);
} }
void MainWindow::on_actionViewProfile_triggered() void MainWindow::on_actionViewProfile_triggered()
@ -252,6 +253,7 @@ void MainWindow::on_actionViewProfile_triggered()
ui->InfoWidget->setVisible(false); ui->InfoWidget->setVisible(false);
ui->ListWidget->setVisible(false); ui->ListWidget->setVisible(false);
ui->ProfileWidget->setVisible(true); ui->ProfileWidget->setVisible(true);
ui->globe->setVisible(false);
} }
void MainWindow::on_actionViewInfo_triggered() void MainWindow::on_actionViewInfo_triggered()
@ -259,6 +261,15 @@ void MainWindow::on_actionViewInfo_triggered()
ui->InfoWidget->setVisible(true); ui->InfoWidget->setVisible(true);
ui->ListWidget->setVisible(false); ui->ListWidget->setVisible(false);
ui->ProfileWidget->setVisible(false); ui->ProfileWidget->setVisible(false);
ui->globe->setVisible(false);
}
void MainWindow::on_actionViewGlobe_triggered()
{
ui->InfoWidget->setVisible(false);
ui->ListWidget->setVisible(false);
ui->ProfileWidget->setVisible(false);
ui->globe->setVisible(true);
} }
void MainWindow::on_actionViewAll_triggered() void MainWindow::on_actionViewAll_triggered()
@ -266,6 +277,7 @@ void MainWindow::on_actionViewAll_triggered()
ui->InfoWidget->setVisible(true); ui->InfoWidget->setVisible(true);
ui->ListWidget->setVisible(true); ui->ListWidget->setVisible(true);
ui->ProfileWidget->setVisible(true); ui->ProfileWidget->setVisible(true);
ui->globe->setVisible(true);
} }
void MainWindow::on_actionPreviousDC_triggered() void MainWindow::on_actionPreviousDC_triggered()

1
qt-ui/mainwindow.h
View file

@ -71,6 +71,7 @@ private Q_SLOTS:
void on_actionViewList_triggered(); void on_actionViewList_triggered();
void on_actionViewProfile_triggered(); void on_actionViewProfile_triggered();
void on_actionViewInfo_triggered(); void on_actionViewInfo_triggered();
void on_actionViewGlobe_triggered();
void on_actionViewAll_triggered(); void on_actionViewAll_triggered();
void on_actionPreviousDC_triggered(); void on_actionPreviousDC_triggered();
void on_actionNextDC_triggered(); void on_actionNextDC_triggered();

26
qt-ui/mainwindow.ui
View file

@ -103,7 +103,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>763</width> <width>763</width>
<height>20</height> <height>34</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -148,6 +148,7 @@
<addaction name="actionViewProfile"/> <addaction name="actionViewProfile"/>
<addaction name="actionViewInfo"/> <addaction name="actionViewInfo"/>
<addaction name="actionViewAll"/> <addaction name="actionViewAll"/>
<addaction name="actionViewGlobe"/>
<addaction name="actionPreviousDC"/> <addaction name="actionPreviousDC"/>
<addaction name="actionNextDC"/> <addaction name="actionNextDC"/>
</widget> </widget>
@ -358,8 +359,25 @@
<string>F1</string> <string>F1</string>
</property> </property>
</action> </action>
<action name="actionViewGlobe">
<property name="text">
<string>View Globe</string>
</property>
<property name="toolTip">
<string>View Globe</string>
</property>
<property name="shortcut">
<string>Ctrl+5</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>KMessageWidget</class>
<extends>QWidget</extends>
<header>kmessagewidget.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>MainTab</class> <class>MainTab</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -382,12 +400,6 @@
<header>globe.h</header> <header>globe.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>KMessageWidget</class>
<extends>QWidget</extends>
<header>kmessagewidget.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>