Skip to content
Permalink
Browse files

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

  • Loading branch information
timlinux committed Oct 21, 2011
2 parents 2ef1772 + b0112f1 commit 513f1c3959c6b86a2d27188653a9ba16e338ae73
Showing with 12,126 additions and 9,400 deletions.
  1. +931 −801 i18n/qgis_de.ts
  2. +9,881 −7,725 i18n/qgis_hr_HR.ts
  3. +4 −4 i18n/qgis_it.ts
  4. +7 −0 images/images.qrc
  5. BIN images/themes/gis/mIconConnect.png
  6. BIN images/themes/gis/mIconDbSchema.png
  7. BIN images/themes/gis/mIconPostgis.png
  8. BIN images/themes/gis/mIconRaster.png
  9. BIN images/themes/gis/mIconSpatialite.png
  10. BIN images/themes/gis/mIconWfs.png
  11. BIN images/themes/gis/mIconWms.png
  12. +1 −1 src/app/qgsbrowserdockwidget.cpp
  13. +1 −0 src/app/qgslabelinggui.cpp
  14. +2 −0 src/app/qgsrasterlayerproperties.cpp
  15. +1 −1 src/browser/qgsbrowser.cpp
  16. +4 −0 src/core/qgsbrowsermodel.cpp
  17. +35 −0 src/core/qgsdataitem.cpp
  18. +25 −0 src/core/qgsdataitem.h
  19. +218 −25 src/core/raster/qgsrasterlayer.cpp
  20. +8 −2 src/gui/qgsattributeeditor.cpp
  21. +19 −0 src/mapserver/qgsconfigparser.cpp
  22. +15 −2 src/mapserver/qgsconfigparser.h
  23. +92 −150 src/mapserver/qgsprojectparser.cpp
  24. +15 −10 src/mapserver/qgsprojectparser.h
  25. +4 −23 src/mapserver/qgssldparser.cpp
  26. +1 −15 src/mapserver/qgssldparser.h
  27. +1 −1 src/providers/gdal/CMakeLists.txt
  28. +116 −0 src/providers/gdal/qgsgdaldataitems.cpp
  29. +18 −0 src/providers/gdal/qgsgdaldataitems.h
  30. +0 −109 src/providers/gdal/qgsgdalprovider.cpp
  31. +7 −11 src/providers/gdal/qgsgdalprovider.h
  32. +2 −2 src/providers/ogr/CMakeLists.txt
  33. +284 −0 src/providers/ogr/qgsogrdataitems.cpp
  34. +43 −0 src/providers/ogr/qgsogrdataitems.h
  35. +2 −235 src/providers/ogr/qgsogrprovider.cpp
  36. +13 −13 src/providers/ogr/qgsogrprovider.h
  37. +28 −6 src/providers/postgres/qgspostgresdataitems.cpp
  38. +6 −0 src/providers/postgres/qgspostgresdataitems.h
  39. +0 −11 src/providers/postgres/qgspostgresprovider.cpp
  40. +9 −2 src/providers/wfs/qgswfsdataitems.cpp
  41. +0 −9 src/providers/wfs/qgswfsprovider.cpp
  42. +2 −0 src/providers/wms/CMakeLists.txt
  43. +266 −0 src/providers/wms/qgswmsdataitems.cpp
  44. +64 −0 src/providers/wms/qgswmsdataitems.h
  45. +0 −196 src/providers/wms/qgswmsprovider.cpp
  46. +1 −46 src/providers/wms/qgswmsprovider.h

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -2230,7 +2230,7 @@ Disabilita l'opzione "Usa estensioni di intersezione" 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"/>
<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"/>
<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"/>
@@ -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>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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 );
}
@@ -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 );

@@ -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 );
@@ -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 );
}
@@ -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();
@@ -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()
{
}
@@ -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

0 comments on commit 513f1c3

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