Skip to content

Commit

Permalink
[Style Manager] Rephrase strings away from being symbol-specific
Browse files Browse the repository at this point in the history
  • Loading branch information
DelazJ authored and nirvn committed Jul 26, 2018
1 parent 0bfe501 commit 466992e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions src/gui/symbology/qgsstyleexportimportdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ QgsStyleExportImportDialog::QgsStyleExportImportDialog( QgsStyle *style, QWidget

if ( mDialogMode == Import )
{
setWindowTitle( tr( "Import Symbol(s)" ) );
setWindowTitle( tr( "Import Item(s)" ) );
// populate the import types
importTypeCombo->addItem( tr( "file specified below" ), QVariant( "file" ) );
// importTypeCombo->addItem( "official QGIS repo online", QVariant( "official" ) );
Expand All @@ -79,12 +79,12 @@ QgsStyleExportImportDialog::QgsStyleExportImportDialog( QgsStyle *style, QWidget
btnBrowse->setText( QStringLiteral( "Browse" ) );
connect( btnBrowse, &QAbstractButton::clicked, this, &QgsStyleExportImportDialog::browse );

label->setText( tr( "Select symbols to import" ) );
label->setText( tr( "Select items to import" ) );
buttonBox->button( QDialogButtonBox::Ok )->setText( tr( "Import" ) );
}
else
{
setWindowTitle( tr( "Export Symbol(s)" ) );
setWindowTitle( tr( "Export Item(s)" ) );
// hide import specific controls when exporting
btnBrowse->setHidden( true );
fromLabel->setHidden( true );
Expand Down Expand Up @@ -122,7 +122,7 @@ void QgsStyleExportImportDialog::doExportImport()
QModelIndexList selection = listItems->selectionModel()->selectedIndexes();
if ( selection.isEmpty() )
{
QMessageBox::warning( this, tr( "Export/import Symbols or Color Ramps" ),
QMessageBox::warning( this, tr( "Export/import Item(s)" ),
tr( "You should select at least one symbol/color ramp." ) );
return;
}
Expand Down Expand Up @@ -462,7 +462,7 @@ void QgsStyleExportImportDialog::selectByGroup()
if ( ! mGroupSelectionDlg )
{
mGroupSelectionDlg = new QgsStyleGroupSelectionDialog( mStyle, this );
mGroupSelectionDlg->setWindowTitle( tr( "Select Symbols by Group" ) );
mGroupSelectionDlg->setWindowTitle( tr( "Select Item(s) by Group" ) );
connect( mGroupSelectionDlg, &QgsStyleGroupSelectionDialog::tagSelected, this, &QgsStyleExportImportDialog::selectTag );
connect( mGroupSelectionDlg, &QgsStyleGroupSelectionDialog::tagDeselected, this, &QgsStyleExportImportDialog::deselectTag );
connect( mGroupSelectionDlg, &QgsStyleGroupSelectionDialog::allSelected, this, &QgsStyleExportImportDialog::selectAll );
Expand All @@ -488,12 +488,12 @@ void QgsStyleExportImportDialog::importTypeChanged( int index )
}
else if ( type == QLatin1String( "official" ) )
{
btnBrowse->setText( QStringLiteral( "Fetch Symbols" ) );
btnBrowse->setText( QStringLiteral( "Fetch Items" ) );
locationLineEdit->setEnabled( false );
}
else
{
btnBrowse->setText( QStringLiteral( "Fetch Symbols" ) );
btnBrowse->setText( QStringLiteral( "Fetch Items" ) );
locationLineEdit->setEnabled( true );
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/symbology/qgsstylegroupselectiondialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ QgsStyleGroupSelectionDialog::QgsStyleGroupSelectionDialog( QgsStyle *style, QWi
QStandardItemModel *model = new QStandardItemModel( groupTree );
groupTree->setModel( model );

QStandardItem *allSymbols = new QStandardItem( tr( "All Symbols" ) );
QStandardItem *allSymbols = new QStandardItem( tr( "All" ) );
allSymbols->setData( "all", Qt::UserRole + 2 );
allSymbols->setEditable( false );
setBold( allSymbols );
Expand Down
4 changes: 2 additions & 2 deletions src/gui/symbology/qgsstylemanagerdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ QgsStyleManagerDialog::QgsStyleManagerDialog( QgsStyle *style, QWidget *parent )
);

QMenu *shareMenu = new QMenu( tr( "Share Menu" ), this );
QAction *exportAction = new QAction( tr( "Export Symbol(s)…" ), this );
QAction *exportAction = new QAction( tr( "Export Item(s)…" ), this );
exportAction->setIcon( QIcon( QgsApplication::iconPath( "mActionFileSave.svg" ) ) );
shareMenu->addAction( exportAction );
QAction *importAction = new QAction( tr( "Import Symbol(s)…" ), this );
QAction *importAction = new QAction( tr( "Import Item(s)…" ), this );
importAction->setIcon( QIcon( QgsApplication::iconPath( "mActionFileOpen.svg" ) ) );
shareMenu->addAction( importAction );
shareMenu->addSeparator();
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsstyleexportimportdialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Select symbols to export</string>
<string>Select items to export</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit 466992e

Please sign in to comment.