[QGIS Commit] r8547 - in trunk/qgis/src: app ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri May 30 11:43:18 EDT 2008


Author: timlinux
Date: 2008-05-30 11:43:18 -0400 (Fri, 30 May 2008)
New Revision: 8547

Removed:
   trunk/qgis/src/app/qgsfillstylewidget.cpp
   trunk/qgis/src/app/qgsfillstylewidget.h
   trunk/qgis/src/app/qgslinestyledialog.cpp
   trunk/qgis/src/app/qgslinestyledialog.h
   trunk/qgis/src/app/qgslinestylewidget.cpp
   trunk/qgis/src/app/qgslinestylewidget.h
   trunk/qgis/src/app/qgsmarkerdialog.cpp
   trunk/qgis/src/app/qgsmarkerdialog.h
   trunk/qgis/src/app/qgspatterndialog.cpp
   trunk/qgis/src/app/qgspatterndialog.h
   trunk/qgis/src/app/qgspointstylewidget.cpp
   trunk/qgis/src/app/qgspointstylewidget.h
   trunk/qgis/src/app/qgsvectorsymbologywidget.cpp
   trunk/qgis/src/app/qgsvectorsymbologywidget.h
   trunk/qgis/src/ui/qgsfillstylewidgetbase.ui
   trunk/qgis/src/ui/qgslinestyledialogbase.ui
   trunk/qgis/src/ui/qgslinestylewidgetbase.ui
   trunk/qgis/src/ui/qgsmarkerdialogbase.ui
   trunk/qgis/src/ui/qgspatterndialogbase.ui
   trunk/qgis/src/ui/qgspointstylewidgetbase.ui
   trunk/qgis/src/ui/qgsvectorsymbologywidgetbase.ui
Log:
Removed these files as they are unused - part of cleanups of code base for 1.0 release.

Deleted: trunk/qgis/src/app/qgsfillstylewidget.cpp
===================================================================
--- trunk/qgis/src/app/qgsfillstylewidget.cpp	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgsfillstylewidget.cpp	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,27 +0,0 @@
-
-/***************************************************************************
-                                 qgsfillstyle.h
-                               ------------------
-        begin                : March 2005
-        copyright            : (C) 2005 by Tim Sutton
-        email                : tim at linfiniti.com
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "qgsfillstylewidget.h"
-
-QgsFillStyleWidget::QgsFillStyleWidget(  QWidget *parent, const char * name, Qt::WFlags f)
-           :QgsFillStyleWidgetBase( )
-{
-}
-
-QgsFillStyleWidget::~QgsFillStyleWidget()
-{
-}

Deleted: trunk/qgis/src/app/qgsfillstylewidget.h
===================================================================
--- trunk/qgis/src/app/qgsfillstylewidget.h	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgsfillstylewidget.h	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,39 +0,0 @@
-/***************************************************************************
-                                qgsfillstyle.h 
-                               ------------------
-        begin                : March 2005
-        copyright            : (C) 2005 by Tim Sutton
-        email                : tim at linfiniti.com
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef QGSFILLSTYLEWIDGET_H
-#define QGSFILLSTYLEWIDGET_H
-
-#include "ui_qgsfillstylewidgetbase.h"
-#include <QDialog>
-
-class QgsFillStyleWidget:public QDialog, Ui::QgsFillStyleWidgetBase
-{
-  Q_OBJECT;
-  public:
-
-  //! Constructor
-  QgsFillStyleWidget(QWidget *parent = 0, const char * name = 0,  Qt::WFlags f = 0 );
-
-  ~QgsFillStyleWidget();
-
-
-public slots:
-  
-private:
-    
-};
-
-#endif

Deleted: trunk/qgis/src/app/qgslinestyledialog.cpp
===================================================================
--- trunk/qgis/src/app/qgslinestyledialog.cpp	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgslinestyledialog.cpp	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,74 +0,0 @@
-/***************************************************************************
-                          qgslinestyledialog.cpp 
- Dialog for selecting vector line styles
-                             -------------------
-    begin                : 2004-02-12
-    copyright            : (C) 2004 by Gary E.Sherman
-    email                : sherman at mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
- /* $Id$ */
-#include "qgslinestyledialog.h"
-#include "qpushbutton.h"
-#include <iostream>
-#include "qgssymbologyutils.h"
-
-QgsLineStyleDialog::QgsLineStyleDialog(QWidget * parent, Qt::WFlags fl):
-  QDialog(parent, fl)
-{
-  setupUi(this);
-
-  //load the icons stored in QgsSymbologyUtils.cpp (to avoid redundancy)
-  solid->setPixmap(QgsSymbologyUtils::char2LinePixmap("SolidLine"));
-  dash->setPixmap(QgsSymbologyUtils::char2LinePixmap("DashLine"));
-  dot->setPixmap(QgsSymbologyUtils::char2LinePixmap("DotLine"));
-  dashdot->setPixmap(QgsSymbologyUtils::char2LinePixmap("DashDotLine"));
-  dashdotdot->setPixmap(QgsSymbologyUtils::char2LinePixmap("DashDotDotLine"));
-  nopen->setPixmap(QgsSymbologyUtils::char2LinePixmap("NoPen"));
-
-  QObject::connect(okbutton, SIGNAL(clicked()), this, SLOT(queryStyle()));
-  QObject::connect(cancelbutton, SIGNAL(clicked()), this, SLOT(reject()));
-  solid->toggle();              //solid style is the default
-}
-
-Qt::PenStyle QgsLineStyleDialog::style()
-{
-  return m_style;
-}
-
-void QgsLineStyleDialog::queryStyle()
-{
-  if (solid->isOn())
-    {
-      m_style = Qt::SolidLine;
-    } 
-  else if (dash->isOn())
-    {
-      m_style = Qt::DashLine;
-    } 
-  else if (dot->isOn())
-    {
-      m_style = Qt::DotLine;
-    } 
-  else if (dashdot->isOn())
-    {
-      m_style = Qt::DashDotLine;
-    } 
-  else if (dashdotdot->isOn())
-    {
-      m_style = Qt::DashDotDotLine;
-    }
-  else if (nopen->isOn())
-    {
-      m_style = Qt::NoPen;
-    }
-  accept();
-}

