Index: src/app/qgssinglesymboldialog.h
===================================================================
--- src/app/qgssinglesymboldialog.h	(revision 7689)
+++ src/app/qgssinglesymboldialog.h	(working copy)
@@ -58,19 +58,21 @@
     void apply( QgsSymbol *sy);
     /**emits the signal settingsChanged()*/
     void resendSettingsChanged();
+    /**changes the texture selection button to enabled or
+     * disabled depending if the texture entry in the combo 
+     */
+    void fillStyleChanged( int theIndex );
 
 protected slots:
     void selectOutlineColor();
     void selectFillColor();
-	void selectTextureImage();
-
+    void selectTextureImage();
+    void symbolChanged ( QListWidgetItem * current, QListWidgetItem * previous );
 private:
     /** Default constructor is private, do not use this */
     QgsSingleSymbolDialog();
+    QString mTexturePath;
 
-    /** vector of marker names for combo items */
-    std::vector<QString> mMarkers;
-
 signals:
     void settingsChanged();
 };
Index: src/app/qgsvectorlayerproperties.h
===================================================================
--- src/app/qgsvectorlayerproperties.h	(revision 7689)
+++ src/app/qgsvectorlayerproperties.h	(working copy)
@@ -63,6 +63,10 @@
   void on_pbnQueryBuilder_clicked();
   void on_pbnIndex_clicked();
   void on_pbnChangeSpatialRefSys_clicked();
+  void on_pbnLoadDefaultStyle_clicked();
+  void on_pbnSaveDefaultStyle_clicked();
+  void on_pbnLoadStyle_clicked();
+  void on_pbnSaveStyleAs_clicked();
   
   signals:
     
Index: src/app/qgsvectorlayerproperties.cpp
===================================================================
--- src/app/qgsvectorlayerproperties.cpp	(revision 7689)
+++ src/app/qgsvectorlayerproperties.cpp	(working copy)
@@ -17,36 +17,41 @@
  ***************************************************************************/
  /* $Id$ */
 
-#include "qgsvectorlayerproperties.h"
 
 #include "qgsattributeactiondialog.h"
 #include "qgscontexthelp.h"
 #include "qgscontinuouscolordialog.h"
 #include "qgscoordinatetransform.h"
 #include "qgsgraduatedsymboldialog.h"
+#include "qgslabeldialog.h"
 #include "qgslabel.h"
-#include "qgslabeldialog.h"
 #include "qgslayerprojectionselector.h"
 #include "qgslogger.h"
 #include "qgssinglesymboldialog.h"
 #include "qgsuniquevaluedialog.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
+#include "qgsvectorlayerproperties.h"
+#include "qgsconfig.h"
 
-#include "qgsconfig.h"
 #ifdef HAVE_POSTGRESQL
 #include "qgspgquerybuilder.h"
 #include "../providers/postgres/qgspostgresprovider.h"
 #endif
 
 #include <QMessageBox>
+#include <QDir>
+#include <QFile>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QSettings>
 
 QgsVectorLayerProperties::QgsVectorLayerProperties(QgsVectorLayer * lyr, 
-                                                         QWidget * parent, 
-                                                         Qt::WFlags fl)
+    QWidget * parent, 
+    Qt::WFlags fl)
 : QDialog(parent, fl),
-      layer(lyr), 
-      mRendererDialog(0)
+  layer(lyr), 
+  mRendererDialog(0)
 {
   setupUi(this);
   connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
@@ -61,7 +66,7 @@
   layout->addWidget( labelDialog );
   labelOptionsFrame->setLayout(layout);
   connect(labelDialog, SIGNAL(labelSourceSet()), 
-          this, SLOT(setLabelCheckBox()));
+      this, SLOT(setLabelCheckBox()));
 
   // Create the Actions dialog tab
   QgsVectorDataProvider *dp = dynamic_cast<QgsVectorDataProvider *>(layer->getDataProvider());
@@ -69,22 +74,22 @@
   actionLayout->setMargin(0);
   QgsFieldMap fields = dp->fields();
   actionDialog = new QgsAttributeActionDialog ( layer->actions(), fields, 
-                                                actionOptionsFrame );
+      actionOptionsFrame );
   actionLayout->addWidget( actionDialog );
 
   reset();
   if(layer->getDataProvider())//enable spatial index button group if supported by provider
   {
-      int capabilities=layer->getDataProvider()->capabilities();
-      if(!(capabilities&QgsVectorDataProvider::CreateSpatialIndex))
-      {
-	  indexGroupBox->setEnabled(false);
-      }
+    int capabilities=layer->getDataProvider()->capabilities();
+    if(!(capabilities&QgsVectorDataProvider::CreateSpatialIndex))
+    {
+      indexGroupBox->setEnabled(false);
+    }
   }
 
   leSpatialRefSys->setText(layer->srs().proj4String());
   leSpatialRefSys->setCursorPosition(0);
-  
+
   connect(sliderTransparency, SIGNAL(valueChanged(int)), this, SLOT(sliderTransparency_valueChanged(int)));
 
 } // QgsVectorLayerProperties ctor
