[QGIS Commit] r13352 - in trunk/qgis/src: core core/symbology-ng gui/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-04-23 11:06:52 -0400 (Fri, 23 Apr 2010)
New Revision: 13352

Modified:
   trunk/qgis/src/core/qgsapplication.cpp
   trunk/qgis/src/core/qgsapplication.h
   trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.h
   trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
   trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
Log:
Added QgsApplication::iconPath utility function (and removed its declaration from QgsSymbolLayerV2Utils)


Modified: trunk/qgis/src/core/qgsapplication.cpp
===================================================================
--- trunk/qgis/src/core/qgsapplication.cpp	2010-04-23 10:36:34 UTC (rev 13351)
+++ trunk/qgis/src/core/qgsapplication.cpp	2010-04-23 15:06:52 UTC (rev 13352)
@@ -159,6 +159,18 @@
   return ":/images/themes/" + mThemeName + "/";
 }
 
+
+QString QgsApplication::iconPath( QString iconFile )
+{
+  // try active theme
+  QString path = activeThemePath();
+  if ( QFile::exists( path + iconFile ) )
+    return path + iconFile;
+
+  // use default theme
+  return defaultThemePath() + iconFile;
+}
+
 /*!
   Set the theme path to the specified theme.
 */

Modified: trunk/qgis/src/core/qgsapplication.h
===================================================================
--- trunk/qgis/src/core/qgsapplication.h	2010-04-23 10:36:34 UTC (rev 13351)
+++ trunk/qgis/src/core/qgsapplication.h	2010-04-23 15:06:52 UTC (rev 13352)
@@ -131,6 +131,11 @@
     //! Returns the path to the default theme directory.
     static const QString defaultThemePath();
 
+    //! Returns path to the desired icon file.
+    //! First it tries to use the active theme path, then default theme path
+    //! @note Added in 1.5
+    static QString iconPath( QString iconFile );
+
     //! Returns the path to user's style. Added in QGIS 1.4
     static const QString userStyleV2Path();
 

Modified: trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.h	2010-04-23 10:36:34 UTC (rev 13351)
+++ trunk/qgis/src/core/symbology-ng/qgssymbollayerv2utils.h	2010-04-23 15:06:52 UTC (rev 13352)
@@ -79,8 +79,6 @@
     /**Creates a render context for a pixel based device*/
     static QgsRenderContext createRenderContext( QPainter* p );
 
-    static QString iconPath( QString iconFile );
-
     /**Multiplies opacity of image pixel values with a (global) transparency value*/
     static void multiplyImageOpacity( QImage* image, qreal alpha );
 };

Modified: trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp	2010-04-23 10:36:34 UTC (rev 13351)
+++ trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp	2010-04-23 15:06:52 UTC (rev 13352)
@@ -19,19 +19,7 @@
 #include "qgslogger.h"
 
 
-static QString iconPath( QString iconFile )
-{
-  // try active theme
-  QString path = QgsApplication::activeThemePath();
-  if ( QFile::exists( path + iconFile ) )
-    return path + iconFile;
 
-  // use default theme
-  return QgsApplication::defaultThemePath() + iconFile;
-}
-
-///////
-
 QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent )
     : QDialog( parent ), mStyle( style ), mModified( false )
 {
@@ -39,9 +27,9 @@
   setupUi( this );
 
   // setup icons
-  btnAddItem->setIcon( QIcon( iconPath( "symbologyAdd.png" ) ) );
-  btnEditItem->setIcon( QIcon( iconPath( "symbologyEdit.png" ) ) );
-  btnRemoveItem->setIcon( QIcon( iconPath( "symbologyRemove.png" ) ) );
+  btnAddItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
+  btnEditItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyEdit.png" ) ) );
+  btnRemoveItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
 
   connect( this, SIGNAL( finished( int ) ), this, SLOT( onFinished() ) );
 

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp	2010-04-23 10:36:34 UTC (rev 13351)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp	2010-04-23 15:06:52 UTC (rev 13352)
@@ -57,19 +57,7 @@
 
 //////////
 
-static QString iconPath( QString iconFile )
-{
-  // try active theme
-  QString path = QgsApplication::activeThemePath();
-  if ( QFile::exists( path + iconFile ) )
-    return path + iconFile;
 
-  // use default theme
-  return QgsApplication::defaultThemePath() + iconFile;
-}
-
-//////////
-
 static bool _initWidgetFunction( QString name, QgsSymbolLayerV2WidgetFunc f )
 {
   QgsSymbolLayerV2Registry* reg = QgsSymbolLayerV2Registry::instance();
@@ -119,11 +107,11 @@
   setupUi( this );
 
   // setup icons
-  btnAddLayer->setIcon( QIcon( iconPath( "symbologyAdd.png" ) ) );
-  btnRemoveLayer->setIcon( QIcon( iconPath( "symbologyRemove.png" ) ) );
-  btnLock->setIcon( QIcon( iconPath( "symbologyLock.png" ) ) );
-  btnUp->setIcon( QIcon( iconPath( "symbologyUp.png" ) ) );
-  btnDown->setIcon( QIcon( iconPath( "symbologyDown.png" ) ) );
+  btnAddLayer->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
+  btnRemoveLayer->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
+  btnLock->setIcon( QIcon( QgsApplication::iconPath( "symbologyLock.png" ) ) );
+  btnUp->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.png" ) ) );
+  btnDown->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.png" ) ) );
 
   // set widget functions
   // (should be probably moved somewhere else)