Minor changes to style widgets and addition of vector symbology widget that will eventually replace all the other renderer widgets. This work will not be continued until after 0.7 release.

git-svn-id: http://svn.osgeo.org/qgis/trunk@3013 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2005-03-24 09:12:02 +00:00
parent e7468e3304
commit 00de828b3d
8 changed files with 383 additions and 190 deletions

View File

@ -97,6 +97,7 @@ headers = qgisapp.h \
qgsmarkerdialog.h \
qgsmarkersymbol.h \
qgsmeasure.h \
qgsvectorsymbologywidget.h \
qgsoptions.h \
qgspatterndialog.h \
qgspluginitem.h \
@ -169,6 +170,7 @@ qgis_UIC = qgisappbase.ui \
qgsmarkerdialogbase.ui \
qgsmessageviewer.ui \
qgsmeasurebase.ui \
qgsvectorsymbologywidgetbase.ui \
qgsoptionsbase.ui \
qgspatterndialogbase.ui \
qgspluginmanagerbase.ui \
@ -241,6 +243,7 @@ qgis_MOC = qgisapp.moc.cpp \
qgsmapserverexport.moc.cpp \
qgsmarkerdialog.moc.cpp \
qgsmeasure.moc.cpp \
qgsvectorsymbologywidget.moc.cpp \
qgsoptions.moc.cpp \
qgspatterndialog.moc.cpp \
qgspluginmanager.moc.cpp \
@ -317,6 +320,7 @@ qgis_SOURCES = main.cpp \
qgsmarkerdialog.cpp \
qgsmarkersymbol.cpp \
qgsmeasure.cpp \
qgsvectorsymbologywidget.cpp \
qgsoptions.cpp \
qgspatterndialog.cpp \
qgspluginitem.cpp \

View File

@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>192</width>
<height>167</height>
<height>143</height>
</rect>
</property>
<property name="caption">
@ -25,8 +25,8 @@
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -53,15 +53,7 @@
<cstring>txtFillColour</cstring>
</property>
<property name="text">
<string>Colour</string>
</property>
</widget>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>txtFillPattern</cstring>
</property>
<property name="text">
<string>Pattern</string>
<string>Colour:</string>
</property>
</widget>
<spacer row="3" column="1">

View File

@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>193</width>
<height>167</height>
<height>143</height>
</rect>
</property>
<property name="caption">
@ -25,8 +25,8 @@
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -38,15 +38,51 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
<widget class="QSpinBox" row="2" column="2">
<property name="name">
<cstring>txtOutlinePattern</cstring>
<cstring>spbOutlineWidth</cstring>
</property>
<property name="text">
<string>Pattern</string>
<property name="minimumSize">
<size>
<width>42</width>
<height>0</height>
</size>
</property>
</widget>
<widget class="QComboBox" row="1" column="0" rowspan="1" colspan="3">
<widget class="QLabel" row="1" column="2">
<property name="name">
<cstring>txtOutLineWidth</cstring>
</property>
<property name="text">
<string>Width:</string>
</property>
</widget>
<spacer row="2" column="1">
<property name="name">
<cstring>spcOutline</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
</size>
</property>
</spacer>
<widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>txtOutlineColour</cstring>
</property>
<property name="text">
<string>Colour:</string>
</property>
</widget>
<widget class="QComboBox" row="0" column="0" rowspan="1" colspan="3">
<item>
<property name="text">
<string>LineStyleWidget</string>
@ -56,7 +92,7 @@
<cstring>lptOutlinePattern</cstring>
</property>
</widget>
<widget class="QPushButton" row="3" column="0">
<widget class="QPushButton" row="2" column="0">
<property name="name">
<cstring>colOutlineColour</cstring>
</property>
@ -78,50 +114,6 @@
<string>col</string>
</property>
</widget>
<widget class="QSpinBox" row="3" column="2">
<property name="name">
<cstring>spbOutlineWidth</cstring>
</property>
<property name="minimumSize">
<size>
<width>42</width>
<height>0</height>
</size>
</property>
</widget>
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>txtOutlineColour</cstring>
</property>
<property name="text">
<string>Colour</string>
</property>
</widget>
<widget class="QLabel" row="2" column="2">
<property name="name">
<cstring>txtOutLineWidth</cstring>
</property>
<property name="text">
<string>Width</string>
</property>
</widget>
<spacer row="3" column="1">
<property name="name">
<cstring>spcOutline</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
</size>
</property>
</spacer>
</grid>
</widget>
</grid>

