From f816bce9f116bd9d11f54d48c06a4941a510fa8f Mon Sep 17 00:00:00 2001
From: Nathan Woodrow <nathan.woodrow@mapsolutions.com.au>
Date: Sun, 30 Mar 2014 15:47:08 +1000
Subject: [PATCH] Tweak UI for symbol builder and selector.

- Move blend options to below symbol builder
- Move Save symbol to under symbol stack
- Move open Symbol manager to next to group dropdown
---
 python/core/symbology-ng/qgsstylev2.sip       |   2 +-
 .../gui/symbology-ng/qgssymbolslistwidget.sip |   2 +-
 src/core/CMakeLists.txt                       |   1 +
 src/core/symbology-ng/qgsstylev2.cpp          |   4 +-
 src/core/symbology-ng/qgsstylev2.h            |  11 +-
 src/gui/symbology-ng/qgssymbolslistwidget.cpp |  45 +-----
 src/gui/symbology-ng/qgssymbolslistwidget.h   |   2 +-
 .../qgssymbolv2selectordialog.cpp             |  29 ++++
 .../symbology-ng/qgssymbolv2selectordialog.h  |   1 +
 src/ui/qgsrendererv2propsdialogbase.ui        | 136 +++++++++---------
 src/ui/qgssymbolv2selectordialogbase.ui       |  48 +++++--
 src/ui/symbollayer/widget_symbolslist.ui      |  44 +++---
 12 files changed, 175 insertions(+), 150 deletions(-)

diff --git a/python/core/symbology-ng/qgsstylev2.sip b/python/core/symbology-ng/qgsstylev2.sip
index 6ee325b697f..9a50281cc33 100644
--- a/python/core/symbology-ng/qgsstylev2.sip
+++ b/python/core/symbology-ng/qgsstylev2.sip
@@ -1,4 +1,4 @@
-class QgsStyleV2
+class QgsStyleV2 : QObject
 {
 %TypeHeaderCode
 #include <qgsstylev2.h>
diff --git a/python/gui/symbology-ng/qgssymbolslistwidget.sip b/python/gui/symbology-ng/qgssymbolslistwidget.sip
index c86dc2d8a00..82603769668 100644
--- a/python/gui/symbology-ng/qgssymbolslistwidget.sip
+++ b/python/gui/symbology-ng/qgssymbolslistwidget.sip
@@ -12,7 +12,7 @@ class QgsSymbolsListWidget : QWidget
     void setMarkerAngle( double angle );
     void setMarkerSize( double size );
     void setLineWidth( double width );
-    void addSymbolToStyle();
+    void symbolAddedToStyle( QString name, QgsSymbolV2* symbol );
     void on_mSymbolUnitComboBox_currentIndexChanged( const QString & text );
     void on_mTransparencySlider_valueChanged( int value );
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f1ce501bf3e..4ffb2b098b1 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -370,6 +370,7 @@ SET(QGIS_CORE_MOC_HDRS
 
   symbology-ng/qgscptcityarchive.h
   symbology-ng/qgssvgcache.h
+  symbology-ng/qgsstylev2.h
 )
 
 IF (WITH_INTERNAL_QEXTSERIALPORT)
diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp
index b4970dc40dd..529363ebae4 100644
--- a/src/core/symbology-ng/qgsstylev2.cpp
+++ b/src/core/symbology-ng/qgsstylev2.cpp
@@ -38,7 +38,7 @@
 QgsStyleV2 *QgsStyleV2::mDefaultStyle = 0;
 
 
-QgsStyleV2::QgsStyleV2()
+QgsStyleV2::QgsStyleV2() : QObject()
 {
   mCurrentDB = 0;
 }
@@ -130,6 +130,8 @@ bool QgsStyleV2::saveSymbol( QString name, QgsSymbolV2* symbol, int groupid, QSt
     return false;
   }
 
+  emit symbolSaved( name, symbol );
+
   return true;
 }
 
diff --git a/src/core/symbology-ng/qgsstylev2.h b/src/core/symbology-ng/qgsstylev2.h
index 5f30634b68a..a7ad7e18e13 100644
--- a/src/core/symbology-ng/qgsstylev2.h
+++ b/src/core/symbology-ng/qgsstylev2.h
@@ -63,8 +63,10 @@ enum TagmapTable { TagmapTagId, TagmapSymbolId };
 enum ColorrampTable { ColorrampId, ColorrampName, ColorrampXML, ColorrampGroupId };
 enum SmartgroupTable { SmartgroupId, SmartgroupName, SmartgroupXML };
 