Deleted: trunk/qgis/src/app/qgslinestyledialog.h
===================================================================
--- trunk/qgis/src/app/qgslinestyledialog.h	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgslinestyledialog.h	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,45 +0,0 @@
-/***************************************************************************
-                          qgslinestyledialog.h 
-               Dialog for selecting line style for vector layers
-                             -------------------
-    begin                : 2004-02-12
-    copyright            : (C) 2004 by Gary E.Sherman
-    email                : sherman at mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
- /* $Id$ */
-#ifndef QGSLINESTYLEDIALOG_H
-#define QGSLINESTYLEDIALOG_H
-
-class qnamespace;
-#include "ui_qgslinestyledialogbase.h"
-#include "qgisgui.h"
-/**Dialog class to query line styles*/
-class QgsLineStyleDialog: public QDialog, private Ui::QgsLineStyleDialogBase
-{
-  Q_OBJECT
- public:
-    QgsLineStyleDialog(QWidget * parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
-    ~QgsLineStyleDialog();
-    Qt::PenStyle style();
- protected:
-    Qt::PenStyle m_style;
- protected slots:
-     /**Queries the selected style if the ok button is pressed and stores it in m_style*/
-     void queryStyle();
-};
-
-inline QgsLineStyleDialog::~QgsLineStyleDialog()
-{
-
-}
-
-#endif

Deleted: trunk/qgis/src/app/qgslinestylewidget.cpp
===================================================================
--- trunk/qgis/src/app/qgslinestylewidget.cpp	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgslinestylewidget.cpp	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,26 +0,0 @@
-/***************************************************************************
-                                 qgslinestyle.h
-                               ------------------
-        begin                : March 2005
-        copyright            : (C) 2005 by Tim Sutton
-        email                : tim at linfiniti.com
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "qgslinestylewidget.h"
-
-QgsLineStyleWidget::QgsLineStyleWidget( QWidget *parent, const char * name, Qt::WFlags f)
-           :QgsLineStyleWidgetBase( )
-{
-}
-
-QgsLineStyleWidget::~QgsLineStyleWidget()
-{
-}

Deleted: trunk/qgis/src/app/qgslinestylewidget.h
===================================================================
--- trunk/qgis/src/app/qgslinestylewidget.h	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgslinestylewidget.h	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,39 +0,0 @@
-/***************************************************************************
-                                qgslinestyle.h 
-                               ------------------
-        begin                : March 2005
-        copyright            : (C) 2005 by Tim Sutton
-        email                : tim at linfiniti.com
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef QGSLINESTYLE_H
-#define QGSLINESTYLE_H
-
-#include "ui_qgslinestylewidgetbase.h"
-#include <QDialog>
-
-class QgsLineStyleWidget: public QDialog, private Ui::QgsLineStyleWidgetBase
-{
-  Q_OBJECT;
-  public:
-
-  //! Constructor
-  QgsLineStyleWidget(QWidget *parent = 0, const char * name = 0,  Qt::WFlags f = 0 );
-
-  ~QgsLineStyleWidget();
-
-
-public slots:
-  
-private:
-    
-};
-
-#endif

Deleted: trunk/qgis/src/app/qgsmarkerdialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsmarkerdialog.cpp	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgsmarkerdialog.cpp	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,111 +0,0 @@
-/***************************************************************************
-                         qgsmarkerdialog.cpp  -  description
-                             -------------------
-    begin                : March 2004
-    copyright            : (C) 2004 by Marco Hugentobler
-    email                : mhugent at geo.unizh.ch
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* $Id$ */
-
-#include "qgsmarkerdialog.h"
-#include "qgsapplication.h"
-
-#include <QDir>
-#include <QFileDialog>
-#include <Q3IconView>
-#include <QPixmap>
-#include <QPainter>
-
-#include "qgsconfig.h"
-#include <qgsmarkercatalogue.h>
-
-QgsMarkerDialog::QgsMarkerDialog(QString startdir): 
-  //paramters removed by Tim during qt4 ui port - FIXME!!!
-  //QgsMarkerDialogBase(0,0,true,Qt::WStyle_StaysOnTop), mCurrentDir(startdir)
-  QgsMarkerDialogBase(), mCurrentDir(startdir)
-{
-  setupUi(this);
-    QObject::connect(mOkButton,SIGNAL(clicked()),this,SLOT(accept()));
-    QObject::connect(mCancelButton,SIGNAL(clicked()),this,SLOT(reject()));
-    QObject::connect(mBrowseDirectoriesButton,SIGNAL(clicked()),this,SLOT(changeDirectory()));
-    QObject::connect(mIconView,SIGNAL(currentChanged(Q3IconViewItem*)),this,SLOT(updateSelectedMarker()));
-    mDirectoryEdit->setText(startdir);
-    visualizeMarkers(startdir);
-}
-
-QgsMarkerDialog::~QgsMarkerDialog()
-{
-
-}
-
-void QgsMarkerDialog::updateSelectedMarker()
-{
-    Q3IconViewItem* current=mIconView->currentItem();
-    if(current)
-    {
-	mSelectedMarker=current->text();
-    }
-    else
-    {
-	mSelectedMarker="";
-    }
-}
-
-QString QgsMarkerDialog::selectedMarker()
-{
-    return mCurrentDir+"/"+mSelectedMarker;
-}
-
-void QgsMarkerDialog::changeDirectory()
-{
-    QString newdir = QFileDialog::getExistingDirectory(
-        this, "Choose a directory", mCurrentDir);
-    if (!newdir.isEmpty())
-    {
-	mCurrentDir=newdir;
-	visualizeMarkers(mCurrentDir);
-	mDirectoryEdit->setText(mCurrentDir);
-    }
-}
-
-void QgsMarkerDialog::visualizeMarkers(QString directory)
-{
-  mIconView->clear();
-
-  QDir dir(directory);
-  QStringList files=dir.entryList("*.svg;*.SVG");
-    
-  for(QStringList::Iterator it = files.begin(); it != files.end(); ++it )
-  {
-    qWarning((*it).toLocal8Bit().data());
-	
-    //render the SVG file to a pixmap and put it into mIconView
-    QPixmap pix (10,10);
-    QPainter myPainter(&pix);
-    QgsMarkerCatalogue::svgMarker(&myPainter,mCurrentDir + "/" + (*it), 1);
-    new Q3IconViewItem(mIconView,*it,pix);
-	
-  }
-}
-
-QString QgsMarkerDialog::defaultDir()
-{
-#ifdef WIN32
-	//TODO fix this to use appropriate path on windows 
-	//qgis install
-	QString dir = "Foo";
-#else
-    QString dir = QgsApplication::svgPath(); 
-#endif
-    return dir;
-}
-

Deleted: trunk/qgis/src/app/qgsmarkerdialog.h
===================================================================
--- trunk/qgis/src/app/qgsmarkerdialog.h	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgsmarkerdialog.h	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,53 +0,0 @@
-/***************************************************************************
-                         qgsmarkerdialog.h  -  description
-                             -------------------
-    begin                : March 2004
-    copyright            : (C) 2004 by Marco Hugentobler
-    email                : mhugent at geo.unizh.ch
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* $Id$ */
-
-
-#ifndef QGSMARKERDIALOG_H
-#define QGSMARKERDIALOG_H
-#include "ui_qgsmarkerdialogbase.h"
-
-/**A class for choosing marker images by clicking icons*/
-class QgsMarkerDialog: public QDialog, private Ui::QgsMarkerDialogBase
-{
-    Q_OBJECT
- public:
-    /**Constructor. If no directory is specified, the home directory is used*/
-    QgsMarkerDialog(QString startdir=QgsMarkerDialog::defaultDir());
-    /**Destructor*/
-    virtual ~QgsMarkerDialog();
-    /**Returns the path of the selected SVG marker*/
-    QString selectedMarker();
-    /**Returns the path to the qgis default directory for svg symbols*/
-    static QString defaultDir();
-    
-    public slots:
-    /**Brings up the file dialog and triggers visualizeMarkers*/
-    void changeDirectory();
-    /**Queries mIconView for selected marker symbols*/
-    void updateSelectedMarker();
-
- protected:
-	/**Current Directory*/
-	QString mCurrentDir;
-	/**File name of the selected marker*/
-	QString mSelectedMarker;
-	/**Renders the SVG pictures of directory to mIconView*/
-	void visualizeMarkers(QString directory);
-};
-
-#endif

Deleted: trunk/qgis/src/app/qgspatterndialog.cpp
===================================================================
--- trunk/qgis/src/app/qgspatterndialog.cpp	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgspatterndialog.cpp	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,105 +0,0 @@
-/***************************************************************************
-                          qgsppatterndialog.cpp 
-                        Pattern dialog for vector layers
-                             -------------------
-    copyright            : (C) 2004 by Gary E.Sherman
-    email                : sherman at mrcc.com
-  
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
- /*  $Id$ */
- 
-#include "qgspatterndialog.h"
-#include "qpushbutton.h"
-#include "qgssymbologyutils.h"
-
-QgsPatternDialog::QgsPatternDialog(QWidget * parent, Qt::WFlags fl):
-  QDialog(parent, fl)
-{
-  setupUi(this);
-
-  //set the icons (which are stored in QgsSymbologyUtils.cpp to avoid redundancy)
-  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"));
-
-  QObject::connect(okbutton, SIGNAL(clicked()), this, SLOT(queryPattern()));
-  QObject::connect(cancelbutton, SIGNAL(clicked()), this, SLOT(reject()));
-  solid->toggle();              //solid pattern is the default
-}
-
-Qt::BrushStyle QgsPatternDialog::pattern()
-{
-  return m_pattern;
-}
-
-void QgsPatternDialog::queryPattern()
-{
-  if (solid->isOn())
-    {
-      m_pattern = Qt::SolidPattern;
-  } else if (fdiag->isOn())
-    {
-      m_pattern = Qt::FDiagPattern;
-  } else if (dense4->isOn())
-    {
-      m_pattern = Qt::Dense4Pattern;
-  } else if (horizontal->isOn())
-    {
-      m_pattern = Qt::HorPattern;
-  } else if (dense5->isOn())
-    {
-      m_pattern = Qt::Dense5Pattern;
-  } else if (diagcross->isOn())
-    {
-      m_pattern = Qt::DiagCrossPattern;
-  } else if (dense1->isOn())
-    {
-      m_pattern = Qt::Dense1Pattern;
-  } else if (dense6->isOn())
-    {
-      m_pattern = Qt::Dense6Pattern;
-  } else if (vertical->isOn())
-    {
-      m_pattern = Qt::VerPattern;
-  } else if (dense7->isOn())
-    {
-      m_pattern = Qt::Dense7Pattern;
-  } else if (cross->isOn())
-    {
-      m_pattern = Qt::CrossPattern;
-  } else if (dense2->isOn())
-    {
-      m_pattern = Qt::Dense2Pattern;
-  } else if (bdiag->isOn())
-    {
-      m_pattern = Qt::BDiagPattern;
-  } else if (dense3->isOn())
-    {
-      m_pattern = Qt::Dense3Pattern;
-  } else if (nopen->isOn())
-    {
-      m_pattern = Qt::NoBrush;
-    }
-  accept();
-}

Deleted: trunk/qgis/src/app/qgspatterndialog.h
===================================================================
--- trunk/qgis/src/app/qgspatterndialog.h	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgspatterndialog.h	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,46 +0,0 @@
-/***************************************************************************
-                          qgspatterndialog 
-            Dialog for selecting pattern for rendering vector layers
-                             -------------------
-    begin                : 2004-02-12
-    copyright            : (C) 2004 by Gary E.Sherman
-    email                : sherman at mrcc.com
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
- /* $Id$ */
-#ifndef QGSPATTERNDIALOG_H
-#define QGSPATTERNDIALOG_H
-
-class qnamespace;
-#include "ui_qgspatterndialogbase.h"
-#include "qgisgui.h"
-
-/**A dialog class to query the fill pattern.*/
-class QgsPatternDialog: public QDialog, private Ui::QgsPatternDialogBase
-{
-    Q_OBJECT
- public:
-    QgsPatternDialog(QWidget * parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
-    ~QgsPatternDialog();
-    Qt::BrushStyle pattern();
- protected:
-    Qt::BrushStyle m_pattern;
- protected slots:
-     /**Queries the selected pattern if the ok button is pressed and stores the pattern in m_pattern*/
-     void queryPattern();
-};
-
-inline QgsPatternDialog::~QgsPatternDialog()
-{
-
-}
-
-#endif

Deleted: trunk/qgis/src/app/qgspointstylewidget.cpp
===================================================================
--- trunk/qgis/src/app/qgspointstylewidget.cpp	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgspointstylewidget.cpp	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,26 +0,0 @@
-/***************************************************************************
-                                 qgslinestyle.h
-                               ------------------
-        begin                : March 2005
-        copyright            : (C) 2005 by Tim Sutton
-        email                : tim at linfiniti.com
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "qgspointstylewidget.h"
-
-QgsPointStyleWidget::QgsPointStyleWidget( QWidget *parent, const char * name, Qt::WFlags f)
-           :QgsPointStyleWidgetBase( )
-{
-}
-
-QgsPointStyleWidget::~QgsPointStyleWidget()
-{
-}

Deleted: trunk/qgis/src/app/qgspointstylewidget.h
===================================================================
--- trunk/qgis/src/app/qgspointstylewidget.h	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgspointstylewidget.h	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,40 +0,0 @@
-/***************************************************************************
-                                qgspointstyle.h 
-                               ------------------
-        begin                : March 2005
-        copyright            : (C) 2005 by Tim Sutton
-        email                : tim at linfiniti.com
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef QGSPOINTSTYLE_H
-#define QGSPOINTSTYLE_H
-
-#include "ui_qgspointstylewidgetbase.h"
-#include <QDialog>
-
-
-class QgsPointStyleWidget:public QDialog, private Ui::QgsPointStyleWidgetBase
-{
-  Q_OBJECT;
-  public:
-
-  //! Constructor
-  QgsPointStyleWidget(QWidget *parent = 0, const char * name = 0,  Qt::WFlags f = 0 );
-
-  ~QgsPointStyleWidget();
-
-
-public slots:
-  
-private:
-    
-};
-
-#endif

Deleted: trunk/qgis/src/app/qgsvectorsymbologywidget.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorsymbologywidget.cpp	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgsvectorsymbologywidget.cpp	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,27 +0,0 @@
-/***************************************************************************
-                                 qgsvectorsymbologywidget.cpp
-                               ------------------
-        begin                : March 2005
-        copyright            : (C) 2005 by Tim Sutton
-        email                : tim at linfiniti.com
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "qgsvectorsymbologywidget.h"
-
-#include <qgssymbol.h>
-
-QgsVectorSymbologyWidget::QgsVectorSymbologyWidget(  QWidget *parent, const char * name, Qt::WFlags f)
-           :QgsVectorSymbologyWidgetBase( parent, name, f)
-{
-}
-
-QgsVectorSymbologyWidget::~QgsVectorSymbologyWidget()
-{
-}

Deleted: trunk/qgis/src/app/qgsvectorsymbologywidget.h
===================================================================
--- trunk/qgis/src/app/qgsvectorsymbologywidget.h	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/app/qgsvectorsymbologywidget.h	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,39 +0,0 @@
-/***************************************************************************
-                               qgsvectorsymbologywidget.h 
-                               ------------------
-        begin                : March 2005
-        copyright            : (C) 2005 by Tim Sutton
-        email                : tim at linfiniti.com
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef QGSVECTORSYMBOLOGYWIDGET_H
-#define QGSVECTORSYMBOLOGYWIDGET_H
-
-class QgsSymbol;
-
-
-#include "ui_qgsvectorsymbologywidgetbase.h"
-
-class QgsVectorSymbologyWidget:public QgsVectorSymbologyWidgetBase
-{
-  Q_OBJECT;
-  public:
-
-  //! Constructor
-  QgsVectorSymbologyWidget(QWidget *parent = 0, const char * name = 0, Qt::WFlags f = 0 );
-
-  ~QgsVectorSymbologyWidget();
-
-public slots:
-  
-private:
-};
-
-#endif

Deleted: trunk/qgis/src/ui/qgsfillstylewidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsfillstylewidgetbase.ui	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/ui/qgsfillstylewidgetbase.ui	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,86 +0,0 @@
-<ui version="4.0" >
- <class>QgsFillStyleWidgetBase</class>
- <widget class="QWidget" name="QgsFillStyleWidgetBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>219</width>
-    <height>111</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Form1</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="grpFill" >
-     <property name="title" >
-      <string>Fill Style</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="colFillColour" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize" >
-         <size>
-          <width>50</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string>col</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="txtFillColour" >
-        <property name="text" >
-         <string>Colour:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>colFillColour</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="2" >
-       <widget class="QComboBox" name="fptFillPattern" >
-        <item>
-         <property name="text" >
-          <string>PolyStyleWidget</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <tabstops>
-  <tabstop>fptFillPattern</tabstop>
-  <tabstop>colFillColour</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

Deleted: trunk/qgis/src/ui/qgslinestyledialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgslinestyledialogbase.ui	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/ui/qgslinestyledialogbase.ui	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,212 +0,0 @@
-<ui version="4.0" >
- <class>QgsLineStyleDialogBase</class>
- <widget class="QDialog" name="QgsLineStyleDialogBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>240</width>
-    <height>261</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Select a line style</string>
-  </property>
-  <property name="modal" >
-   <bool>true</bool>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>10</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" colspan="4" >
-    <widget class="Q3ButtonGroup" name="buttonGroup1" >
-     <property name="title" >
-      <string>Styles</string>
-     </property>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="exclusive" >
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>10</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="0" >
-       <widget class="QPushButton" name="dot" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="nopen" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="dashdotdot" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="dashdot" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QPushButton" name="dash" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QPushButton" name="solid" >
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>30</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="3" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>81</width>
-       <height>23</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>81</width>
-       <height>23</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="okbutton" >
-     <property name="text" >
-      <string>Ok</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2" >
-    <widget class="QPushButton" name="cancelbutton" >
-     <property name="text" >
-      <string>Cancel</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3ButtonGroup</class>
-   <extends>Q3GroupBox</extends>
-   <header>Qt3Support/Q3ButtonGroup</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>solid</tabstop>
-  <tabstop>dashdot</tabstop>
-  <tabstop>dash</tabstop>
-  <tabstop>dashdotdot</tabstop>
-  <tabstop>dot</tabstop>
-  <tabstop>nopen</tabstop>
-  <tabstop>okbutton</tabstop>
-  <tabstop>cancelbutton</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

Deleted: trunk/qgis/src/ui/qgslinestylewidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgslinestylewidgetbase.ui	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/ui/qgslinestylewidgetbase.ui	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,147 +0,0 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>QgsLineStyleWidgetBase</class>
- <widget class="QWidget" name="QgsLineStyleWidgetBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>193</width>
-    <height>128</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Form2</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>10</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="Q3GroupBox" name="grpOutline" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>7</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string>Outline Style</string>
-     </property>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>10</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="2" >
-       <widget class="QSpinBox" name="spbOutlineWidth" >
-        <property name="minimumSize" >
-         <size>
-          <width>42</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLabel" name="txtOutLineWidth" >
-        <property name="text" >
-         <string>Width:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>spbOutlineWidth</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>30</width>
-          <height>21</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QLabel" name="txtOutlineColour" >
-        <property name="text" >
-         <string>Colour:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>colOutlineColour</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="3" >
-       <widget class="QComboBox" name="lptOutlinePattern" >
-        <item>
-         <property name="text" >
-          <string>LineStyleWidget</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QPushButton" name="colOutlineColour" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize" >
-         <size>
-          <width>50</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string>col</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3GroupBox</class>
-   <extends></extends>
-   <header>Qt3Support/Q3GroupBox</header>
-   <container>1</container>
-   <pixmap></pixmap>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>lptOutlinePattern</tabstop>
-  <tabstop>colOutlineColour</tabstop>
-  <tabstop>spbOutlineWidth</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

Deleted: trunk/qgis/src/ui/qgsmarkerdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsmarkerdialogbase.ui	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/ui/qgsmarkerdialogbase.ui	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,132 +0,0 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>QgsMarkerDialogBase</class>
- <widget class="QDialog" name="QgsMarkerDialogBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>440</width>
-    <height>346</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Choose a marker symbol</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>10</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="mDirectoryLabel" >
-     <property name="text" >
-      <string>Directory</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4" >
-    <widget class="QPushButton" name="mBrowseDirectoriesButton" >
-     <property name="focusPolicy" >
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="text" >
-      <string>...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="3" >
-    <widget class="QLineEdit" name="mDirectoryEdit" >
-     <property name="focusPolicy" >
-      <enum>Qt::NoFocus</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>100</width>
-       <height>23</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="mOkButton" >
-     <property name="focusPolicy" >
-      <enum>Qt::StrongFocus</enum>
-     </property>
-     <property name="text" >
-      <string>Ok</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="mCancelButton" >
-     <property name="focusPolicy" >
-      <enum>Qt::StrongFocus</enum>
-     </property>
-     <property name="text" >
-      <string>Cancel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="3" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>120</width>
-       <height>23</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" colspan="5" >
-    <widget class="Q3IconView" name="mIconView" >
-     <property name="focusPolicy" >
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <item>
-      <property name="text" >
-       <string>New Item</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3IconView</class>
-   <extends></extends>
-   <header>q3iconview.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>mDirectoryEdit</tabstop>
-  <tabstop>mIconView</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

Deleted: trunk/qgis/src/ui/qgspatterndialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgspatterndialogbase.ui	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/ui/qgspatterndialogbase.ui	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,283 +0,0 @@
-<ui version="4.0" >
- <class>QgsPatternDialogBase</class>
- <widget class="QDialog" name="QgsPatternDialogBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>411</width>
-    <height>326</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Select a fill pattern</string>
-  </property>
-  <property name="modal" >
-   <bool>true</bool>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>10</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" colspan="4" >
-    <widget class="Q3ButtonGroup" name="buttonGroup1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="exclusive" >
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>10</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QPushButton" name="solid" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="default" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="fdiag" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QPushButton" name="dense4" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QPushButton" name="horizontal" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QPushButton" name="dense5" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="diagcross" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="dense1" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" >
-       <widget class="QPushButton" name="dense6" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QPushButton" name="vertical" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QPushButton" name="cross" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" >
-       <widget class="QPushButton" name="dense2" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" >
-       <widget class="QPushButton" name="bdiag" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" >
-       <widget class="QPushButton" name="dense3" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2" >
-       <widget class="QPushButton" name="dense7" >
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2" >
-       <widget class="QPushButton" name="nopen" >
-        <property name="toolTip" >
-         <string>No Fill</string>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="2" >
-    <widget class="QPushButton" name="cancelbutton" >
-     <property name="text" >
-      <string>Cancel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="okbutton" >
-     <property name="text" >
-      <string>Ok</string>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>41</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>41</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3ButtonGroup</class>
-   <extends>Q3GroupBox</extends>
-   <header>Qt3Support/Q3ButtonGroup</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>solid</tabstop>
-  <tabstop>fdiag</tabstop>
-  <tabstop>dense4</tabstop>
-  <tabstop>horizontal</tabstop>
-  <tabstop>diagcross</tabstop>
-  <tabstop>dense5</tabstop>
-  <tabstop>vertical</tabstop>
-  <tabstop>dense1</tabstop>
-  <tabstop>dense6</tabstop>
-  <tabstop>cross</tabstop>
-  <tabstop>dense2</tabstop>
-  <tabstop>dense7</tabstop>
-  <tabstop>bdiag</tabstop>
-  <tabstop>dense3</tabstop>
-  <tabstop>okbutton</tabstop>
-  <tabstop>cancelbutton</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

Deleted: trunk/qgis/src/ui/qgspointstylewidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgspointstylewidgetbase.ui	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/ui/qgspointstylewidgetbase.ui	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,78 +0,0 @@
-<ui version="4.0" >
- <class>QgsPointStyleWidgetBase</class>
- <widget class="QWidget" name="QgsPointStyleWidgetBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>180</width>
-    <height>141</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Form3</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>10</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="grpSymbol" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>7</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string>Symbol Style</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>10</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="txtSymbolScale" >
-        <property name="text" >
-         <string>Scale</string>
-        </property>
-        <property name="buddy" >
-         <cstring>spbSymbolScale</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QSpinBox" name="spbSymbolScale" >
-        <property name="minimumSize" >
-         <size>
-          <width>42</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QComboBox" name="comboBox8" />
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>comboBox8</tabstop>
-  <tabstop>spbSymbolScale</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

Deleted: trunk/qgis/src/ui/qgsvectorsymbologywidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorsymbologywidgetbase.ui	2008-05-30 15:40:39 UTC (rev 8546)
+++ trunk/qgis/src/ui/qgsvectorsymbologywidgetbase.ui	2008-05-30 15:43:18 UTC (rev 8547)
@@ -1,222 +0,0 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>QgsVectorSymbologyWidgetBase</class>
- <widget class="QWidget" name="QgsVectorSymbologyWidgetBase" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>483</width>
-    <height>468</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Form2</string>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>10</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item rowspan="3" row="1" column="1" >
-    <widget class="Q3ListView" name="listView1" >
-     <property name="resizePolicy" >
-      <enum>Q3ScrollView::AutoOneFit</enum>
-     </property>
-     <property name="selectionMode" >
-      <enum>Q3ListView::Single</enum>
-     </property>
-     <property name="allColumnsShowFocus" >
-      <bool>true</bool>
-     </property>
-     <property name="showSortIndicator" >
-      <bool>true</bool>
-     </property>
-     <property name="resizeMode" >
-      <enum>Q3ListView::AllColumns</enum>
-     </property>
-     <column>
-      <property name="text" >
-       <string>Label</string>
-      </property>
-     </column>
-     <column>
-      <property name="text" >
-       <string>Min</string>
-      </property>
-     </column>
-     <column>
-      <property name="text" >
-       <string>Max</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="Q3GroupBox" name="groupBox1" >
-     <property name="title" >
-      <string>Symbol Classes:</string>
-     </property>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>10</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="textLabel3" >
-        <property name="text" >
-         <string>Count:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>spinBox5</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QSpinBox" name="spinBox5" />
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="textLabel2" >
-        <property name="text" >
-         <string>Mode:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>comboBox5_2</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="textLabel1" >
-        <property name="text" >
-         <string>Field:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>comboBox5</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QComboBox" name="comboBox5" />
-      </item>
-      <item row="1" column="1" >
-       <widget class="QComboBox" name="comboBox5_2" />
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>41</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QgsFillStyleWidget" name="qgsFillStyleWidget1" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>3</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QgsLineStyleWidget" name="qgsLineStyleWidget1" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>3</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QgsPointStyleWidget" name="qgsPointStyleWidget1" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>3</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize" >
-      <size>
-       <width>32767</width>
-       <height>32767</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3ListView</class>
-   <extends></extends>
-   <header>q3listview.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
-  </customwidget>
-  <customwidget>
-   <class>QgsLineStyleWidget</class>
-   <extends>QWidget</extends>
-   <header>qgslinestylewidget.h</header>
-   <container>1</container>
-   <pixmap></pixmap>
-  </customwidget>
-  <customwidget>
-   <class>QgsFillStyleWidget</class>
-   <extends>QWidget</extends>
-   <header>qgsfillstylewidget.h</header>
-   <container>1</container>
-   <pixmap></pixmap>
-  </customwidget>
-  <customwidget>
-   <class>QgsPointStyleWidget</class>
-   <extends>QWidget</extends>
-   <header>qgspointstylewidget.h</header>
-   <container>1</container>
-   <pixmap></pixmap>
-  </customwidget>
-  <customwidget>
-   <class>Q3GroupBox</class>
-   <extends></extends>
-   <header>Qt3Support/Q3GroupBox</header>
-   <container>1</container>
-   <pixmap></pixmap>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>comboBox5</tabstop>
-  <tabstop>comboBox5_2</tabstop>
-  <tabstop>spinBox5</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>



More information about the QGIS-commit mailing list