Skip to content

Commit 4d23dd5

Browse files
author
morb_au
committedSep 24, 2006
Real fix for trac ticket #140 (continued).
Buttons where the background color is meaningful are now rendered in classic Windows style in the Vector Properties dialog (both single value and continuous color renderers). As part of this change the button itself is colored and not just the adjacent label. The labels have now been removed and the buttons resized to fill the gap. Bonus feature: Continuous color dialog now ranges from black to white by default. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5873 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1Preview-0.9.0-1
1 parent c6937e7 commit 4d23dd5

8 files changed

+1127
-1200
lines changed
 

‎src/gui/qgscontinuouscolordialog.cpp

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,43 @@ QgsContinuousColorDialog::QgsContinuousColorDialog(QgsVectorLayer * layer)
6464
qWarning("Warning, data provider is null in QgsContinuousColorDialog::QgsContinuousColorDialog(...)");
6565
return;
6666
}
67-
67+
68+
// new Qt4 idiom
69+
#ifdef Q_WS_WIN
70+
// Coloured buttons do not work under the Windows XP style - use plain Windows instead
71+
btnMinValue->setStyle(&mWindowsStyle);
72+
btnMaxValue->setStyle(&mWindowsStyle);
73+
#endif
74+
6875
//restore the correct colors for minimum and maximum values
69-
76+
7077
const QgsContinuousColorRenderer* renderer = dynamic_cast < const QgsContinuousColorRenderer * >(layer->renderer());;
71-
78+
7279
if (renderer)
7380
{
7481
classificationComboBox->setCurrentItem(renderer->classificationField());
7582
const QgsSymbol* minsymbol = renderer->minimumSymbol();
7683
const QgsSymbol* maxsymbol = renderer->maximumSymbol();
84+
7785
if (mVectorLayer->vectorType() == QGis::Line || mVectorLayer->vectorType() == QGis::Point)
7886
{
79-
lblMinValue->setPaletteBackgroundColor(minsymbol->pen().color());
80-
lblMaxValue->setPaletteBackgroundColor(maxsymbol->pen().color());
81-
}
87+
// old Qt3 idiom
88+
// lblMinValue->setPaletteBackgroundColor(minsymbol->pen().color());
89+
// lblMaxValue->setPaletteBackgroundColor(maxsymbol->pen().color());
90+
// new Qt4 idiom
91+
btnMinValue->setPalette( minsymbol->pen().color() );
92+
btnMaxValue->setPalette( maxsymbol->pen().color() );
93+
}
8294
else
8395
{
84-
lblMinValue->setPaletteBackgroundColor(minsymbol->brush().color());
85-
lblMaxValue->setPaletteBackgroundColor(maxsymbol->brush().color());
96+
// old Qt3 idiom
97+
// lblMinValue->setPaletteBackgroundColor(minsymbol->brush().color());
98+
// lblMaxValue->setPaletteBackgroundColor(maxsymbol->brush().color());
99+
// new Qt4 idiom
100+
btnMinValue->setPalette( minsymbol->brush().color() );
101+
btnMaxValue->setPalette( maxsymbol->brush().color() );
86102
}
103+
87104
outlinewidthspinbox->setMinValue(0);
88105
outlinewidthspinbox->setValue(minsymbol->pen().width());
89106

@@ -98,6 +115,10 @@ QgsContinuousColorDialog::QgsContinuousColorDialog(QgsVectorLayer * layer)
98115
outlinewidthspinbox->setValue(1);
99116
if (mVectorLayer->vectorType() != QGis::Polygon)
100117
cb_polygonOutline->setVisible(false);
118+
119+
btnMinValue->setPalette(Qt::black);
120+
btnMaxValue->setPalette(Qt::white);
121+
101122
}
102123
// Ensure that the state of other widgets is appropriate for the
103124
// state of the polygonoutline checkbox.
@@ -148,22 +169,22 @@ void QgsContinuousColorDialog::apply()
148169
QgsSymbol* minsymbol = new QgsSymbol(mVectorLayer->vectorType(), QString::number(minimum, 'f'), "", "");
149170
if (mVectorLayer->vectorType() == QGis::Line || mVectorLayer->vectorType() == QGis::Point)
150171
{
151-
minsymbol->setPen(QPen(lblMinValue->paletteBackgroundColor(),outlinewidthspinbox->value()));
172+
minsymbol->setPen(QPen(btnMinValue->paletteBackgroundColor(),outlinewidthspinbox->value()));
152173
}
153174
else
154175
{
155-
minsymbol->setBrush(QBrush(lblMinValue->paletteBackgroundColor()));
176+
minsymbol->setBrush(QBrush(btnMinValue->paletteBackgroundColor()));
156177
minsymbol->setPen(QPen(QColor(0, 0, 0), outlinewidthspinbox->value()));
157178
}
158179