-class CORE_EXPORT QgsStyleV2
+class CORE_EXPORT QgsStyleV2 : public QObject
 {
+    Q_OBJECT
+
   public:
     QgsStyleV2();
     ~QgsStyleV2();
@@ -315,6 +317,10 @@ class CORE_EXPORT QgsStyleV2
     //! Imports the symbols and colorramps into the default style database from the given XML file
     bool importXML( QString filename );
 
+  signals:
+
+    void symbolSaved( QString name, QgsSymbolV2* symbol );
+
   protected:
 
     QgsSymbolV2Map mSymbols;
@@ -350,6 +356,9 @@ class CORE_EXPORT QgsStyleV2
      *  \return Success state of the update operation
      */
     bool updateSymbol( StyleEntity type, QString name );
+
+  private:
+    Q_DISABLE_COPY( QgsStyleV2 )
 };
 
 
diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.cpp b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
index a84aa43e3ab..83ad4825f92 100644
--- a/src/gui/symbology-ng/qgssymbolslistwidget.cpp
+++ b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
@@ -62,22 +62,8 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
   viewSymbols->setModel( model );
   connect( viewSymbols->selectionModel(), SIGNAL( currentChanged( const QModelIndex &, const QModelIndex & ) ), this, SLOT( setSymbolFromStyle( const QModelIndex & ) ) );
 
-  if ( parent )
-  {
-    if ( dynamic_cast<QgsStyleV2ManagerDialog*>( parent->parentWidget() ) )
-    {
-      btnStyle->setVisible( false );
-    }
-  }
-  // Set the Style Menu under btnStyle
-  QMenu *styleMenu = new QMenu( btnStyle );
-  QAction *styleMgrAction = new QAction( tr( "Style Manager" ), styleMenu );
-  styleMenu->addAction( styleMgrAction );
-  QAction *saveStyle = new QAction( tr( "Save in symbol library..." ), styleMenu );
-  styleMenu->addAction( saveStyle );
-  connect( styleMgrAction, SIGNAL( triggered() ), this, SLOT( openStyleManager() ) );
-  connect( saveStyle, SIGNAL( triggered() ), this, SLOT( addSymbolToStyle() ) );
-  btnStyle->setMenu( styleMenu );
+  connect( mStyle, SIGNAL( symbolSaved( QString, QgsSymbolV2* ) ), this, SLOT( symbolAddedToStyle( QString, QgsSymbolV2* ) ) );
+  connect(  openStyleManagerButton, SIGNAL( pressed() ), this, SLOT( openStyleManager() ) );
 
   lblSymbolName->setText( "" );
   populateSymbolView();
@@ -217,33 +203,8 @@ void QgsSymbolsListWidget::setLineWidth( double width )
   emit changed();
 }
 
-void QgsSymbolsListWidget::addSymbolToStyle()
+void QgsSymbolsListWidget::symbolAddedToStyle( QString name, QgsSymbolV2* symbol)
 {
-  bool ok;
-  QString name = QInputDialog::getText( this, tr( "Symbol name" ),
-                                        tr( "Please enter name for the symbol:" ) , QLineEdit::Normal, tr( "New symbol" ), &ok );
-  if ( !ok || name.isEmpty() )
-    return;
-
-  // check if there is no symbol with same name
-  if ( mStyle->symbolNames().contains( name ) )
-  {
-    int res = QMessageBox::warning( this, tr( "Save symbol" ),
-                                    tr( "Symbol with name '%1' already exists. Overwrite?" )
-                                    .arg( name ),
-                                    QMessageBox::Yes | QMessageBox::No );
-    if ( res != QMessageBox::Yes )
-    {
-      return;
-    }
-  }
-
-  // add new symbol to style and re-populate the list
-  mStyle->addSymbol( name, mSymbol->clone() );
-
-  // make sure the symbol is stored
-  mStyle->saveSymbol( name, mSymbol->clone(), 0, QStringList() );
-
   populateSymbolView();
 }
 
diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.h b/src/gui/symbology-ng/qgssymbolslistwidget.h
index 0116e78985d..8c91eb45090 100644
--- a/src/gui/symbology-ng/qgssymbolslistwidget.h
+++ b/src/gui/symbology-ng/qgssymbolslistwidget.h
@@ -38,7 +38,7 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW
     void setMarkerAngle( double angle );
     void setMarkerSize( double size );
     void setLineWidth( double width );
-    void addSymbolToStyle();
+    void symbolAddedToStyle( QString name, QgsSymbolV2* symbol );
     void on_mSymbolUnitComboBox_currentIndexChanged( const QString & text );
     void on_mTransparencySlider_valueChanged( int value );
 
diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
index 8625a567379..e83f2a0928a 100644
--- a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
+++ b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
@@ -182,6 +182,7 @@ QgsSymbolV2SelectorDialog::QgsSymbolV2SelectorDialog( QgsSymbolV2* symbol, QgsSt
   connect( btnAddLayer, SIGNAL( clicked() ), this, SLOT( addLayer() ) );
   connect( btnRemoveLayer, SIGNAL( clicked() ), this, SLOT( removeLayer() ) );
   connect( btnLock, SIGNAL( clicked() ), this, SLOT( lockLayer() ) );
+  connect( btnSaveSymbol, SIGNAL( clicked() ), this, SLOT( saveSymbol() ) );
 
   updateUi();
 
@@ -485,6 +486,34 @@ void QgsSymbolV2SelectorDialog::lockLayer()
   layer->setLocked( btnLock->isChecked() );
 }
 
