Skip to content
Permalink
Browse files

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

  • Loading branch information
volaya committed Nov 6, 2012
2 parents a2e6a48 + ff78ef1 commit d97d4a6596a2fbb28ad17778b4c92cef3fd6cd9c
@@ -18,6 +18,7 @@ ADD_SUBDIRECTORY(pymorph)
ADD_SUBDIRECTORY(r)
ADD_SUBDIRECTORY(saga)
ADD_SUBDIRECTORY(script)
ADD_SUBDIRECTORY(servertools)
ADD_SUBDIRECTORY(taudem)
#ADD_SUBDIRECTORY(tests)

@@ -267,6 +267,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
mPanelMenu->addAction( mUndoDock->toggleViewAction() );
mAtlasDock = new QDockWidget( tr( "Atlas generation" ), this );
mAtlasDock->setObjectName( "AtlasDock" );
mPanelMenu->addAction( mAtlasDock->toggleViewAction() );

mGeneralDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
mItemDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
@@ -2158,6 +2158,8 @@ void QgsLegend::removePixmapHeightValue( int height )

void QgsLegend::handleCloseEditor( QWidget * editor, QAbstractItemDelegate::EndEditHint hint )
{
Q_UNUSED( editor );
Q_UNUSED( hint );
QgsLegendItem *item = dynamic_cast<QgsLegendItem *>( currentItem() );
if ( item )
{
@@ -211,8 +211,10 @@ void QgsPluginManager::getPythonPluginDescriptions()
myData.setRenderAsWidget( false );
myData.setChecked( false ); //start off assuming false

if ( iconName == "__error__" or iconName.isEmpty() )
if ( iconName == "__error__" || iconName.isEmpty() )
{
myData.setIcon( QPixmap( QgsApplication::defaultThemePath() + "/plugin.png" ) );
}
else
{
bool relative = QFileInfo( iconName ).isRelative();
@@ -44,7 +44,7 @@ QgsMessageBar::QgsMessageBar( QWidget *parent )

mCloseBtn = new QToolButton( this );
mCloseBtn->setToolTip( tr( "Close" ) );
mCloseBtn->setStyleSheet( "background-color: rgba(255, 255, 255, 0);" );
mCloseBtn->setStyleSheet( "QToolButton {background-color: rgba(255, 255, 255, 0);}" );
mCloseBtn->setCursor( Qt::PointingHandCursor );
mCloseBtn->setIcon( QgsApplication::getThemeIcon( "/mIconClose.png" ) );
connect( mCloseBtn, SIGNAL( clicked() ), this, SLOT( popWidget() ) );

0 comments on commit d97d4a6

Please sign in to comment.
You can’t perform that action at this time.