debian/changelog

@@ -5,8 +5,9 @@ qgis (1.9.90) UNRELEASED; urgency=low
   * include heatmap plugin
   * drop extra include path for QtWebkit on oneiric and natty
   * add translations for desktop link
+  * add browser desktop entry
 
- -- Jürgen E. Fischer <jef@norbit.de>  Thu, 16 Feb 2012 23:21:09 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Thu, 23 Feb 2012 09:36:48 +0100
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

debian/qbrowser.desktop

@@ -0,0 +1,55 @@
+[Desktop Entry]
+Type=Application
+Name=Quantum GIS Browser
+Version=1.0
+GenericName=Geographic Information System
+GenericName[ar]=نظام المعلومات الجغرافي
+GenericName[az]=Coğrafi informasiya sistemi
+GenericName[bg]=Географска информационна система
+GenericName[bs]=Geografski informacioni sistem
+GenericName[ca]=Sistema d'informació geogràfica
+GenericName[cs]=Geografický Informační Systém
+GenericName[de]=Geographisches Informationssystem
+GenericName[el]=Σύστημα Γεωγραφικών Πληροφοριών
+GenericName[es]=Sistema de Información Geográfica
+GenericName[et]=Geoinfosüsteem
+GenericName[eu]=Geografia-informazioko sistemen
+GenericName[fa]=سامانه اطلاعات مکانی
+GenericName[fi]=Maantieteellinen Tietojärjestelmä
+GenericName[fr]=Système d'Information Géographique
+GenericName[gl]=Sistema de información xeográfica
+GenericName[he]=מערכת מידע גאוגרפית
+GenericName[hi]=भूगोलीय_सूचना_प्रणाली
+GenericName[hr]=Geografski informacijski sustav
+GenericName[hu]=Földrajzi információs rendszer
+GenericName[hy]=Աշխարհագրական տեղեկատվական համակարգ
+GenericName[id]=Sistem informasi geografis
+GenericName[is]=Landfræðilegt upplýsingakerfi
+GenericName[it]=Sistema Informativo Geografico
+GenericName[ka]=გეოინფორმაციული სისტემა
+GenericName[lt]=Geografinė informacinė sistema
+GenericName[lv]=Ģeogrāfiskā informācijas sistēma
+GenericName[mk]=Географски информационен систем
+GenericName[ml]=ജി.ഐ.എസ്.
+GenericName[nl]=Geografisch informatiesysteem
+GenericName[nn]=Geografiske informasjonssystem
+GenericName[no]=Geografiske informasjonssystemer
+GenericName[pl]=System Informacji Geograficznej
+GenericName[pt]=Sistema de Informação Geográfica
+GenericName[ro]=Sistem Informatic Geografic
+GenericName[ru]=Геоинформационная система
+GenericName[sh]=Geografski informacijski sistem
+GenericName[sk]=Geografický informačný systém
+GenericName[sl]=Geografski informacijski sistem
+GenericName[sr]=Географски информациони систем
+GenericName[sv]=Geografiskt Informationssystem
+GenericName[th]=ระบบสารสนเทศภูมิศาสตร์
+GenericName[tr]=Coğrafi bilgi sistemi
+GenericName[uk]=Геоінформаційна система
+GenericName[uz]=Geografik axborot tizimi
+Icon=qgis-icon
+TryExec=/usr/bin/qbrowser
+Exec=/usr/bin/qbrowser %F
+Terminal=false
+StartupNotify=false
+Categories=Qt;Education;Science;Geography;

debian/qgis.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
-Name=Quantum GIS
+Name=Quantum GIS Desktop
 Version=1.0
-GenericName=Geographical Information System
+GenericName=Geographic Information System
 GenericName[ar]=نظام المعلومات الجغرافي
 GenericName[az]=Coğrafi informasiya sistemi
 GenericName[bg]=Географска информационна система

debian/qgis.install

@@ -19,6 +19,7 @@ usr/share/pixmaps/qgis-icon.xpm
 usr/share/pixmaps/qgis-mime-icon.png
 usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes
 ../qgis.desktop usr/share/applications
+../qbrowser.desktop usr/share/applications
 ../qgis.xml usr/share/mime/packages
 ../mime/application/x-esri-shape.desktop usr/share/mimelnk/application
 ../mime/application/x-mapinfo-mif.desktop usr/share/mimelnk/application

i18n/qgis_it.ts

@@ -1806,7 +1806,7 @@ Il plugin non sarà installato.</translation>
     </message>
     <message>
         <source>Miscellaneous</source>
-        <translation>MIscellanea</translation>
+        <translation>Miscellanea</translation>
     </message>
     <message>
         <source>GdalTools settings</source>
@@ -12921,7 +12921,6 @@ Database:%2</source>
         <comment>number of rows</comment>
         <translation type="unfinished">
             <numerusform></numerusform>
-            <numerusform></numerusform>
         </translation>
     </message>
     <message>

python/core/symbology-ng-core.sip

@@ -625,7 +625,9 @@ class QgsSymbolV2RenderContext
     QgsSymbolV2::OutputUnit outputUnit() const;
     void setOutputUnit( QgsSymbolV2::OutputUnit u );
 
+    //! Get alpha transparency 1 for opaque, 0 for invisible
     qreal alpha() const;
+    //! Set alpha transparency 1 for opaque, 0 for invisible
     void setAlpha( qreal alpha );
 
     bool selected() const;

src/app/composer/qgscomposermapwidget.cpp

@@ -658,7 +658,7 @@ void QgsComposerMapWidget::on_mAnnotationFontButton_clicked()
   // Native Mac dialog works only for Qt Carbon
   QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont(), this, QString(), QFontDialog::DontUseNativeDialog );
 #else
-  QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont(), this );
+  QFont newFont = QFontDialog::getFont( &ok, mComposerMap->gridAnnotationFont() );
 #endif
   if ( ok )
   {

src/app/qgisapp.cpp

@@ -625,6 +625,11 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   // request notification of FileOpen events (double clicking a file icon in Mac OS X Finder)
   QgsApplication::setFileOpenEventReceiver( this );
 
+#ifdef ANDROID
+  //add reacting to long click in android
+  grabGesture(Qt::TapAndHoldGesture);
+#endif
+
   // update windows
   qApp->processEvents();
 
@@ -734,6 +739,12 @@ bool QgisApp::event( QEvent * event )
     openFile( foe->file() );
     done = true;
   }
