[QGIS Commit] r14422 - in trunk/qgis/src: gui/symbology-ng ui

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-10-20 13:01:27 -0700 (Wed, 20 Oct 2010)
New Revision: 14422

Modified:
   trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
   trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.h
   trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui
Log:
Added "style manager..." button to symbol selector so that users will find the style manager more easily.


Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp	2010-10-20 19:37:36 UTC (rev 14421)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp	2010-10-20 20:01:27 UTC (rev 14422)
@@ -2,6 +2,7 @@
 #include "qgssymbolv2selectordialog.h"
 
 #include "qgssymbolv2propertiesdialog.h"
+#include "qgsstylev2managerdialog.h"
 
 #include "qgssymbolv2.h"
 #include "qgssymbollayerv2utils.h"
@@ -34,8 +35,8 @@
   }
 
   connect( btnSymbolProperties, SIGNAL( clicked() ), this, SLOT( changeSymbolProperties() ) );
+  connect( btnStyleManager, SIGNAL( clicked() ), SLOT( openStyleManager() ) );
 
-
   QStandardItemModel* model = new QStandardItemModel( viewSymbols );
   viewSymbols->setModel( model );
   connect( viewSymbols, SIGNAL( clicked( const QModelIndex & ) ), this, SLOT( setSymbolFromStyle( const QModelIndex & ) ) );
@@ -276,3 +277,11 @@
   }
   return mAdvancedMenu;
 }
+
+void QgsSymbolV2SelectorDialog::openStyleManager()
+{
+  QgsStyleV2ManagerDialog dlg( mStyle, this );
+  dlg.exec();
+
+  populateSymbolView();
+}

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.h
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.h	2010-10-20 19:37:36 UTC (rev 14421)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2selectordialog.h	2010-10-20 20:01:27 UTC (rev 14422)
@@ -45,6 +45,8 @@
     void on_mSymbolUnitComboBox_currentIndexChanged( const QString & text );
     void on_mTransparencySlider_valueChanged( int value );
 
+    void openStyleManager();
+
   signals:
     void symbolModified();
 

Modified: trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui	2010-10-20 19:37:36 UTC (rev 14421)
+++ trunk/qgis/src/ui/qgssymbolv2selectordialogbase.ui	2010-10-20 20:01:27 UTC (rev 14422)
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Symbol selector</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4">
+  <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0">
     <widget class="QLabel" name="lblPreview">
      <property name="sizePolicy">
@@ -246,40 +246,71 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Symbols from style</string>
+   <item row="2" column="0" colspan="2">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
-    <widget class="QListView" name="viewSymbols">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>2</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>48</width>
-       <height>48</height>
-      </size>
-     </property>
-     <property name="flow">
-      <enum>QListView::LeftToRight</enum>
-     </property>
-     <property name="resizeMode">
-      <enum>QListView::Adjust</enum>
-     </property>
-     <property name="spacing">
-      <number>5</number>
-     </property>
-     <property name="viewMode">
-      <enum>QListView::IconMode</enum>
-     </property>
-    </widget>
+    <layout class="QGridLayout" name="gridLayout_4">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Symbols from style</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="2">
+      <widget class="QPushButton" name="btnStyleManager">
+       <property name="text">
+        <string>Style manager...</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" colspan="3">
+      <widget class="QListView" name="viewSymbols">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>2</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
+       </property>
+       <property name="flow">
+        <enum>QListView::LeftToRight</enum>
+       </property>
+       <property name="resizeMode">
+        <enum>QListView::Adjust</enum>
+       </property>
+       <property name="spacing">
+        <number>5</number>
+       </property>
+       <property name="viewMode">
+        <enum>QListView::IconMode</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="4" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
@@ -305,12 +336,13 @@
   <tabstop>mSymbolUnitComboBox</tabstop>
   <tabstop>mTransparencySlider</tabstop>
   <tabstop>btnColor</tabstop>
+  <tabstop>spinWidth</tabstop>
   <tabstop>spinSize</tabstop>
   <tabstop>spinAngle</tabstop>
   <tabstop>btnAdvanced</tabstop>
   <tabstop>btnAddToStyle</tabstop>
+  <tabstop>btnStyleManager</tabstop>
   <tabstop>viewSymbols</tabstop>
-  <tabstop>spinWidth</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>