+void QgsSymbolV2SelectorDialog::saveSymbol()
+{
+  bool ok;
+  QString name = QInputDialog::getText( this, tr( "Symbol name" ),
+                                        tr( "Please enter name for the symbol:" ) , QLineEdit::Normal, tr( "New symbol" ), &ok );
+  if ( !ok || name.isEmpty() )
+    return;
+
+  // check if there is no symbol with same name
+  if ( mStyle->symbolNames().contains( name ) )
+  {
+    int res = QMessageBox::warning( this, tr( "Save symbol" ),
+                                    tr( "Symbol with name '%1' already exists. Overwrite?" )
+                                    .arg( name ),
+                                    QMessageBox::Yes | QMessageBox::No );
+    if ( res != QMessageBox::Yes )
+    {
+      return;
+    }
+  }
+
+  // add new symbol to style and re-populate the list
+  mStyle->addSymbol( name, mSymbol->clone() );
+
+  // make sure the symbol is stored
+  mStyle->saveSymbol( name, mSymbol->clone(), 0, QStringList() );
+}
+
 void QgsSymbolV2SelectorDialog::changeLayer( QgsSymbolLayerV2* newLayer )
 {
   SymbolLayerItem *item = currentLayerItem();
diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.h b/src/gui/symbology-ng/qgssymbolv2selectordialog.h
index 718362d15f3..82c2f2ff005 100644
--- a/src/gui/symbology-ng/qgssymbolv2selectordialog.h
+++ b/src/gui/symbology-ng/qgssymbolv2selectordialog.h
@@ -72,6 +72,7 @@ class GUI_EXPORT QgsSymbolV2SelectorDialog : public QDialog, private Ui::QgsSymb
     void addLayer();
     void removeLayer();
 
+    void saveSymbol();
     void lockLayer();
 
     void layerChanged();
diff --git a/src/ui/qgsrendererv2propsdialogbase.ui b/src/ui/qgsrendererv2propsdialogbase.ui
index 761ab242481..da884497908 100644
--- a/src/ui/qgsrendererv2propsdialogbase.ui
+++ b/src/ui/qgsrendererv2propsdialogbase.ui
@@ -14,69 +14,6 @@
    <string>Renderer settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QgsCollapsibleGroupBox" name="groupBox">
-     <property name="title">
-      <string>Layer rendering</string>
-     </property>
-     <property name="collapsed" stdset="0">
-      <bool>false</bool>
-     </property>
-     <property name="saveCollapsedState" stdset="0">
-      <bool>true</bool>
-     </property>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="1" colspan="3">
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QSlider" name="mLayerTransparencySlider">
-            <property name="maximum">
-             <number>100</number>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="mLayerTransparencySpnBx">
-            <property name="maximum">
-             <number>100</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="lblTransparency">
-          <property name="text">
-           <string>Layer transparency</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="QgsBlendModeComboBox" name="mFeatureBlendComboBox"/>
-        </item>
-        <item row="1" column="2">
-         <widget class="QLabel" name="lblFeatureBlend">
-          <property name="text">
-           <string>Feature blending mode</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="lblLayerBlend">
-          <property name="text">
-           <string>Layer blending mode</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QgsBlendModeComboBox" name="mBlendModeComboBox"/>
-        </item>
-       </layout>
-    </widget>
-   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -127,6 +64,69 @@
      </widget>
     </widget>
    </item>
+   <item>
+    <widget class="QgsCollapsibleGroupBox" name="groupBox">
+     <property name="title">
+      <string>Layer rendering</string>
+     </property>
+     <property name="collapsed" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="saveCollapsedState" stdset="0">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="1" colspan="3">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QSlider" name="mLayerTransparencySlider">
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="mLayerTransparencySpnBx">
+          <property name="maximum">
+           <number>100</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="lblTransparency">
+        <property name="text">
+         <string>Layer transparency</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QgsBlendModeComboBox" name="mFeatureBlendComboBox"/>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="lblFeatureBlend">
+        <property name="text">
+         <string>Feature blending mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="lblLayerBlend">
+        <property name="text">
+         <string>Layer blending mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QgsBlendModeComboBox" name="mBlendModeComboBox"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
@@ -137,17 +137,17 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QgsBlendModeComboBox</class>
-   <extends>QComboBox</extends>
-   <header>qgsblendmodecombobox.h</header>
-  </customwidget>
   <customwidget>
    <class>QgsCollapsibleGroupBox</class>
    <extends>QGroupBox</extends>
    <header>qgscollapsiblegroupbox.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsBlendModeComboBox</class>
+   <extends>QComboBox</extends>
+   <header>qgsblendmodecombobox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>cboRenderers</tabstop>
diff --git a/src/ui/qgssymbolv2selectordialogbase.ui b/src/ui/qgssymbolv2selectordialogbase.ui
index 9dabf8826fa..8b4ca3fffcc 100644
--- a/src/ui/qgssymbolv2selectordialogbase.ui
+++ b/src/ui/qgssymbolv2selectordialogbase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>444</width>
-    <height>383</height>
+    <width>436</width>
+    <height>359</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,13 +44,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Symbol layers</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QTreeView" name="layersTree">
        <property name="sizePolicy">
@@ -137,6 +130,35 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <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>
+        <widget class="QPushButton" name="btnSaveSymbol">
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>Move down</string>
+         </property>
+         <property name="text">
+          <string>Save</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
     </layout>
@@ -160,12 +182,18 @@
       </sizepolicy>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QStackedWidget" name="stackedWidget">
         <property name="sizePolicy">
diff --git a/src/ui/symbollayer/widget_symbolslist.ui b/src/ui/symbollayer/widget_symbolslist.ui
index 4ed72dcaef8..96fbcd2583c 100644
--- a/src/ui/symbollayer/widget_symbolslist.ui
+++ b/src/ui/symbollayer/widget_symbolslist.ui
@@ -114,7 +114,7 @@
         </sizepolicy>
        </property>
        <property name="currentIndex">
-        <number>2</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="pageMarker">
         <layout class="QGridLayout" name="gridLayout">
@@ -204,7 +204,7 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <property name="spacing">
       <number>3</number>
@@ -212,23 +212,10 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Saved styles</string>
+        <string>Symbols in library</string>
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>0</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QComboBox" name="groupsCombo">
        <property name="sizePolicy">
@@ -248,9 +235,16 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="openStyleManagerButton">
+       <property name="text">
+        <string>Open Library</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QListView" name="viewSymbols">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -287,7 +281,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <property name="topMargin">
       <number>2</number>
@@ -312,13 +306,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QPushButton" name="btnStyle">
-       <property name="text">
-        <string>Symbol</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="btnAdvanced">
        <property name="text">
@@ -328,6 +315,13 @@
      </item>
     </layout>
    </item>
+   <item row="1" column="0">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>