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

qgis · Oct 21, 2011 · 513f1c3 · 513f1c3
2 parents 2ef1772 + b0112f1
commit 513f1c3
Show file tree

Hide file tree

Showing 46 changed files with 12,126 additions and 9,400 deletions.
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_hr_HR.ts b/i18n/qgis_hr_HR.ts
diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
@@ -2230,7 +2230,7 @@ Disabilita l&apos;opzione &quot;Usa estensioni di intersezione&quot; per ottener
     </message>
     <message>
         <source>Select directory with GDAL executables</source>
-        <translation>Scegli la cartella contenente gli eseguibili GDAL</translation>
+        <translation>Scegli la cartella contenente gli eseguibili di GDAL</translation>
     </message>
     <message>
         <source>Select directory with the GDAL documentation</source>
@@ -10247,7 +10247,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/ui/qgsannotationwidgetbase.ui" line="50"/>
         <source>Frame width</source>
-        <translation>Larghezza del riquadro</translation>
+        <translation>Spessore del riquadro</translation>
     </message>
     <message>
         <location filename="../src/ui/qgsannotationwidgetbase.ui" line="67"/>
@@ -29412,7 +29412,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp" line="107"/>
         <source>Calculating </source>
-        <translation>Calcolo in corso</translation>
+        <translation>Calcolo in corso </translation>
     </message>
     <message>
         <location filename="../src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp" line="107"/>
@@ -30992,7 +30992,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/plugins/spatialquery/qgsspatialquerydialogbase.ui" line="332"/>
         <source>Zoom to item</source>
-        <translation>Zomm all&apos;oggetto</translation>
+        <translation>Zoom all&apos;oggetto</translation>
     </message>
     <message>
         <location filename="../src/plugins/spatialquery/qgsspatialquerydialogbase.ui" line="353"/>

diff --git a/images/images.qrc b/images/images.qrc
@@ -353,6 +353,13 @@
         <file>themes/default/plugins/north_arrow.png</file>
         <file>themes/default/plugins/scale_bar.png</file>
         <file>themes/default/mActionAddWfsLayer.png</file>
+        <file>themes/gis/mIconWms.png</file>
+        <file>themes/gis/mIconWfs.png</file>
+        <file>themes/gis/mIconSpatialite.png</file>
+        <file>themes/gis/mIconRaster.png</file>
+        <file>themes/gis/mIconPostgis.png</file>
+        <file>themes/gis/mIconConnect.png</file>
+        <file>themes/gis/mIconDbSchema.png</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/gis/mIconConnect.png b/images/themes/gis/mIconConnect.png
diff --git a/images/themes/gis/mIconDbSchema.png b/images/themes/gis/mIconDbSchema.png
diff --git a/images/themes/gis/mIconPostgis.png b/images/themes/gis/mIconPostgis.png
diff --git a/images/themes/gis/mIconRaster.png b/images/themes/gis/mIconRaster.png
diff --git a/images/themes/gis/mIconSpatialite.png b/images/themes/gis/mIconSpatialite.png
diff --git a/images/themes/gis/mIconWfs.png b/images/themes/gis/mIconWfs.png
diff --git a/images/themes/gis/mIconWms.png b/images/themes/gis/mIconWms.png
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -269,7 +269,7 @@ void QgsBrowserDockWidget::refreshModel( const QModelIndex& index )
   for ( int i = 0 ; i < mModel->rowCount( index ); i++ )
   {
     QModelIndex idx = mModel->index( i, 0, index );
-    if ( mBrowserView->isExpanded( idx ) )
+    if ( mBrowserView->isExpanded( idx ) || !mModel->hasChildren( idx ) )
     {
       refreshModel( idx );
     }

diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -62,6 +62,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
   }
 
   chkMergeLines->setEnabled( layer->geometryType() == QGis::Line );
+  chkAddDirectionSymbol->setEnabled( layer->geometryType() == QGis::Line );
   label_19->setEnabled( layer->geometryType() != QGis::Point );
   mMinSizeSpinBox->setEnabled( layer->geometryType() != QGis::Point );
 

diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -176,6 +176,8 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
     cboGreen->addItem( myRasterBandName );
     cboBlue->addItem( myRasterBandName );
     cboxColorMapBand->addItem( myRasterBandName );
+    cboxTransparencyBand->addItem( myRasterBandName );
+    cboxTransparencyBand->setEnabled( true );
   }
 
   cboRed->addItem( TRSTRING_NOT_SET );

