Skip to content

Commit

Permalink
Fix untranslatable strings in qgsstylev2managerdialog.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
@artfwo @m-kuhn
artfwo authored and m-kuhn committed Aug 9, 2013
1 parent 27bd3f0 commit 6bbb8dc
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions src/gui/symbology-ng/qgsstylev2managerdialog.cpp
View file
Expand Up @@ -58,9 +58,9 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
tabItemType->setDocumentMode( true );
#endif
#if QT_VERSION >= 0x40700
searchBox->setPlaceholderText( tr( "Type here to filter symbols ..." ) );
searchBox->setPlaceholderText( tr( "Type here to filter symbols..." ) );
#else
searchBox->setToolTip( tr( "Type here to filter symbols ..." ) );
searchBox->setToolTip( tr( "Type here to filter symbols..." ) );
#endif

// setup icons
Expand All @@ -77,9 +77,9 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
connect( btnEditItem, SIGNAL( clicked() ), this, SLOT( editItem() ) );
connect( btnRemoveItem, SIGNAL( clicked() ), this, SLOT( removeItem() ) );

QMenu *shareMenu = new QMenu( "Share Menu", this );
QAction *exportAction = shareMenu->addAction( "Export" );
QAction *importAction = shareMenu->addAction( "Import" );
QMenu *shareMenu = new QMenu( tr( "Share Menu" ), this );
QAction *exportAction = shareMenu->addAction( tr( "Export" ) );
QAction *importAction = shareMenu->addAction( tr( "Import" ) );
connect( exportAction, SIGNAL( triggered() ), this, SLOT( exportItems() ) );
connect( importAction, SIGNAL( triggered() ), this, SLOT( importItems() ) );
btnShare->setMenu( shareMenu );
Expand All @@ -106,9 +106,9 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa
connect( groupModel, SIGNAL( itemChanged( QStandardItem* ) ),
this, SLOT( groupRenamed( QStandardItem* ) ) );

QMenu *groupMenu = new QMenu( "Group Actions", this );
QAction *groupSymbols = groupMenu->addAction( "Group Symbols" );
QAction *editSmartgroup = groupMenu->addAction( "Edit Smart Group" );
QMenu *groupMenu = new QMenu( tr( "Group Actions" ), this );
QAction *groupSymbols = groupMenu->addAction( tr( "Group Symbols" ) );
QAction *editSmartgroup = groupMenu->addAction( tr( "Edit Smart Group" ) );
btnManageGroups->setMenu( groupMenu );
connect( groupSymbols, SIGNAL( triggered() ), this, SLOT( groupSymbolsAction() ) );
connect( editSmartgroup, SIGNAL( triggered() ), this, SLOT( editSmartgroupAction() ) );
Expand Down Expand Up @@ -922,7 +922,7 @@ void QgsStyleV2ManagerDialog::addGroup()
}
else
{
itemName = QString( "New Group" );
itemName = QString( tr( "New Group" ) );
itemData = QVariant( "newgroup" );
}

Expand Down Expand Up @@ -1030,7 +1030,7 @@ void QgsStyleV2ManagerDialog::groupSymbolsAction()
if ( mGrouppingMode )
{
mGrouppingMode = false;
senderAction->setText( "Group Symbols" );
senderAction->setText( tr( "Group Symbols" ) );
// disconnect slot which handles regrouping
disconnect( model, SIGNAL( itemChanged( QStandardItem* ) ),
this, SLOT( regrouped( QStandardItem* ) ) );
Expand Down Expand Up @@ -1067,7 +1067,7 @@ void QgsStyleV2ManagerDialog::groupSymbolsAction()

mGrouppingMode = true;
// Change the text menu
senderAction->setText( "Finish Grouping" );
senderAction->setText( tr( "Finish Grouping" ) );
// Remove all Symbol editing functionalities
disconnect( treeModel, SIGNAL( itemChanged( QStandardItem* ) ),
this, SLOT( groupRenamed( QStandardItem* ) ) );
Expand Down Expand Up @@ -1259,37 +1259,37 @@ void QgsStyleV2ManagerDialog::grouptreeContextMenu( const QPoint& point )
QPoint globalPos = groupTree->viewport()->mapToGlobal( point );

QModelIndex index = groupTree->indexAt( point );
QgsDebugMsg( "Now you clicked : " + index.data().toString() );
QgsDebugMsg( "Now you clicked: " + index.data().toString() );

QMenu groupMenu;

if ( index.parent().isValid() && ( index.data().toString() != "Ungrouped" ) )
{
if ( index.parent().data( Qt::UserRole + 1 ).toString() == "smartgroups" )
{
groupMenu.addAction( "Edit Group" );
groupMenu.addAction( tr( "Edit Group" ) );
}
else
{
groupMenu.addAction( "Add Group" );
groupMenu.addAction( tr( "Add Group" ) );
}
groupMenu.addAction( "Remove Group" );
groupMenu.addAction( tr( "Remove Group" ) );
}
else if ( index.data( Qt::UserRole + 1 ) == "groups" || index.data( Qt::UserRole + 1 ) == "smartgroups" )
{
groupMenu.addAction( "Add Group" );
groupMenu.addAction( tr( "Add Group" ) );
}


QAction* selectedItem = groupMenu.exec( globalPos );

if ( selectedItem )
{
if ( selectedItem->text() == "Add Group" )
if ( selectedItem->text() == tr( "Add Group" ) )
addGroup();
else if ( selectedItem->text() == "Remove Group" )
else if ( selectedItem->text() == tr( "Remove Group" ) )
removeGroup();
else if ( selectedItem->text() == "Edit Group" )
else if ( selectedItem->text() == tr( "Edit Group" ) )
editSmartgroupAction();
}
}
Expand All @@ -1300,15 +1300,15 @@ void QgsStyleV2ManagerDialog::listitemsContextMenu( const QPoint& point )

QMenu *groupMenu = new QMenu( this );
QMenu *groupList = new QMenu( this );
groupList->setTitle( "Apply Group" );
groupList->setTitle( tr( "Apply Group" ) );

QStringList groups = mStyle->groupNames();
foreach ( QString group, groups )
{
groupList->addAction( group );
}
groupMenu->addMenu( groupList );
groupMenu->addAction( "Un-group" );
groupMenu->addAction( tr( "Un-group" ) );

QAction* selectedItem = groupMenu->exec( globalPos );

Expand All @@ -1321,7 +1321,7 @@ void QgsStyleV2ManagerDialog::listitemsContextMenu( const QPoint& point )
return;
}
int groupId = 0;
if ( selectedItem->text() != "Un-group" )
if ( selectedItem->text() != tr( "Un-group" ) )
{
groupId = mStyle->groupId( selectedItem->text() );
}
Expand Down

0 comments on commit 6bbb8dc

Please sign in to comment.