@@ -92,7 +97,7 @@
 QgsVectorLayerProperties::~QgsVectorLayerProperties()
 {
   disconnect(labelDialog, SIGNAL(labelSourceSet()), 
-          this, SLOT(setLabelCheckBox()));  
+      this, SLOT(setLabelCheckBox()));  
 }
 void QgsVectorLayerProperties::sliderTransparency_valueChanged(int theValue)
 {
@@ -109,27 +114,27 @@
 void QgsVectorLayerProperties::alterLayerDialog(const QString & dialogString)
 {
 
-    widgetStackRenderers->removeWidget(mRendererDialog);
-    delete mRendererDialog;
-    mRendererDialog=0;
-    if(dialogString == tr("Single Symbol"))
-    {
-	mRendererDialog = new QgsSingleSymbolDialog(layer);
-    }
-    else if(dialogString == tr("Graduated Symbol"))
-    {
-	mRendererDialog = new QgsGraduatedSymbolDialog(layer);
-    }
-    else if(dialogString == tr("Continuous Color"))
-    {
-	mRendererDialog = new QgsContinuousColorDialog(layer);
-    }
-    else if(dialogString == tr("Unique Value"))
-    {
-	mRendererDialog = new QgsUniqueValueDialog(layer);
-    }
-    widgetStackRenderers->addWidget(mRendererDialog);
-    widgetStackRenderers->setCurrentWidget(mRendererDialog);  
+  widgetStackRenderers->removeWidget(mRendererDialog);
+  delete mRendererDialog;
+  mRendererDialog=0;
+  if(dialogString == tr("Single Symbol"))
+  {
+    mRendererDialog = new QgsSingleSymbolDialog(layer);
+  }
+  else if(dialogString == tr("Graduated Symbol"))
+  {
+    mRendererDialog = new QgsGraduatedSymbolDialog(layer);
+  }
+  else if(dialogString == tr("Continuous Color"))
+  {
+    mRendererDialog = new QgsContinuousColorDialog(layer);
+  }
+  else if(dialogString == tr("Unique Value"))
+  {
+    mRendererDialog = new QgsUniqueValueDialog(layer);
+  }
+  widgetStackRenderers->addWidget(mRendererDialog);
+  widgetStackRenderers->setCurrentWidget(mRendererDialog);  
 }
 
 void QgsVectorLayerProperties::setLegendType(QString type)
@@ -147,8 +152,12 @@
 {
   // populate the general information
   txtDisplayName->setText(layer->name());
-  pbnQueryBuilder->setWhatsThis(tr("This button opens the PostgreSQL query builder and allows you to create a subset of features to display on the map canvas rather than displaying all features in the layer"));
-  txtSubsetSQL->setWhatsThis(tr("The query used to limit the features in the layer is shown here. This is currently only supported for PostgreSQL layers. To enter or modify the query, click on the Query Builder button"));
+  pbnQueryBuilder->setWhatsThis(tr("This button opens the PostgreSQL query "
+        "builder and allows you to create a subset of features to display on "
+        "the map canvas rather than displaying all features in the layer"));
+  txtSubsetSQL->setWhatsThis(tr("The query used to limit the features in the "
+        "layer is shown here. This is currently only supported for PostgreSQL "
+        "layers. To enter or modify the query, click on the Query Builder button"));
 
   //we are dealing with a pg layer here so that we can enable the sql box
   QgsVectorDataProvider *dp = dynamic_cast<QgsVectorDataProvider *>(layer->getDataProvider());
@@ -184,15 +193,15 @@
 
   // symbology initialization
   if(legendtypecombobox->count()==0)
+  {
+    legendtypecombobox->insertItem(tr("Single Symbol"));
+    if(myFields.size()>0)
     {
-      legendtypecombobox->insertItem(tr("Single Symbol"));
-      if(myFields.size()>0)
-      {
-	  legendtypecombobox->insertItem(tr("Graduated Symbol"));
-	  legendtypecombobox->insertItem(tr("Continuous Color"));
-	  legendtypecombobox->insertItem(tr("Unique Value"));
-      }
+      legendtypecombobox->insertItem(tr("Graduated Symbol"));
+      legendtypecombobox->insertItem(tr("Continuous Color"));
+      legendtypecombobox->insertItem(tr("Unique Value"));
     }
+  }
 
   //find out the type of renderer in the vectorlayer, create a dialog with these settings and add it to the form
   delete mRendererDialog;
@@ -200,37 +209,38 @@
   QString rtype=layer->renderer()->name();
   if(rtype=="Single Symbol")
   {
-      mRendererDialog=new QgsSingleSymbolDialog(layer);
-      legendtypecombobox->setCurrentIndex(0);
+    mRendererDialog=new QgsSingleSymbolDialog(layer);
+    legendtypecombobox->setCurrentIndex(0);
   }
   else if(rtype=="Graduated Symbol")
   {
-      mRendererDialog=new QgsGraduatedSymbolDialog(layer);
-      legendtypecombobox->setCurrentIndex(1);
+    mRendererDialog=new QgsGraduatedSymbolDialog(layer);
+    legendtypecombobox->setCurrentIndex(1);
   }
   else if(rtype=="Continuous Color")
   {
-      mRendererDialog=new QgsContinuousColorDialog(layer);
-      legendtypecombobox->setCurrentIndex(2);
+    mRendererDialog=new QgsContinuousColorDialog(layer);
+    legendtypecombobox->setCurrentIndex(2);
   }
   else if(rtype == "Unique Value")
   {
-      mRendererDialog=new QgsUniqueValueDialog(layer);
-      legendtypecombobox->setCurrentIndex(3);
+    mRendererDialog=new QgsUniqueValueDialog(layer);
+    legendtypecombobox->setCurrentIndex(3);
   }
-  
+
   if(mRendererDialog)
   {
-      widgetStackRenderers->addWidget(mRendererDialog);
-      widgetStackRenderers->setCurrentWidget(mRendererDialog);
+    widgetStackRenderers->addWidget(mRendererDialog);
+    widgetStackRenderers->setCurrentWidget(mRendererDialog);
   }
-  
 
-  QObject::connect(legendtypecombobox, SIGNAL(activated(const QString &)), this, SLOT(alterLayerDialog(const QString &)));
 
+  QObject::connect(legendtypecombobox, SIGNAL(activated(const QString &)), this, 
+      SLOT(alterLayerDialog(const QString &)));
+
   // reset fields in label dialog
   layer->label()->setFields ( layer->getDataProvider()->fields() );
-  
+
   //set the metadata contents
   teMetadata->setText(getMetadata());
   actionDialog->init();
@@ -259,8 +269,6 @@
   // Set up sql subset query if applicable
   //
 #ifdef HAVE_POSTGRESQL
-  // Tim commented out the next line because dp is not actually used anywhere....
-  //QgsVectorDataProvider *dp = dynamic_cast<QgsVectorDataProvider *>(layer->getDataProvider());
   //see if we are dealing with a pg layer here
   if(layer->providerType() == "postgres")
   {
@@ -288,32 +296,36 @@
   layer->setLayerName(displayName());
 
 
-  QgsSingleSymbolDialog *sdialog = dynamic_cast < QgsSingleSymbolDialog * >(widgetStackRenderers->currentWidget());
-  QgsGraduatedSymbolDialog *gdialog = dynamic_cast < QgsGraduatedSymbolDialog * >(widgetStackRenderers->currentWidget());
-  QgsContinuousColorDialog *cdialog = dynamic_cast < QgsContinuousColorDialog * >(widgetStackRenderers->currentWidget());
-  QgsUniqueValueDialog* udialog = dynamic_cast< QgsUniqueValueDialog * >(widgetStackRenderers->currentWidget()); 
+  QgsSingleSymbolDialog *sdialog = 
+    dynamic_cast < QgsSingleSymbolDialog * >(widgetStackRenderers->currentWidget());
+  QgsGraduatedSymbolDialog *gdialog = 
+    dynamic_cast < QgsGraduatedSymbolDialog * >(widgetStackRenderers->currentWidget());
+  QgsContinuousColorDialog *cdialog = 
+    dynamic_cast < QgsContinuousColorDialog * >(widgetStackRenderers->currentWidget());
+  QgsUniqueValueDialog* udialog = 
+    dynamic_cast< QgsUniqueValueDialog * >(widgetStackRenderers->currentWidget()); 
 
   if (sdialog)
-    {
-      sdialog->apply();
-    } 
+  {
+    sdialog->apply();
+  } 
   else if (gdialog)
   {
-      gdialog->apply();
+    gdialog->apply();
   }
   else if (cdialog)
-    {
-      cdialog->apply();
-    }
+  {
+    cdialog->apply();
+  }
   else if(udialog)
   {
-      udialog->apply();
+    udialog->apply();
   }
   layer->setTransparency(static_cast < unsigned int >(255 - sliderTransparency->value()));
-  
+
   // update symbology
   emit refreshLegend(layer->getLayerID(), false);
-  
+
   layer->triggerRepaint();
 
 }
@@ -333,7 +345,7 @@
   // and postgres connection from the provider
   QgsDataSourceURI uri(myPGProvider->dataSourceUri());
   QgsPgQueryBuilder *pqb = new QgsPgQueryBuilder(&uri, this);
-       
+
   // Set the sql in the query builder to the same in the prop dialog
   // (in case the user has already changed it)
   pqb->setSql(txtSubsetSQL->text());
@@ -355,55 +367,56 @@
 
 void QgsVectorLayerProperties::on_pbnIndex_clicked()
 {
-    QgsVectorDataProvider* pr=layer->getDataProvider();
-    if(pr)
+  QgsVectorDataProvider* pr=layer->getDataProvider();
+  if(pr)
+  {
+    setCursor(Qt::WaitCursor);
+    bool errval=pr->createSpatialIndex();
+    setCursor(Qt::ArrowCursor);
+    if(errval)
     {
-	setCursor(Qt::WaitCursor);
-	bool errval=pr->createSpatialIndex();
-	setCursor(Qt::ArrowCursor);
-	if(errval)
-	{
-	    QMessageBox::information(this, tr("Spatial Index"), tr("Creation of spatial index successfull"));
-	}
-	else
-	{
-           // TODO: Remind the user to use OGR >= 1.2.6 and Shapefile
-	   QMessageBox::information(this, tr("Spatial Index"), tr("Creation of spatial index failed")); 
-	}
+      QMessageBox::information(this, tr("Spatial Index"), 
+          tr("Creation of spatial index successfull"));
     }
+    else
+    {
+      // TODO: Remind the user to use OGR >= 1.2.6 and Shapefile
+      QMessageBox::information(this, tr("Spatial Index"), tr("Creation of spatial index failed")); 
+    }
+  }
 }
 
 QString QgsVectorLayerProperties::getMetadata()
 {
-  QString myMetadataQString = "<html><body>";
-  myMetadataQString += "<table width=\"100%\">";
-  
+  QString myMetedata = "<html><body>";
+  myMetedata += "<table width=\"100%\">";
+
   //-------------
-  
-  myMetadataQString += "<tr><td bgcolor=\"gray\">";
-  myMetadataQString += tr("General:");
-  myMetadataQString += "</td></tr>";
 
+  myMetedata += "<tr><td bgcolor=\"gray\">";
+  myMetedata += tr("General:");
+  myMetedata += "</td></tr>";
+
   // data comment
   if (!(layer->dataComment().isEmpty()))
   {
-    myMetadataQString += "<tr><td bgcolor=\"white\">";
-    myMetadataQString += tr("Layer comment: ") + 
-        layer->dataComment();
-    myMetadataQString += "</td></tr>";
+    myMetedata += "<tr><td bgcolor=\"white\">";
+    myMetedata += tr("Layer comment: ") + 
+      layer->dataComment();
+    myMetedata += "</td></tr>";
   }
 
   //storage type
-  myMetadataQString += "<tr><td bgcolor=\"white\">";
-  myMetadataQString += tr("Storage type of this layer : ") + 
-                       layer->storageType();
-  myMetadataQString += "</td></tr>";
+  myMetedata += "<tr><td bgcolor=\"white\">";
+  myMetedata += tr("Storage type of this layer : ") + 
+    layer->storageType();
+  myMetedata += "</td></tr>";
 
   // data source
-  myMetadataQString += "<tr><td bgcolor=\"white\">";
-  myMetadataQString += tr("Source for this layer : ") +
-                       layer->publicSource();
-  myMetadataQString += "</td></tr>";
+  myMetedata += "<tr><td bgcolor=\"white\">";
+  myMetedata += tr("Source for this layer : ") +
+    layer->publicSource();
+  myMetedata += "</td></tr>";
 
   //geom type
 
@@ -411,48 +424,48 @@
 
   if ( vectorType < 0 || vectorType > QGis::Polygon )
   {
-      QgsDebugMsg( "Invalid vector type" );
+    QgsDebugMsg( "Invalid vector type" );
   }
   else
   {
-      QString vectorTypeString( QGis::qgisVectorGeometryType[layer->vectorType()] );
+    QString vectorTypeString( QGis::qgisVectorGeometryType[layer->vectorType()] );
 
-      myMetadataQString += "<tr><td bgcolor=\"white\">";
-      myMetadataQString += tr("Geometry type of the features in this layer : ") + 
-          vectorTypeString;
-      myMetadataQString += "</td></tr>";
+    myMetedata += "<tr><td bgcolor=\"white\">";
+    myMetedata += tr("Geometry type of the features in this layer : ") + 
+      vectorTypeString;
+    myMetedata += "</td></tr>";
   }
 
 
-      //feature count
-  myMetadataQString += "<tr><td bgcolor=\"white\">";
-  myMetadataQString += tr("The number of features in this layer : ") + 
-                       QString::number(layer->featureCount());
-  myMetadataQString += "</td></tr>";
+  //feature count
+  myMetedata += "<tr><td bgcolor=\"white\">";
+  myMetedata += tr("The number of features in this layer : ") + 
+    QString::number(layer->featureCount());
+  myMetedata += "</td></tr>";
   //capabilities
-  myMetadataQString += "<tr><td bgcolor=\"white\">";
-  myMetadataQString += tr("Editing capabilities of this layer : ") + 
-                       layer->capabilitiesString();
-  myMetadataQString += "</td></tr>";
+  myMetedata += "<tr><td bgcolor=\"white\">";
+  myMetedata += tr("Editing capabilities of this layer : ") + 
+    layer->capabilitiesString();
+  myMetedata += "</td></tr>";
 
   //-------------
 
   QgsRect myExtent = layer->extent();  
-  myMetadataQString += "<tr><td bgcolor=\"gray\">";
-  myMetadataQString += tr("Extents:");
-  myMetadataQString += "</td></tr>";
+  myMetedata += "<tr><td bgcolor=\"gray\">";
+  myMetedata += tr("Extents:");
+  myMetedata += "</td></tr>";
   //extents in layer cs  TODO...maybe make a little nested table to improve layout...
-  myMetadataQString += "<tr><td bgcolor=\"white\">";
-  myMetadataQString += tr("In layer spatial reference system units : ") + 
-                       tr("xMin,yMin ") + 
-                       QString::number(myExtent.xMin()) + 
-                       "," + 
-                       QString::number( myExtent.yMin()) +
-                       tr(" : xMax,yMax ") + 
-                       QString::number(myExtent.xMax()) + 
-                       "," + 
-                       QString::number(myExtent.yMax());
-  myMetadataQString += "</td></tr>";
+  myMetedata += "<tr><td bgcolor=\"white\">";
+  myMetedata += tr("In layer spatial reference system units : ") + 
+    tr("xMin,yMin ") + 
+    QString::number(myExtent.xMin()) + 
+    "," + 
+    QString::number( myExtent.yMin()) +
+    tr(" : xMax,yMax ") + 
+    QString::number(myExtent.xMax()) + 
+    "," + 
+    QString::number(myExtent.yMax());
+  myMetedata += "</td></tr>";
 
   //extents in project cs
 
@@ -461,40 +474,40 @@
     /*    
     // TODO: currently disabled, will revisit later [MD]
     QgsRect myProjectedExtent = coordinateTransform->transformBoundingBox(layer->extent());
-    myMetadataQString += "<tr><td bgcolor=\"white\">";
-    myMetadataQString += tr("In project spatial reference system units : ") + 
-                         tr("xMin,yMin ") + 
-                         QString::number(myProjectedExtent.xMin()) + 
-                         "," + 
-                         QString::number( myProjectedExtent.yMin()) +
-                         tr(" : xMax,yMax ") + 
-                         QString::number(myProjectedExtent.xMax()) + 
-                         "," + 
-                         QString::number(myProjectedExtent.yMax());
-    myMetadataQString += "</td></tr>";
+    myMetedata += "<tr><td bgcolor=\"white\">";
+    myMetedata += tr("In project spatial reference system units : ") + 
+    tr("xMin,yMin ") + 
+    QString::number(myProjectedExtent.xMin()) + 
+    "," + 
+    QString::number( myProjectedExtent.yMin()) +
+    tr(" : xMax,yMax ") + 
+    QString::number(myProjectedExtent.xMax()) + 
+    "," + 
+    QString::number(myProjectedExtent.yMax());
+    myMetedata += "</td></tr>";
     */
 
     // 
     // Display layer spatial ref system
     //
-    myMetadataQString += "<tr><td bgcolor=\"gray\">";
-    myMetadataQString += tr("Layer Spatial Reference System:");
-    myMetadataQString += "</td></tr>";  
-    myMetadataQString += "<tr><td bgcolor=\"white\">";
-    myMetadataQString += layer->srs().proj4String().replace(QRegExp("\"")," \"");                       
-    myMetadataQString += "</td></tr>";
+    myMetedata += "<tr><td bgcolor=\"gray\">";
+    myMetedata += tr("Layer Spatial Reference System:");
+    myMetedata += "</td></tr>";  
+    myMetedata += "<tr><td bgcolor=\"white\">";
+    myMetedata += layer->srs().proj4String().replace(QRegExp("\"")," \"");                       
+    myMetedata += "</td></tr>";
 
     // 
     // Display project (output) spatial ref system
     //  
     /*
     // TODO: disabled for now, will revisit later [MD]
-    myMetadataQString += "<tr><td bgcolor=\"gray\">";
-    myMetadataQString += tr("Project (Output) Spatial Reference System:");
-    myMetadataQString += "</td></tr>";  
-    myMetadataQString += "<tr><td bgcolor=\"white\">";
-    myMetadataQString += coordinateTransform->destSRS().proj4String().replace(QRegExp("\"")," \"");                       
-    myMetadataQString += "</td></tr>";
+    myMetedata += "<tr><td bgcolor=\"gray\">";
+    myMetedata += tr("Project (Output) Spatial Reference System:");
+    myMetedata += "</td></tr>";  
+    myMetedata += "<tr><td bgcolor=\"white\">";
+    myMetedata += coordinateTransform->destSRS().proj4String().replace(QRegExp("\"")," \"");                       
+    myMetedata += "</td></tr>";
     */
 
   }
@@ -503,74 +516,74 @@
     UNUSED(cse);
     QgsDebugMsg( cse.what() );
 
-    myMetadataQString += "<tr><td bgcolor=\"white\">";
-    myMetadataQString += tr("In project spatial reference system units : ");
-    myMetadataQString += " (Invalid transformation of layer extents) ";
-    myMetadataQString += "</td></tr>";
+    myMetedata += "<tr><td bgcolor=\"white\">";
+    myMetedata += tr("In project spatial reference system units : ");
+    myMetedata += " (Invalid transformation of layer extents) ";
+    myMetedata += "</td></tr>";
 
   }
 
-      
+
   //
   // Add the info about each field in the attribute table
   //
-  myMetadataQString += "<tr><td bgcolor=\"gray\">";
-  myMetadataQString += tr("Attribute field info:");
-  myMetadataQString += "</td></tr>";
-  myMetadataQString += "<tr><td bgcolor=\"white\">";
+  myMetedata += "<tr><td bgcolor=\"gray\">";
+  myMetedata += tr("Attribute field info:");
+  myMetedata += "</td></tr>";
+  myMetedata += "<tr><td bgcolor=\"white\">";
 
   // Start a nested table in this trow
-  myMetadataQString += "<table width=\"100%\">";
-  myMetadataQString += "<tr><th bgcolor=\"black\">";
-  myMetadataQString += "<font color=\"white\">" + tr("Field") + "</font>";
-  myMetadataQString += "</th>";
-  myMetadataQString += "<th bgcolor=\"black\">";
-  myMetadataQString += "<font color=\"white\">" + tr("Type") + "</font>";
-  myMetadataQString += "</th>";
-  myMetadataQString += "<th bgcolor=\"black\">";
-  myMetadataQString += "<font color=\"white\">" + tr("Length") + "</font>";
-  myMetadataQString += "</th>";
-  myMetadataQString += "<th bgcolor=\"black\">";
-  myMetadataQString += "<font color=\"white\">" + tr("Precision") + "</font>";
-  myMetadataQString += "</th>";      
-  myMetadataQString += "<th bgcolor=\"black\">";
-  myMetadataQString += "<font color=\"white\">" + tr("Comment") + "</font>";
-  myMetadataQString += "</th>";
- 
+  myMetedata += "<table width=\"100%\">";
+  myMetedata += "<tr><th bgcolor=\"black\">";
+  myMetedata += "<font color=\"white\">" + tr("Field") + "</font>";
+  myMetedata += "</th>";
+  myMetedata += "<th bgcolor=\"black\">";
+  myMetedata += "<font color=\"white\">" + tr("Type") + "</font>";
+  myMetedata += "</th>";
+  myMetedata += "<th bgcolor=\"black\">";
+  myMetedata += "<font color=\"white\">" + tr("Length") + "</font>";
+  myMetedata += "</th>";
+  myMetedata += "<th bgcolor=\"black\">";
+  myMetedata += "<font color=\"white\">" + tr("Precision") + "</font>";
+  myMetedata += "</th>";      
+  myMetedata += "<th bgcolor=\"black\">";
+  myMetedata += "<font color=\"white\">" + tr("Comment") + "</font>";
+  myMetedata += "</th>";
+
   //get info for each field by looping through them
   QgsVectorDataProvider *myDataProvider = dynamic_cast<QgsVectorDataProvider *>(layer->getDataProvider());
   const QgsFieldMap& myFields = myDataProvider->fields();
   for (QgsFieldMap::const_iterator it = myFields.begin(); it != myFields.end(); ++it)
   {
     const QgsField& myField = *it;
-    
-    myMetadataQString += "<tr><td bgcolor=\"white\">";
-    myMetadataQString += myField.name();
-    myMetadataQString += "</td>";
-    myMetadataQString += "<td bgcolor=\"white\">";
-    myMetadataQString += myField.typeName();
-    myMetadataQString += "</td>";
-    myMetadataQString += "<td bgcolor=\"white\">";
-    myMetadataQString += QString("%1").arg(myField.length());
-    myMetadataQString += "</td>";
-    myMetadataQString += "<td bgcolor=\"white\">";
-    myMetadataQString += QString("%1").arg(myField.precision());
-    myMetadataQString += "</td>";
-    myMetadataQString += "<td bgcolor=\"white\">";
-    myMetadataQString += QString("%1").arg(myField.comment());
-    myMetadataQString += "</td></tr>";
+
+    myMetedata += "<tr><td bgcolor=\"white\">";
+    myMetedata += myField.name();
+    myMetedata += "</td>";
+    myMetedata += "<td bgcolor=\"white\">";
+    myMetedata += myField.typeName();
+    myMetedata += "</td>";
+    myMetedata += "<td bgcolor=\"white\">";
+    myMetedata += QString("%1").arg(myField.length());
+    myMetedata += "</td>";
+    myMetedata += "<td bgcolor=\"white\">";
+    myMetedata += QString("%1").arg(myField.precision());
+    myMetedata += "</td>";
+    myMetedata += "<td bgcolor=\"white\">";
+    myMetedata += QString("%1").arg(myField.comment());
+    myMetedata += "</td></tr>";
   } 
 
   //close field list
-  myMetadataQString += "</table>"; //end of nested table
-  myMetadataQString += "</td></tr>"; //end of stats container table row
+  myMetedata += "</table>"; //end of nested table
+  myMetedata += "</td></tr>"; //end of stats container table row
   //
   // Close the table
   //
 
-  myMetadataQString += "</table>";
-  myMetadataQString += "</body></html>";
-  return myMetadataQString;
+  myMetedata += "</table>";
+  myMetedata += "</body></html>";
+  return myMetedata;
 
 }
 
@@ -578,19 +591,170 @@
 
 void QgsVectorLayerProperties::on_pbnChangeSpatialRefSys_clicked()
 {
-    QgsLayerProjectionSelector * mySelector = new QgsLayerProjectionSelector(this);
-    mySelector->setSelectedSRSID(layer->srs().srsid());
-    if(mySelector->exec())
+  QgsLayerProjectionSelector * mySelector = new QgsLayerProjectionSelector(this);
+  mySelector->setSelectedSRSID(layer->srs().srsid());
+  if(mySelector->exec())
+  {
+    QgsSpatialRefSys srs(mySelector->getCurrentSRSID(), QgsSpatialRefSys::QGIS_SRSID);
+    layer->setSrs(srs);
+  }
+  else
+  {
+    QApplication::restoreOverrideCursor();
+  }
+  delete mySelector;
+
+  leSpatialRefSys->setText(layer->srs().proj4String());
+  leSpatialRefSys->setCursorPosition(0);
+}
+
+void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()
+{
+  bool defaultLoadedFlag = false;
+  QString myMessage = layer->loadDefaultStyle( defaultLoadedFlag );
+  //reset if the default style was loaded ok only
+  if ( defaultLoadedFlag )
+  {
+    reset ();
+  }
+  QMessageBox::information( this, 
+      tr("Default Style"), 
+      myMessage
+      ); 
+}
+
+void QgsVectorLayerProperties::on_pbnSaveDefaultStyle_clicked()
+{
+  // a flag passed by reference
+  bool defaultSavedFlag = false;
+  // after calling this the above flag will be set true for success
+  // or false if the save operation failed
+  QString myMessage = layer->saveDefaultStyle( defaultSavedFlag );
+  QMessageBox::information( this, 
+      tr("Default Style"), 
+      myMessage
+      ); 
+}
+
+
+void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
+{
+  QSettings myQSettings;  // where we keep last used filter in persistant state
+  QString myLastUsedDir = myQSettings.value ( "style/lastStyleDir", "." ).toString();
+
+  //create a file dialog
+  std::auto_ptr < QFileDialog > myFileDialog
+    (
+     new QFileDialog (
+       this,
+       QFileDialog::tr ( "Load layer properties from style file (.qml)" ),
+       myLastUsedDir,
+       tr ( "QGIS Layer Style File (*.qml)" )
+       )
+    );
+  myFileDialog->setFileMode ( QFileDialog::AnyFile );
+  myFileDialog->setAcceptMode ( QFileDialog::AcceptOpen );
+
+  //prompt the user for a filename
+  QString myFileName;
+  if ( myFileDialog->exec() == QDialog::Accepted )
+  {
+    QStringList myFiles = myFileDialog->selectedFiles();
+    if ( !myFiles.isEmpty() )
     {
-      QgsSpatialRefSys srs(mySelector->getCurrentSRSID(), QgsSpatialRefSys::QGIS_SRSID);
-      layer->setSrs(srs);
+      myFileName = myFiles[0];
     }
+  }
+
+  if ( !myFileName.isEmpty() )
+  {
+    if ( myFileDialog->selectedFilter() == tr ( "QGIS Layer Style File (*.qml)" ) )
+    {
+      //ensure the user never ommitted the extension from the filename
+      if ( !myFileName.toUpper().endsWith ( ".QML" ) )
+      {
+        myFileName += ".qml";
+      }
+      bool defaultLoadedFlag = false;
+      QString myMessage = layer->loadNamedStyle( myFileName, defaultLoadedFlag );
+      //reset if the default style was loaded ok only
+      if ( defaultLoadedFlag )
+      {
+        reset ();
+      }
+      QMessageBox::information( this, 
+          tr("Default Style"), 
+          myMessage
+          ); 
+    }
     else
     {
-      QApplication::restoreOverrideCursor();
+      QMessageBox::warning ( this, tr ( "QGIS" ), tr ( "Unknown style format: " ) +
+          myFileDialog->selectedFilter() );
+
     }
-    delete mySelector;
+    myQSettings.setValue ( "style/lastStyleDir", myFileDialog->directory().absolutePath() );
+  }
+}
 
