Skip to content

Commit 0243201

Browse files
SebDieBlnSebDieBln
committedJan 6, 2016
[StyleManager] fix labels
1 parent 95e571c commit 0243201

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed
 

‎src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, Q
6363

6464
if ( mDialogMode == Import )
6565
{
66-
setWindowTitle( tr( "Import style(s)" ) );
66+
setWindowTitle( tr( "Import symbol(s)" ) );
6767
// populate the import types
6868
importTypeCombo->addItem( tr( "file specified below" ), QVariant( "file" ) );
6969
// importTypeCombo->addItem( "official QGIS repo online", QVariant( "official" ) );
@@ -85,7 +85,7 @@ QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, Q
8585
}
8686
else
8787
{
88-
setWindowTitle( tr( "Export style(s)" ) );
88+
setWindowTitle( tr( "Export symbol(s)" ) );
8989
// hide import specific controls when exporting
9090
btnBrowse->setHidden( true );
9191
fromLabel->setHidden( true );

‎src/gui/symbology-ng/qgsstylev2managerdialog.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
6464
connect( btnEditItem, SIGNAL( clicked() ), this, SLOT( editItem() ) );
6565
connect( btnRemoveItem, SIGNAL( clicked() ), this, SLOT( removeItem() ) );
6666

67-
QMenu *shareMenu = new QMenu( tr( "Share Menu" ), this );
68-
QAction *exportAsPNGAction = shareMenu->addAction( tr( "Export as PNG" ) );
69-
QAction *exportAsSVGAction = shareMenu->addAction( tr( "Export as SVG" ) );
70-
QAction *exportAction = shareMenu->addAction( tr( "Export" ) );
71-
QAction *importAction = shareMenu->addAction( tr( "Import" ) );
67+
QMenu *shareMenu = new QMenu( tr( "Share menu" ), this );
68+
QAction *exportAsPNGAction = shareMenu->addAction( tr( "Export selected symbols as PNG" ) );
69+
QAction *exportAsSVGAction = shareMenu->addAction( tr( "Export selected symbols as SVG" ) );
70+
QAction *exportAction = shareMenu->addAction( tr( "Export..." ) );
71+
QAction *importAction = shareMenu->addAction( tr( "Import..." ) );
7272
exportAsPNGAction->setIcon( QIcon( QgsApplication::iconPath( "mActionSharingExport.svg" ) ) );
7373
exportAsSVGAction->setIcon( QIcon( QgsApplication::iconPath( "mActionSharingExport.svg" ) ) );
7474
exportAction->setIcon( QIcon( QgsApplication::iconPath( "mActionSharingExport.svg" ) ) );
@@ -101,9 +101,9 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
101101
connect( groupModel, SIGNAL( itemChanged( QStandardItem* ) ),
102102
this, SLOT( groupRenamed( QStandardItem* ) ) );
103103

104-
QMenu *groupMenu = new QMenu( tr( "Group Actions" ), this );
105-
QAction *groupSymbols = groupMenu->addAction( tr( "Group Symbols" ) );
106-
QAction *editSmartgroup = groupMenu->addAction( tr( "Edit Smart Group" ) );
104+
QMenu *groupMenu = new QMenu( tr( "Group actions" ), this );
105+
QAction *groupSymbols = groupMenu->addAction( tr( "Group symbols" ) );
106+
QAction *editSmartgroup = groupMenu->addAction( tr( "Edit smart group" ) );
107107
btnManageGroups->setMenu( groupMenu );
108108
connect( groupSymbols, SIGNAL( triggered() ), this, SLOT( groupSymbolsAction() ) );
109109
connect( editSmartgroup, SIGNAL( triggered() ), this, SLOT( editSmartgroupAction() ) );
@@ -1057,7 +1057,7 @@ void QgsStyleV2ManagerDialog::groupSymbolsAction()
10571057
if ( mGrouppingMode )
10581058
{
10591059
mGrouppingMode = false;
1060-
senderAction->setText( tr( "Group Symbols" ) );
1060+
senderAction->setText( tr( "Group symbols" ) );
10611061
// disconnect slot which handles regrouping
10621062
disconnect( model, SIGNAL( itemChanged( QStandardItem* ) ),
10631063
this, SLOT( regrouped( QStandardItem* ) ) );
@@ -1094,7 +1094,7 @@ void QgsStyleV2ManagerDialog::groupSymbolsAction()
10941094

10951095
mGrouppingMode = true;
10961096
// Change the text menu
1097-
senderAction->setText( tr( "Finish Grouping" ) );
1097+
senderAction->setText( tr( "Finish grouping" ) );
10981098
// Remove all Symbol editing functionalities
10991099
disconnect( treeModel, SIGNAL( itemChanged( QStandardItem* ) ),
11001100
this, SLOT( groupRenamed( QStandardItem* ) ) );
@@ -1296,29 +1296,29 @@ void QgsStyleV2ManagerDialog::grouptreeContextMenu( const QPoint& point )
12961296
{
12971297
if ( index.parent().data( Qt::UserRole + 1 ).toString() == "smartgroups" )
12981298
{
1299-
groupMenu.addAction( tr( "Edit Group" ) );
1299+
groupMenu.addAction( tr( "Edit smart group" ) );
13001300
}
13011301
else
13021302
{
1303-
groupMenu.addAction( tr( "Add Group" ) );
1303+
groupMenu.addAction( tr( "Add group" ) );
13041304
}
1305-
groupMenu.addAction( tr( "Remove Group" ) );
1305+
groupMenu.addAction( tr( "Remove group" ) );
13061306
}
13071307
else if ( index.data( Qt::UserRole + 1 ) == "groups" || index.data( Qt::UserRole + 1 ) == "smartgroups" )
13081308
{
1309-
groupMenu.addAction( tr( "Add Group" ) );
1309+
groupMenu.addAction( tr( "Add group" ) );
13101310
}
13111311

13121312

13131313
QAction* selectedItem = groupMenu.exec( globalPos );
13141314

13151315
if ( selectedItem )
13161316
{
1317-
if ( selectedItem->text() == tr( "Add Group" ) )
1317+
if ( selectedItem->text() == tr( "Add group" ) )
13181318
addGroup();
1319-
else if ( selectedItem->text() == tr( "Remove Group" ) )
1319+
else if ( selectedItem->text() == tr( "Remove group" ) )
13201320
removeGroup();
1321-
else if ( selectedItem->text() == tr( "Edit Group" ) )
1321+
else if ( selectedItem->text() == tr( "Edit smart group" ) )
13221322
editSmartgroupAction();
13231323
}
13241324
}

0 commit comments

Comments
 (0)