View File

@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>180</width>
<height>326</height>
<height>141</height>
</rect>
</property>
<property name="caption">
@ -25,7 +25,7 @@
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@ -38,15 +38,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>txtSymbol</cstring>
</property>
<property name="text">
<string>Symbol</string>
</property>
</widget>
<widget class="QLabel" row="2" column="2">
<widget class="QLabel" row="1" column="0">
<property name="name">
<cstring>txtSymbolScale</cstring>
</property>
@ -54,7 +46,7 @@
<string>Scale</string>
</property>
</widget>
<widget class="QSpinBox" row="3" column="2">
<widget class="QSpinBox" row="2" column="0">
<property name="name">
<cstring>spbSymbolScale</cstring>
</property>
@ -65,126 +57,15 @@
</size>
</property>
</widget>
<spacer row="3" column="1">
<widget class="QComboBox" row="0" column="0">
<property name="name">
<cstring>spcSymbol</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
</size>
</property>
</spacer>
<widget class="QPushButton" row="3" column="0">
<property name="name">
<cstring>btnSymbolFirstColour</cstring>
</property>
<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>
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>txtSymbolColour</cstring>
</property>
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="text">
<string>Colour</string>
</property>
</widget>
<widget class="QIconView" row="1" column="0" rowspan="1" colspan="3">
<item>
<property name="text">
<string>New Item</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
</item>
<item>
<property name="text">
<string>New Item</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
</item>
<item>
<property name="text">
<string>New Item</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
</item>
<item>
<property name="text">
<string>New Item</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
</item>
<item>
<property name="text">
<string>New Item</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
</item>
<item>
<property name="text">
<string>New Item</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
</item>
<property name="name">
<cstring>iconView1</cstring>
<cstring>comboBox8</cstring>
</property>
</widget>
</grid>
</widget>
</grid>
</widget>
<images>
<image name="image0">
<data format="XPM.GZ" length="1347">789c7dd3c14ac4301405d07dbf22f4ed8a743ace0882f8098a4b415ca4c92475310a3a2e44fc777393a64df2dabed7452e1c6eb368778d787e7a10cdaefabac8cb9b126a909fa2d1dfe7f3cfcbebfd6f551fae857bf69dd8d75755dd0a251e3fde4f38933b53e707b10f518df18478e8b08803e271c21af1e6168b681165e7f688681055874594211a13a242347efc95da9688dad58946ca75e58d6be9e5ba0a46e92d351a952aa2d3b2495459989849f949546632b5688c32c65aeadde428ed0132da23306e4c5863f1ba017042738f6fc138a5fdbd0a135b2203ec7bca7b723022e23d19628601cb0d6f59e8612dce0c2b2641658fb5650b375a0795a2c2b8afcaaba4859ba852c4cda4364da9964daed64caa60c2475d9a590503c54d54d1d0a2096abb67541bf79955fc0debbfbbea1f81b84f0e</data>
</image>
</images>
<connections>
<connection>
<sender>btnSymbolFirstColour</sender>
<signal>clicked()</signal>
<receiver>QgsPointStyleWidgetBase</receiver>
<slot>btnSymbolFirstColour_clicked()</slot>
</connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">qgspointstylewidgetbase.ui.h</include>
</includes>

View File

