sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:qgis/Quantum-GIS

Browse Source
This commit is contained in:
Marco Hugentobler 2012-06-14 10:40:39 +02:00
commit f9ff8ccd46
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/qgsexpressionbuilderwidget.cpp
View File

@ -87,7 +87,11 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
if ( func.mParams >= 1 )
name += "(";
registerItem( func.mGroup, func.mName, " " + name + " " );
};
}
#if QT_VERSION >= 0x040700
txtSearchEdit->setPlaceHolderText( tr( "Search" ) );
#endif
}
@ -114,9 +118,9 @@ void QgsExpressionBuilderWidget::currentChanged( const QModelIndex &index, const
mValueListWidget->clear();
}
btnLoadAll->setVisible(item->getItemType() == QgsExpressionItem::Field);
btnLoadSample->setVisible(item->getItemType() == QgsExpressionItem::Field);
mValueGroupBox->setVisible(item->getItemType() == QgsExpressionItem::Field);
btnLoadAll->setVisible( item->getItemType() == QgsExpressionItem::Field );
btnLoadSample->setVisible( item->getItemType() == QgsExpressionItem::Field );
mValueGroupBox->setVisible( item->getItemType() == QgsExpressionItem::Field );
// Show the help for the current item.
QString help = loadFunctionHelp( item );

3
src/ui/qgsexpressionbuilder.ui
View File

@ -79,9 +79,6 @@
<property name="enabled">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>Search</string>
</property>
</widget>
</item>
</layout>