diff --git a/src/browser/qgsbrowser.cpp b/src/browser/qgsbrowser.cpp
@@ -531,7 +531,7 @@ void QgsBrowser::refresh( const QModelIndex& index )
   for ( int i = 0 ; i < mModel->rowCount( index ); i++ )
   {
     QModelIndex idx = mModel->index( i, 0, index );
-    if ( treeView->isExpanded( idx ) )
+    if ( treeView->isExpanded( idx ) || !mModel->hasChildren( idx ) )
     {
       refresh( idx );
     }

diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -134,6 +134,10 @@ QVariant QgsBrowserModel::data( const QModelIndex &index, int role ) const
   {
     return item->name();
   }
+  else if ( role == Qt::ToolTipRole )
+  {
+    return item->toolTip();
+  }
   else if ( role == Qt::DecorationRole && index.column() == 0 )
   {
     return item->icon();

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -76,6 +76,16 @@ const QIcon &QgsLayerItem::iconTable()
   return icon;
 }
 
+const QIcon &QgsLayerItem::iconRaster()
+{
+  static QIcon icon;
+
+  if ( icon.isNull() )
+    icon = QIcon( getThemePixmap( "/mIconRaster.png" ) );
+
+  return icon;
+}
+
 const QIcon &QgsLayerItem::iconDefault()
 {
   static QIcon icon;
@@ -86,6 +96,16 @@ const QIcon &QgsLayerItem::iconDefault()
   return icon;
 }
 
+const QIcon &QgsDataCollectionItem::iconDataCollection()
+{
+  static QIcon icon;
+
+  if ( icon.isNull() )
+    icon = QIcon( getThemePixmap( "/mIconDbSchema.png" ) );
+
+  return icon;
+}
+
 const QIcon &QgsDataCollectionItem::iconDir()
 {
   static QIcon icon;
@@ -277,6 +297,7 @@ QgsLayerItem::QgsLayerItem( QgsDataItem* parent, QString name, QString path, QSt
     case Line:       mIcon = iconLine(); break;
     case Polygon:    mIcon = iconPolygon(); break;
     case TableLayer: mIcon = iconTable(); break;
+    case Raster:     mIcon = iconRaster(); break;
     default:         mIcon = iconDefault(); break;
   }
 }
@@ -304,6 +325,7 @@ bool QgsLayerItem::equal( const QgsDataItem *other )
 QgsDataCollectionItem::QgsDataCollectionItem( QgsDataItem* parent, QString name, QString path )
     : QgsDataItem( Collection, parent, name, path )
 {
+  mIcon = iconDataCollection();
 }
 
 QgsDataCollectionItem::~QgsDataCollectionItem()
@@ -565,3 +587,16 @@ void QgsDirectoryParamWidget::showHideColumn()
   }
   settings.setValue( "/dataitem/directoryHiddenColumns", lst );
 }
+
+
+QgsErrorItem::QgsErrorItem( QgsDataItem* parent, QString error, QString path )
+    : QgsDataItem( QgsDataItem::Error, parent, error, path )
+{
+  mIcon = QIcon( getThemePixmap( "/mIconDelete.png" ) );
+
+  mPopulated = true; // no more children
+}
+
+QgsErrorItem::~QgsErrorItem()
+{
+}
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -46,6 +46,7 @@ class CORE_EXPORT QgsDataItem : public QObject
       Collection,
       Directory,
       Layer,
+      Error,
     };
 
     QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString name, QString path );
@@ -111,6 +112,9 @@ class CORE_EXPORT QgsDataItem : public QObject
 
     void setIcon( QIcon icon ) { mIcon = icon; }
 
+    void setToolTip( QString msg ) { mToolTip = msg; }
+    QString toolTip() const { return mToolTip; }
+
   protected:
 
     Type mType;
@@ -119,6 +123,7 @@ class CORE_EXPORT QgsDataItem : public QObject
     bool mPopulated;
     QString mName;
     QString mPath; // it is also used to identify item in tree
+    QString mToolTip;
     QIcon mIcon;
 
   public slots:
@@ -179,6 +184,7 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
     static const QIcon &iconLine();
     static const QIcon &iconPolygon();
     static const QIcon &iconTable();
+    static const QIcon &iconRaster();
     static const QIcon &iconDefault();
 };
 
@@ -195,6 +201,7 @@ class CORE_EXPORT QgsDataCollectionItem : public QgsDataItem
     void addChild( QgsDataItem *item ) { mChildren.append( item ); }
 
     static const QIcon &iconDir(); // shared icon: open/closed directory
+    static const QIcon &iconDataCollection(); // default icon for data collection
 };
 
 /** A directory: contains subdirectories and layers */
@@ -225,6 +232,24 @@ class CORE_EXPORT QgsDirectoryItem : public QgsDataCollectionItem
     static QVector<QLibrary*> mLibraries;
 };
 
+/**
+ Data item that can be used to report problems (e.g. network error)
+ */
+class CORE_EXPORT QgsErrorItem : public QgsDataItem
+{
+    Q_OBJECT
+  public:
+
+    QgsErrorItem( QgsDataItem* parent, QString error, QString path );
+    ~QgsErrorItem();
+
+    //QVector<QgsDataItem*> createChildren();
+    //virtual bool equal( const QgsDataItem *other );
+};
+
+
+// ---------
+
 class QgsDirectoryParamWidget : public QTreeWidget
 {
     Q_OBJECT