Fun profile
Dirk Hohndel
dirk at hohndel.org
Wed Jun 12 11:55:26 PDT 2013
On Wed, 2013-06-12 at 14:49 -0400, Dirk Hohndel wrote:
> Look at this for a moment and enjoy its Zen...
> Which of course immediately brought up the issue that we simply always
> keep the map around
> right now (which makes no sense). But there's obviously also something
> going seriously wrong
> with the axis on this one...
>From 863c48593949e91beb6b7ff02a1385b9977182f5 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk at hohndel.org>
Date: Wed, 12 Jun 2013 14:53:23 -0400
Subject: [PATCH] Add fifth view mode "Globe" for main window
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 at hohndel.org>
---
qt-ui/mainwindow.cpp | 12 ++++++++++++
qt-ui/mainwindow.h | 1 +
qt-ui/mainwindow.ui | 26 +++++++++++++++++++-------
3 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index f40e957..3399968 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -245,6 +245,7 @@ void MainWindow::on_actionViewList_triggered()
ui->InfoWidget->setVisible(false);
ui->ListWidget->setVisible(true);
ui->ProfileWidget->setVisible(false);
+ ui->globe->setVisible(false);
}
void MainWindow::on_actionViewProfile_triggered()
@@ -252,6 +253,7 @@ void MainWindow::on_actionViewProfile_triggered()
ui->InfoWidget->setVisible(false);
ui->ListWidget->setVisible(false);
ui->ProfileWidget->setVisible(true);
+ ui->globe->setVisible(false);
}
void MainWindow::on_actionViewInfo_triggered()
@@ -259,6 +261,15 @@ void MainWindow::on_actionViewInfo_triggered()
ui->InfoWidget->setVisible(true);
ui->ListWidget->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()
@@ -266,6 +277,7 @@ void MainWindow::on_actionViewAll_triggered()
ui->InfoWidget->setVisible(true);
ui->ListWidget->setVisible(true);
ui->ProfileWidget->setVisible(true);
+ ui->globe->setVisible(true);
}
void MainWindow::on_actionPreviousDC_triggered()
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index f3024ef..937d6d2 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -71,6 +71,7 @@ private Q_SLOTS:
void on_actionViewList_triggered();
void on_actionViewProfile_triggered();
void on_actionViewInfo_triggered();
+ void on_actionViewGlobe_triggered();
void on_actionViewAll_triggered();
void on_actionPreviousDC_triggered();
void on_actionNextDC_triggered();
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index a29cb61..a91b961 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -103,7 +103,7 @@
<x>0</x>
<y>0</y>
<width>763</width>
- <height>20</height>
+ <height>34</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -148,6 +148,7 @@
<addaction name="actionViewProfile"/>
<addaction name="actionViewInfo"/>
<addaction name="actionViewAll"/>
+ <addaction name="actionViewGlobe"/>
<addaction name="actionPreviousDC"/>
<addaction name="actionNextDC"/>
</widget>
@@ -358,9 +359,26 @@
<string>F1</string>
</property>
</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>
<customwidgets>
<customwidget>
+ <class>KMessageWidget</class>
+ <extends>QWidget</extends>
+ <header>kmessagewidget.h</header>
+ <container>1</container>
+ </customwidget>
+ <customwidget>
<class>MainTab</class>
<extends>QWidget</extends>
<header>maintab.h</header>
@@ -382,12 +400,6 @@
<header>globe.h</header>
<container>1</container>
</customwidget>
- <customwidget>
- <class>KMessageWidget</class>
- <extends>QWidget</extends>
- <header>kmessagewidget.h</header>
- <container>1</container>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
--
1.8.0.rc0.18.gf84667d
More information about the subsurface
mailing list