-    leSpatialRefSys->setText(layer->srs().proj4String());
-    leSpatialRefSys->setCursorPosition(0);
+
+void QgsVectorLayerProperties::on_pbnSaveStyleAs_clicked()
+{
+
+  QSettings myQSettings;  // where we keep last used filter in persistant state
+  QString myLastUsedDir = myQSettings.value ( "style/lastStyleDir", "." ).toString();
+
+  //create a file dialog
+  std::auto_ptr < QFileDialog > myFileDialog
+    (
+     new QFileDialog (
+       this,
+       QFileDialog::tr ( "Save layer properties as style file (.qml)" ),
+       myLastUsedDir,
+       tr ( "QGIS Layer Style File (*.qml)" )
+       )
+    );
+  myFileDialog->setFileMode ( QFileDialog::AnyFile );
+  myFileDialog->setAcceptMode ( QFileDialog::AcceptSave );
+
+  //prompt the user for a filename
+  QString myOutputFileName;
+  if ( myFileDialog->exec() == QDialog::Accepted )
+  {
+    QStringList myFiles = myFileDialog->selectedFiles();
+    if ( !myFiles.isEmpty() )
+    {
+      myOutputFileName = myFiles[0];
+    }
+  }
+
+  if ( !myOutputFileName.isEmpty() )
+  {
+    if ( myFileDialog->selectedFilter() == tr ( "QGIS Layer Style File (*.qml)" ) )
+    {
+      //ensure the user never ommitted the extension from the filename
+      if ( !myOutputFileName.toUpper().endsWith ( ".QML" ) )
+      {
+        myOutputFileName += ".qml";
+      }
+      bool defaultLoadedFlag = false;
+      QString myMessage = layer->saveNamedStyle( myOutputFileName, defaultLoadedFlag );
+      //reset if the default style was loaded ok only
+      if ( defaultLoadedFlag )
+      {
+        reset ();
+      }
+      QMessageBox::information( this, 
+          tr("Default Style"), 
+          myMessage
+          ); 
+    }
+    else
+    {
+      QMessageBox::warning ( this, tr ( "QGIS" ), tr ( "Unknown style format: " ) +
+          myFileDialog->selectedFilter() );
+
+    }
+    myQSettings.setValue ( "style/lastStyleDir", myFileDialog->directory().absolutePath() );
+  }
 }
Index: src/app/qgssinglesymboldialog.cpp
===================================================================
--- src/app/qgssinglesymboldialog.cpp	(revision 7689)
+++ src/app/qgssinglesymboldialog.cpp	(working copy)
@@ -27,6 +27,7 @@
 #include <QPainter>
 #include <QImage>
 #include <QFileDialog>
+#include <QListWidgetItem>
 
 
 QgsSingleSymbolDialog::QgsSingleSymbolDialog(): QDialog(), mVectorLayer(0)
@@ -39,139 +40,132 @@
 
 QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(layer)
 {
-    setupUi(this);
+  setupUi(this);
 
 #ifdef QGISDEBUG
-    qWarning("constructor QgsSingleSymbolDialog called WITH a layer");
+  qWarning("constructor QgsSingleSymbolDialog called WITH a layer");
 #endif
 
-    //
-    //set point symbol combo box
-    //
+  //
+  //set point symbol list
+  //
 
-    // If this layer doesn't have points, break out of the following
-    // two loops after the first iteration. This gives one point
-    // symbol in the dialog, etc so that other code can rely on such a
-    // fact, but avoids the long time required to load all of the
-    // available symbols when they are not needed.
+  // If this layer doesn't have points, break out of the following
+  // two loops after the first iteration. This gives one point
+  // symbol in the dialog, etc so that other code can rely on such a
+  // fact, but avoids the long time required to load all of the
+  // available symbols when they are not needed.
 
-    QStringList ml = QgsMarkerCatalogue::instance()->list();
-    mMarkers.clear();
+  // NOTE BY Tim: I think the note above and the break out in the 
+  // loops can be removed now with changes I have made to use combo
+  // boxes for line style and fill style...test and remove if poss.
 
-    int size = 18;
-    QPen pen (QColor(0,0,255));
-    QBrush brush ( QColor(220,220,220), Qt::SolidPattern );
 
-    
-    for ( QStringList::iterator it = ml.begin(); it != ml.end(); ++it ) 
+  QPen pen (QColor(0,0,255));
+  QBrush brush ( QColor(220,220,220), Qt::SolidPattern );
+  int size = 18;
+  int myCounter = 0;
+  QStringList ml = QgsMarkerCatalogue::instance()->list();
+  for ( QStringList::iterator it = ml.begin(); it != ml.end(); ++it ) 
+  {
+    QPixmap myPixmap = QPixmap::fromImage(QgsMarkerCatalogue::instance()->imageMarker ( *it, size, pen, brush ));
+    QListWidgetItem * mypItem = new QListWidgetItem(lstSymbols);
+    QIcon myIcon;
+    myIcon.addPixmap ( myPixmap );
+    mypItem->setIcon ( myIcon );
+    mypItem->setText ( "" );
+    //store the symbol offset in the UserData role for later retrieval
+    mypItem->setData ( Qt::UserRole, *it);
+    if (layer->vectorType() != QGis::Point)
     {
-      mMarkers.push_back ( *it );
-      QPixmap pic = QPixmap::fromImage(QgsMarkerCatalogue::instance()->imageMarker ( *it, size, pen, brush ));
-      mPointSymbolComboBox->insertItem ( pic );
-      if (layer->vectorType() != QGis::Point)
-      {
-        break;
-      }
+      break;
     }
+    ++myCounter;
+  }
 
-    //
-    //set outline / line style
-    //
-    pbnLineSolid->setPixmap(QgsSymbologyUtils::char2LinePixmap("SolidLine"));
-    pbnLineDash->setPixmap(QgsSymbologyUtils::char2LinePixmap("DashLine"));
-    pbnLineDot->setPixmap(QgsSymbologyUtils::char2LinePixmap("DotLine"));
-    pbnLineDashDot->setPixmap(QgsSymbologyUtils::char2LinePixmap("DashDotLine"));
-    pbnLineDashDotDot->setPixmap(QgsSymbologyUtils::char2LinePixmap("DashDotDotLine"));
-    pbnLineNoPen->setPixmap(QgsSymbologyUtils::char2LinePixmap("NoPen"));
+  //
+  //set outline / line style
+  //
+  cboOutlineStyle->addItem(QIcon(QgsSymbologyUtils::char2LinePixmap("SolidLine")),tr("Solid Line"),"SolidLine");
+  cboOutlineStyle->addItem(QIcon(QgsSymbologyUtils::char2LinePixmap("DashLine")),tr("Dash Line"),"DashLine");
+  cboOutlineStyle->addItem(QIcon(QgsSymbologyUtils::char2LinePixmap("DotLine")),tr("Dot Line"),"DotLine");
+  cboOutlineStyle->addItem(QIcon(QgsSymbologyUtils::char2LinePixmap("DashDotLine")),tr("Dash Dot Line"),"DashDotLine");
+  cboOutlineStyle->addItem(QIcon(QgsSymbologyUtils::char2LinePixmap("DashDotDotLine")),tr("Dash Dot Dot Line"),"DashDotDotLine");
+  cboOutlineStyle->addItem(QIcon(QgsSymbologyUtils::char2LinePixmap("NoPen")),tr("No Pen"),"NoPen");
 
-    //
-    //set pattern button group icons and state
-    //
-    solid->setPixmap(QgsSymbologyUtils::char2PatternPixmap("SolidPattern"));
-    horizontal->setPixmap(QgsSymbologyUtils::char2PatternPixmap("HorPattern"));
-    vertical->setPixmap(QgsSymbologyUtils::char2PatternPixmap("VerPattern"));
-    cross->setPixmap(QgsSymbologyUtils::char2PatternPixmap("CrossPattern"));
-    bdiag->setPixmap(QgsSymbologyUtils::char2PatternPixmap("BDiagPattern"));
-    fdiag->setPixmap(QgsSymbologyUtils::char2PatternPixmap("FDiagPattern"));
-    diagcross->setPixmap(QgsSymbologyUtils::char2PatternPixmap("DiagCrossPattern"));
-    dense1->setPixmap(QgsSymbologyUtils::char2PatternPixmap("Dense1Pattern"));
-    dense2->setPixmap(QgsSymbologyUtils::char2PatternPixmap("Dense2Pattern"));
-    dense3->setPixmap(QgsSymbologyUtils::char2PatternPixmap("Dense3Pattern"));
-    dense4->setPixmap(QgsSymbologyUtils::char2PatternPixmap("Dense4Pattern"));
-    dense5->setPixmap(QgsSymbologyUtils::char2PatternPixmap("Dense5Pattern"));
-    dense6->setPixmap(QgsSymbologyUtils::char2PatternPixmap("Dense6Pattern"));
-    dense7->setPixmap(QgsSymbologyUtils::char2PatternPixmap("Dense7Pattern"));
-    nopen->setPixmap(QgsSymbologyUtils::char2PatternPixmap("NoBrush"));
-	texture->setPixmap(QgsSymbologyUtils::char2PatternPixmap("TexturePattern"));
+  //
+  //set pattern icons and state
+  //
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("SolidPattern")),tr("Solid Pattern"),"SolidPattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("HorPattern")),tr("Hor Pattern"),"HorPattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("VerPattern")),tr("Ver Pattern"),"VerPattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("CrossPattern")),tr("Cross Pattern"),"CrossPattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("BDiagPattern")),tr("BDiag Pattern"),"BDiagPattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("FDiagPattern")),tr("FDiag Pattern"),"FDiagPattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("DiagCrossPattern")),tr("Diag Cross Pattern"),"DiagCrossPattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense1Pattern")),tr("Dense1 Pattern"),"Dense1Pattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense2Pattern")),tr("Dense2 Pattern"),"Dense2Pattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense3Pattern")),tr("Dense3 Pattern"),"Dense3Pattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense4Pattern")),tr("Dense4 Pattern"),"Dense4Pattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense5Pattern")),tr("Dense5 Pattern"),"Dense5Pattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense6Pattern")),tr("Dense6 Pattern"),"Dense6Pattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense7Pattern")),tr("Dense7 Pattern"),"Dense7Pattern");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("NoBrush")),tr("No Brush"),"NoBrush");
+  cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("TexturePattern")),tr("Texture Pattern"),"TexturePattern");
 
