Skip to content

Commit

Permalink
fix warnings and translation strings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Nov 12, 2017
1 parent 68da18c commit 150a64e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/Grass7Utils.py
Expand Up @@ -472,14 +472,14 @@ def checkGrassIsInstalled(ignorePreviousState=False):
'it before running GRASS GIS 7 algorithms.')
if Grass7Utils.command is None:
return Grass7Utils.tr(
'GRASS GIS 7 binary {0} can\t be found on this system from a shell.'
'GRASS GIS 7 binary {0} can\'t be found on this system from a shell. '
'Please install it or configure your PATH {1} environment variable.'.format(
'(grass.bat)' if isWindows() else '(grass.sh)',
'or OSGEO4W_ROOT' if isWindows() else ''))
# GNU/Linux
else:
return Grass7Utils.tr(
'GRASS 7 can\'t be found on this system from a shell.'
'GRASS 7 can\'t be found on this system from a shell. '
'Please install it or configure your PATH environment variable.')

@staticmethod
Expand Down
5 changes: 0 additions & 5 deletions src/app/qgsattributesformproperties.cpp
Expand Up @@ -451,11 +451,6 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt

void QgsAttributesFormProperties::onAttributeSelectionChanged()
{
bool isAddPossible = false;
if ( mFormLayoutTree->selectedItems().count() == 1 && !mAvailableWidgetsTree->selectedItems().isEmpty() )
if ( mFormLayoutTree->selectedItems()[0]->data( 0, DnDTreeRole ).value<DnDTreeItemData>().type() == DnDTreeItemData::Container )
isAddPossible = true;

storeAttributeTypeDialog();
storeAttributeRelationEdit();

Expand Down

0 comments on commit 150a64e

Please sign in to comment.