summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-27 11:29:24 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-27 11:29:24 (GMT)
commitaf52863dea16e9255d0173e024847b59f7309f4b (patch)
tree9e5b12d7e94376e662431cebe18826a3f20abe0e
parent6fee682460dcd5197c4867f0d721a8dedb3562ee (diff)
Fix dialog window titles: do not append ourselves the appname
The appname is appended by the platform (integration) usually, so that only results in duplication. Cmp. also 35ee1504e51fd2958a800b273a8acaa40281b68e
-rw-r--r--src/lib/marble/BookmarkManagerDialog.cpp8
-rw-r--r--src/lib/marble/BookmarkManagerDialog.ui2
-rw-r--r--src/lib/marble/EditBookmarkDialog.ui2
-rw-r--r--src/lib/marble/MovieCaptureDialog.ui2
-rw-r--r--src/lib/marble/NewBookmarkFolderDialog.ui2
-rw-r--r--src/lib/marble/TourCaptureDialog.ui2
-rw-r--r--src/lib/marble/routing/RoutingManager.cpp2
-rw-r--r--src/plugins/render/routing/RoutingConfigDialog.ui2
-rw-r--r--src/plugins/render/satellites/SatellitesConfigDialog.ui2
9 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/marble/BookmarkManagerDialog.cpp b/src/lib/marble/BookmarkManagerDialog.cpp
index f657f13..bf105ed 100644
--- a/src/lib/marble/BookmarkManagerDialog.cpp
+++ b/src/lib/marble/BookmarkManagerDialog.cpp
@@ -173,7 +173,7 @@ void BookmarkManagerDialogPrivate::deleteFolder()
if ( folder ) {
if ( folder->size() > 0 ) {
QString const text = QObject::tr( "The folder %1 is not empty. Removing it will delete all bookmarks it contains. Are you sure you want to delete the folder?" ).arg( folder->name() );
- if ( QMessageBox::question( m_parent, QObject::tr("Remove Folder - Marble"), text, QMessageBox::Yes, QMessageBox::No ) != QMessageBox::Yes) {
+ if (QMessageBox::question(m_parent, BookmarkManagerDialog::tr("Remove Folder"), text, QMessageBox::Yes, QMessageBox::No) != QMessageBox::Yes) {
return;
}
}
@@ -413,14 +413,14 @@ void BookmarkManagerDialog::exportBookmarks()
if ( !file.open( QIODevice::ReadWrite ) || !writer.write( &file, bookmarkDocument() ) ) {
mDebug() << "Could not write the bookmarks file" << fileName;
QString const text = tr( "Unable to save bookmarks. Please check that the file is writable." );
- QMessageBox::warning( this, tr( "Bookmark Export - Marble" ), text );
+ QMessageBox::warning(this, tr("Bookmark Export"), text);
}
}
}
void BookmarkManagerDialog::importBookmarks()
{
- QString const file = QFileDialog::getOpenFileName( this, tr( "Import Bookmarks - Marble" ),
+ QString const file = QFileDialog::getOpenFileName(this, tr("Import Bookmarks"),
QDir::homePath(), tr( "KML Files (*.kml)" ) );
if ( file.isEmpty() ) {
return;
@@ -429,7 +429,7 @@ void BookmarkManagerDialog::importBookmarks()
GeoDataDocument *import = BookmarkManager::openFile( file );
if ( !import ) {
QString const text = tr( "The file %1 cannot be opened as a KML file." ).arg( file );
- QMessageBox::warning( this, tr( "Bookmark Import - Marble" ), text );
+ QMessageBox::warning(this, tr( "Bookmark Import"), text);
return;
}
diff --git a/src/lib/marble/BookmarkManagerDialog.ui b/src/lib/marble/BookmarkManagerDialog.ui
index b642302..fc2a916 100644
--- a/src/lib/marble/BookmarkManagerDialog.ui
+++ b/src/lib/marble/BookmarkManagerDialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Bookmark Manager - Marble</string>
+ <string>Bookmark Manager</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/lib/marble/EditBookmarkDialog.ui b/src/lib/marble/EditBookmarkDialog.ui
index 8fdc9cd..4f6d48b 100644
--- a/src/lib/marble/EditBookmarkDialog.ui
+++ b/src/lib/marble/EditBookmarkDialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Edit Bookmark - Marble</string>
+ <string>Edit Bookmark</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/lib/marble/MovieCaptureDialog.ui b/src/lib/marble/MovieCaptureDialog.ui
index c90998c..ce0d52b 100644
--- a/src/lib/marble/MovieCaptureDialog.ui
+++ b/src/lib/marble/MovieCaptureDialog.ui
@@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
- <string>Movie Recording - Marble</string>
+ <string>Movie Recording</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
diff --git a/src/lib/marble/NewBookmarkFolderDialog.ui b/src/lib/marble/NewBookmarkFolderDialog.ui
index 1d56400..6406d91 100644
--- a/src/lib/marble/NewBookmarkFolderDialog.ui
+++ b/src/lib/marble/NewBookmarkFolderDialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>New Bookmark Folder - Marble</string>
+ <string>New Bookmark Folder</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/lib/marble/TourCaptureDialog.ui b/src/lib/marble/TourCaptureDialog.ui
index 9d3a927..c229aab 100644
--- a/src/lib/marble/TourCaptureDialog.ui
+++ b/src/lib/marble/TourCaptureDialog.ui
@@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
- <string>Movie Recording - Marble</string>
+ <string>Movie Recording</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
diff --git a/src/lib/marble/routing/RoutingManager.cpp b/src/lib/marble/routing/RoutingManager.cpp
index c46475f..5e0b115 100644
--- a/src/lib/marble/routing/RoutingManager.cpp
+++ b/src/lib/marble/routing/RoutingManager.cpp
@@ -509,7 +509,7 @@ void RoutingManager::setGuidanceModeEnabled( bool enabled )
text += ' ' + tr( "Road construction, weather and other unforeseen variables can result in the suggested route not to be the most expedient or safest route to your destination." );
text += ' ' + tr( "Please use common sense while navigating." ) + "</p>";
text += "<p>" + tr( "The Marble development team wishes you a pleasant and safe journey." ) + "</p>";
- QPointer<QMessageBox> messageBox = new QMessageBox( QMessageBox::Information, tr( "Guidance Mode - Marble" ), text, QMessageBox::Ok );
+ QPointer<QMessageBox> messageBox = new QMessageBox(QMessageBox::Information, tr("Guidance Mode"), text, QMessageBox::Ok);
QCheckBox *showAgain = new QCheckBox( tr( "Show again" ) );
showAgain->setChecked( true );
showAgain->blockSignals( true ); // otherwise it'd close the dialog
diff --git a/src/plugins/render/routing/RoutingConfigDialog.ui b/src/plugins/render/routing/RoutingConfigDialog.ui
index 7ca424a..090660d 100644
--- a/src/plugins/render/routing/RoutingConfigDialog.ui
+++ b/src/plugins/render/routing/RoutingConfigDialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Routing Configuration - Marble</string>
+ <string>Routing Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
diff --git a/src/plugins/render/satellites/SatellitesConfigDialog.ui b/src/plugins/render/satellites/SatellitesConfigDialog.ui
index 6358d86..270ee93 100644
--- a/src/plugins/render/satellites/SatellitesConfigDialog.ui
+++ b/src/plugins/render/satellites/SatellitesConfigDialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Satellites Configuration - Marble</string>
+ <string>Satellites Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>