+  if (mVectorLayer)
+  {
+    const QgsSingleSymbolRenderer *renderer=dynamic_cast<const QgsSingleSymbolRenderer*>(mVectorLayer->renderer());
 
-    if (mVectorLayer)
+    if (renderer)
     {
-        const QgsSingleSymbolRenderer *renderer=dynamic_cast<const QgsSingleSymbolRenderer*>(mVectorLayer->renderer());
-
-        if (renderer)
-        {
-	      // Set from the existing renderer
-	      set ( renderer->symbol() );
-	    }
-        else
-        {
-            // Take values from an example instance
-            QgsSingleSymbolRenderer exampleRenderer = QgsSingleSymbolRenderer( mVectorLayer->vectorType() );
-            set ( exampleRenderer.symbol() );
-        }
-
-        if (mVectorLayer && mVectorLayer->vectorType() == QGis::Line)
-        {
-            btnFillColor->setEnabled(false);
-            grpPattern->setEnabled(false);
-            mGroupPoint->setEnabled(false);
-        }
-	
-        if (mVectorLayer && mVectorLayer->vectorType() == QGis::Polygon) {
-            mGroupPoint->setEnabled(false);
-
-        }
-       
+      // Set from the existing renderer
+      set ( renderer->symbol() );
     }
     else
     {
-        qWarning("Warning, layer is a null pointer in QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer)");
+      // Take values from an example instance
+      QgsSingleSymbolRenderer exampleRenderer = QgsSingleSymbolRenderer( mVectorLayer->vectorType() );
+      set ( exampleRenderer.symbol() );
     }
 
-     //do the signal/slot connections
-    QObject::connect(btnOutlineColor, SIGNAL(clicked()), this, SLOT(selectOutlineColor()));
-    //QObject::connect(stylebutton, SIGNAL(clicked()), this, SLOT(selectOutlineStyle()));
-    QObject::connect(btnFillColor, SIGNAL(clicked()), this, SLOT(selectFillColor()));
-    QObject::connect(outlinewidthspinbox, SIGNAL(valueChanged(int)), this, SLOT(resendSettingsChanged()));
-    QObject::connect(mLabelEdit, SIGNAL(textChanged(const QString&)), this, SLOT(resendSettingsChanged()));
-    QObject::connect(mPointSymbolComboBox, SIGNAL(activated(int)), this, SLOT(resendSettingsChanged()));
-    QObject::connect(mPointSizeSpinBox, SIGNAL(valueChanged(int)), this, SLOT(resendSettingsChanged()));
+    if (mVectorLayer && mVectorLayer->vectorType() == QGis::Line)
+    {
+      btnFillColor->setEnabled(false);
+      cboFillStyle->setEnabled(false);
+      mGroupPoint->setEnabled(false);
+      mGroupPoint->setVisible(false);
+    }
 
-    //connect fill style and line style buttons
-    QObject::connect(pbnLineSolid, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(pbnLineDot, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(pbnLineDashDot, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(pbnLineDash, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(pbnLineDashDotDot, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(pbnLineNoPen, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(solid, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(fdiag, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(dense4, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(horizontal, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(bdiag, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(diagcross, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(dense5, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(vertical, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(dense1, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(dense3, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(dense6, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(cross, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(dense2, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(dense7, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(nopen, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-    QObject::connect(texture, SIGNAL(clicked()), this, SLOT(resendSettingsChanged()));
-	QObject::connect(textureSelect, SIGNAL(clicked()), this, SLOT(selectTextureImage()));
+    if (mVectorLayer && mVectorLayer->vectorType() == QGis::Polygon) 
+    {
+      mGroupPoint->setEnabled(false);
+      mGroupPoint->setVisible(false);
+    }
+
+  }
+  else
+  {
+    qWarning("Warning, layer is a null pointer in "
+        "QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer)");
+  }
+
+  //do the signal/slot connections
+  connect(btnOutlineColor, SIGNAL(clicked()), this, SLOT(selectOutlineColor()));
+  connect(btnFillColor, SIGNAL(clicked()), this, SLOT(selectFillColor()));
+  connect(outlinewidthspinbox, SIGNAL(valueChanged(int)), this, SLOT(resendSettingsChanged()));
+  connect(mLabelEdit, SIGNAL(textChanged(const QString&)), this, SLOT(resendSettingsChanged()));
+  connect (lstSymbols,SIGNAL(currentItemChanged ( QListWidgetItem * , QListWidgetItem * )),
+        this, SLOT (symbolChanged (QListWidgetItem * , QListWidgetItem * )));
+  connect(mPointSizeSpinBox, SIGNAL(valueChanged(int)), this, SLOT(resendSettingsChanged()));
+  connect(cboOutlineStyle, SIGNAL(
+        currentIndexChanged ( const QString & )), this, SLOT(resendSettingsChanged()));
+  connect(cboFillStyle, SIGNAL(
+        currentIndexChanged ( const QString & )), this, SLOT(resendSettingsChanged()));
+  //need this to deal with when texture fill is selected or deselected
+  connect(cboFillStyle, SIGNAL(
+        currentIndexChanged ( int )), this, SLOT(fillStyleChanged(int)));
+  connect(toolSelectTexture, SIGNAL(clicked()), this, SLOT(selectTextureImage()));
 }
 
 QgsSingleSymbolDialog::~QgsSingleSymbolDialog()
@@ -190,7 +184,7 @@
         emit settingsChanged();
     }
     
-    setActiveWindow();
+    activateWindow();
 }
 
 void QgsSingleSymbolDialog::selectFillColor()
@@ -202,20 +196,19 @@
         emit settingsChanged();
     }
 
-    setActiveWindow();
+    activateWindow();
 }
 
 //should this method have a different name?
 void QgsSingleSymbolDialog::selectTextureImage()
 {
   QString fileName = QFileDialog::getOpenFileName(this, "Open File",
-                                                textureFilePath->text(),
-                                                "Images (*.png *.xpm *.jpg)"); //should we allow other types of images?
+           mTexturePath,
+           "Images (*.png *.xpm *.jpg)"); //should we allow other types of images?
 
-  if(fileName.isNull() == false){ //only process the string if the user clicked OK
-    textureFilePath->setText(fileName);
-    texture->setOn(true); //set the fill style to custom texture
-    texture->setPixmap(QPixmap(fileName)); //Change the button to show the selected image
+  if(fileName.isNull() == false)
+  { //only process the string if the user clicked OK
+    mTexturePath = fileName;
     resendSettingsChanged();
   }
 }
@@ -230,100 +223,32 @@
     //
     // Apply point symbol
     // 
-    sy->setNamedPointSymbol( mMarkers[mPointSymbolComboBox->currentItem()] ) ;
+    if ( lstSymbols->currentItem() )
+    {
+      sy->setNamedPointSymbol( lstSymbols->currentItem()->data(Qt::UserRole).toString() ) ;
+    }
     sy->setPointSize ( mPointSizeSpinBox->value() );
     
     //
     // Apply the line style
     //
-    if  (pbnLineNoPen->isOn())
-        (sy->setLineStyle(Qt::NoPen));
-    else if  (pbnLineDash->isOn())
-        (sy->setLineStyle(Qt::DashLine));
-    else if  (pbnLineDot->isOn())
-        (sy->setLineStyle(Qt::DotLine)) ;
-    else if  (pbnLineDashDot->isOn())
-        (sy->setLineStyle(Qt::DashDotLine));
-    else if  (pbnLineDashDotDot->isOn())
-        (sy->setLineStyle(Qt::DashDotDotLine)) ;
-    else
-        (sy->setLineStyle(Qt::SolidLine)); //default to solid
+    QString myLineStyle = 
+      cboOutlineStyle->itemData(cboOutlineStyle->currentIndex(),Qt::UserRole).toString();
+     sy->setLineStyle(QgsSymbologyUtils::qString2PenStyle(myLineStyle));
 
-
     //
     // Apply the pattern
     //
 
     //Store the file path, and set the brush to TexturePattern.  If we have a different button selected,
     // the below code will override it, but leave the file path alone.
-    sy->setCustomTexture(textureFilePath->text());
+   
+    sy->setCustomTexture(mTexturePath);
 
-    if (solid->isOn())
-    {
-        sy->setFillStyle(Qt::SolidPattern);
-    }
-    else if (fdiag->isOn())
-    {
-        sy->setFillStyle(Qt::FDiagPattern);
-    }
-    else if (dense4->isOn())
-    {
-        sy->setFillStyle(Qt::Dense4Pattern);
-    }
-    else if (horizontal->isOn())
-    {
-        sy->setFillStyle(Qt::HorPattern);
-    }
-    else if (dense5->isOn())
-    {
-        sy->setFillStyle(Qt::Dense5Pattern);
-    }
-    else if (diagcross->isOn())
-    {
-        sy->setFillStyle(Qt::DiagCrossPattern);
-    }
-    else if (dense1->isOn())
-    {
-        sy->setFillStyle(Qt::Dense1Pattern);
-    }
-    else if (dense6->isOn())
-    {
-        sy->setFillStyle(Qt::Dense6Pattern);
-    }
-    else if (vertical->isOn())
-    {
-        sy->setFillStyle(Qt::VerPattern);
-    }
-    else if (dense7->isOn())
-    {
-        sy->setFillStyle(Qt::Dense7Pattern);
-    }
-    else if (cross->isOn())
-    {
-        sy->setFillStyle(Qt::CrossPattern);
-    }
-    else if (dense2->isOn())
-    {
-        sy->setFillStyle(Qt::Dense2Pattern);
-    }
-    else if (bdiag->isOn())
-    {
-        sy->setFillStyle(Qt::BDiagPattern);
-    }
-    else if (dense3->isOn())
-    {
-        sy->setFillStyle(Qt::Dense3Pattern);
-    }
-    else if (nopen->isOn())
-    {
-        sy->setFillStyle(Qt::NoBrush);
-    }
-    else if (texture->isOn())
-    {
-      //we already set the brush to TexturePattern up above, so don't do anything here
-    }
+    QString myFillStyle = 
+      cboFillStyle->itemData(cboFillStyle->currentIndex(),Qt::UserRole).toString();
+    sy->setFillStyle(QgsSymbologyUtils::qString2BrushStyle(myFillStyle));
 
-    //apply the label
     sy->setLabel(mLabelEdit->text());
 }
 
@@ -343,118 +268,74 @@
 
   mLabelEdit->setText(sy->label());
 
-	// Set point symbol
-  for ( uint i = 0; i < mMarkers.size(); i++ ) {
-	    if ( mMarkers[i] ==  sy->pointSymbolName() ) {
-	        mPointSymbolComboBox->setCurrentItem ( i );
-		break;
-	    }
-	}
-	mPointSizeSpinBox->setValue ( sy->pointSize() );
-	
-	outlinewidthspinbox->setValue(sy->pen().width());
+  // Set point symbol
+  QString mySymbolName = sy->pointSymbolName();
+  for ( int i = 0; i < lstSymbols->count(); ++i )
+  {
+    if (lstSymbols->item(i)->data( Qt::UserRole ).toString() == (mySymbolName))
+    {
+      lstSymbols->setCurrentItem ( lstSymbols->item(i) );
+      lstSymbols->item(i)->setBackground( QBrush ( Qt::cyan ) );
+      break;
+    }
+  }
+  mPointSizeSpinBox->setValue ( sy->pointSize() );
 
-	//set line width 1 as minimum to avoid confusion between line width 0 and no pen line style
-	// ... but, drawLine is not correct with width > 0 -> until solved set to 0
-	outlinewidthspinbox->setMinValue(0);
+  outlinewidthspinbox->setValue(sy->pen().width());
 
-    btnFillColor->setColor( sy->brush().color() );
+  //set line width 1 as minimum to avoid confusion between line width 0 and no pen line style
+  // ... but, drawLine is not correct with width > 0 -> until solved set to 0
+  outlinewidthspinbox->setMinValue(0);
 
-    btnOutlineColor->setColor( sy->pen().color() );
+  btnFillColor->setColor( sy->brush().color() );
 
-	//stylebutton->setName(QgsSymbologyUtils::penStyle2Char(sy->pen().style()));
-	//stylebutton->setPixmap(QgsSymbologyUtils::char2LinePixmap(stylebutton->name()));
-	//load the icons stored in QgsSymbologyUtils.cpp (to avoid redundancy)
+  btnOutlineColor->setColor( sy->pen().color() );
 
-	QPen myPen = sy->pen();
+  //load the icons stored in QgsSymbologyUtils.cpp (to avoid redundancy)
 
-	switch ( myPen.style() )
-	{
-	    case Qt::NoPen :
-		pbnLineNoPen->setOn(true);
-		break;
-	    case Qt::DashLine :
-		pbnLineDash->setOn(true);
-		break;
-	    case Qt::DotLine :
-		pbnLineDot->setOn(true);
-		break;
-	    case Qt::DashDotLine :
-		pbnLineDashDot->setOn(true);
-		break;
-	    case Qt::DashDotDotLine :
-		pbnLineDashDotDot->setOn(true);
-		break;
-	    default :
-		pbnLineSolid->setOn(true); // default to solid
-		break;
-	}
-
-	QBrush myBrush = sy->brush();
-
-	switch ( myBrush.style() )
-	{
-	    case Qt::SolidPattern :
-		solid->setOn(true);
-		break;
-	    case Qt::HorPattern :
-		horizontal->setOn(true);
-		break;
-	    case Qt::VerPattern :
-		vertical->setOn(true);
-		break;
-	    case  Qt::CrossPattern :
-		cross->setOn(true);
-		break;
-	    case Qt::BDiagPattern :
-		bdiag->setOn(true);
-		break;
-	    case Qt::FDiagPattern :
-		fdiag->setOn(true);
-		break;
-	    case Qt::DiagCrossPattern :
-		diagcross->setOn(true);
-		break;
-	    case Qt::Dense1Pattern :
-		dense1->setOn(true);
-		break;
-	    case Qt::Dense2Pattern :
-		dense2->setOn(true);
-		break;
-	    case Qt::Dense3Pattern :
-		dense3->setOn(true);
-		break;
-	    case Qt::Dense4Pattern :
-		dense4->setOn(true);
-		break;
-	    case Qt::Dense5Pattern :
-		dense5->setOn(true);
-		break;
-	    case Qt::Dense6Pattern :
-		dense6->setOn(true);
-		break;
-	    case Qt::Dense7Pattern :
-		dense7->setOn(true);
-		break;
-	    case Qt::NoBrush :
-		nopen->setOn(true);
-		break;
-		case Qt::TexturePattern :
-		texture->setOn(true);
-		break;
-	    default :
-		solid->setOn(true);
-		break;
-	}
-    textureFilePath->setText(sy->customTexture()); //get and show the file path, even if we aren't using it.
-    if(sy->customTexture().size() > 0)//if the file path isn't empty, show the image on the button
+  //
+  // Set the line style combo
+  //
+  
+  QPen myPen = sy->pen();
+  QString myLineStyle = QgsSymbologyUtils::penStyle2QString(myPen.style());
+  for ( int i = 0; i < cboOutlineStyle->count(); ++i )
+  {
+    if (cboOutlineStyle->itemData(i, Qt::UserRole ).toString() == myLineStyle)
     {
-      texture->setPixmap(QPixmap(sy->customTexture())); //show the current texture image
+      cboOutlineStyle->setCurrentIndex( i );
+      break;
     }
-	else
+  }
+
+  //
+  // Set the brush combo
+  //
+  
+  QBrush myBrush = sy->brush();
+  QString myFillStyle =  QgsSymbologyUtils::brushStyle2QString(myBrush.style());
+  for ( int i = 0; i < cboFillStyle->count(); ++i )
+  {
+    if (cboFillStyle->itemData(i, Qt::UserRole ).toString() == myFillStyle)
     {
-      texture->setPixmap(QgsSymbologyUtils::char2PatternPixmap("TexturePattern")); //show the default question mark
+      cboFillStyle->setCurrentIndex( i );
+      break;
     }
+  }
+  
+  //get and show the file path, even if we aren't using it.
+  mTexturePath = sy->customTexture(); 
+  //if the file path isn't empty, show the image on the button
+  if(sy->customTexture().size() > 0)
+  {
+    //show the current texture image
+   // texture->setPixmap(QPixmap(sy->customTexture())); 
+  }
+  else
+  {
+    //show the default question mark
+    //texture->setPixmap(QgsSymbologyUtils::char2PatternPixmap("TexturePattern")); 
+  }
 }
 
 void QgsSingleSymbolDialog::setOutlineColor(QColor& c)
@@ -464,19 +345,15 @@
 
 void QgsSingleSymbolDialog::setOutlineStyle(Qt::PenStyle pstyle)
 {
-    // XXX use switch() instead
-    if (pstyle==Qt::NoPen)
-        (pbnLineNoPen->setOn(true));
-    else if (pstyle==Qt::DashLine)
-        (pbnLineDash->setOn(true));
-    else if (pstyle==Qt::DotLine)
-        (pbnLineDot->setOn(true));
-    else if (pstyle==Qt::DashDotLine)
-        (pbnLineDashDot->setOn(true));
-    else if (pstyle==Qt::DashDotDotLine)
-        (pbnLineDashDotDot->setOn(true));
-    else
-        (pbnLineSolid->setOn(true)); //default to solid
+  QString myLineStyle = QgsSymbologyUtils::penStyle2QString(pstyle);
+  for ( int i = 0; i < cboOutlineStyle->count(); ++i )
+  {
+    if (cboOutlineStyle->itemData(i, Qt::UserRole ).toString() == myLineStyle)
+    {
+      cboOutlineStyle->setCurrentIndex( i );
+      break;
+    }
+  }
 }
 
 void QgsSingleSymbolDialog::setFillColor(QColor& c)
@@ -487,42 +364,17 @@
 void QgsSingleSymbolDialog::setFillStyle(Qt::BrushStyle fstyle)
 {
 #ifdef QGISDEBUG
-    qWarning(("Setting fill style: "+QgsSymbologyUtils::brushStyle2QString(fstyle)).toLocal8Bit().data());
+  qWarning(("Setting fill style: "+QgsSymbologyUtils::brushStyle2QString(fstyle)).toLocal8Bit().data());
 #endif
-
-    // XXX use switch instead
-    if (fstyle==Qt::SolidPattern)
-        (solid->setOn(true));
-    else if (fstyle==Qt::HorPattern)
-        (horizontal->setOn(true));
-    else if (fstyle==Qt::VerPattern)
-        (vertical->setOn(true));
-    else if (fstyle==Qt::CrossPattern)
-        (cross->setOn(true));
-    else if (fstyle==Qt::BDiagPattern)
-        (bdiag->setOn(true));
-    else if (fstyle==Qt::FDiagPattern)
-        (fdiag->setOn(true));
-    else if (fstyle==Qt::DiagCrossPattern)
-        (diagcross->setOn(true));
-    else if (fstyle==Qt::Dense1Pattern)
-        (dense1->setOn(true));
-    else if (fstyle==Qt::Dense2Pattern)
-        (dense2->setOn(true));
-    else if (fstyle==Qt::Dense3Pattern)
-        (dense3->setOn(true));
-    else if (fstyle==Qt::Dense4Pattern)
-        (dense4->setOn(true));
-    else if (fstyle==Qt::Dense5Pattern)
-        (dense5->setOn(true));
-    else if (fstyle==Qt::Dense6Pattern)
-        (dense6->setOn(true));
-    else if (fstyle==Qt::Dense7Pattern)
-        (dense7->setOn(true));
-	else if (fstyle==Qt::TexturePattern)
-		(texture->setOn(true));
-    else if (fstyle==Qt::NoBrush)
-        (nopen->setOn(true)); //default to no brush
+  QString myFillStyle =  QgsSymbologyUtils::brushStyle2QString(fstyle);
+  for ( int i = 0; i < cboFillStyle->count(); ++i )
+  {
+    if (cboFillStyle->itemData(i, Qt::UserRole ).toString() == myFillStyle)
+    {
+      cboFillStyle->setCurrentIndex( i );
+      break;
+    }
+  }
 }
 
 void QgsSingleSymbolDialog::setOutlineWidth(int width)
@@ -537,19 +389,9 @@
 
 Qt::PenStyle QgsSingleSymbolDialog::getOutlineStyle()
 {
-    if  (pbnLineNoPen->isOn())
-        return Qt::NoPen;
-    else if  (pbnLineDash->isOn())
-        return Qt::DashLine;
-    else if  (pbnLineDot->isOn())
-        return Qt::DotLine ;
-    else if  (pbnLineDashDot->isOn())
-        return Qt::DashDotLine;
-    else if  (pbnLineDashDotDot->isOn())
-        return Qt::DashDotDotLine ;
-    else
-        return Qt::SolidLine; //default to solid
-
+    QString myLineStyle = 
+      cboOutlineStyle->itemData(cboOutlineStyle->currentIndex(),Qt::UserRole).toString();
+    return QgsSymbologyUtils::qString2PenStyle(myLineStyle);
 }
 
 int QgsSingleSymbolDialog::getOutlineWidth()
@@ -564,69 +406,9 @@
 
 Qt::BrushStyle QgsSingleSymbolDialog::getFillStyle()
 {
-    if (solid->isOn())
-    {
-        return Qt::SolidPattern;
-    }
-    else if (fdiag->isOn())
-    {
-        return Qt::FDiagPattern;
-    }
-    else if (dense4->isOn())
-    {
-        return Qt::Dense4Pattern;
-    }
-    else if (horizontal->isOn())
-    {
-        return Qt::HorPattern;
-    }
-    else if (dense5->isOn())
-    {
-        return Qt::Dense5Pattern;
-    }
-    else if (diagcross->isOn())
-    {
-        return Qt::DiagCrossPattern;
-    }
-    else if (dense1->isOn())
-    {
-        return Qt::Dense1Pattern;
-    }
-    else if (dense6->isOn())
-    {
-        return Qt::Dense6Pattern;
-    }
-    else if (vertical->isOn())
-    {
-        return Qt::VerPattern;
-    }
-    else if (dense7->isOn())
-    {
-        return Qt::Dense7Pattern;
-    }
-    else if (cross->isOn())
-    {
-        return Qt::CrossPattern;
-    }
-    else if (dense2->isOn())
-    {
-        return Qt::Dense2Pattern;
-    }
-    else if (bdiag->isOn())
-    {
-        return Qt::BDiagPattern;
-    }
-    else if (dense3->isOn())
-    {
-        return Qt::Dense3Pattern;
-    }
-    else if (texture->isOn())
-    {
-        return Qt::TexturePattern;
-    }
-    //fall back to transparent
-    return Qt::NoBrush;
-
+    QString myFillStyle = 
+      cboFillStyle->itemData(cboFillStyle->currentIndex(),Qt::UserRole).toString();
+    return QgsSymbologyUtils::qString2BrushStyle(myFillStyle);
 }
 
 void QgsSingleSymbolDialog::resendSettingsChanged()
@@ -644,4 +426,30 @@
     mLabelEdit->setText(label);
 }
 
+void QgsSingleSymbolDialog::symbolChanged 
+    ( QListWidgetItem * current, QListWidgetItem * previous )
+{
+    current->setBackground( QBrush ( Qt::cyan ) );
+    if (previous)
+    {
+      previous->setBackground( QBrush ( Qt::white ) );
+    }
+    emit settingsChanged();
+}
 
+void QgsSingleSymbolDialog::fillStyleChanged( int theIndex )
+{
+  //if the new style is texture we need to enable the texture
+  //selection button, otherwise disable it
+  QString myFillStyle = 
+      cboFillStyle->itemData( theIndex ,Qt::UserRole ).toString();
+  if ( "TexturePattern" == myFillStyle )
+  {
+    toolSelectTexture->setEnabled( true );
+  }
+  else
+  {
+    toolSelectTexture->setEnabled( false );
+  }
+
+}
Index: src/core/qgsvectorlayer.cpp
===================================================================
--- src/core/qgsvectorlayer.cpp	(revision 7689)
+++ src/core/qgsvectorlayer.cpp	(working copy)
@@ -85,7 +85,8 @@
 
 QgsVectorLayer::QgsVectorLayer(QString vectorLayerPath,
     QString baseName,
-    QString providerKey)
+    QString providerKey,
+    bool loadDefaultStyleFlag )
 : QgsMapLayer(VECTOR, baseName, vectorLayerPath),
   mUpdateThreshold(0),       // XXX better default value?
   mDataProvider(NULL),
@@ -105,12 +106,29 @@
   }
   if(mValid)
   {
-    setCoordinateSystem();
-    
-    // add single symbol renderer as default
-    QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer(vectorType());
-    setRenderer(renderer);
-
+    // check if there is a default style / propertysheet defined
+    // for this layer and if so apply it
+    //
+    //
+    if ( loadDefaultStyleFlag )
+    {
+      bool defaultLoadedFlag = false;
+      loadDefaultStyle( defaultLoadedFlag );
+      if ( !defaultLoadedFlag )
+      {
+        setCoordinateSystem();
+        // add single symbol renderer as default
+        QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer(vectorType());
+        setRenderer(renderer);
+      }
+    }
+    else  // Otherwise use some very basic defaults
+    {
+      setCoordinateSystem();
+      // add single symbol renderer as default
+      QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer(vectorType());
+      setRenderer(renderer);
+    }
     // Get the update threshold from user settings. We
     // do this only on construction to avoid the penality of
     // fetching this each time the layer is drawn. If the user
@@ -119,7 +137,7 @@
     // TODO: load this setting somewhere else [MD]
     //QSettings settings;
     //mUpdateThreshold = settings.readNumEntry("Map/updateThreshold", 1000);
-    
+
   }
 } // QgsVectorLayer ctor
 
Index: src/core/qgsmaplayer.cpp
===================================================================
--- src/core/qgsmaplayer.cpp	(revision 7689)
+++ src/core/qgsmaplayer.cpp	(working copy)
@@ -22,7 +22,15 @@
 #include <QDomNode>
 #include <QFileInfo>
 #include <QSettings> // TODO: get rid of it [MD]
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomImplementation>
+#include <QTextStream>
 
+
 #include "qgslogger.h"
 #include "qgsmaptopixel.h"
 #include "qgsrect.h"
@@ -399,3 +407,135 @@
 
   return layerName;
 }
+
+QString QgsMapLayer::loadDefaultStyle ( bool & theResultFlag )
+{
+
+  QString myURI = publicSource();
+  QFileInfo myFileInfo ( myURI );
+  //get the file name for our .qml style file
+  QString myFileName = myFileInfo.path() + QDir::separator() + 
+    myFileInfo.completeBaseName () + ".qml";
+  return loadNamedStyle ( myFileName, theResultFlag );
+}
+QString QgsMapLayer::loadNamedStyle ( const QString theURI , bool & theResultFlag )
+{
+  theResultFlag = false;
+  //first check if its a file - we will add support for
+  //database etc uris later
+  QFileInfo myFileInfo ( theURI );
+  if ( !myFileInfo.isFile() )
+  {
+     return QObject::tr( "Currently only filebased datasets are supported" );
+  }
+  QFile myFile ( theURI );
+  if ( myFile.open(QFile::ReadOnly ) )
+  {
+    QDomDocument myDocument ( "qgis" );
+    // location of problem associated with errorMsg
+    int line, column;
+    QString myErrorMessage;
+    if ( !myDocument.setContent ( &myFile, &myErrorMessage, &line, &column ) )
+    {
+      myFile.close();
+      return myErrorMessage + " at line " + QString::number( line ) +
+          " column " + QString::number( column );
+    }
+    else //dom parsed in ok
+    {
+      myFile.close();
+
+      // now get the layer node out and pass it over to the layer
+      // to deserialise...
+      QDomElement myRoot = myDocument.firstChildElement("qgis");
+      if (myRoot.isNull())
+      {
+        myErrorMessage = "Error: qgis element could not be found in " + theURI;
+        return myErrorMessage;
+      }
+
+      QDomElement myLayer = myRoot.firstChildElement("maplayer");
+      if (myLayer.isNull())
+      {
+        myErrorMessage = "Error: maplayer element could not be found in " + theURI;
+        return myErrorMessage;
+      }
+      
+      //
+      // we need to ensure the data source matches the layers
+      // current datasource not the one specified in the qml
+      //
+      QDomElement myDataSource = myLayer.firstChildElement("datasource");
+      if (myDataSource.isNull())
+      {
+        myErrorMessage = "Error: datasource element could not be found in " + theURI;
+        return myErrorMessage;
+      }
+      QDomElement myNewDataSource = myDocument.createElement( "datasource" );
+      QDomText myDataSourceText = myDocument.createTextNode( source() );
+      myNewDataSource.appendChild( myDataSourceText );
+      myLayer.replaceChild( myNewDataSource ,
+          myLayer.firstChildElement("datasource") );
+
+      //
+      // Now go on to parse the xml (QDomElement inherits QDomNode
+      // so we can just pass along the element to readXML)
+      //
+      theResultFlag = readXML ( myLayer );
+
+      return QObject::tr( "Loaded default style file from " ) + theURI;
+    }
+  }
+}
+QString QgsMapLayer::saveDefaultStyle ( bool & theResultFlag )
+{
+
+  QString myURI = publicSource();
+  QFileInfo myFileInfo ( myURI );
+  //get the file name for our .qml style file
+  QString myFileName = myFileInfo.path() + QDir::separator() + 
+    myFileInfo.completeBaseName () + ".qml";
+  return saveNamedStyle ( myFileName, theResultFlag );
+}
+QString QgsMapLayer::saveNamedStyle ( const QString theURI , bool & theResultFlag )
+{
+
+  QFileInfo myFileInfo ( theURI );
+  //now check if we can write to the dir where the layer
+  //exists...
+  QFileInfo myDirInfo ( myFileInfo.path() ); //excludes filename
+  if ( !myDirInfo.isWritable() )
+  {
+    return QObject::tr( "The directory containing your dataset needs to be writeable!" );
+  }
+  //now construct the file name for our .qml style file
+  QString myFileName = myFileInfo.path() + QDir::separator() + 
+                       myFileInfo.completeBaseName () + ".qml";
+
+  QDomImplementation DOMImplementation;
+  QDomDocumentType documentType =
+      DOMImplementation.createDocumentType(
+          "qgis", "http://mrcc.com/qgis.dtd","SYSTEM" );
+  QDomDocument myDocument ( documentType );
+  QDomElement myRootNode = myDocument.createElement( "qgis" );
+  myRootNode.setAttribute( "version", QString("%1").arg( QGis::qgisVersion ) );
+  myDocument.appendChild( myRootNode );
+  writeXML( myRootNode, myDocument );
+
+
+  QFile myFile ( myFileName );
+  if ( myFile.open(QFile::WriteOnly | QFile::Truncate ) )
+  {
+    QTextStream myFileStream( &myFile );
+    // save as utf-8 with 2 spaces for indents
+    myDocument.save( myFileStream, 2 );  
+    myFile.close();
+    return QObject::tr( "Created default style file as " ) + myFileName;
+  }
+  else
+  {
+    return QObject::tr( "ERROR: Failed to created default style file as " ) + myFileName + 
+      tr( " Check file permissions and retry." );
+  }
+
+}
Index: src/core/qgsvectorlayer.h
===================================================================
--- src/core/qgsvectorlayer.h	(revision 7689)
+++ src/core/qgsvectorlayer.h	(working copy)
@@ -71,7 +71,8 @@
 public:
 
   /** Constructor */
-  QgsVectorLayer(QString path = 0, QString baseName = 0, QString providerLib = 0);
+  QgsVectorLayer(QString path = 0, QString baseName = 0, 
+      QString providerLib = 0, bool loadDefaultStyleFlag = true);
 
   /** Destructor */
   virtual ~QgsVectorLayer();
Index: src/core/symbology/qgssymbol.cpp
===================================================================
--- src/core/symbology/qgssymbol.cpp	(revision 7689)
+++ src/core/symbology/qgssymbol.cpp	(working copy)
@@ -90,7 +90,7 @@
     mType = s.mType;
     mPen = s.mPen;
     mBrush = s.mBrush;
-	mTextureFilePath = s.mTextureFilePath;
+    mTextureFilePath = s.mTextureFilePath;
     mPointSymbolName = s.mPointSymbolName;
     mPointSize = s.mPointSize;
     mPointSymbolImage = s.mPointSymbolImage;
Index: src/core/symbology/qgssymbologyutils.cpp
===================================================================
--- src/core/symbology/qgssymbologyutils.cpp	(revision 7689)
+++ src/core/symbology/qgssymbologyutils.cpp	(working copy)
@@ -641,205 +641,251 @@
 QString QgsSymbologyUtils::penStyle2QString(Qt::PenStyle penstyle)
 {
   if (penstyle == Qt::NoPen)
-    {
-      return "NoPen";
-  } else if (penstyle == Qt::SolidLine)
-    {
-      return "SolidLine";
-  } else if (penstyle == Qt::DashLine)
-    {
-      return "DashLine";
-  } else if (penstyle == Qt::DotLine)
-    {
-      return "DotLine";
-  } else if (penstyle == Qt::DashDotLine)
-    {
-      return "DashDotLine";
-  } else if (penstyle == Qt::DashDotDotLine)
-    {
-      return "DashDotDotLine";
-  } else if (penstyle == Qt::MPenStyle)
-    {
-      return "MPenStyle";
-  } else                        //return a null string 
-    {
-      return QString();
-    }
+  {
+    return "NoPen";
+  } 
+  else if (penstyle == Qt::SolidLine)
+  {
+    return "SolidLine";
+  } 
+  else if (penstyle == Qt::DashLine)
+  {
+    return "DashLine";
+  } 
+  else if (penstyle == Qt::DotLine)
+  {
+    return "DotLine";
+  } 
+  else if (penstyle == Qt::DashDotLine)
+  {
+    return "DashDotLine";
+  } 
+  else if (penstyle == Qt::DashDotDotLine)
+  {
+    return "DashDotDotLine";
+  } 
+  else if (penstyle == Qt::MPenStyle)
+  {
+    return "MPenStyle";
+  } 
+  else                        //return a null string 
+  {
+    return QString();
+  }
 }
 
 Qt::PenStyle QgsSymbologyUtils::qString2PenStyle(QString penString)
 {
   if (penString == "NoPen")
-    {
-      return Qt::NoPen;
-  } else if (penString == "SolidLine")
-    {
-      return Qt::SolidLine;
-  } else if (penString == "DashLine")
-    {
-      return Qt::DashLine;
-  } else if (penString == "DotLine")
-    {
-      return Qt::DotLine;
-  } else if (penString == "DashDotLine")
-    {
-      return Qt::DashDotLine;
-  } else if (penString == "DashDotDotLine")
-    {
-      return Qt::DashDotDotLine;
-  } else if (penString == "MPenStyle")
-    {
-      return Qt::MPenStyle;
-  } else
-    {
-      return Qt::NoPen;
-    }
+  {
+    return Qt::NoPen;
+  } 
+  else if (penString == "SolidLine")
+  {
+    return Qt::SolidLine;
+  } 
+  else if (penString == "DashLine")
+  {
+    return Qt::DashLine;
+  } 
+  else if (penString == "DotLine")
+  {
+    return Qt::DotLine;
+  } 
+  else if (penString == "DashDotLine")
+  {
+    return Qt::DashDotLine;
+  } 
+  else if (penString == "DashDotDotLine")
+  {
+    return Qt::DashDotDotLine;
+  } 
+  else if (penString == "MPenStyle")
+  {
+    return Qt::MPenStyle;
+  } 
+  else
+  {
+    return Qt::NoPen;
+  }
 }
 
 QString QgsSymbologyUtils::brushStyle2QString(Qt::BrushStyle brushstyle)
 {
   if (brushstyle == Qt::NoBrush)
-    {
-      return "NoBrush";
-  } else if (brushstyle == Qt::SolidPattern)
-    {
-      return "SolidPattern";
-  } else if (brushstyle == Qt::Dense1Pattern)
-    {
-      return "Dense1Pattern";
-  } else if (brushstyle == Qt::Dense2Pattern)
-    {
-      return "Dense2Pattern";
-  } else if (brushstyle == Qt::Dense3Pattern)
-    {
-      return "Dense3Pattern";
-  } else if (brushstyle == Qt::Dense4Pattern)
-    {
-      return "Dense4Pattern";
-  } else if (brushstyle == Qt::Dense5Pattern)
-    {
-      return "Dense5Pattern";
-  } else if (brushstyle == Qt::Dense6Pattern)
-    {
-      return "Dense6Pattern";
-  } else if (brushstyle == Qt::Dense7Pattern)
-    {
-      return "Dense7Pattern";
-  } else if (brushstyle == Qt::HorPattern)
-    {
-      return "HorPattern";
-  } else if (brushstyle == Qt::VerPattern)
-    {
-      return "VerPattern";
-  } else if (brushstyle == Qt::CrossPattern)
-    {
-      return "CrossPattern";
-  } else if (brushstyle == Qt::BDiagPattern)
-    {
-      return "BDiagPattern";
-  } else if (brushstyle == Qt::FDiagPattern)
-    {
-      return "FDiagPattern";
-  } else if (brushstyle == Qt::DiagCrossPattern)
-    {
-      return "DiagCrossPattern";
-  } else if (brushstyle == Qt::TexturePattern)
-    {
-      return "CustomPattern";
-  } else                        //return a null string
-    {
-      qWarning("Warning, no matching pattern found in QgsSymbologyUtils::brushStyle2QString");
-      return " ";
-    }
+  {
+    return "NoBrush";
+  } 
+  else if (brushstyle == Qt::SolidPattern)
+  {
+    return "SolidPattern";
+  } 
+  else if (brushstyle == Qt::Dense1Pattern)
+  {
+    return "Dense1Pattern";
+  } 
+  else if (brushstyle == Qt::Dense2Pattern)
+  {
+    return "Dense2Pattern";
+  } 
+  else if (brushstyle == Qt::Dense3Pattern)
+  {
+    return "Dense3Pattern";
+  } 
+  else if (brushstyle == Qt::Dense4Pattern)
+  {
+    return "Dense4Pattern";
+  } 
+  else if (brushstyle == Qt::Dense5Pattern)
+  {
+    return "Dense5Pattern";
+  } 
+  else if (brushstyle == Qt::Dense6Pattern)
+  {
+    return "Dense6Pattern";
+  } 
+  else if (brushstyle == Qt::Dense7Pattern)
+  {
+    return "Dense7Pattern";
+  } 
+  else if (brushstyle == Qt::HorPattern)
+  {
+    return "HorPattern";
+  } 
+  else if (brushstyle == Qt::VerPattern)
+  {
+    return "VerPattern";
+  } 
+  else if (brushstyle == Qt::CrossPattern)
+  {
+    return "CrossPattern";
+  } 
+  else if (brushstyle == Qt::BDiagPattern)
+  {
+    return "BDiagPattern";
+  } 
+  else if (brushstyle == Qt::FDiagPattern)
+  {
+    return "FDiagPattern";
+  } 
+  else if (brushstyle == Qt::DiagCrossPattern)
+  {
+    return "DiagCrossPattern";
+  } 
+  else if (brushstyle == Qt::TexturePattern)
+  {
+    return "CustomPattern";
+  } 
+  else                        //return a null string
+  {
+    qWarning("Warning, no matching pattern found in QgsSymbologyUtils::brushStyle2QString");
+    return " ";
+  }
 }
 
 Qt::BrushStyle QgsSymbologyUtils::qString2BrushStyle(QString brushString)
 {
   if (brushString == "NoBrush")
-    {
-      return Qt::NoBrush;
-  } else if (brushString == "SolidPattern")
-    {
-      return Qt::SolidPattern;
-  } else if (brushString == "Dense1Pattern")
-    {
-      return Qt::Dense1Pattern;
-  } else if (brushString == "Dense2Pattern")
-    {
-      return Qt::Dense2Pattern;
-  } else if (brushString == "Dense3Pattern")
-    {
-      return Qt::Dense3Pattern;
-  } else if (brushString == "Dense4Pattern")
-    {
-      return Qt::Dense4Pattern;
-  } else if (brushString == "Dense5Pattern")
-    {
-      return Qt::Dense5Pattern;
-  } else if (brushString == "Dense6Pattern")
-    {
-      return Qt::Dense6Pattern;
-  } else if (brushString == "Dense7Pattern")
-    {
-      return Qt::Dense7Pattern;
-  } else if (brushString == "HorPattern")
-    {
-      return Qt::HorPattern;
-  } else if (brushString == "VerPattern")
-    {
-      return Qt::VerPattern;
-  } else if (brushString == "CrossPattern")
-    {
-      return Qt::CrossPattern;
-  } else if (brushString == "BDiagPattern")
-    {
-      return Qt::BDiagPattern;
-  } else if (brushString == "FDiagPattern")
-    {
-      return Qt::FDiagPattern;
-  } else if (brushString == "DiagCrossPattern")
-    {
-      return Qt::DiagCrossPattern;
-  } else if (brushString == "CustomPattern")
-    {
-      return Qt::TexturePattern;
-  } else                        //return a null string
-    {
-     qWarning("Brush style \"" + brushString + "\" not found in qString2BrushStyle");
-      return Qt::NoBrush;
-    }
+  {
+    return Qt::NoBrush;
+  } 
+  else if (brushString == "SolidPattern")
+  {
+    return Qt::SolidPattern;
+  } 
+  else if (brushString == "Dense1Pattern")
+  {
+    return Qt::Dense1Pattern;
+  } 
+  else if (brushString == "Dense2Pattern")
+  {
+    return Qt::Dense2Pattern;
+  } 
+  else if (brushString == "Dense3Pattern")
+  {
+    return Qt::Dense3Pattern;
+  } 
+  else if (brushString == "Dense4Pattern")
+  {
+    return Qt::Dense4Pattern;
+  } 
+  else if (brushString == "Dense5Pattern")
+  {
+    return Qt::Dense5Pattern;
+  } 
+  else if (brushString == "Dense6Pattern")
+  {
+    return Qt::Dense6Pattern;
+  } 
+  else if (brushString == "Dense7Pattern")
+  {
+    return Qt::Dense7Pattern;
+  } 
+  else if (brushString == "HorPattern")
+  {
+    return Qt::HorPattern;
+  } 
+  else if (brushString == "VerPattern")
+  {
+    return Qt::VerPattern;
+  } 
+  else if (brushString == "CrossPattern")
+  {
+    return Qt::CrossPattern;
+  } 
+  else if (brushString == "BDiagPattern")
+  {
+    return Qt::BDiagPattern;
+  } 
+  else if (brushString == "FDiagPattern")
+  {
+    return Qt::FDiagPattern;
+  } 
+  else if (brushString == "DiagCrossPattern")
+  {
+    return Qt::DiagCrossPattern;
+  } 
+  else if (brushString == "CustomPattern")
+  {
+    return Qt::TexturePattern;
+  } 
+  else                        //return a null string
+  {
+    qWarning("Brush style \"" + brushString + "\" not found in qString2BrushStyle");
+    return Qt::NoBrush;
+  }
 }
 
 QPixmap QgsSymbologyUtils::qString2LinePixmap(QString lineString)
 {
   if (lineString == "SolidLine")
-    {
-      return QPixmap(solidLineData);
-    }
+  {
+    return QPixmap(solidLineData);
+  }
 
   if (lineString == "DashLine")
-    {
-      return QPixmap(dashLineData);
-    }
+  {
+    return QPixmap(dashLineData);
+  }
 
   if (lineString == "DotLine")
-    {
-      return QPixmap(dotLineData);
-    }
+  {
+    return QPixmap(dotLineData);
+  }
 
   if (lineString == "DashDotLine")
-    {
-      return QPixmap(dashDotLineData);
-    }
+  {
+    return QPixmap(dashDotLineData);
+  }
 
   if (lineString == "DashDotDotLine")
-    {
-      return QPixmap(dashDotDotLineData);
-    }
+  {
+    return QPixmap(dashDotDotLineData);
+  }
   if(lineString =="NoPen")
-    {
-      return QPixmap(noPenLineData);
-    }
+  {
+    return QPixmap(noPenLineData);
+  }
 
   return QPixmap();             // XXX I hope returning a blank one is ok
 }
@@ -847,411 +893,411 @@
 QPixmap QgsSymbologyUtils::qString2PatternPixmap(QString patternString)
 {
   if (patternString == "SolidPattern")
-    {
-      return QPixmap(solidData);
+  {
+    return QPixmap(solidData);
   } else if (patternString == "Dense1Pattern")
-    {
-      return QPixmap(dense1Data);
+  {
+    return QPixmap(dense1Data);
   } else if (patternString == "Dense2Pattern")
-    {
-      return QPixmap(dense2Data);
+  {
+    return QPixmap(dense2Data);
   } else if (patternString == "Dense3Pattern")
-    {
-      return QPixmap(dense3Data);
+  {
+    return QPixmap(dense3Data);
   } else if (patternString == "Dense4Pattern")
-    {
-      return QPixmap(dense4Data);
+  {
+    return QPixmap(dense4Data);
   } else if (patternString == "Dense5Pattern")
-    {
-      return QPixmap(dense5Data);
+  {
+    return QPixmap(dense5Data);
   } else if (patternString == "Dense6Pattern")
-    {
-      return QPixmap(dense6Data);
+  {
+    return QPixmap(dense6Data);
   } else if (patternString == "Dense7Pattern")
-    {
-      return QPixmap(dense7Data);
+  {
+    return QPixmap(dense7Data);
   } else if (patternString == "HorPattern")
-    {
-      return QPixmap(horizontalData);
+  {
+    return QPixmap(horizontalData);
   } else if (patternString == "VerPattern")
-    {
-      return QPixmap(verticalData);
+  {
+    return QPixmap(verticalData);
   } else if (patternString == "CrossPattern")
-    {
-      return QPixmap(crossData);
+  {
+    return QPixmap(crossData);
   } else if (patternString == "BDiagPattern")
-    {
-      return QPixmap(bdiagData);
+  {
+    return QPixmap(bdiagData);
   } else if (patternString == "FDiagPattern")
-    {
-      return QPixmap(fdiagData);
+  {
+    return QPixmap(fdiagData);
   } else if (patternString == "DiagCrossPattern")
-    {
-      return QPixmap(diagCrossData);
+  {
+    return QPixmap(diagCrossData);
   } else if (patternString == "TexturePattern")
-    {
-      return QPixmap(texturePatternData);
+  {
+    return QPixmap(texturePatternData);
   } else if (patternString == "NoBrush")
-    {
-      return QPixmap(nobrush);
+  {
+    return QPixmap(nobrush);
   } else                        //return a null patternString
-    {
-      qWarning("Warning, no matching pattern found in QgsSymbologyUtils::qString2PatternPixmap");
-      return QPixmap();
-    }
+  {
+    qWarning("Warning, no matching pattern found in QgsSymbologyUtils::qString2PatternPixmap");
+    return QPixmap();
+  }
 }
 
 const char * QgsSymbologyUtils::penStyle2Char(Qt::PenStyle penstyle)
 {
   if (penstyle == Qt::NoPen)
-    {
-      return "NoPen";
+  {
+    return "NoPen";
   } else if (penstyle == Qt::SolidLine)
-    {
-      return "SolidLine";
+  {
+    return "SolidLine";
   } else if (penstyle == Qt::DashLine)
-    {
-      return "DashLine";
+  {
+    return "DashLine";
   } else if (penstyle == Qt::DotLine)
-    {
-      return "DotLine";
+  {
+    return "DotLine";
   } else if (penstyle == Qt::DashDotLine)
-    {
-      return "DashDotLine";
+  {
+    return "DashDotLine";
   } else if (penstyle == Qt::DashDotDotLine)
-    {
-      return "DashDotDotLine";
+  {
+    return "DashDotDotLine";
   } else if (penstyle == Qt::MPenStyle)
-    {
-      return "MPenStyle";
+  {
+    return "MPenStyle";
   } else                        //return an empty char* 
-    {
-      return " ";
-    }
+  {
+    return " ";
+  }
 }
 
 const char *QgsSymbologyUtils::brushStyle2Char(Qt::BrushStyle brushstyle)
 {
   if (brushstyle == Qt::NoBrush)
-    {
-      return "NoBrush";
+  {
+    return "NoBrush";
   } else if (brushstyle == Qt::SolidPattern)
-    {
-      return "SolidPattern";
+  {
+    return "SolidPattern";
   } else if (brushstyle == Qt::Dense1Pattern)
-    {
-      return "Dense1Pattern";
+  {
+    return "Dense1Pattern";
   } else if (brushstyle == Qt::Dense2Pattern)
-    {
-      return "Dense2Pattern";
+  {
+    return "Dense2Pattern";
   } else if (brushstyle == Qt::Dense3Pattern)
-    {
-      return "Dense3Pattern";
+  {
+    return "Dense3Pattern";
   } else if (brushstyle == Qt::Dense4Pattern)
-    {
-      return "Dense4Pattern";
+  {
+    return "Dense4Pattern";
   } else if (brushstyle == Qt::Dense5Pattern)
-    {
-      return "Dense5Pattern";
+  {
+    return "Dense5Pattern";
   } else if (brushstyle == Qt::Dense6Pattern)
-    {
-      return "Dense6Pattern";
+  {
+    return "Dense6Pattern";
   } else if (brushstyle == Qt::Dense7Pattern)
-    {
-      return "Dense7Pattern";
+  {
+    return "Dense7Pattern";
   } else if (brushstyle == Qt::HorPattern)
-    {
-      return "HorPattern";
+  {
+    return "HorPattern";
   } else if (brushstyle == Qt::VerPattern)
-    {
-      return "VerPattern";
+  {
+    return "VerPattern";
   } else if (brushstyle == Qt::CrossPattern)
-    {
-      return "CrossPattern";
+  {
+    return "CrossPattern";
   } else if (brushstyle == Qt::BDiagPattern)
-    {
-      return "BDiagPattern";
+  {
+    return "BDiagPattern";
   } else if (brushstyle == Qt::FDiagPattern)
-    {
-      return "FDiagPattern";
+  {
+    return "FDiagPattern";
   } else if (brushstyle == Qt::DiagCrossPattern)
-    {
-      return "DiagCrossPattern";
+  {
+    return "DiagCrossPattern";
   } else if (brushstyle == Qt::TexturePattern)
-    {
-      return "CustomPattern";
+  {
+    return "CustomPattern";
   } else                        //return an empty char*
-    {
-      return " ";
-    }
+  {
+    return " ";
+  }
 }
 
 QPixmap QgsSymbologyUtils::char2LinePixmap(const char *c)
 {
   if (strcmp(c, "SolidLine") == 0)
-    {
-      return QPixmap(solidLineData);
-    }
+  {
+    return QPixmap(solidLineData);
+  }
 
   else if (strcmp(c, "DashLine") == 0)
-    {
-      return QPixmap(dashLineData);
-    }
+  {
+    return QPixmap(dashLineData);
+  }
 
   else if (strcmp(c, "DotLine") == 0)
-    {
-      return QPixmap(dotLineData);
-    }
+  {
+    return QPixmap(dotLineData);
+  }
 
   else if (strcmp(c, "DashDotLine") == 0)
-    {
-      return QPixmap(dashDotLineData);
-    }
+  {
+    return QPixmap(dashDotLineData);
+  }
 
   else if (strcmp(c, "DashDotDotLine") == 0)
-    {
-      return QPixmap(dashDotDotLineData);
-    }
+  {
+    return QPixmap(dashDotDotLineData);
+  }
 
   else if (strcmp(c, "NoPen") == 0)
-    {
-      return QPixmap(noPenLineData);
-    }
+  {
+    return QPixmap(noPenLineData);
+  }
 
   else
-    {
-      qWarning("Warning, no matching style found in QgsSymbologyUtils::char2LinePixmap");
-      return QPixmap();
-    }
+  {
+    qWarning("Warning, no matching style found in QgsSymbologyUtils::char2LinePixmap");
+    return QPixmap();
+  }
 }
 
 QPixmap QgsSymbologyUtils::char2PatternPixmap(const char *c)
 {
   if (strcmp(c, "SolidPattern") == 0)
-    {
-      return QPixmap(solidData);
+  {
+    return QPixmap(solidData);
   } else if (strcmp(c, "Dense1Pattern") == 0)
-    {
-      return QPixmap(dense1Data);
+  {
+    return QPixmap(dense1Data);
   } else if (strcmp(c, "Dense2Pattern") == 0)
-    {
-      return QPixmap(dense2Data);
+  {
+    return QPixmap(dense2Data);
   } else if (strcmp(c, "Dense3Pattern") == 0)
-    {
-      return QPixmap(dense3Data);
+  {
+    return QPixmap(dense3Data);
   } else if (strcmp(c, "Dense4Pattern") == 0)
-    {
-      return QPixmap(dense4Data);
+  {
+    return QPixmap(dense4Data);
   } else if (strcmp(c, "Dense5Pattern") == 0)
-    {
-      return QPixmap(dense5Data);
+  {
+    return QPixmap(dense5Data);
   } else if (strcmp(c, "Dense6Pattern") == 0)
-    {
-      return QPixmap(dense6Data);
+  {
+    return QPixmap(dense6Data);
   } else if (strcmp(c, "Dense7Pattern") == 0)
-    {
-      return QPixmap(dense7Data);
+  {
+    return QPixmap(dense7Data);
   } else if (strcmp(c, "HorPattern") == 0)
-    {
-      return QPixmap(horizontalData);
+  {
+    return QPixmap(horizontalData);
   } else if (strcmp(c, "VerPattern") == 0)
-    {
-      return QPixmap(verticalData);
+  {
+    return QPixmap(verticalData);
   } else if (strcmp(c, "CrossPattern") == 0)
-    {
-      return QPixmap(crossData);
+  {
+    return QPixmap(crossData);
   } else if (strcmp(c, "BDiagPattern") == 0)
-    {
-      return QPixmap(bdiagData);
+  {
+    return QPixmap(bdiagData);
   } else if (strcmp(c, "FDiagPattern") == 0)
-    {
-      return QPixmap(fdiagData);
+  {
+    return QPixmap(fdiagData);
   } else if (strcmp(c, "DiagCrossPattern") == 0)
-    {
-      return QPixmap(diagCrossData);
+  {
+    return QPixmap(diagCrossData);
   } else if (strcmp(c, "TexturePattern") == 0)
-    {
-      return QPixmap(texturePatternData);
+  {
+    return QPixmap(texturePatternData);
   }else if (strcmp(c, "NoBrush") == 0)
-    {
-      return QPixmap(nobrush);
+  {
+    return QPixmap(nobrush);
   } else
-    {
-      qWarning("Warning, no matching pattern found in QgsSymbologyUtils::char2PatternPixmap");
-      return QPixmap();
-    }
+  {
+    qWarning("Warning, no matching pattern found in QgsSymbologyUtils::char2PatternPixmap");
+    return QPixmap();
+  }
 
 }
 
 Qt::PenStyle QgsSymbologyUtils::char2PenStyle(const char *c)
 {
   if (strcmp(c, "NoPen") == 0)
-    {
-      return Qt::NoPen;
+  {
+    return Qt::NoPen;
   } else if (strcmp(c, "SolidLine") == 0)
-    {
-      return Qt::SolidLine;
+  {
+    return Qt::SolidLine;
   } else if (strcmp(c, "DashLine") == 0)
-    {
-      return Qt::DashLine;
+  {
+    return Qt::DashLine;
   } else if (strcmp(c, "DotLine") == 0)
-    {
-      return Qt::DotLine;
+  {
+    return Qt::DotLine;
   } else if (strcmp(c, "DashDotLine") == 0)
-    {
-      return Qt::DashDotLine;
+  {
+    return Qt::DashDotLine;
   } else if (strcmp(c, "DashDotDotLine") == 0)
-    {
-      return Qt::DashDotDotLine;
+  {
+    return Qt::DashDotDotLine;
   } else if (strcmp(c, "MPenStyle") == 0)
-    {
-      return Qt::MPenStyle;
+  {
+    return Qt::MPenStyle;
   } else
-    {
-      qWarning("Warning, no matching pen style found in QgsSymbologyUtils::char2PenStyle");
-      return Qt::NoPen;
-    }
+  {
+    qWarning("Warning, no matching pen style found in QgsSymbologyUtils::char2PenStyle");
+    return Qt::NoPen;
+  }
 }
 
 Qt::BrushStyle QgsSymbologyUtils::char2BrushStyle(const char *c)
 {
   if (strcmp(c, "SolidPattern") == 0)
-    {
-      return Qt::SolidPattern;
+  {
+    return Qt::SolidPattern;
   } else if (strcmp(c, "Dense1Pattern") == 0)
-    {
-      return Qt::Dense1Pattern;
+  {
+    return Qt::Dense1Pattern;
   } else if (strcmp(c, "Dense2Pattern") == 0)
-    {
-      return Qt::Dense2Pattern;
+  {
+    return Qt::Dense2Pattern;
   } else if (strcmp(c, "Dense3Pattern") == 0)
-    {
-      return Qt::Dense3Pattern;
+  {
+    return Qt::Dense3Pattern;
   } else if (strcmp(c, "Dense4Pattern") == 0)
-    {
-      return Qt::Dense4Pattern;
+  {
+    return Qt::Dense4Pattern;
   } else if (strcmp(c, "Dense5Pattern") == 0)
-    {
-      return Qt::Dense5Pattern;
+  {
+    return Qt::Dense5Pattern;
   } else if (strcmp(c, "Dense6Pattern") == 0)
-    {
-      return Qt::Dense6Pattern;
+  {
+    return Qt::Dense6Pattern;
   } else if (strcmp(c, "Dense7Pattern") == 0)
-    {
-      return Qt::Dense7Pattern;
+  {
+    return Qt::Dense7Pattern;
   } else if (strcmp(c, "HorPattern") == 0)
-    {
-      return Qt::HorPattern;
+  {
+    return Qt::HorPattern;
   } else if (strcmp(c, "VerPattern") == 0)
-    {
-      return Qt::VerPattern;
+  {
+    return Qt::VerPattern;
   } else if (strcmp(c, "CrossPattern") == 0)
-    {
-      return Qt::CrossPattern;
+  {
+    return Qt::CrossPattern;
   } else if (strcmp(c, "BDiagPattern") == 0)
-    {
-      return Qt::BDiagPattern;
+  {
+    return Qt::BDiagPattern;
   } else if (strcmp(c, "FDiagPattern") == 0)
-    {
-      return Qt::FDiagPattern;
+  {
+    return Qt::FDiagPattern;
   } else if (strcmp(c, "DiagCrossPattern") == 0)
-    {
-      return Qt::DiagCrossPattern;
+  {
+    return Qt::DiagCrossPattern;
   } else if (strcmp(c, "CustomPattern") == 0)
-    {
-      return Qt::TexturePattern;
+  {
+    return Qt::TexturePattern;
   } else if (strcmp(c, "NoBrush") == 0)
-    {
-      return Qt::NoBrush;
+  {
+    return Qt::NoBrush;
   }else                        //return a null string
-    {
-      qWarning("Warning, no matching brush style found in QgsSymbologyUtils::char2BrushStyle");
-      return Qt::NoBrush;
-    }
+  {
+    qWarning("Warning, no matching brush style found in QgsSymbologyUtils::char2BrushStyle");
+    return Qt::NoBrush;
+  }
 }
 
 QPixmap QgsSymbologyUtils::penStyle2Pixmap(Qt::PenStyle penstyle)
 {
   switch (penstyle)
-    {
-      case (Qt::SolidLine):
-        return QPixmap(solidLineData);
-        break;
-      case (Qt::DashLine):
-        return QPixmap(dashLineData);
-        break;
-      case (Qt::DotLine):
-        return QPixmap(dotLineData);
-        break;
-      case (Qt::DashDotLine):
-        return QPixmap(dashDotLineData);
-        break;
-      case (Qt::DashDotDotLine):
-        return QPixmap(dashDotDotLineData);
-        break;
-      case (Qt::NoPen):
-	return QPixmap(noPenLineData);
-	break;
-      default:
-        qWarning("Warning, no matching pen style found in QgsSymbologyUtils::penStyle2Pixmap");
-        return QPixmap();
-    }
+  {
+    case (Qt::SolidLine):
+      return QPixmap(solidLineData);
+      break;
+    case (Qt::DashLine):
+      return QPixmap(dashLineData);
+      break;
+    case (Qt::DotLine):
+      return QPixmap(dotLineData);
+      break;
+    case (Qt::DashDotLine):
+      return QPixmap(dashDotLineData);
+      break;
+    case (Qt::DashDotDotLine):
+      return QPixmap(dashDotDotLineData);
+      break;
+    case (Qt::NoPen):
+      return QPixmap(noPenLineData);
+      break;
+    default:
+      qWarning("Warning, no matching pen style found in QgsSymbologyUtils::penStyle2Pixmap");
+      return QPixmap();
+  }
 }
 
 QPixmap QgsSymbologyUtils::brushStyle2Pixmap(Qt::BrushStyle brushstyle)
 {
   switch (brushstyle)
-    {
-      case (Qt::SolidPattern):
-        return QPixmap(solidData);
-        break;
-      case (Qt::Dense1Pattern):
-        return QPixmap(dense1Data);
-        break;
-      case (Qt::Dense2Pattern):
-        return QPixmap(dense2Data);
-        break;
-      case (Qt::Dense3Pattern):
-        return QPixmap(dense3Data);
-        break;
-      case (Qt::Dense4Pattern):
-        return QPixmap(dense4Data);
-        break;
-      case (Qt::Dense5Pattern):
-        return QPixmap(dense5Data);
-        break;
-      case (Qt::Dense6Pattern):
-        return QPixmap(dense6Data);
-        break;
-      case (Qt::Dense7Pattern):
-        return QPixmap(dense7Data);
-        break;
-      case (Qt::HorPattern):
-        return QPixmap(horizontalData);
-        break;
-      case (Qt::VerPattern):
-        return QPixmap(verticalData);
-        break;
-      case (Qt::CrossPattern):
-        return QPixmap(crossData);
-        break;
-      case (Qt::BDiagPattern):
-        return QPixmap(bdiagData);
-        break;
-      case (Qt::FDiagPattern):
-        return QPixmap(fdiagData);
-        break;
-      case (Qt::DiagCrossPattern):
-        return QPixmap(diagCrossData);
-        break;
-      case (Qt::TexturePattern) :
-		return QPixmap(texturePatternData);
-		break;
-      case (Qt::NoBrush):
-        return QPixmap(nobrush);
-      default:
-        qWarning("Warning, no matching pattern found in QgsSymbologyUtils::brushStyle2Pixmap");
-    }
+  {
+    case (Qt::SolidPattern):
+      return QPixmap(solidData);
+      break;
+    case (Qt::Dense1Pattern):
+      return QPixmap(dense1Data);
+      break;
+    case (Qt::Dense2Pattern):
+      return QPixmap(dense2Data);
+      break;
+    case (Qt::Dense3Pattern):
+      return QPixmap(dense3Data);
+      break;
+    case (Qt::Dense4Pattern):
+      return QPixmap(dense4Data);
+      break;
+    case (Qt::Dense5Pattern):
+      return QPixmap(dense5Data);
+      break;
+    case (Qt::Dense6Pattern):
+      return QPixmap(dense6Data);
+      break;
+    case (Qt::Dense7Pattern):
+      return QPixmap(dense7Data);
+      break;
+    case (Qt::HorPattern):
+      return QPixmap(horizontalData);
+      break;
+    case (Qt::VerPattern):
+      return QPixmap(verticalData);
+      break;
+    case (Qt::CrossPattern):
+      return QPixmap(crossData);
+      break;
+    case (Qt::BDiagPattern):
+      return QPixmap(bdiagData);
+      break;
+    case (Qt::FDiagPattern):
+      return QPixmap(fdiagData);
+      break;
+    case (Qt::DiagCrossPattern):
+      return QPixmap(diagCrossData);
+      break;
+    case (Qt::TexturePattern) :
+      return QPixmap(texturePatternData);
+      break;
+    case (Qt::NoBrush):
+      return QPixmap(nobrush);
+    default:
+      qWarning("Warning, no matching pattern found in QgsSymbologyUtils::brushStyle2Pixmap");
+  }
 
   return QPixmap();             // XXX I hope returning a blank one is ok
 }
Index: src/core/symbology/qgssymbologyutils.h
===================================================================
--- src/core/symbology/qgssymbologyutils.h	(revision 7689)
+++ src/core/symbology/qgssymbologyutils.h	(working copy)
@@ -27,20 +27,20 @@
 /**Namespace containing static methods which are useful for the symbology widgets*/
 namespace QgsSymbologyUtils
 {
-    QPixmap  CORE_EXPORT qString2LinePixmap(QString string);
-    QPixmap  CORE_EXPORT char2LinePixmap(const char* c);
-    QPixmap CORE_EXPORT qString2PatternPixmap(QString string);
-    QPixmap  CORE_EXPORT char2PatternPixmap(const char* c);
-    QString CORE_EXPORT penStyle2QString(Qt::PenStyle penstyle);
-    const char CORE_EXPORT * penStyle2Char(Qt::PenStyle penstyle);
-    QPixmap CORE_EXPORT penStyle2Pixmap(Qt::PenStyle penstyle);
-    Qt::PenStyle CORE_EXPORT qString2PenStyle(QString string);
-    Qt::PenStyle CORE_EXPORT char2PenStyle(const char* c);
-    QString CORE_EXPORT brushStyle2QString(Qt::BrushStyle brushstyle);
-    const char CORE_EXPORT * brushStyle2Char(Qt::BrushStyle brushstyle);
-    QPixmap CORE_EXPORT brushStyle2Pixmap(Qt::BrushStyle brushstyle);
-    Qt::BrushStyle CORE_EXPORT qString2BrushStyle(QString string);
-    Qt::BrushStyle CORE_EXPORT char2BrushStyle(const char* c);
+  QPixmap CORE_EXPORT qString2LinePixmap(QString string);
+  QPixmap CORE_EXPORT char2LinePixmap(const char* c);
+  QPixmap CORE_EXPORT qString2PatternPixmap(QString string);
+  QPixmap CORE_EXPORT char2PatternPixmap(const char* c);
+  QString CORE_EXPORT penStyle2QString(Qt::PenStyle penstyle);
+  const char CORE_EXPORT * penStyle2Char(Qt::PenStyle penstyle);
+  QPixmap CORE_EXPORT penStyle2Pixmap(Qt::PenStyle penstyle);
+  Qt::PenStyle CORE_EXPORT qString2PenStyle(QString string);
+  Qt::PenStyle CORE_EXPORT char2PenStyle(const char* c);
+  QString CORE_EXPORT brushStyle2QString(Qt::BrushStyle brushstyle);
+  const char CORE_EXPORT * brushStyle2Char(Qt::BrushStyle brushstyle);
+  QPixmap CORE_EXPORT brushStyle2Pixmap(Qt::BrushStyle brushstyle);
+  Qt::BrushStyle CORE_EXPORT qString2BrushStyle(QString string);
+  Qt::BrushStyle CORE_EXPORT char2BrushStyle(const char* c);
 }
 
 #endif
Index: src/core/qgsmaplayer.h
===================================================================
--- src/core/qgsmaplayer.h	(revision 7689)
+++ src/core/qgsmaplayer.h	(working copy)
@@ -198,7 +198,57 @@
     
     /** A convenience function to capitalise the layer name */
     static QString capitaliseLayerName(const QString name);
+
+    /** Retrieve the default style for this layer if one 
+     * exists (either as a .qml file on disk or as a 
+     * record in the users style table in their personal qgis.db)
+     * @param a reference to a flag that will be set to false if
+     * we did not manage to load the default style.
+     * @return a QString with any status messages
+     * @see also loadNamedStyle ();
+     */
+    virtual QString loadDefaultStyle ( bool & theResultFlag );
   
+    /** Retrieve a named style for this layer if one 
+     * exists (either as a .qml file on disk or as a 
+     * record in the users style table in their personal qgis.db)
+     * @param QString theURI - the file name or other URI for the
+     * style file. First an attempt will be made to see if this 
+     * is a file and load that, if that fails the qgis.db styles 
+     * table will be consulted to see if there is a style who's 
+     * key matches the URI.
+     * @param a reference to a flag that will be set to false if
+     * we did not manage to load the default style.
+     * @return a QString with any status messages
+     * @see also loadDefaultStyle ();
+     */
+    virtual QString loadNamedStyle ( const QString theURI , bool & theResultFlag );
+
+    /** Save the properties of this layer as the default style 
+     * (either as a .qml file on disk or as a 
+     * record in the users style table in their personal qgis.db)
+     * @param a reference to a flag that will be set to false if
+     * we did not manage to save the default style.
+     * @return a QString with any status messages
+     * @see also loadNamedStyle () and saveNamedStyle()
+     */
+    virtual QString saveDefaultStyle ( bool & theResultFlag );
+  
+    /** Save the properties of this layer as a named style 
+     * (either as a .qml file on disk or as a 
+     * record in the users style table in their personal qgis.db)
+     * @param QString theURI - the file name or other URI for the
+     * style file. First an attempt will be made to see if this 
+     * is a file and save to that, if that fails the qgis.db styles 
+     * table will be used to create a style entry who's 
+     * key matches the URI.
+     * @param a reference to a flag that will be set to false if
+     * we did not manage to save the default style.
+     * @return a QString with any status messages
+     * @see also saveDefaultStyle ();
+     */
+    virtual QString saveNamedStyle ( const QString theURI , bool & theResultFlag );
+    
 public slots:
 
     /** Event handler for when a coordinate transform fails due to bad vertex error */
Index: src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- src/ui/qgsvectorlayerpropertiesbase.ui	(revision 7689)
+++ src/ui/qgsvectorlayerpropertiesbase.ui	(working copy)
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>469</width>
+    <width>508</width>
     <height>600</height>
    </rect>
   </property>
@@ -26,21 +26,11 @@
   </property>
   <layout class="QGridLayout" >
    <property name="margin" >
-    <number>9</number>
+    <number>11</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" column="0" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="tabShape" >
@@ -55,7 +45,7 @@
       </attribute>
       <layout class="QGridLayout" >
        <property name="margin" >
-        <number>9</number>
+        <number>11</number>
        </property>
        <property name="spacing" >
         <number>6</number>
@@ -64,8 +54,8 @@
         <widget class="QStackedWidget" name="widgetStackRenderers" >
          <property name="sizePolicy" >
           <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>7</vsizetype>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -137,7 +127,7 @@
       </attribute>
       <layout class="QGridLayout" >
        <property name="margin" >
-        <number>9</number>
+        <number>11</number>
        </property>
        <property name="spacing" >
         <number>6</number>
@@ -188,7 +178,7 @@
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
-           <number>8</number>
+           <number>11</number>
           </property>
           <property name="spacing" >
            <number>6</number>
@@ -249,7 +239,7 @@
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
-           <number>8</number>
+           <number>11</number>
           </property>
           <property name="spacing" >
            <number>6</number>
@@ -297,7 +287,7 @@
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
-           <number>8</number>
+           <number>11</number>
           </property>
           <property name="spacing" >
            <number>6</number>
@@ -326,7 +316,7 @@
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
-           <number>9</number>
+           <number>11</number>
           </property>
           <property name="spacing" >
            <number>6</number>
@@ -378,7 +368,7 @@
       </attribute>
       <layout class="QGridLayout" >
        <property name="margin" >
-        <number>9</number>
+        <number>11</number>
        </property>
        <property name="spacing" >
         <number>6</number>
@@ -398,7 +388,7 @@
       </attribute>
       <layout class="QGridLayout" >
        <property name="margin" >
-        <number>9</number>
+        <number>11</number>
        </property>
        <property name="spacing" >
         <number>6</number>
@@ -407,8 +397,8 @@
         <widget class="QFrame" name="labelOptionsFrame" >
          <property name="sizePolicy" >
           <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>7</vsizetype>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -425,7 +415,7 @@
         <widget class="QCheckBox" name="labelCheckBox" >
          <property name="sizePolicy" >
           <sizepolicy>
-           <hsizetype>7</hsizetype>
+           <hsizetype>0</hsizetype>
            <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
@@ -444,7 +434,7 @@
       </attribute>
       <layout class="QGridLayout" >
        <property name="margin" >
-        <number>9</number>
+        <number>11</number>
        </property>
        <property name="spacing" >
         <number>6</number>
@@ -453,8 +443,8 @@
         <widget class="QFrame" name="actionOptionsFrame" >
          <property name="sizePolicy" >
           <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>7</vsizetype>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -471,6 +461,54 @@
      </widget>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>11</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="pbnLoadDefaultStyle" >
+       <property name="text" >
+        <string>Restore Default Style</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pbnSaveDefaultStyle" >
+       <property name="text" >
+        <string>Save As Default</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pbnLoadStyle" >
+       <property name="text" >
+        <string>Load Style ...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pbnSaveStyleAs" >
+       <property name="text" >
+        <string>Save Style ...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
Index: src/ui/qgssinglesymboldialogbase.ui
===================================================================
--- src/ui/qgssinglesymboldialogbase.ui	(revision 7689)
+++ src/ui/qgssinglesymboldialogbase.ui	(working copy)
@@ -5,14 +5,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>413</width>
-    <height>497</height>
+    <width>395</width>
+    <height>506</height>
    </rect>
   </property>
   <property name="sizePolicy" >
    <sizepolicy>
-    <hsizetype>3</hsizetype>
-    <vsizetype>5</vsizetype>
+    <hsizetype>0</hsizetype>
+    <vsizetype>0</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -22,7 +22,7 @@
   </property>
   <layout class="QGridLayout" >
    <property name="margin" >
-    <number>9</number>
+    <number>11</number>
    </property>
    <property name="spacing" >
     <number>6</number>
@@ -30,7 +30,7 @@
    <item row="0" column="0" >
     <layout class="QHBoxLayout" >
      <property name="margin" >
-      <number>0</number>
+      <number>11</number>
      </property>
      <property name="spacing" >
       <number>6</number>
@@ -44,7 +44,7 @@
         </size>
        </property>
        <property name="text" >
-        <string>Label:</string>
+        <string>Label</string>
        </property>
        <property name="buddy" >
         <cstring>mLabelEdit</cstring>
@@ -65,17 +65,44 @@
    </item>
    <item row="1" column="0" >
     <widget class="QGroupBox" name="mGroupPoint" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>0</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title" >
-      <string>Point</string>
+      <string>Point Symbol</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
-       <number>9</number>
+       <number>11</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="0" column="2" >
+      <item row="0" column="0" colspan="3" >
+       <widget class="QListWidget" name="lstSymbols" >
+        <property name="dragDropMode" >
+         <enum>QAbstractItemView::DragDrop</enum>
+        </property>
+        <property name="alternatingRowColors" >
+         <bool>false</bool>
+        </property>
+        <property name="viewMode" >
+         <enum>QListView::IconMode</enum>
+        </property>
+        <property name="uniformItemSizes" >
+         <bool>true</bool>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
@@ -85,37 +112,13 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>78</width>
+          <width>251</width>
           <height>35</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="0" column="1" >
-       <widget class="QComboBox" name="mPointSymbolComboBox" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>7</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize" >
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>32767</width>
-          <height>40</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3" >
+      <item row="1" column="1" >
        <widget class="QLabel" name="textLabel1_2" >
         <property name="text" >
          <string>Size</string>
@@ -125,7 +128,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="4" >
+      <item row="1" column="2" >
        <widget class="QSpinBox" name="mPointSizeSpinBox" >
         <property name="maximum" >
          <number>1000</number>
@@ -141,721 +144,169 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="textLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>1</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>Symbol</string>
-        </property>
-        <property name="buddy" >
-         <cstring>mPointSymbolComboBox</cstring>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" >
-    <widget class="QGroupBox" name="grpPattern" >
+   <item row="2" column="0" >
+    <widget class="QGroupBox" name="groupBox_3" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>0</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title" >
-      <string>Fill Patterns:</string>
+      <string>Style Options</string>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
-       <number>4</number>
+       <number>11</number>
       </property>
       <property name="spacing" >
-       <number>4</number>
+       <number>6</number>
       </property>
-      <item row="1" column="1" >
-       <widget class="QToolButton" name="dense5" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
+      <item row="0" column="0" colspan="2" >
+       <widget class="QLabel" name="outlinecolorlabel_2" >
         <property name="text" >
-         <string/>
+         <string>Outline style</string>
         </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
+        <property name="buddy" >
+         <cstring>btnOutlineColor</cstring>
         </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QToolButton" name="dense4" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
+      <item row="0" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
+        <property name="sizeHint" >
          <size>
-          <width>50</width>
+          <width>161</width>
           <height>20</height>
          </size>
         </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
+       </spacer>
       </item>
-      <item row="0" column="0" >
-       <widget class="QToolButton" name="solid" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QToolButton" name="fdiag" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3" >
-       <widget class="QToolButton" name="horizontal" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QToolButton" name="diagcross" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="4" >
-       <widget class="QToolButton" name="bdiag" >
+       <widget class="QComboBox" name="cboOutlineStyle" >
         <property name="sizePolicy" >
          <sizepolicy>
-          <hsizetype>1</hsizetype>
-          <vsizetype>1</vsizetype>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="minimumSize" >
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QToolButton" name="cross" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>5</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
+      <item row="1" column="0" colspan="2" >
+       <widget class="QLabel" name="outlinecolorlabel" >
         <property name="text" >
-         <string/>
+         <string>Outline color</string>
         </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
+        <property name="buddy" >
+         <cstring>btnOutlineColor</cstring>
         </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="1" column="2" >
-       <widget class="QToolButton" name="vertical" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
+      <item row="1" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="text" >
-         <string/>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="iconSize" >
+        <property name="sizeHint" >
          <size>
-          <width>50</width>
-          <height>20</height>
+          <width>116</width>
+          <height>16</height>
          </size>
         </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
+       </spacer>
       </item>
-      <item row="1" column="3" >
-       <widget class="QToolButton" name="dense1" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="4" >
-       <widget class="QToolButton" name="dense3" >
+       <widget class="QgsColorButton" name="btnOutlineColor" >
         <property name="sizePolicy" >
          <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>5</vsizetype>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize" >
          <size>
-          <width>0</width>
+          <width>100</width>
           <height>0</height>
          </size>
         </property>
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
         <property name="text" >
          <string/>
         </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="2" column="2" >
-       <widget class="QToolButton" name="dense2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>5</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
+      <item row="2" column="0" colspan="2" >
+       <widget class="QLabel" name="outlinewidthlabel" >
         <property name="text" >
-         <string/>
+         <string>Outline width:</string>
         </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
+        <property name="buddy" >
+         <cstring>outlinewidthspinbox</cstring>
         </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="2" column="4" >
-       <widget class="QToolButton" name="nopen" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>5</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <item row="2" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="minimumSize" >
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="maximumSize" >
+        <property name="sizeHint" >
          <size>
-          <width>60</width>
-          <height>30</height>
+          <width>201</width>
+          <height>16</height>
          </size>
         </property>
-        <property name="toolTip" >
-         <string>No Fill</string>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
+       </spacer>
       </item>
-      <item row="2" column="0" >
-       <widget class="QToolButton" name="dense6" >
+      <item row="2" column="4" >
+       <widget class="QSpinBox" name="outlinewidthspinbox" >
         <property name="sizePolicy" >
          <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>5</vsizetype>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="maximumSize" >
          <size>
-          <width>60</width>
-          <height>30</height>
+          <width>99999</width>
+          <height>32767</height>
          </size>
         </property>
-        <property name="text" >
-         <string/>
+        <property name="minimum" >
+         <number>0</number>
         </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="2" column="3" >
-       <widget class="QToolButton" name="dense7" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>5</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="3" >
-       <widget class="QLineEdit" name="textureFilePath" />
-      </item>
-      <item row="3" column="4" >
-       <widget class="QPushButton" name="textureSelect" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string>Browse:</string>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="0" >
-       <widget class="QToolButton" name="texture" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>5</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
+       <widget class="QLabel" name="fillcolorlabel" >
         <property name="text" >
-         <string/>
+         <string>Fill color:</string>
         </property>
-        <property name="iconSize" >
-         <size>
-          <width>50</width>
-          <height>20</height>
-         </size>
+        <property name="buddy" >
+         <cstring>btnFillColor</cstring>
         </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="title" >
-      <string>Outline Style:</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>8</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="2" >
-       <widget class="QToolButton" name="pbnLineDashDot" >
-        <property name="maximumSize" >
-         <size>
-          <width>50</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>60</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="4" >
-       <widget class="QToolButton" name="pbnLineDashDotDot" >
-        <property name="maximumSize" >
-         <size>
-          <width>50</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>60</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QToolButton" name="pbnLineSolid" >
-        <property name="maximumSize" >
-         <size>
-          <width>50</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>60</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3" >
-       <widget class="QToolButton" name="pbnLineDash" >
-        <property name="maximumSize" >
-         <size>
-          <width>50</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>60</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QToolButton" name="pbnLineDot" >
-        <property name="maximumSize" >
-         <size>
-          <width>50</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>60</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="5" >
-       <widget class="QToolButton" name="pbnLineNoPen" >
-        <property name="maximumSize" >
-         <size>
-          <width>50</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="iconSize" >
-         <size>
-          <width>60</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="autoExclusive" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0" >
-    <widget class="QGroupBox" name="groupBox_3" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>8</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="2" >
+      <item row="3" column="1" colspan="3" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
@@ -865,45 +316,22 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>201</width>
+          <width>138</width>
           <height>16</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="1" column="3" >
-       <widget class="QSpinBox" name="outlinewidthspinbox" >
+      <item row="3" column="4" >
+       <widget class="QgsColorButton" name="btnFillColor" >
         <property name="sizePolicy" >
          <sizepolicy>
-          <hsizetype>4</hsizetype>
+          <hsizetype>0</hsizetype>
           <vsizetype>0</vsizetype>
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="maximumSize" >
-         <size>
-          <width>100</width>
-          <height>32767</height>
-         </size>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QLabel" name="outlinewidthlabel" >
-        <property name="text" >
-         <string>Outline Width:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>outlinewidthspinbox</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3" >
-       <widget class="QgsColorButton" name="btnOutlineColor" >
         <property name="minimumSize" >
          <size>
           <width>100</width>
@@ -915,74 +343,65 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="3" >
-       <widget class="QgsColorButton" name="btnFillColor" >
-        <property name="minimumSize" >
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="fillcolorlabel_2" >
         <property name="text" >
-         <string/>
+         <string>Fill style</string>
         </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>138</width>
-          <height>16</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="fillcolorlabel" >
-        <property name="text" >
-         <string>Fill Color:</string>
-        </property>
         <property name="buddy" >
          <cstring>btnFillColor</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="2" >
-       <widget class="QLabel" name="outlinecolorlabel" >
-        <property name="text" >
-         <string>Outline color:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>btnOutlineColor</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
+      <item row="4" column="2" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
         <property name="sizeHint" >
          <size>
-          <width>116</width>
-          <height>16</height>
+          <width>40</width>
+          <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
+      <item row="4" column="3" colspan="2" >
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>11</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QComboBox" name="cboFillStyle" />
+        </item>
+        <item>
+         <widget class="QToolButton" name="toolSelectTexture" >
+          <property name="text" >
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
+   <item row="3" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
@@ -996,32 +415,10 @@
  </customwidgets>
  <tabstops>
   <tabstop>mLabelEdit</tabstop>
-  <tabstop>mPointSymbolComboBox</tabstop>
   <tabstop>mPointSizeSpinBox</tabstop>
-  <tabstop>pbnLineSolid</tabstop>
-  <tabstop>pbnLineDot</tabstop>
-  <tabstop>pbnLineDashDot</tabstop>
-  <tabstop>pbnLineDash</tabstop>
-  <tabstop>pbnLineDashDotDot</tabstop>
-  <tabstop>pbnLineNoPen</tabstop>
   <tabstop>btnOutlineColor</tabstop>
   <tabstop>outlinewidthspinbox</tabstop>
   <tabstop>btnFillColor</tabstop>
-  <tabstop>solid</tabstop>
-  <tabstop>fdiag</tabstop>
-  <tabstop>dense4</tabstop>
-  <tabstop>horizontal</tabstop>
-  <tabstop>bdiag</tabstop>
-  <tabstop>diagcross</tabstop>
-  <tabstop>dense5</tabstop>
-  <tabstop>vertical</tabstop>
-  <tabstop>dense1</tabstop>
-  <tabstop>dense3</tabstop>
-  <tabstop>dense6</tabstop>
-  <tabstop>cross</tabstop>
-  <tabstop>dense2</tabstop>
-  <tabstop>dense7</tabstop>
-  <tabstop>nopen</tabstop>
  </tabstops>
  <resources/>
  <connections/>