Commit af52863d authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

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 35ee1504
parent 6fee6824
......@@ -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;
}
......
......@@ -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>
......
......@@ -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>
......
......@@ -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">
......
......@@ -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>
......
......@@ -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">
......
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment