[QGIS Commit] r12135 - in branches/symbology-ng-branch/src: gui
gui/symbology-ng ui ui/symbollayer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Nov 15 19:08:27 EST 2009
Author: wonder
Date: 2009-11-15 19:08:24 -0500 (Sun, 15 Nov 2009)
New Revision: 12135
Modified:
branches/symbology-ng-branch/src/gui/qgscolorbutton.cpp
branches/symbology-ng-branch/src/gui/qgscolorbutton.h
branches/symbology-ng-branch/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
branches/symbology-ng-branch/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
branches/symbology-ng-branch/src/ui/qgssymbolv2selectordialogbase.ui
branches/symbology-ng-branch/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_linedecoration.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_markerline.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_simplefill.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_simpleline.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_simplemarker.ui
Log:
- slight redesign of symbol selector dialog
- created a new (experimental) class QgsColorButtonV2
- made all widgets in symbology-ng to use QgsColorButtonV2
Modified: branches/symbology-ng-branch/src/gui/qgscolorbutton.cpp
===================================================================
--- branches/symbology-ng-branch/src/gui/qgscolorbutton.cpp 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/gui/qgscolorbutton.cpp 2009-11-16 00:08:24 UTC (rev 12135)
@@ -66,3 +66,33 @@
mColor = color;
update();
}
+
+
+//////////////////
+
+QgsColorButtonV2::QgsColorButtonV2( QWidget* parent )
+ : QPushButton(parent)
+{
+}
+
+void QgsColorButtonV2::setColor( const QColor &color )
+{
+ mColor = color;
+
+ QPixmap pixmap(iconSize());
+ pixmap.fill(QColor(0,0,0,0));
+
+ QRect rect(1,1, iconSize().width() - 2, iconSize().height() - 2);
+
+ // draw a slightly rounded rectangle
+ QPainter p;
+ p.begin(&pixmap);
+ p.setPen(Qt::NoPen);
+ p.setRenderHint(QPainter::Antialiasing);
+ p.setBrush(color);
+ p.drawRoundedRect(rect, 4, 4);
+ p.end();
+
+ // set this pixmap as icon
+ setIcon(QIcon(pixmap));
+}
Modified: branches/symbology-ng-branch/src/gui/qgscolorbutton.h
===================================================================
--- branches/symbology-ng-branch/src/gui/qgscolorbutton.h 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/gui/qgscolorbutton.h 2009-11-16 00:08:24 UTC (rev 12135)
@@ -17,6 +17,7 @@
#define QGSCOLORBUTTON_H
#include <QToolButton>
+#include <QPushButton>
/** \ingroup gui
* A cross platform button subclass for selecting colors.
@@ -37,4 +38,18 @@
QColor mColor;
};
+
+class QgsColorButtonV2 : public QPushButton
+{
+ public:
+ QgsColorButtonV2( QWidget* parent = 0 );
+
+ void setColor( const QColor &color );
+ QColor color() const { return mColor; }
+
+ private:
+ QColor mColor;
+};
+
+
#endif
Modified: branches/symbology-ng-branch/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
===================================================================
--- branches/symbology-ng-branch/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp 2009-11-16 00:08:24 UTC (rev 12135)
@@ -27,6 +27,7 @@
if (embedded)
{
buttonBox->hide();
+ layout()->setContentsMargins(0,0,0,0);
}
connect(buttonBox, SIGNAL(accepted()), this, SLOT(onOK()));
Modified: branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
===================================================================
--- branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.cpp 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.cpp 2009-11-16 00:08:24 UTC (rev 12135)
@@ -16,14 +16,7 @@
#include <QStandardItemModel>
#include <QSvgRenderer>
-static void updateColorButton(QAbstractButton* button, QColor color)
-{
- QPixmap p(20,20);
- p.fill(color);
- button->setIcon(QIcon(p));
-}
-//////////
QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget(QWidget* parent)
: QgsSymbolLayerV2Widget(parent)
@@ -51,7 +44,7 @@
// set values
spinWidth->setValue(mLayer->width());
- updateColorButton(btnChangeColor, mLayer->color());
+ btnChangeColor->setColor(mLayer->color());
cboPenStyle->setPenStyle(mLayer->penStyle());
spinOffset->setValue(mLayer->offset());
cboJoinStyle->setPenJoinStyle(mLayer->penJoinStyle());
@@ -75,7 +68,7 @@
if (!color.isValid())
return;
mLayer->setColor(color);
- updateColorButton(btnChangeColor, mLayer->color());
+ btnChangeColor->setColor(mLayer->color());
emit changed();
}
@@ -145,8 +138,8 @@
break;
}
}
- updateColorButton(btnChangeColorBorder, mLayer->borderColor());
- updateColorButton(btnChangeColorFill, mLayer->color());
+ btnChangeColorBorder->setColor(mLayer->borderColor());
+ btnChangeColorFill->setColor(mLayer->color());
spinSize->setValue(mLayer->size());
spinAngle->setValue(mLayer->angle());
@@ -176,7 +169,7 @@
if (!borderColor.isValid())
return;
mLayer->setBorderColor(borderColor);
- updateColorButton(btnChangeColorBorder, mLayer->borderColor());
+ btnChangeColorBorder->setColor(mLayer->borderColor());
emit changed();
}
@@ -186,7 +179,7 @@
if (!color.isValid())
return;
mLayer->setColor(color);
- updateColorButton(btnChangeColorFill, mLayer->color());
+ btnChangeColorFill->setColor(mLayer->color());
emit changed();
}
@@ -232,8 +225,8 @@
mLayer = static_cast<QgsSimpleFillSymbolLayerV2*>(layer);
// set values
- updateColorButton(btnChangeColor, mLayer->color());
- updateColorButton(btnChangeBorderColor, mLayer->borderColor());
+ btnChangeColor->setColor(mLayer->color());
+ btnChangeBorderColor->setColor(mLayer->borderColor());
cboFillStyle->setBrushStyle(mLayer->brushStyle());
}
@@ -248,7 +241,7 @@
if (!color.isValid())
return;
mLayer->setColor(color);
- updateColorButton(btnChangeColor, mLayer->color());
+ btnChangeColor->setColor(mLayer->color());
emit changed();
}
@@ -258,7 +251,7 @@
if (!color.isValid())
return;
mLayer->setBorderColor(color);
- updateColorButton(btnChangeBorderColor, mLayer->borderColor());
+ btnChangeBorderColor->setColor(mLayer->borderColor());
emit changed();
}
@@ -482,7 +475,7 @@
mLayer = static_cast<QgsLineDecorationSymbolLayerV2*>(layer);
// set values
- updateColorButton(btnChangeColor, mLayer->color());
+ btnChangeColor->setColor(mLayer->color());
}
QgsSymbolLayerV2* QgsLineDecorationSymbolLayerV2Widget::symbolLayer()
@@ -496,6 +489,6 @@
if (!color.isValid())
return;
mLayer->setColor(color);
- updateColorButton(btnChangeColor, mLayer->color());
+ btnChangeColor->setColor(mLayer->color());
emit changed();
}
Modified: branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
===================================================================
--- branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp 2009-11-16 00:08:24 UTC (rev 12135)
@@ -27,6 +27,7 @@
if (embedded)
{
buttonBox->hide();
+ layout()->setContentsMargins(0,0,0,0);
}
connect(btnSymbolProperties, SIGNAL(clicked()), this, SLOT(changeSymbolProperties()));
@@ -44,12 +45,15 @@
// there's a correspondence between symbol type number and page numbering => exploit it!
stackedWidget->setCurrentIndex(symbol->type());
- connect(btnSetColor, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
+ connect(btnColorMarker, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
+ connect(btnColorLine, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
+ connect(btnColorFill, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
connect(spinAngle, SIGNAL(valueChanged(double)), this, SLOT(setMarkerAngle(double)));
connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(setMarkerSize(double)));
connect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(setLineWidth(double)));
connect(btnAddToStyle, SIGNAL(clicked()), this, SLOT(addSymbolToStyle()));
+ btnSymbolProperties->setIcon( QIcon( QgsApplication::defaultThemePath() + "mActionOptions.png" ) );
btnAddToStyle->setIcon( QIcon( QgsApplication::defaultThemePath() + "symbologyAdd.png" ) );
}
@@ -114,9 +118,10 @@
void QgsSymbolV2SelectorDialog::updateSymbolColor()
{
- QPixmap p(20,20);
- p.fill(mSymbol->color());
- btnSetColor->setIcon(QIcon(p));
+ QColor c = mSymbol->color();
+ btnColorMarker->setColor(c);
+ btnColorLine->setColor(c);
+ btnColorFill->setColor(c);
}
void QgsSymbolV2SelectorDialog::updateSymbolInfo()
Modified: branches/symbology-ng-branch/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
===================================================================
--- branches/symbology-ng-branch/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp 2009-11-16 00:08:24 UTC (rev 12135)
@@ -5,16 +5,7 @@
#include <QColorDialog>
-static void updateColorButton(QAbstractButton* button, QColor color)
-{
- QPixmap p(20,20);
- p.fill(color);
- button->setIcon(QIcon(p));
-}
-/////////
-
-
QgsVectorGradientColorRampV2Dialog::QgsVectorGradientColorRampV2Dialog(QgsVectorGradientColorRampV2* ramp, QWidget* parent)
: QDialog(parent), mRamp(ramp)
{
@@ -32,8 +23,8 @@
QSize size(300,40);
lblPreview->setPixmap(QgsSymbolLayerV2Utils::colorRampPreviewPixmap(mRamp, size));
- updateColorButton(btnColor1, mRamp->color1());
- updateColorButton(btnColor2, mRamp->color2());
+ btnColor1->setColor(mRamp->color1());
+ btnColor2->setColor(mRamp->color2());
}
void QgsVectorGradientColorRampV2Dialog::setColor1()
Modified: branches/symbology-ng-branch/src/ui/qgssymbolv2selectordialogbase.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/qgssymbolv2selectordialogbase.ui 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/ui/qgssymbolv2selectordialogbase.ui 2009-11-16 00:08:24 UTC (rev 12135)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>452</width>
- <height>397</height>
+ <height>404</height>
</rect>
</property>
<property name="windowTitle">
@@ -15,15 +15,21 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" rowspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
<widget class="QLabel" name="lblPreview">
<property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>100</height>
+ </size>
+ </property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
@@ -38,36 +44,56 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QPushButton" name="btnSymbolProperties">
- <property name="text">
- <string>Properties</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2" rowspan="3">
+ <item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
- <number>1</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="pageMarker">
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QgsColorButtonV2" name="btnColorMarker">
+ <property name="text">
+ <string>Change</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Size:</string>
+ <string>Size</string>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinSize">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Angle:</string>
+ <string>Rotation</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="2" column="1">
<widget class="QDoubleSpinBox" name="spinAngle">
+ <property name="suffix">
+ <string>°</string>
+ </property>
<property name="decimals">
<number>1</number>
</property>
@@ -79,8 +105,33 @@
</property>
</widget>
</item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="pageLine">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Color</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="1">
- <widget class="QDoubleSpinBox" name="spinSize">
+ <widget class="QgsColorButtonV2" name="btnColorLine">
+ <property name="text">
+ <string>Change</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Width</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinWidth">
<property name="decimals">
<number>1</number>
</property>
@@ -91,51 +142,51 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="pageLine">
- <layout class="QHBoxLayout">
+ <widget class="QWidget" name="pageFill">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <widget class="QLabel" name="label_4">
+ <widget class="QLabel" name="label_7">
<property name="text">
- <string>Width:</string>
+ <string>Color</string>
</property>
</widget>
</item>
<item>
- <widget class="QDoubleSpinBox" name="spinWidth">
- <property name="decimals">
- <number>1</number>
+ <widget class="QgsColorButtonV2" name="btnColorFill">
+ <property name="text">
+ <string>Change</string>
</property>
- <property name="value">
- <double>1.000000000000000</double>
- </property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="pageFill"/>
</widget>
</item>
- <item row="0" column="3" rowspan="2">
- <spacer name="verticalSpacer">
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="btnSymbolProperties">
+ <property name="text">
+ <string>Properties</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>40</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="1" rowspan="2">
- <widget class="QPushButton" name="btnSetColor">
- <property name="text">
- <string>Set color</string>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
+ <item>
<widget class="QPushButton" name="btnAddToStyle">
<property name="text">
<string>Add to style</string>
@@ -153,6 +204,12 @@
</item>
<item>
<widget class="QListView" name="viewSymbols">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
+ </property>
<property name="iconSize">
<size>
<width>48</width>
@@ -185,6 +242,25 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>QgsColorButtonV2</class>
+ <extends>QPushButton</extends>
+ <header>qgscolorbutton.h</header>
+ </customwidget>
+ </customwidgets>
+ <tabstops>
+ <tabstop>btnColorMarker</tabstop>
+ <tabstop>spinSize</tabstop>
+ <tabstop>spinAngle</tabstop>
+ <tabstop>btnColorLine</tabstop>
+ <tabstop>spinWidth</tabstop>
+ <tabstop>btnColorFill</tabstop>
+ <tabstop>btnSymbolProperties</tabstop>
+ <tabstop>btnAddToStyle</tabstop>
+ <tabstop>viewSymbols</tabstop>
+ <tabstop>buttonBox</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
Modified: branches/symbology-ng-branch/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui 2009-11-16 00:08:24 UTC (rev 12135)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsVectorGradientColorRampV2DialogBase</class>
- <widget class="QDialog" name="QgsVectorGradientColorRampV2DialogBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsVectorGradientColorRampV2DialogBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,35 +10,35 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Gradient color ramp</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Color 1:</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="btnColor1" >
- <property name="text" >
- <string>change</string>
+ <item row="0" column="1">
+ <widget class="QgsColorButtonV2" name="btnColor1">
+ <property name="text">
+ <string>Change</string>
</property>
</widget>
</item>
- <item rowspan="2" row="0" column="2" >
+ <item row="0" column="2" rowspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>71</height>
@@ -45,17 +46,17 @@
</property>
</spacer>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Color 2:</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="btnColor2" >
- <property name="text" >
- <string>change</string>
+ <item row="1" column="1">
+ <widget class="QgsColorButtonV2" name="btnColor2">
+ <property name="text">
+ <string>Change</string>
</property>
</widget>
</item>
@@ -63,13 +64,13 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -78,20 +79,20 @@
</spacer>
</item>
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Preview</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="lblPreview" >
- <property name="frameShape" >
+ <widget class="QLabel" name="lblPreview">
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
@@ -100,17 +101,24 @@
</widget>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>QgsColorButtonV2</class>
+ <extends>QPushButton</extends>
+ <header>qgscolorbutton.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections>
<connection>
@@ -119,11 +127,11 @@
<receiver>QgsVectorGradientColorRampV2DialogBase</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>258</x>
<y>281</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>168</x>
<y>256</y>
</hint>
@@ -135,11 +143,11 @@
<receiver>QgsVectorGradientColorRampV2DialogBase</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>363</x>
<y>273</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>371</x>
<y>259</y>
</hint>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_linedecoration.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_linedecoration.ui 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_linedecoration.ui 2009-11-16 00:08:24 UTC (rev 12135)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>WidgetLineDecoration</class>
- <widget class="QWidget" name="WidgetLineDecoration" >
- <property name="geometry" >
+ <widget class="QWidget" name="WidgetLineDecoration">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,41 +10,41 @@
<height>244</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Color:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="btnChangeColor" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QgsColorButtonV2" name="btnChangeColor">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string>change</string>
+ <property name="text">
+ <string>Change</string>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>112</width>
<height>21</height>
@@ -55,10 +56,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>350</width>
<height>81</height>
@@ -68,6 +69,13 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>QgsColorButtonV2</class>
+ <extends>QPushButton</extends>
+ <header>qgscolorbutton.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
</ui>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_markerline.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_markerline.ui 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_markerline.ui 2009-11-16 00:08:24 UTC (rev 12135)
@@ -26,7 +26,7 @@
<item row="0" column="1">
<widget class="QPushButton" name="btnChangeMarker">
<property name="text">
- <string>change</string>
+ <string>Change</string>
</property>
</widget>
</item>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_simplefill.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_simplefill.ui 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_simplefill.ui 2009-11-16 00:08:24 UTC (rev 12135)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>WidgetSimpleFill</class>
- <widget class="QWidget" name="WidgetSimpleFill" >
- <property name="geometry" >
+ <widget class="QWidget" name="WidgetSimpleFill">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,35 +10,35 @@
<height>154</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Color:</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="btnChangeColor" >
- <property name="text" >
- <string>change</string>
+ <item row="0" column="1">
+ <widget class="QgsColorButtonV2" name="btnChangeColor">
+ <property name="text">
+ <string>Change</string>
</property>
</widget>
</item>
- <item rowspan="3" row="0" column="2" >
+ <item row="0" column="2" rowspan="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>91</width>
<height>51</height>
@@ -45,27 +46,27 @@
</property>
</spacer>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Fill style:</string>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QgsBrushStyleComboBox" name="cboFillStyle" />
+ <item row="2" column="1">
+ <widget class="QgsBrushStyleComboBox" name="cboFillStyle"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
<string>Border color:</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="btnChangeBorderColor" >
- <property name="text" >
- <string>change</string>
+ <item row="1" column="1">
+ <widget class="QgsColorButtonV2" name="btnChangeBorderColor">
+ <property name="text">
+ <string>Change</string>
</property>
</widget>
</item>
@@ -73,10 +74,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>244</width>
<height>21</height>
@@ -92,6 +93,11 @@
<extends>QComboBox</extends>
<header>qgsbrushstylecombobox.h</header>
</customwidget>
+ <customwidget>
+ <class>QgsColorButtonV2</class>
+ <extends>QPushButton</extends>
+ <header>qgscolorbutton.h</header>
+ </customwidget>
</customwidgets>
<tabstops>
<tabstop>btnChangeColor</tabstop>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_simpleline.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_simpleline.ui 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_simpleline.ui 2009-11-16 00:08:24 UTC (rev 12135)
@@ -24,7 +24,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="QPushButton" name="btnChangeColor">
+ <widget class="QgsColorButtonV2" name="btnChangeColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -32,7 +32,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>change</string>
+ <string>Change</string>
</property>
</widget>
</item>
@@ -181,6 +181,11 @@
<extends>QComboBox</extends>
<header>qgspenstylecombobox.h</header>
</customwidget>
+ <customwidget>
+ <class>QgsColorButtonV2</class>
+ <extends>QPushButton</extends>
+ <header>qgscolorbutton.h</header>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_simplemarker.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_simplemarker.ui 2009-11-15 22:47:24 UTC (rev 12134)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_simplemarker.ui 2009-11-16 00:08:24 UTC (rev 12135)
@@ -24,9 +24,9 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="QPushButton" name="btnChangeColorBorder">
+ <widget class="QgsColorButtonV2" name="btnChangeColorBorder">
<property name="text">
- <string>change</string>
+ <string>Change</string>
</property>
</widget>
</item>
@@ -54,9 +54,9 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QPushButton" name="btnChangeColorFill">
+ <widget class="QgsColorButtonV2" name="btnChangeColorFill">
<property name="text">
- <string>change</string>
+ <string>Change</string>
</property>
</widget>
</item>
@@ -191,6 +191,13 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>QgsColorButtonV2</class>
+ <extends>QPushButton</extends>
+ <header>qgscolorbutton.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
</ui>
More information about the QGIS-commit
mailing list