159180
QgsSymbol* maxsymbol = new QgsSymbol(mVectorLayer->vectorType(), QString::number(maximum, 'f'), "", "");
160181
if (mVectorLayer->vectorType() == QGis::Line || mVectorLayer->vectorType() == QGis::Point)
161182
{
162-
maxsymbol->setPen(QPen(lblMaxValue->paletteBackgroundColor(),outlinewidthspinbox->value()));
183+
maxsymbol->setPen(QPen(btnMaxValue->paletteBackgroundColor(),outlinewidthspinbox->value()));
163184
}
164185
else
165186
{
166-
maxsymbol->setBrush(QBrush(lblMaxValue->paletteBackgroundColor()));
187+
maxsymbol->setBrush(QBrush(btnMaxValue->paletteBackgroundColor()));
167188
maxsymbol->setPen(QPen(QColor(0, 0, 0), outlinewidthspinbox->value()));
168189
}
169190

@@ -181,20 +202,26 @@ void QgsContinuousColorDialog::apply()
181202

182203
void QgsContinuousColorDialog::selectMinimumColor()
183204
{
184-
QColor mincolor = QColorDialog::getColor(QColor(Qt::black), this);
205+
QColor mincolor = QColorDialog::getColor(btnMinValue->paletteBackgroundColor(), this);
185206
if(mincolor.isValid())
186207
{
187-
lblMinValue->setPaletteBackgroundColor(mincolor);
208+
// old Qt3 idiom
209+
// lblMinValue->setPaletteBackgroundColor(mincolor);
210+
// new Qt4 idiom
211+
btnMinValue->setPalette(mincolor);
188212
}
189213
setActiveWindow();
190214
}
191215

192216
void QgsContinuousColorDialog::selectMaximumColor()
193217
{
194-
QColor maxcolor = QColorDialog::getColor(QColor(Qt::black), this);
218+
QColor maxcolor = QColorDialog::getColor(btnMaxValue->paletteBackgroundColor(), this);
195219
if(maxcolor.isValid())
196220
{
197-
lblMaxValue->setPaletteBackgroundColor(maxcolor);
221+
// old Qt3 idiom
222+
// lblMaxValue->setPaletteBackgroundColor(maxcolor);
223+
// new Qt4 idiom
224+
btnMaxValue->setPalette(maxcolor);
198225
}
199226
setActiveWindow();
200227
}

‎src/gui/qgscontinuouscolordialog.h

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,43 @@
2323
#include "ui_qgscontinuouscolordialogbase.h"
2424
#include <map>
2525

26+
#ifdef Q_WS_WIN
27+
#include <QWindowsStyle>
28+
#endif
29+
2630
class QgsVectorLayer;
2731

2832

2933
class QgsContinuousColorDialog: public QDialog, private Ui::QgsContinuousColorDialogBase
3034
{
3135
Q_OBJECT
32-
public:
36+
37+
public:
3338
QgsContinuousColorDialog(QgsVectorLayer* layer);
3439
~QgsContinuousColorDialog();
40+
3541
public slots:
36-
void apply();
42+
void apply();
43+
3744
protected slots:
3845
void selectMinimumColor();
3946
void selectMaximumColor();
4047
void on_cb_polygonOutline_clicked();
48+
4149
protected:
4250
QgsVectorLayer* mVectorLayer;
4351
/**Stores the names and numbers of the fields with numeric values*/
4452
std::map<QString,int> mFieldMap;
53+
4554
private:
55+
/** Default constructor is private, do not use this */
4656
QgsContinuousColorDialog();
57+
58+
#ifdef Q_WS_WIN
59+
//! Holds the classic Windows style that is used to render labels with a background color
60+
QWindowsStyle mWindowsStyle;
61+
#endif
62+
4763
};
4864

4965
#endif

‎src/gui/qgssinglesymboldialog.cpp

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,20 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer * layer): QDialog(),
108108

109109
if (renderer)
110110
{
111-
// Set
112-
set ( renderer->symbol());
111+
// Set from the existing renderer
112+
set ( renderer->symbol() );
113113
}
114+
else
115+
{
116+
// Take values from an example instance
117+
QgsSingleSymbolRenderer exampleRenderer = QgsSingleSymbolRenderer( mVectorLayer->vectorType() );
118+
set ( exampleRenderer.symbol() );
119+
}
114120