@ -0,0 +1,27 @@
/***************************************************************************
qgsvectorsymbologywidget.cpp
------------------
begin : March 2005
copyright : (C) 2005 by Tim Sutton
email : tim@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, WFlags f)
:QgsVectorSymbologyWidgetBase( parent, name, f)
{
}
QgsVectorSymbologyWidget::~QgsVectorSymbologyWidget()
{
}

View File

@ -0,0 +1,43 @@
/***************************************************************************
qgsvectorsymbologywidget.h
------------------
begin : March 2005
copyright : (C) 2005 by Tim Sutton
email : tim@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;
#ifdef WIN32
#include "qgsvectorsymbologywidgetbase.uic.h"
#else
#include "qgsvectorsymbologywidgetbase.uic.h"
#endif
class QgsVectorSymbologyWidget:public QgsVectorSymbologyWidgetBase
{
Q_OBJECT;
public:
//! Constructor
QgsVectorSymbologyWidget(QWidget *parent = 0, const char * name = 0, WFlags f = 0 );
~QgsVectorSymbologyWidget();
public slots:
private:
};
#endif

View File

@ -0,0 +1,236 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>QgsVectorSymbologyWidgetBase</class>
<widget class="QWidget">
<property name="name">
<cstring>QgsVectorSymbologyWidgetBase</cstring>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>483</width>
<height>468</height>
</rect>
</property>
<property name="caption">
<string>Form2</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QListView" row="1" column="1" rowspan="3" colspan="1">
<column>
<property name="text">
<string>Label</string>
</property>
<property name="clickable">
<bool>true</bool>
</property>
<property name="resizable">
<bool>true</bool>
</property>
</column>
<column>
<property name="text">
<string>Min</string>
</property>
<property name="clickable">
<bool>true</bool>
</property>
<property name="resizable">
<bool>true</bool>
</property>
</column>
<column>
<property name="text">
<string>Max</string>
</property>
<property name="clickable">
<bool>true</bool>
</property>
<property name="resizable">
<bool>true</bool>
</property>
</column>
<item>
<property name="text">
<string>Rivers</string>
</property>
<property name="text">
<string>1000</string>
</property>
<property name="text">
<string>10000</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
<property name="pixmap">
<pixmap></pixmap>
</property>
<property name="pixmap">
<pixmap></pixmap>
</property>
</item>
<property name="name">
<cstring>listView1</cstring>
</property>
<property name="resizePolicy">
<enum>AutoOneFit</enum>
</property>
<property name="selectionMode">
<enum>Single</enum>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<property name="showSortIndicator">
<bool>true</bool>
</property>
<property name="resizeMode">
<enum>AllColumns</enum>
</property>
</widget>
<widget class="QGroupBox" row="0" column="1">
<property name="name">
<cstring>groupBox1</cstring>
</property>
<property name="title">
<string>Symbol Classes:</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="2" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
<property name="text">
<string>Count:</string>
</property>
</widget>
<widget class="QSpinBox" row="2" column="1">
<property name="name">
<cstring>spinBox5</cstring>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
<property name="text">
<string>Mode:</string>
</property>
</widget>
<widget class="QLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="text">
<string>Field:</string>
</property>
</widget>
<widget class="QComboBox" row="0" column="1">
<property name="name">
<cstring>comboBox5</cstring>
</property>
</widget>
<widget class="QComboBox" row="1" column="1">
<property name="name">
<cstring>comboBox5_2</cstring>
</property>
</widget>
</grid>
</widget>
<spacer row="3" column="0">
<property name="name">
<cstring>spacer1</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
</size>
</property>
</spacer>
<widget class="QgsFillStyleWidget" row="1" column="0">
<property name="name">
<cstring>qgsFillStyleWidget1</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>3</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
<widget class="QgsLineStyleWidget" row="0" column="0">
<property name="name">
<cstring>qgsLineStyleWidget1</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>3</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
<widget class="QgsPointStyleWidget" row="2" column="0">
<property name="name">
<cstring>qgsPointStyleWidget1</cstring>
</property>
<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>
</grid>
</widget>
<images>
<image name="image0">
<data format="PNG" length="185">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff610000008049444154388da592dd1100110c84374653fa508a3294a20eca724f66e2272eb9db2743f6db20546bc51f3900c825f45c42d79a78ad0380141bad071a3300f8b148b1910458f747e004e0105e703271392951fb2624fdc2ad6d2e7fdad418878e57b0e80a784b170196a1da00c3ac49df0056f304f862de3ab09a81cb2069f50077c13ffab40c910d0000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>listView1</sender>
<signal>selectionChanged(QListViewItem*)</signal>
<receiver>QgsVectorSymbologyWidgetBase</receiver>
<slot>listView1_selectionChanged(QListViewItem*)</slot>
</connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">qgsvectorsymbologywidgetbase.ui.h</include>
</includes>
<slots>
<slot>listView1_selectionChanged( QListViewItem * )</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>qgsfillstylewidget.h</includehint>
<includehint>qgslinestylewidget.h</includehint>
<includehint>qgspointstylewidget.h</includehint>
</includehints>
</UI>

View File

@ -0,0 +1,18 @@
/****************************************************************************
** ui.h extension file, included from the uic-generated form implementation.
**
** If you want to add, delete, or rename functions or slots, use
** Qt Designer to update this file, preserving your code.
**
** You should not define a constructor or destructor in this file.
** Instead, write your code in functions called init() and destroy().
** These will automatically be called by the form's constructor and
** destructor.
*****************************************************************************/
void QgsVectorSymbologyWidgetBase::listView1_selectionChanged( QListViewItem * )
{
}