summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2017-07-15 01:48:53 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-28 07:31:11 -0700
commit4a10c94840b8b8db9f4781de5aa1ba4a651bac33 (patch)
tree1877dc78c9f03404810de491100f7c6c31862096 /desktop-widgets
parentb054c211a1f6641c9b3b2e95c82d1a16024388dd (diff)
downloadsubsurface-4a10c94840b8b8db9f4781de5aa1ba4a651bac33.tar.gz
mainwindow: rename "actionViewGlobe" to "actionViewMap"
Also change the menu entry text itself to "Map" instead of "Globe". "Map" covers both Marble and Qt Location in terms of "map" solutions. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/mainwindow.cpp4
-rw-r--r--desktop-widgets/mainwindow.h2
-rw-r--r--desktop-widgets/mainwindow.ui6
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 6563ce64b..0b245be50 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1094,7 +1094,7 @@ void MainWindow::on_actionViewInfo_triggered()
ui.mainSplitter->setSizes(BEHAVIOR << EXPANDED << COLLAPSED);
}
-void MainWindow::on_actionViewGlobe_triggered()
+void MainWindow::on_actionViewMap_triggered()
{
TOGGLE_COLLAPSABLE( true );
beginChangeState(GLOBE_MAXIMIZED);
@@ -1319,7 +1319,7 @@ void MainWindow::initialUiSetup()
on_actionViewAll_triggered();
break;
case GLOBE_MAXIMIZED:
- on_actionViewGlobe_triggered();
+ on_actionViewMap_triggered();
break;
case INFO_MAXIMIZED:
on_actionViewInfo_triggered();
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 33995e46f..6336d0c64 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -121,7 +121,7 @@ slots:
void on_actionViewList_triggered();
void on_actionViewProfile_triggered();
void on_actionViewInfo_triggered();
- void on_actionViewGlobe_triggered();
+ void on_actionViewMap_triggered();
void on_actionViewAll_triggered();
void on_actionPreviousDC_triggered();
void on_actionNextDC_triggered();
diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui
index f040340a8..d1d0e8d4e 100644
--- a/desktop-widgets/mainwindow.ui
+++ b/desktop-widgets/mainwindow.ui
@@ -107,7 +107,7 @@
<addaction name="actionViewList"/>
<addaction name="actionViewProfile"/>
<addaction name="actionViewInfo"/>
- <addaction name="actionViewGlobe"/>
+ <addaction name="actionViewMap"/>
<addaction name="separator"/>
<addaction name="actionYearlyStatistics"/>
<addaction name="actionPreviousDC"/>
@@ -375,9 +375,9 @@
<string notr="true">F1</string>
</property>
</action>
- <action name="actionViewGlobe">
+ <action name="actionViewMap">
<property name="text">
- <string>&amp;Globe</string>
+ <string>&amp;Map</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+5</string>