+#ifdef ANDROID
+  else if (event->type() == QEvent::Gesture )
+  {
+    done = gestureEvent(static_cast<QGestureEvent*>(event));
+  }
+#endif
   else
   {
     // pass other events to base class
@@ -2249,9 +2260,11 @@ void QgisApp::askUserForGDALSublayers( QgsRasterLayer *layer )
 
   if ( chooseSublayersDialog.exec() )
   {
-    foreach( QString layer, chooseSublayersDialog.getSelection() )
+    foreach( QString path, chooseSublayersDialog.getSelection() )
     {
-      QgsRasterLayer *rlayer = new QgsRasterLayer( layer, layer );
+      QString name = path;
+      name.replace( layer->source(), QFileInfo( layer->source() ).completeBaseName() );
+      QgsRasterLayer *rlayer = new QgsRasterLayer( path, name );
       if ( rlayer && rlayer->isValid() )
       {
         addRasterLayer( rlayer );
@@ -2263,11 +2276,11 @@ void QgisApp::askUserForGDALSublayers( QgsRasterLayer *layer )
 bool QgisApp::shouldAskUserForGDALSublayers( QgsRasterLayer *layer )
 {
   // return false if layer is empty or raster has no sublayers
-  if ( !layer || layer->subLayers().size() < 1 )
+  if ( !layer || layer->providerType() != "gdal" || layer->subLayers().size() < 1 )
     return false;
 
   QSettings settings;
-  int promptLayers = settings.value( "/qgis/promptForRasterSublayers", "if_need" ).toInt();
+  int promptLayers = settings.value( "/qgis/promptForRasterSublayers", 1 ).toInt();
   // 0 = always -> always ask (if there are existing sublayers)
   // 1 = if needed -> ask if layer has no bands, but has sublayers
   // 2 = never
@@ -3501,16 +3514,21 @@ void QgisApp::layerProperties()
   showLayerProperties( activeLayer() );
 }
 
-void QgisApp::deleteSelected( QgsMapLayer *layer )
+void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget* parent )
 {
   if ( !layer )
   {
     layer = mMapLegend->currentLayer();
   }
 
+  if ( !parent )
+  {
+    parent = this;
+  }
+
   if ( !layer )
   {
-    QMessageBox::information( this,
+    QMessageBox::information( parent,
                               tr( "No Layer Selected" ),
                               tr( "To delete features, you must select a vector layer in the legend" ) );
     return;
@@ -3519,37 +3537,37 @@ void QgisApp::deleteSelected( QgsMapLayer *layer )
   QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( layer );
   if ( !vlayer )
   {
-    QMessageBox::information( this,
+    QMessageBox::information( parent,
                               tr( "No Vector Layer Selected" ),
                               tr( "Deleting features only works on vector layers" ) );
     return;
   }
 
   if ( !( vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::DeleteFeatures ) )
   {
-    QMessageBox::information( this, tr( "Provider does not support deletion" ),
+    QMessageBox::information( parent, tr( "Provider does not support deletion" ),
                               tr( "Data provider does not support deleting features" ) );
     return;
   }
 
   if ( !vlayer->isEditable() )
   {
-    QMessageBox::information( this, tr( "Layer not editable" ),
+    QMessageBox::information( parent, tr( "Layer not editable" ),
                               tr( "The current layer is not editable. Choose 'Start editing' in the digitizing toolbar." ) );
     return;
   }
 
   //display a warning
   int numberOfDeletedFeatures = vlayer->selectedFeaturesIds().size();
-  if ( QMessageBox::warning( this, tr( "Delete features" ), tr( "Delete %n feature(s)?", "number of features to delete", numberOfDeletedFeatures ), QMessageBox::Ok, QMessageBox::Cancel ) == QMessageBox::Cancel )
+  if ( QMessageBox::warning( parent, tr( "Delete features" ), tr( "Delete %n feature(s)?", "number of features to delete", numberOfDeletedFeatures ), QMessageBox::Ok, QMessageBox::Cancel ) == QMessageBox::Cancel )
   {
     return;
   }
 
   vlayer->beginEditCommand( tr( "Features deleted" ) );
   if ( !vlayer->deleteSelectedFeatures() )
   {
-    QMessageBox::information( this, tr( "Problem deleting features" ),
+    QMessageBox::information( parent, tr( "Problem deleting features" ),
                               tr( "A problem occured during deletion of features" ) );
   }
 
@@ -6977,3 +6995,27 @@ QMenu* QgisApp::createPopupMenu()
 
   return menu;
 }
+
+#ifdef ANDROID
+bool QgisApp::gestureEvent(QGestureEvent *event)
+{
+  if (QGesture *tapAndHold = event->gesture(Qt::TapAndHoldGesture))
+  {
+    tapAndHoldTriggered(static_cast<QTapAndHoldGesture *>(tapAndHold));
+  }
+  return true;
+}
+
+void QgisApp::tapAndHoldTriggered(QTapAndHoldGesture *gesture)
+{
+  if (gesture->state() == Qt::GestureFinished) {
+    QPoint pos = gesture->position().toPoint();
+    QWidget * receiver = QApplication::widgetAt( pos );
+    qDebug() << "tapAndHoldTriggered: LONG CLICK gesture happened at " << pos;
+    qDebug() << "widget under point of click: " << receiver;
+
+    QApplication::postEvent( receiver, new QMouseEvent( QEvent::MouseButtonPress, receiver->mapFromGlobal( pos ), Qt::RightButton, Qt::RightButton, Qt::NoModifier ) );
+    QApplication::postEvent( receiver, new QMouseEvent( QEvent::MouseButtonRelease, receiver->mapFromGlobal( pos ), Qt::RightButton, Qt::RightButton, Qt::NoModifier ) );
+  }
+}
+#endif

src/app/qgisapp.h

@@ -83,6 +83,11 @@ class QgsScaleComboBox;
 #include <QPointer>
 #include <QSslError>
 
+#ifdef ANDROID
+#include <QGestureEvent>
+#include <QTapAndHoldGesture>
+#endif
+
 #include "qgsconfig.h"
 #include "qgsfeature.h"
 #include "qgspoint.h"
@@ -413,7 +418,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void loadOGRSublayers( QString layertype, QString uri, QStringList list );
 
     /**Deletes the selected attributes for the currently selected vector layer*/
-    void deleteSelected( QgsMapLayer *layer = 0 );
+    void deleteSelected( QgsMapLayer *layer = 0, QWidget* parent = 0 );
 
     //! project was written
     void writeProject( QDomDocument & );
@@ -1113,6 +1118,11 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     bool cmpByText( QAction* a, QAction* b );
 
     QString mOldScale;
+
+#ifdef ANDROID
+    bool gestureEvent(QGestureEvent *event);
+    void tapAndHoldTriggered(QTapAndHoldGesture *gesture);
+#endif
 };
 
 #ifdef ANDROID

src/app/qgsattributetabledialog.cpp

@@ -248,7 +248,7 @@ void QgsAttributeTableDialog::on_mRemoveSelectionButton_clicked()
 
 void QgsAttributeTableDialog::on_mDeleteSelectedButton_clicked()
 {
-  QgisApp::instance()->deleteSelected( mLayer );
+  QgisApp::instance()->deleteSelected( mLayer, this );
 }
 
 void QgsAttributeTableDialog::on_cbxShowSelectedOnly_toggled( bool theFlag )

src/app/qgsbrowserdockwidget.cpp

@@ -126,10 +126,9 @@ void QgsBrowserDockWidget::itemClicked( const QModelIndex& index )
   QString providerKey = layerItem->providerKey();
 
   QgsDebugMsg( providerKey + " : " + uri );
-  QgsMapLayer* layer = NULL;
   if ( type == QgsMapLayer::VectorLayer )
   {
-    layer = QgisApp::instance()->addVectorLayer( uri, layerItem->name(), providerKey );
+    QgisApp::instance()->addVectorLayer( uri, layerItem->name(), providerKey );
   }
   if ( type == QgsMapLayer::RasterLayer )
   {
@@ -159,7 +158,7 @@ void QgsBrowserDockWidget::itemClicked( const QModelIndex& index )
     QgsDebugMsg( "rasterLayerPath = " + rasterLayerPath );
     QgsDebugMsg( "layers = " + layers.join( " " ) );
 
-    layer = QgisApp::instance()->addRasterLayer( rasterLayerPath, layerItem->name(), providerKey, layers, styles, format, crs );
+    QgisApp::instance()->addRasterLayer( rasterLayerPath, layerItem->name(), providerKey, layers, styles, format, crs );
   }
 }
 
@@ -248,7 +247,9 @@ void QgsBrowserDockWidget::removeFavourite()
 
 void QgsBrowserDockWidget::refresh()
 {
+  QApplication::setOverrideCursor( Qt::WaitCursor );
   refreshModel( QModelIndex() );
+  QApplication::restoreOverrideCursor();
 }
 
 void QgsBrowserDockWidget::refreshModel( const QModelIndex& index )

src/core/qgsvectorlayer.cpp

@@ -1301,7 +1301,8 @@ void QgsVectorLayer::setRenderer( QgsRenderer *r )
 
   if ( r != mRenderer )
   {
-    setUsingRendererV2( false );
+    if ( r )
+      setUsingRendererV2( false );
     delete mRenderer;
     mRenderer = r;
   }
@@ -4604,7 +4605,8 @@ void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2 *r )
 
   if ( r != mRendererV2 )
   {
-    setUsingRendererV2( true );
+    if ( r )
+      setUsingRendererV2( true );
     delete mRendererV2;
     mRendererV2 = r;
   }

src/core/symbology-ng/qgssymbolv2.h

@@ -92,7 +92,9 @@ class CORE_EXPORT QgsSymbolV2
     OutputUnit outputUnit() const { return mOutputUnit; }
     void setOutputUnit( OutputUnit u ) { mOutputUnit = u; }
 
+    //! Get alpha transparency 1 for opaque, 0 for invisible
     qreal alpha() const { return mAlpha; }
+    //! Set alpha transparency 1 for opaque, 0 for invisible
     void setAlpha( qreal alpha ) { mAlpha = alpha; }
 
     //! @note added in 1.5
@@ -137,7 +139,9 @@ class CORE_EXPORT QgsSymbolV2RenderContext
     QgsSymbolV2::OutputUnit outputUnit() const { return mOutputUnit; }
     void setOutputUnit( QgsSymbolV2::OutputUnit u ) { mOutputUnit = u; }
 
+    //! Get alpha transparency 1 for opaque, 0 for invisible
     qreal alpha() const { return mAlpha; }
+    //! Set alpha transparency 1 for opaque, 0 for invisible
     void setAlpha( qreal alpha ) { mAlpha = alpha; }
 
     bool selected() const { return mSelected; }

src/mapserver/qgsconfigparser.cpp

@@ -33,6 +33,7 @@ QgsConfigParser::QgsConfigParser()
     , mOutputUnits( QgsMapRenderer::Millimeters )
 {
   setDefaultLegendSettings();
+  mSelectionColor = QColor( 255, 255, 0 ); //yellow opaque is default selection color
 }
 
 QgsConfigParser::~QgsConfigParser()