115121
if (mVectorLayer && mVectorLayer->vectorType() == QGis::Line)
116122
{
117-
lblFillColor->unsetPalette();
123+
// lblFillColor->unsetPalette();
124+
btnFillColor->setPalette(QPalette()); // reset to default application palette
118125
btnFillColor->setEnabled(false);
119126
grpPattern->setEnabled(false);
120127
mGroupPoint->setEnabled(false);
@@ -174,10 +181,13 @@ QgsSingleSymbolDialog::~QgsSingleSymbolDialog()
174181

175182
void QgsSingleSymbolDialog::selectOutlineColor()
176183
{
177-
QColor c = QColorDialog::getColor(lblOutlineColor->paletteBackgroundColor(),this);
184+
QColor c = QColorDialog::getColor(btnOutlineColor->paletteBackgroundColor(),this);
178185

179186
if ( c.isValid() ) {
180-
lblOutlineColor->setPaletteBackgroundColor(c);
187+
// old Qt3 idiom
188+
// lblOutlineColor->setPaletteBackgroundColor(c);
189+
// new Qt4 idiom
190+
btnOutlineColor->setPalette(c);
181191
emit settingsChanged();
182192
}
183193

@@ -186,10 +196,13 @@ void QgsSingleSymbolDialog::selectOutlineColor()
186196

187197
void QgsSingleSymbolDialog::selectFillColor()
188198
{
189-
QColor c = QColorDialog::getColor(lblFillColor->paletteBackgroundColor(),this);
199+
QColor c = QColorDialog::getColor(btnFillColor->paletteBackgroundColor(),this);
190200

191201
if ( c.isValid() ) {
192-
lblFillColor->setPaletteBackgroundColor(c);
202+
// old Qt3 idiom
203+
// lblFillColor->setPaletteBackgroundColor(c);
204+
// new Qt4 idiom
205+
btnFillColor->setPalette(c);
193206
emit settingsChanged();
194207
}
195208

@@ -199,9 +212,9 @@ void QgsSingleSymbolDialog::selectFillColor()
199212
void QgsSingleSymbolDialog::apply( QgsSymbol *sy )
200213
{
201214
//query the values of the widgets and set the symbology of the vector layer
202-
sy->setFillColor(lblFillColor->paletteBackgroundColor());
215+
sy->setFillColor(btnFillColor->paletteBackgroundColor());
203216
sy->setLineWidth(outlinewidthspinbox->value());
204-
sy->setColor(lblOutlineColor->paletteBackgroundColor());
217+
sy->setColor(btnOutlineColor->paletteBackgroundColor());
205218

206219
//
207220
// Apply point symbol
@@ -323,9 +336,24 @@ void QgsSingleSymbolDialog::set ( const QgsSymbol *sy )
323336
// ... but, drawLine is not correct with width > 0 -> until solved set to 0
324337
outlinewidthspinbox->setMinValue(0);
325338

326-
lblFillColor->setPaletteBackgroundColor(sy->brush().color());
327339

328-
lblOutlineColor->setPaletteBackgroundColor(sy->pen().color());
340+
// old Qt3 idiom
341+
// lblFillColor->setPaletteBackgroundColor(sy->brush().color());
342+
// new Qt4 idiom
343+
#ifdef Q_WS_WIN
344+
// Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
345+
btnFillColor->setStyle(&mWindowsStyle);
346+
#endif
347+
btnFillColor->setPalette( sy->brush().color() );
348+
349+
// old Qt3 idiom
350+
// lblOutlineColor->setPaletteBackgroundColor(sy->pen().color());
351+
// new Qt4 idiom
352+
#ifdef Q_WS_WIN
353+
// Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
354+
btnOutlineColor->setStyle(&mWindowsStyle);
355+
#endif
356+
btnOutlineColor->setPalette( sy->pen().color() );
329357

330358
//stylebutton->setName(QgsSymbologyUtils::penStyle2Char(sy->pen().style()));
331359
//stylebutton->setPixmap(QgsSymbologyUtils::char2LinePixmap(stylebutton->name()));
@@ -412,7 +440,10 @@ void QgsSingleSymbolDialog::set ( const QgsSymbol *sy )
412440

413441
void QgsSingleSymbolDialog::setOutlineColor(QColor& c)
414442
{
415-
lblOutlineColor->setPaletteBackgroundColor(c);
443+
// old Qt3 idiom
444+
// lblOutlineColor->setPaletteBackgroundColor(c);
445+
// new Qt4 idiom
446+
btnOutlineColor->setPalette(c);
416447
}
417448

418449
void QgsSingleSymbolDialog::setOutlineStyle(Qt::PenStyle pstyle)
@@ -434,7 +465,10 @@ void QgsSingleSymbolDialog::setOutlineStyle(Qt::PenStyle pstyle)
434465

435466
void QgsSingleSymbolDialog::setFillColor(QColor& c)
436467
{
437-
lblFillColor->setPaletteBackgroundColor(c);
468+
// old Qt3 idiom
469+
// lblFillColor->setPaletteBackgroundColor(c);
470+
// new Qt4 idiom
471+
btnFillColor->setPalette(c);
438472
}
439473

440474
void QgsSingleSymbolDialog::setFillStyle(Qt::BrushStyle fstyle)
@@ -483,7 +517,7 @@ void QgsSingleSymbolDialog::setOutlineWidth(int width)
483517

484518
QColor QgsSingleSymbolDialog::getOutlineColor()
485519
{
486-
return lblOutlineColor->paletteBackgroundColor();
520+
return btnOutlineColor->paletteBackgroundColor();
487521
}
488522

489523
Qt::PenStyle QgsSingleSymbolDialog::getOutlineStyle()
@@ -510,7 +544,7 @@ int QgsSingleSymbolDialog::getOutlineWidth()
510544

511545
QColor QgsSingleSymbolDialog::getFillColor()
512546
{
513-
return lblFillColor->paletteBackgroundColor();
547+
return btnFillColor->paletteBackgroundColor();
514548
}
515549

516550
Qt::BrushStyle QgsSingleSymbolDialog::getFillStyle()

‎src/gui/qgssinglesymboldialog.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
#include "ui_qgssinglesymboldialogbase.h"
2323
#include <vector>
2424

25+
#ifdef Q_WS_WIN
26+
#include <QWindowsStyle>
27+
#endif
28+
2529
class QgsSymbol;
2630
class QgsVectorLayer;
2731

@@ -50,7 +54,7 @@ class QgsSingleSymbolDialog: public QDialog, private Ui::QgsSingleSymbolDialogBa
5054
protected:
5155
QgsVectorLayer* mVectorLayer;
5256
public slots:
53-
/* set from QgsSymbol */
57+
/* arrange the widgets on this dialog to reflect the current state of QgsSymbol */
5458
void set(const QgsSymbol *sy);
5559
/**applies the changes to the vector layer*/
5660
void apply();
@@ -62,13 +66,20 @@ public slots:
6266
protected slots:
6367
void selectOutlineColor();
6468
void selectFillColor();
69+
6570
private:
66-
/**Default constructor is privat to not use is*/
71+
/** Default constructor is private, do not use this */
6772
QgsSingleSymbolDialog();
6873

6974
/** vector of marker names for combo items */
7075
std::vector<QString> mMarkers;
7176

77+
#ifdef Q_WS_WIN
78+
//! Holds the classic Windows style that is used to render labels with a background color
79+
QWindowsStyle mWindowsStyle;
80+
#endif
81+
82+
7283
signals:
7384
void settingsChanged();
7485
};

‎src/ui/qgscontinuouscolordialogbase.ui

Lines changed: 40 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -17,110 +17,83 @@
1717
</property>
1818
<layout class="QGridLayout" >
1919
<property name="margin" >
20-
<number>9</number>
20+
<number>8</number>
2121
</property>
2222
<property name="spacing" >
2323
<number>6</number>
2424
</property>
25-
<item row="3" column="3" >
25+
<item row="3" column="1" >
26+
<widget class="QSpinBox" name="outlinewidthspinbox" />
27+
</item>
28+
<item row="3" column="2" >
2629
<widget class="QCheckBox" name="cb_polygonOutline" >
2730
<property name="text" >
2831
<string>Draw polygon outline</string>
2932
</property>
3033
</widget>
3134
</item>
32-
<item row="3" column="4" >
33-
<spacer>
34-
<property name="orientation" >
35-
<enum>Qt::Horizontal</enum>
36-
</property>
37-
<property name="sizeType" >
38-
<enum>QSizePolicy::Expanding</enum>
39-
</property>
40-
<property name="sizeHint" >
35+
<item row="0" column="0" >
36+
<widget class="QLabel" name="classvarlabel" >
37+
<property name="minimumSize" >
4138
<size>
42-
<width>21</width>
39+
<width>0</width>
4340
<height>20</height>
4441
</size>
4542
</property>
46-
</spacer>
47-
</item>
48-
<item row="0" column="3" colspan="2" >
49-
<spacer>
50-
<property name="orientation" >
51-
<enum>Qt::Horizontal</enum>
52-
</property>
53-
<property name="sizeType" >
54-
<enum>QSizePolicy::Expanding</enum>
43+
<property name="text" >
44+
<string>Classification Field:</string>
5545
</property>
56-
<property name="sizeHint" >
57-
<size>
58-
<width>141</width>
59-
<height>21</height>
60-
</size>
46+
<property name="buddy" >
47+
<cstring>classificationComboBox</cstring>
6148
</property>
62-
</spacer>
49+
</widget>
6350
</item>
64-
<item row="0" column="1" colspan="2" >
65-
<widget class="QComboBox" name="classificationComboBox" >
51+
<item row="1" column="0" >
52+
<widget class="QLabel" name="mincolorlabel" >
6653
<property name="minimumSize" >
6754
<size>
6855
<width>0</width>
6956
<height>20</height>
7057
</size>
7158
</property>
59+
<property name="text" >
60+
<string>Minimum Value:</string>
61+
</property>
62+
<property name="buddy" >
63+
<cstring>btnMinValue</cstring>
64+
</property>
7265
</widget>
7366
</item>
74-
<item row="1" column="2" >
75-
<widget class="QToolButton" name="btnMinValue" >
67+
<item row="3" column="0" >
68+
<widget class="QLabel" name="outlinewidthlabel" >
7669
<property name="minimumSize" >
7770
<size>
78-
<width>22</width>
79-
<height>22</height>
80-
</size>
81-
</property>
82-
<property name="maximumSize" >
83-
<size>
84-
<width>22</width>
85-
<height>22</height>
71+
<width>0</width>
72+
<height>20</height>
8673
</size>
8774
</property>
8875
<property name="text" >
89-
<string>...</string>
76+
<string>Outline Width:</string>
77+
</property>
78+
<property name="buddy" >
79+
<cstring>outlinewidthspinbox</cstring>
9080
</property>
9181
</widget>
9282
</item>
93-
<item row="1" column="1" >
94-
<widget class="QLabel" name="lblMinValue" >
95-
<property name="sizePolicy" >
96-
<sizepolicy>
97-
<hsizetype>1</hsizetype>
98-
<vsizetype>1</vsizetype>
99-
<horstretch>0</horstretch>
100-
<verstretch>0</verstretch>
101-
</sizepolicy>
102-
</property>
83+
<item row="2" column="1" >
84+
<widget class="QToolButton" name="btnMaxValue" >
10385
<property name="minimumSize" >
10486
<size>
105-
<width>50</width>
87+
<width>100</width>
10688
<height>22</height>
10789
</size>
10890
</property>
10991
<property name="maximumSize" >
11092
<size>
111-
<width>50</width>
93+
<width>100</width>
11294
<height>22</height>
11395
</size>
11496
</property>
115-
<property name="autoFillBackground" >
116-
<bool>true</bool>
117-
</property>
118-
<property name="frameShape" >
119-
<enum>QFrame::StyledPanel</enum>
120-
</property>
121-
<property name="frameShadow" >
122-
<enum>QFrame::Sunken</enum>
123-
</property>
12497
<property name="text" >
12598
<string/>
12699
</property>
@@ -142,125 +115,35 @@
142115
</property>
143116
</widget>
144117
</item>
145-
<item row="2" column="2" >
146-
<widget class="QToolButton" name="btnMaxValue" >
147-
<property name="minimumSize" >
148-
<size>
149-
<width>22</width>
150-
<height>22</height>
151-
</size>
152-
</property>
153-
<property name="maximumSize" >
154-
<size>
155-
<width>22</width>
156-
<height>22</height>
157-
</size>
158-
</property>
159-
<property name="text" >
160-
<string>...</string>
161-
</property>
162-
</widget>
163-
</item>
164-
<item row="2" column="1" >
165-
<widget class="QLabel" name="lblMaxValue" >
166-
<property name="sizePolicy" >
167-
<sizepolicy>
168-
<hsizetype>1</hsizetype>
169-
<vsizetype>1</vsizetype>
170-
<horstretch>0</horstretch>
171-
<verstretch>0</verstretch>
172-
</sizepolicy>
173-
</property>
118+
<item row="1" column="1" >
119+
<widget class="QToolButton" name="btnMinValue" >
174120
<property name="minimumSize" >
175121
<size>
176-
<width>50</width>
122+
<width>100</width>
177123
<height>22</height>
178124
</size>
179125
</property>
180126
<property name="maximumSize" >
181127
<size>
182-
<width>50</width>
128+
<width>100</width>
183129
<height>22</height>
184130
</size>
185131
</property>
186-
<property name="autoFillBackground" >
187-
<bool>true</bool>
188-
</property>
189-
<property name="frameShape" >
190-
<enum>QFrame::StyledPanel</enum>
191-
</property>
192-
<property name="frameShadow" >
193-
<enum>QFrame::Sunken</enum>
194-
</property>
195132
<property name="text" >
196133
<string/>
197134
</property>
198135
</widget>
199136
</item>
200-
<item row="3" column="1" >
201-
<widget class="QSpinBox" name="outlinewidthspinbox" />
202-
</item>
203-
<item row="3" column="0" >
204-
<widget class="QLabel" name="outlinewidthlabel" >
205-
<property name="minimumSize" >
206-
<size>
207-
<width>0</width>
208-
<height>20</height>
209-
</size>
210-
</property>
211-
<property name="text" >
212-
<string>Outline Width:</string>
213-
</property>
214-
<property name="buddy" >
215-
<cstring>outlinewidthspinbox</cstring>
216-
</property>
217-
</widget>
218-
</item>
219-
<item row="1" column="0" >
220-
<widget class="QLabel" name="mincolorlabel" >
221-
<property name="minimumSize" >
222-
<size>
223-
<width>0</width>
224-
<height>20</height>
225-
</size>
226-
</property>
227-
<property name="text" >
228-
<string>Minimum Value:</string>
229-
</property>
230-
<property name="buddy" >
231-
<cstring>btnMinValue</cstring>
232-
</property>
233-
</widget>
234-
</item>
235-
<item row="0" column="0" >
236-
<widget class="QLabel" name="classvarlabel" >
137+
<item row="0" column="1" >
138+
<widget class="QComboBox" name="classificationComboBox" >
237139
<property name="minimumSize" >
238140
<size>
239141
<width>0</width>
240142
<height>20</height>
241143
</size>
242144
</property>
243-
<property name="text" >
244-
<string>Classification Field:</string>
245-
</property>
246-
<property name="buddy" >
247-
<cstring>classificationComboBox</cstring>
248-
</property>
249145
</widget>
250146
</item>
251-
<item row="4" column="2" >
252-
<spacer>
253-
<property name="orientation" >
254-
<enum>Qt::Vertical</enum>
255-
</property>
256-
<property name="sizeHint" >
257-
<size>
258-
<width>20</width>
259-
<height>40</height>
260-
</size>
261-
</property>
262-
</spacer>
263-
</item>
264147
</layout>
265148
</widget>
266149
<layoutdefault spacing="6" margin="11" />

‎src/ui/qgsoptionsbase.ui

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<widget class="QToolButton" name="pbnSelectionColour" >
161161
<property name="minimumSize" >
162162
<size>
163-
<width>10</width>
163+
<width>100</width>
164164
<height>22</height>
165165
</size>
166166
</property>
@@ -194,6 +194,12 @@
194194
</item>
195195
<item>
196196
<widget class="QToolButton" name="pbnCanvasColor" >
197+
<property name="minimumSize" >
198+
<size>
199+
<width>100</width>
200+
<height>22</height>
201+
</size>
202+
</property>
197203
<property name="text" >
198204
<string/>
199205
</property>

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
</property>
242242
<property name="minimumSize" >
243243
<size>
244-
<width>0</width>
244+
<width>100</width>
245245
<height>22</height>
246246
</size>
247247
</property>
@@ -317,7 +317,7 @@
317317
</property>
318318
<property name="minimumSize" >
319319
<size>
320-
<width>10</width>
320+
<width>80</width>
321321
<height>22</height>
322322
</size>
323323
</property>
@@ -362,6 +362,12 @@
362362
<verstretch>0</verstretch>
363363
</sizepolicy>
364364
</property>
365+
<property name="minimumSize" >
366+
<size>
367+
<width>80</width>
368+
<height>0</height>
369+
</size>
370+
</property>
365371
<property name="text" >
366372
<string/>
367373
</property>

‎src/ui/qgssinglesymboldialogbase.ui

Lines changed: 949 additions & 1005 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.