add transparency slider ; ui tweaks

qgis · Jul 17, 2012 · 3a1772f · 3a1772f
1 parent fab96ed
commit 3a1772f
Show file tree

Hide file tree

Showing 4 changed files with 343 additions and 255 deletions.
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -520,6 +520,7 @@ void QgsProjectProperties::apply()
   QgsProject::instance()->writeEntry( "DefaultStyles", "/Line", cboStyleLine->currentText() );
   QgsProject::instance()->writeEntry( "DefaultStyles", "/Fill", cboStyleFill->currentText() );
   QgsProject::instance()->writeEntry( "DefaultStyles", "/ColorRamp", cboStyleColorRamp->currentText() );
+  QgsProject::instance()->writeEntry( "DefaultStyles", "/AlphaInt", 255 - mTransparencySlider->value() );
   QgsProject::instance()->writeEntry( "DefaultStyles", "/RandomColors", cbxStyleRandomColors->isChecked() );
 
   //todo XXX set canvas color
@@ -761,9 +762,13 @@ void QgsProjectProperties::populateStyles()
       cboList[i]->setCurrentIndex( index );
   }
 
-  // random colors?
+  // random colors
   cbxStyleRandomColors->setChecked( QgsProject::instance()->readBoolEntry( "DefaultStyles", "/RandomColors", true ) );
 
+  // alpha transparency
+  int transparencyInt = 255 - QgsProject::instance()->readNumEntry( "DefaultStyles", "/AlphaInt", 255 );
+  mTransparencySlider->setValue( transparencyInt );
+  on_mTransparencySlider_valueChanged( transparencyInt );
 }
 
 void QgsProjectProperties::on_pbtnStyleManager_clicked()
@@ -788,6 +793,20 @@ void QgsProjectProperties::on_pbtnStyleFill_clicked()
   editSymbol( cboStyleFill );
 }
 
+void QgsProjectProperties::on_pbtnStyleColorRamp_clicked()
+{
+  // TODO for now just open style manager
+  // code in QgsStyleV2ManagerDialog::editColorRamp()
+  on_pbtnStyleManager_clicked();
+}
+
+void QgsProjectProperties::on_mTransparencySlider_valueChanged( int value )
+{
+  double alpha = 1 - ( value / 255.0 );
+  double transparencyPercent = ( 1 - alpha ) * 100;
+  mTransparencyLabel->setText( tr( "Transparency %1%" ).arg(( int ) transparencyPercent ) );
+}
+
 void QgsProjectProperties::editSymbol( QComboBox* cbo )
 {
   QString symbolName = cbo->currentText();
@@ -819,10 +838,4 @@ void QgsProjectProperties::editSymbol( QComboBox* cbo )
   cbo->setItemIcon( cbo->currentIndex(), icon );
 }
 
-void QgsProjectProperties::on_pbtnStyleColorRamp_clicked()
-{
-  // TODO for now just open style manager
-  // code in QgsStyleV2ManagerDialog::editColorRamp()
-  on_pbtnStyleManager_clicked();
-}
 
diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h
@@ -99,6 +99,7 @@ class QgsProjectProperties : public QDialog, private Ui::QgsProjectPropertiesBas
     void on_pbtnStyleLine_clicked();
     void on_pbtnStyleFill_clicked();
     void on_pbtnStyleColorRamp_clicked();
+    void on_mTransparencySlider_valueChanged( int value );
 
     /*!
      * Slot to show the context help for this dialog

diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -95,6 +95,9 @@ QgsSymbolV2* QgsSymbolV2::defaultSymbol( QGis::GeometryType geomType )
     }
   }
 
+  // set alpha transparency
+  s->setAlpha( QgsProject::instance()->readDoubleEntry( "DefaultStyles", "/AlphaInt", 255 ) / 255.0 );
+
   // set random color, it project prefs allow
   if ( defaultSymbol == "" ||
        QgsProject::instance()->readBoolEntry( "DefaultStyles", "/RandomColors", true ) )