Skip to content

Commit 63dfba8

Browse files
author
timlinux
committedNov 8, 2009
UI overhaul bonanza...hope this doesnt break anything...I guess we should say [FEATURE] at some point as the map composer dialogs have been somewhat overhauled....
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12031 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent f8c3e42 commit 63dfba8

23 files changed

+1273
-1263
lines changed
 

‎src/app/composer/qgscomposerlabelwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel* label ): QWidg
2727

2828
//add widget for general composer item properties
2929
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, label );
30-
gridLayout->addWidget( itemPropertiesWidget, 5, 0, 1, 2 );
30+
toolBox->addItem( itemPropertiesWidget, tr( "Item properties" ) );
3131

3232
if ( mComposerLabel )
3333
{

‎src/app/composer/qgscomposerlegendwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend ): m
2727

2828
//add widget for item properties
2929
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );
30-
gridLayout->addWidget( itemPropertiesWidget, 2, 0, 1, 1 );
31-
30+
toolBox->addItem( itemPropertiesWidget, tr( "Item Options") );
31+
3232
if ( legend )
3333
{
3434
mItemTreeView->setModel( legend->model() );

‎src/app/composer/qgscomposermapwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg
2828

2929
//add widget for general composer item properties
3030
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerMap );
31-
gridLayout->addWidget( itemPropertiesWidget );
31+
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
3232
QDoubleValidator v( 0 );
3333

3434
mWidthLineEdit->setValidator( &v );

‎src/app/composer/qgscomposerpicturewidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture
3535

3636
//add widget for general composer item properties
3737
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, picture );
38-
gridLayout->addWidget( itemPropertiesWidget, 8, 0, 1, 4 );
38+
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
3939

4040
mWidthLineEdit->setValidator( new QDoubleValidator( this ) );
4141
mHeightLineEdit->setValidator( new QDoubleValidator( this ) );

‎src/app/composer/qgscomposerscalebarwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
2828

2929
//add widget for general composer item properties
3030
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar );
31-
gridLayout->addWidget( itemPropertiesWidget );
31+
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
3232

3333
blockMemberSignals( true );
3434
mStyleComboBox->insertItem( 0, tr( "Single Box" ) );

‎src/app/qgisapp.cpp

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl )
466466
QgsDebugMsg( QgsApplication::showSettings() );
467467
QgsDebugMsg( "\n--------------------------\n\n\n" );
468468
mMapCanvas->freeze( false );
469+
mLastComposerId = 0;
469470
} // QgisApp ctor
470471

471472

@@ -3690,26 +3691,8 @@ void QgisApp::newPrintComposer()
36903691
}
36913692

36923693
//ask user about name
3693-
bool composerExists = true;
3694-
QString composerId;
3695-
while ( composerExists )
3696-
{
3697-
composerId = QInputDialog::getText( 0, tr( "Enter id string for composer" ), tr( "id:" ) );
3698-
if ( composerId.isNull() )
3699-
{
3700-
return;
3701-
}
3702-
3703-
if ( mPrintComposers.contains( composerId ) )
3704-
{
3705-
QMessageBox::critical( 0, tr( "Composer id already exists" ), tr( "The entered composer id '%1' already exists. Please enter a different id" ).arg( composerId ) );
3706-
}
3707-
else
3708-
{
3709-
composerExists = false;
3710-
}
3711-
}
3712-
3694+
mLastComposerId++;
3695+
QString composerId = QString( tr("Map Composer %1").arg( mLastComposerId ) );
37133696
//create new composer object
37143697
QgsComposer* newComposerObject = new QgsComposer( this, composerId );
37153698
//add it to the map of existing print composers
@@ -4244,6 +4227,7 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath )
42444227
composer->showMinimized();
42454228
composer->zoomFull();
42464229
}
4230+
mLastComposerId = composerNodes.size();
42474231

42484232
return true;
42494233
}
@@ -4256,6 +4240,7 @@ void QgisApp::deletePrintComposers()
42564240
delete it.value();
42574241
}
42584242
mPrintComposers.clear();
4243+
mLastComposerId = 0;
42594244
}
42604245

42614246
void QgisApp::mergeSelectedFeatures()

‎src/app/qgisapp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,7 @@ class QgisApp : public QMainWindow
991991

992992
QgsUndoWidget* mUndoWidget;
993993

994+
int mLastComposerId;
994995
};
995996

996997
#endif

‎src/ui/qgscomposeritemwidgetbase.ui

Lines changed: 79 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -6,119 +6,94 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>215</width>
10-
<height>434</height>
9+
<width>236</width>
10+
<height>314</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QGridLayout" name="gridLayout_2">
17-
<property name="margin">
18-
<number>0</number>
19-
</property>
16+
<layout class="QGridLayout" name="gridLayout">
2017
<item row="0" column="0">
21-
<widget class="QGroupBox" name="mComposerItemPropertiesGroupBox">
22-
<property name="title">
23-
<string>Composer item properties</string>
18+
<widget class="QPushButton" name="mFrameColorButton">
19+
<property name="text">
20+
<string>Frame color...</string>
2421
</property>
25-
<layout class="QGridLayout" name="gridLayout">
26-
<item row="0" column="0">
27-
<widget class="QLabel" name="mColorLabel">
28-
<property name="text">
29-
<string>Color</string>
30-
</property>
31-
<property name="wordWrap">
32-
<bool>true</bool>
33-
</property>
34-
<property name="buddy">
35-
<cstring>mFrameColorButton</cstring>
36-
</property>
37-
</widget>
38-
</item>
39-
<item row="1" column="0">
40-
<widget class="QPushButton" name="mFrameColorButton">
41-
<property name="text">
42-
<string>Frame...</string>
43-
</property>
44-
</widget>
45-
</item>
46-
<item row="2" column="0">
47-
<widget class="QPushButton" name="mBackgroundColorButton">
48-
<property name="text">
49-
<string>Background...</string>
50-
</property>
51-
</widget>
52-
</item>
53-
<item row="3" column="0">
54-
<widget class="QLabel" name="mOpacityLabel">
55-
<property name="text">
56-
<string>Opacity</string>
57-
</property>
58-
<property name="wordWrap">
59-
<bool>true</bool>
60-
</property>
61-
<property name="buddy">
62-
<cstring>mOpacitySlider</cstring>
63-
</property>
64-
</widget>
65-
</item>
66-
<item row="4" column="0">
67-
<widget class="QSlider" name="mOpacitySlider">
68-
<property name="maximum">
69-
<number>255</number>
70-
</property>
71-
<property name="orientation">
72-
<enum>Qt::Horizontal</enum>
73-
</property>
74-
</widget>
75-
</item>
76-
<item row="5" column="0">
77-
<widget class="QLabel" name="mOutlineWidthLabel">
78-
<property name="text">
79-
<string>Outline width</string>
80-
</property>
81-
<property name="wordWrap">
82-
<bool>true</bool>
83-
</property>
84-
<property name="buddy">
85-
<cstring>mOutlineWidthSpinBox</cstring>
86-
</property>
87-
</widget>
88-
</item>
89-
<item row="6" column="0">
90-
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
91-
</item>
92-
<item row="7" column="0">
93-
<widget class="QPushButton" name="mPositionButton">
94-
<property name="text">
95-
<string>Position...</string>
96-
</property>
97-
</widget>
98-
</item>
99-
<item row="8" column="0">
100-
<widget class="QCheckBox" name="mFrameCheckBox">
101-
<property name="text">
102-
<string>Show frame</string>
103-
</property>
104-
</widget>
105-
</item>
106-
<item row="9" column="0">
107-
<spacer name="verticalSpacer">
108-
<property name="orientation">
109-
<enum>Qt::Vertical</enum>
110-
</property>
111-
<property name="sizeHint" stdset="0">
112-
<size>
113-
<width>20</width>
114-
<height>40</height>
115-
</size>
116-
</property>
117-
</spacer>
118-
</item>
119-
</layout>
12022
</widget>
12123
</item>
24+
<item row="1" column="0">
25+
<widget class="QPushButton" name="mBackgroundColorButton">
26+
<property name="text">
27+
<string>Background color...</string>
28+
</property>
29+
</widget>
30+
</item>
31+
<item row="2" column="0">
32+
<widget class="QLabel" name="mOpacityLabel">
33+
<property name="text">
34+
<string>Opacity</string>
35+
</property>
36+
<property name="wordWrap">
37+
<bool>true</bool>
38+
</property>
39+
<property name="buddy">
40+
<cstring>mOpacitySlider</cstring>
41+
</property>
42+
</widget>
43+
</item>
44+
<item row="3" column="0">
45+
<widget class="QSlider" name="mOpacitySlider">
46+
<property name="maximum">
47+
<number>255</number>
48+
</property>
49+
<property name="orientation">
50+
<enum>Qt::Horizontal</enum>
51+
</property>
52+
</widget>
53+
</item>
54+
<item row="4" column="0">
55+
<widget class="QLabel" name="mOutlineWidthLabel">
56+
<property name="text">
57+
<string>Outline width</string>
58+
</property>
59+
<property name="wordWrap">
60+
<bool>true</bool>
61+
</property>
62+
<property name="buddy">
63+
<cstring>mOutlineWidthSpinBox</cstring>
64+
</property>
65+
</widget>
66+
</item>
67+
<item row="5" column="0">
68+
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
69+
</item>
70+
<item row="6" column="0">
71+
<widget class="QPushButton" name="mPositionButton">
72+
<property name="text">
73+
<string>Position...</string>
74+
</property>
75+
</widget>
76+
</item>
77+
<item row="7" column="0">
78+
<widget class="QCheckBox" name="mFrameCheckBox">
79+
<property name="text">
80+
<string>Show frame</string>
81+
</property>
82+
</widget>
83+
</item>
84+
<item row="8" column="0">
85+
<spacer name="verticalSpacer">
86+
<property name="orientation">
87+
<enum>Qt::Vertical</enum>
88+
</property>
89+
<property name="sizeHint" stdset="0">
90+
<size>
91+
<width>215</width>
92+
<height>57</height>
93+
</size>
94+
</property>
95+
</spacer>
96+
</item>
12297
</layout>
12398
</widget>
12499
<resources/>

‎src/ui/qgscomposerlabelwidgetbase.ui

Lines changed: 54 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>217</width>
10-
<height>302</height>
9+
<width>203</width>
10+
<height>303</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -19,43 +19,65 @@
1919
<property name="windowTitle">
2020
<string>Label Options</string>
2121
</property>
22-
<layout class="QGridLayout" name="gridLayout">
22+
<layout class="QGridLayout" name="gridLayout_2">
2323
<property name="margin">
2424
<number>0</number>
2525
</property>
2626
<item row="0" column="0">
27-
<widget class="QTextEdit" name="mTextEdit">
28-
<property name="lineWrapMode">
29-
<enum>QTextEdit::NoWrap</enum>
27+
<widget class="QToolBox" name="toolBox">
28+
<property name="currentIndex">
29+
<number>0</number>
3030
</property>
31+
<widget class="QWidget" name="page">
32+
<property name="geometry">
33+
<rect>
34+
<x>0</x>
35+
<y>0</y>
36+
<width>203</width>
37+
<height>271</height>
38+
</rect>
39+
</property>
40+
<attribute name="label">
41+
<string>Label</string>
42+
</attribute>
43+
<layout class="QGridLayout" name="gridLayout">
44+
<item row="1" column="0">
45+
<widget class="QPushButton" name="mFontButton">
46+
<property name="sizePolicy">
47+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
48+
<horstretch>0</horstretch>
49+
<verstretch>0</verstretch>
50+
</sizepolicy>
51+
</property>
52+
<property name="text">
53+
<string>Font</string>
54+
</property>
55+
</widget>
56+
</item>
57+
<item row="2" column="0">
58+
<widget class="QLabel" name="mMarginTextLabel">
59+
<property name="text">
60+
<string>Margin (mm)</string>
61+
</property>
62+
<property name="buddy">
63+
<cstring>mMarginDoubleSpinBox</cstring>
64+
</property>
65+
</widget>
66+
</item>
67+
<item row="3" column="0">
68+
<widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox"/>
69+
</item>
70+
<item row="0" column="0">
71+
<widget class="QTextEdit" name="mTextEdit">
72+
<property name="lineWrapMode">
73+
<enum>QTextEdit::NoWrap</enum>
74+
</property>
75+
</widget>
76+
</item>
77+
</layout>
78+
</widget>
3179
</widget>
3280
</item>
33-
<item row="1" column="0">
34-
<widget class="QPushButton" name="mFontButton">
35-
<property name="sizePolicy">
36-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
37-
<horstretch>0</horstretch>
38-
<verstretch>0</verstretch>
39-
</sizepolicy>
40-
</property>
41-
<property name="text">
42-
<string>Font</string>
43-
</property>
44-
</widget>
45-
</item>
46-
<item row="2" column="0">
47-
<widget class="QLabel" name="mMarginTextLabel">
48-
<property name="text">
49-
<string>Margin (mm)</string>
50-
</property>
51-
<property name="buddy">
52-
<cstring>mMarginDoubleSpinBox</cstring>
53-
</property>
54-
</widget>
55-
</item>
56-
<item row="3" column="0">
57-
<widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox"/>
58-
</item>
5981
</layout>
6082
</widget>
6183
<layoutdefault spacing="6" margin="11"/>

‎src/ui/qgscomposerlegendwidgetbase.ui

Lines changed: 235 additions & 205 deletions
Large diffs are not rendered by default.

‎src/ui/qgscomposermapwidgetbase.ui

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>504</width>
10-
<height>802</height>
9+
<width>404</width>
10+
<height>447</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -19,28 +19,28 @@
1919
<property name="windowTitle">
2020
<string>Map options</string>
2121
</property>
22-
<layout class="QGridLayout" name="gridLayout_5">
22+
<layout class="QGridLayout" name="gridLayout_8">
2323
<property name="margin">
2424
<number>0</number>
2525
</property>
2626
<item row="0" column="0">
27-
<widget class="QScrollArea" name="scrollArea">
28-
<property name="widgetResizable">
29-
<bool>true</bool>
27+
<widget class="QToolBox" name="toolBox">
28+
<property name="currentIndex">
29+
<number>0</number>
3030
</property>
31-
<widget class="QWidget" name="scrollAreaWidgetContents">
31+
<widget class="QWidget" name="page">
3232
<property name="geometry">
3333
<rect>
3434
<x>0</x>
3535
<y>0</y>
36-
<width>481</width>
37-
<height>1482</height>
36+
<width>386</width>
37+
<height>419</height>
3838
</rect>
3939
</property>
40+
<attribute name="label">
41+
<string>Map</string>
42+
</attribute>
4043
<layout class="QGridLayout" name="gridLayout">
41-
<property name="margin">
42-
<number>0</number>
43-
</property>
4444
<item row="0" column="0">
4545
<widget class="QGroupBox" name="groupBox">
4646
<property name="title">
@@ -175,7 +175,22 @@
175175
</layout>
176176
</widget>
177177
</item>
178-
<item row="2" column="0">
178+
</layout>
179+
</widget>
180+
<widget class="QWidget" name="page_2">
181+
<property name="geometry">
182+
<rect>
183+
<x>0</x>
184+
<y>0</y>
185+
<width>404</width>
186+
<height>351</height>
187+
</rect>
188+
</property>
189+
<attribute name="label">
190+
<string>Extents</string>
191+
</attribute>
192+
<layout class="QGridLayout" name="gridLayout_5">
193+
<item row="0" column="0">
179194
<widget class="QGroupBox" name="mMapExtentGroupBox">
180195
<property name="title">
181196
<string>Map extent</string>
@@ -264,7 +279,14 @@
264279
</layout>
265280
</widget>
266281
</item>
267-
<item row="3" column="0">
282+
</layout>
283+
</widget>
284+
<widget class="QWidget" name="page_3">
285+
<attribute name="label">
286+
<string>Grid</string>
287+
</attribute>
288+
<layout class="QGridLayout" name="gridLayout_7">
289+
<item row="0" column="0">
268290
<widget class="QGroupBox" name="mGridCheckBox">
269291
<property name="title">
270292
<string>Show grid?</string>
@@ -552,7 +574,6 @@
552574
</customwidget>
553575
</customwidgets>
554576
<tabstops>
555-
<tabstop>scrollArea</tabstop>
556577
<tabstop>mPreviewModeComboBox</tabstop>
557578
<tabstop>mUpdatePreviewButton</tabstop>
558579
<tabstop>mWidthLineEdit</tabstop>

‎src/ui/qgscomposerpicturewidgetbase.ui

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>347</width>
9+
<width>240</width>
1010
<height>540</height>
1111
</rect>
1212
</property>
@@ -24,19 +24,22 @@
2424
<number>0</number>
2525
</property>
2626
<item row="0" column="0">
27-
<widget class="QScrollArea" name="scrollArea">
28-
<property name="widgetResizable">
29-
<bool>true</bool>
27+
<widget class="QToolBox" name="toolBox">
28+
<property name="currentIndex">
29+
<number>0</number>
3030
</property>
31-
<widget class="QWidget" name="scrollAreaWidgetContents">
31+
<widget class="QWidget" name="page">
3232
<property name="geometry">
3333
<rect>
3434
<x>0</x>
3535
<y>0</y>
36-
<width>324</width>
36+
<width>226</width>
3737
<height>679</height>
3838
</rect>
3939
</property>
40+
<attribute name="label">
41+
<string>Picture options</string>
42+
</attribute>
4043
<layout class="QGridLayout" name="gridLayout_2">
4144
<item row="0" column="0">
4245
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
@@ -102,6 +105,12 @@
102105
<string>Preview</string>
103106
</property>
104107
<layout class="QGridLayout">
108+
<property name="leftMargin">
109+
<number>0</number>
110+
</property>
111+
<property name="rightMargin">
112+
<number>0</number>
113+
</property>
105114
<item row="0" column="0">
106115
<widget class="QListWidget" name="mPreviewListWidget">
107116
<property name="showDropIndicator" stdset="0">
@@ -251,7 +260,7 @@
251260
<item row="8" column="0">
252261
<widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">
253262
<property name="text">
254-
<string>Take rotation from composer map</string>
263+
<string>Sync from map</string>
255264
</property>
256265
</widget>
257266
</item>
@@ -280,7 +289,6 @@
280289
<tabstop>mRotationSpinBox</tabstop>
281290
<tabstop>mRotationFromComposerMapCheckBox</tabstop>
282291
<tabstop>mComposerMapComboBox</tabstop>
283-
<tabstop>scrollArea</tabstop>
284292
</tabstops>
285293
<resources/>
286294
<connections/>

‎src/ui/qgscomposerscalebarwidgetbase.ui

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>212</width>
9+
<width>325</width>
1010
<height>537</height>
1111
</rect>
1212
</property>
@@ -19,25 +19,28 @@
1919
<property name="windowTitle">
2020
<string>Barscale Options</string>
2121
</property>
22-
<layout class="QGridLayout" name="gridLayout_2">
22+
<layout class="QGridLayout" name="gridLayout">
2323
<property name="margin">
2424
<number>0</number>
2525
</property>
2626
<item row="0" column="0">
27-
<widget class="QScrollArea" name="scrollArea">
28-
<property name="widgetResizable">
29-
<bool>true</bool>
27+
<widget class="QToolBox" name="toolBox">
28+
<property name="currentIndex">
29+
<number>0</number>
3030
</property>
31-
<widget class="QWidget" name="scrollAreaWidgetContents">
31+
<widget class="QWidget" name="page">
3232
<property name="geometry">
3333
<rect>
3434
<x>0</x>
35-
<y>-179</y>
36-
<width>189</width>
35+
<y>0</y>
36+
<width>307</width>
3737
<height>714</height>
3838
</rect>
3939
</property>
40-
<layout class="QGridLayout" name="gridLayout">
40+
<attribute name="label">
41+
<string>Scale bar</string>
42+
</attribute>
43+
<layout class="QGridLayout" name="gridLayout_2">
4144
<item row="0" column="0">
4245
<widget class="QLabel" name="mSegmentSizeLabel">
4346
<property name="text">
@@ -269,22 +272,6 @@
269272
</layout>
270273
</widget>
271274
<layoutdefault spacing="6" margin="11"/>
272-
<tabstops>
273-
<tabstop>scrollArea</tabstop>
274-
<tabstop>mSegmentSizeSpinBox</tabstop>
275-
<tabstop>mMapUnitsPerBarUnitSpinBox</tabstop>
276-
<tabstop>mNumberOfSegmentsSpinBox</tabstop>
277-
<tabstop>mSegmentsLeftSpinBox</tabstop>
278-
<tabstop>mStyleComboBox</tabstop>
279-
<tabstop>mMapComboBox</tabstop>
280-
<tabstop>mHeightSpinBox</tabstop>
281-
<tabstop>mLineWidthSpinBox</tabstop>
282-
<tabstop>mLabelBarSpaceSpinBox</tabstop>
283-
<tabstop>mBoxSizeSpinBox</tabstop>
284-
<tabstop>mUnitLabelLineEdit</tabstop>
285-
<tabstop>mFontButton</tabstop>
286-
<tabstop>mColorPushButton</tabstop>
287-
</tabstops>
288275
<resources/>
289276
<connections/>
290277
</ui>

‎src/ui/qgscompositionwidgetbase.ui

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>514</width>
10-
<height>535</height>
9+
<width>416</width>
10+
<height>620</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -32,9 +32,9 @@
3232
<property name="geometry">
3333
<rect>
3434
<x>0</x>
35-
<y>-290</y>
36-
<width>491</width>
37-
<height>823</height>
35+
<y>-72</y>
36+
<width>396</width>
37+
<height>688</height>
3838
</rect>
3939
</property>
4040
<layout class="QGridLayout" name="gridLayout_3">
@@ -243,6 +243,9 @@
243243
<property name="wordWrap">
244244
<bool>true</bool>
245245
</property>
246+
<property name="buddy">
247+
<cstring>mResolutionSpinBox</cstring>
248+
</property>
246249
</widget>
247250
</item>
248251
<item row="2" column="0">
@@ -262,6 +265,9 @@
262265
<property name="wordWrap">
263266
<bool>true</bool>
264267
</property>
268+
<property name="buddy">
269+
<cstring>mOffsetXSpinBox</cstring>
270+
</property>
265271
</widget>
266272
</item>
267273
<item row="4" column="0">
@@ -275,6 +281,9 @@
275281
<property name="wordWrap">
276282
<bool>true</bool>
277283
</property>
284+
<property name="buddy">
285+
<cstring>mOffsetYSpinBox</cstring>
286+
</property>
278287
</widget>
279288
</item>
280289
<item row="6" column="0">
@@ -288,6 +297,9 @@
288297
<property name="wordWrap">
289298
<bool>true</bool>
290299
</property>
300+
<property name="buddy">
301+
<cstring>mPenWidthSpinBox</cstring>
302+
</property>
291303
</widget>
292304
</item>
293305
<item row="8" column="0">
@@ -301,6 +313,9 @@
301313
<property name="wordWrap">
302314
<bool>true</bool>
303315
</property>
316+
<property name="buddy">
317+
<cstring>mGridColorButton</cstring>
318+
</property>
304319
</widget>
305320
</item>
306321
<item row="10" column="0">
@@ -324,6 +339,9 @@
324339
<property name="wordWrap">
325340
<bool>true</bool>
326341
</property>
342+
<property name="buddy">
343+
<cstring>mGridStyleComboBox</cstring>
344+
</property>
327345
</widget>
328346
</item>
329347
<item row="12" column="0">

‎src/ui/qgsconfigureshortcutsdialog.ui

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -120,35 +120,19 @@
120120
</tabstops>
121121
<resources/>
122122
<connections>
123-
<connection>
124-
<sender>buttonBox</sender>
125-
<signal>accepted()</signal>
126-
<receiver>QgsConfigureShortcutsDialog</receiver>
127-
<slot>accept()</slot>
128-
<hints>
129-
<hint type="sourcelabel">
130-
<x>248</x>
131-
<y>254</y>
132-
</hint>
133-
<hint type="destinationlabel">
134-
<x>157</x>
135-
<y>274</y>
136-
</hint>
137-
</hints>
138-
</connection>
139123
<connection>
140124
<sender>buttonBox</sender>
141125
<signal>rejected()</signal>
142126
<receiver>QgsConfigureShortcutsDialog</receiver>
143127
<slot>reject()</slot>
144128
<hints>
145129
<hint type="sourcelabel">
146-
<x>316</x>
147-
<y>260</y>
130+
<x>334</x>
131+
<y>279</y>
148132
</hint>
149133
<hint type="destinationlabel">
150-
<x>286</x>
151-
<y>274</y>
134+
<x>267</x>
135+
<y>297</y>
152136
</hint>
153137
</hints>
154138
</connection>

‎src/ui/qgscontinuouscolordialogbase.ui

Lines changed: 124 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -6,145 +6,153 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>506</width>
10-
<height>265</height>
9+
<width>453</width>
10+
<height>222</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Continuous color</string>
1515
</property>
16-
<layout class="QGridLayout">
17-
<property name="margin">
18-
<number>9</number>
19-
</property>
20-
<property name="spacing">
21-
<number>6</number>
22-
</property>
23-
<item row="1" column="1">
24-
<layout class="QFormLayout" name="formLayout">
16+
<layout class="QGridLayout" name="gridLayout_2">
17+
<item row="0" column="1">
18+
<layout class="QGridLayout" name="gridLayout">
2519
<item row="0" column="0">
26-
<widget class="QLabel" name="classvarlabel">
27-
<property name="minimumSize">
28-
<size>
29-
<width>0</width>
30-
<height>20</height>
31-
</size>
32-
</property>
33-
<property name="text">
34-
<string>Classification field</string>
35-
</property>
36-
<property name="buddy">
37-
<cstring>classificationComboBox</cstring>
38-
</property>
39-
</widget>
40-
</item>
41-
<item row="0" column="1">
42-
<widget class="QComboBox" name="classificationComboBox">
43-
<property name="minimumSize">
44-
<size>
45-
<width>0</width>
46-
<height>20</height>
47-
</size>
48-
</property>
49-
</widget>
20+
<layout class="QFormLayout" name="formLayout">
21+
<item row="0" column="0">
22+
<widget class="QLabel" name="classvarlabel">
23+
<property name="minimumSize">
24+
<size>
25+
<width>0</width>
26+
<height>20</height>
27+
</size>
28+
</property>
29+
<property name="text">
30+
<string>Classification field</string>
31+
</property>
32+
<property name="buddy">
33+
<cstring>classificationComboBox</cstring>
34+
</property>
35+
</widget>
36+
</item>
37+
<item row="0" column="1">
38+
<widget class="QComboBox" name="classificationComboBox">
39+
<property name="minimumSize">
40+
<size>
41+
<width>0</width>
42+
<height>20</height>
43+
</size>
44+
</property>
45+
</widget>
46+
</item>
47+
<item row="1" column="0">
48+
<widget class="QLabel" name="mincolorlabel">
49+
<property name="minimumSize">
50+
<size>
51+
<width>0</width>
52+
<height>20</height>
53+
</size>
54+
</property>
55+
<property name="text">
56+
<string>Minimum value</string>
57+
</property>
58+
<property name="buddy">
59+
<cstring>btnMinValue</cstring>
60+
</property>
61+
</widget>
62+
</item>
63+
<item row="2" column="0">
64+
<widget class="QLabel" name="maxcolorlabel">
65+
<property name="minimumSize">
66+
<size>
67+
<width>0</width>
68+
<height>20</height>
69+
</size>
70+
</property>
71+
<property name="text">
72+
<string>Maximum value</string>
73+
</property>
74+
<property name="buddy">
75+
<cstring>btnMaxValue</cstring>
76+
</property>
77+
</widget>
78+
</item>
79+
<item row="1" column="1">
80+
<widget class="QgsColorButton" name="btnMinValue">
81+
<property name="minimumSize">
82+
<size>
83+
<width>100</width>
84+
<height>0</height>
85+
</size>
86+
</property>
87+
</widget>
88+
</item>
89+
<item row="2" column="1">
90+
<widget class="QgsColorButton" name="btnMaxValue">
91+
<property name="minimumSize">
92+
<size>
93+
<width>100</width>
94+
<height>0</height>
95+
</size>
96+
</property>
97+
</widget>
98+
</item>
99+
<item row="3" column="0">
100+
<widget class="QLabel" name="outlinewidthlabel">
101+
<property name="minimumSize">
102+
<size>
103+
<width>0</width>
104+
<height>20</height>
105+
</size>
106+
</property>
107+
<property name="text">
108+
<string>Outline width</string>
109+
</property>
110+
<property name="buddy">
111+
<cstring>outlinewidthspinbox</cstring>
112+
</property>
113+
</widget>
114+
</item>
115+
<item row="3" column="1">
116+
<widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
117+
</item>
118+
</layout>
50119
</item>
51120
<item row="1" column="0">
52-
<widget class="QLabel" name="mincolorlabel">
53-
<property name="minimumSize">
54-
<size>
55-
<width>0</width>
56-
<height>20</height>
57-
</size>
58-
</property>
59-
<property name="text">
60-
<string>Minimum value</string>
61-
</property>
62-
<property name="buddy">
63-
<cstring>btnMinValue</cstring>
64-
</property>
65-
</widget>
66-
</item>
67-
<item row="2" column="0">
68-
<widget class="QLabel" name="maxcolorlabel">
69-
<property name="minimumSize">
70-
<size>
71-
<width>0</width>
72-
<height>20</height>
73-
</size>
74-
</property>
75-
<property name="text">
76-
<string>Maximum value</string>
77-
</property>
78-
<property name="buddy">
79-
<cstring>btnMaxValue</cstring>
80-
</property>
81-
</widget>
82-
</item>
83-
<item row="1" column="1">
84-
<widget class="QgsColorButton" name="btnMinValue">
85-
<property name="minimumSize">
86-
<size>
87-
<width>100</width>
88-
<height>0</height>
89-
</size>
90-
</property>
91-
</widget>
92-
</item>
93-
<item row="2" column="1">
94-
<widget class="QgsColorButton" name="btnMaxValue">
95-
<property name="minimumSize">
96-
<size>
97-
<width>100</width>
98-
<height>0</height>
99-
</size>
100-
</property>
101-
</widget>
102-
</item>
103-
<item row="3" column="0">
104-
<widget class="QLabel" name="outlinewidthlabel">
105-
<property name="minimumSize">
106-
<size>
107-
<width>0</width>
108-
<height>20</height>
109-
</size>
110-
</property>
121+
<widget class="QCheckBox" name="cb_polygonOutline">
111122
<property name="text">
112-
<string>Outline width</string>
123+
<string>Draw polygon outline</string>
113124
</property>
114125
</widget>
115126
</item>
116-
<item row="3" column="1">
117-
<widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
118-
</item>
119127
</layout>
120128
</item>
121-
<item row="1" column="2">
122-
<spacer name="horizontalSpacer">
129+
<item row="1" column="1">
130+
<spacer name="verticalSpacer">
123131
<property name="orientation">
124-
<enum>Qt::Horizontal</enum>
132+
<enum>Qt::Vertical</enum>
125133
</property>
126134
<property name="sizeHint" stdset="0">
127135
<size>
128-
<width>40</width>
129-
<height>20</height>
136+
<width>20</width>
137+
<height>40</height>
130138
</size>
131139
</property>
132140
</spacer>
133141
</item>
134-
<item row="4" column="1">
135-
<spacer name="verticalSpacer">
142+
<item row="0" column="2">
143+
<spacer name="horizontalSpacer">
136144
<property name="orientation">
137-
<enum>Qt::Vertical</enum>
145+
<enum>Qt::Horizontal</enum>
138146
</property>
139147
<property name="sizeHint" stdset="0">
140148
<size>
141-
<width>20</width>
142-
<height>40</height>
149+
<width>40</width>
150+
<height>20</height>
143151
</size>
144152
</property>
145153
</spacer>
146154
</item>
147-
<item row="1" column="0">
155+
<item row="0" column="0">
148156
<spacer name="horizontalSpacer_2">
149157
<property name="orientation">
150158
<enum>Qt::Horizontal</enum>
@@ -157,13 +165,6 @@
157165
</property>
158166
</spacer>
159167
</item>
160-
<item row="2" column="2">
161-
<widget class="QCheckBox" name="cb_polygonOutline">
162-
<property name="text">
163-
<string>Draw polygon outline</string>
164-
</property>
165-
</widget>
166-
</item>
167168
</layout>
168169
</widget>
169170
<layoutdefault spacing="6" margin="11"/>
@@ -174,6 +175,13 @@
174175
<header>qgscolorbutton.h</header>
175176
</customwidget>
176177
</customwidgets>
178+
<tabstops>
179+
<tabstop>classificationComboBox</tabstop>
180+
<tabstop>btnMinValue</tabstop>
181+
<tabstop>btnMaxValue</tabstop>
182+
<tabstop>outlinewidthspinbox</tabstop>
183+
<tabstop>cb_polygonOutline</tabstop>
184+
</tabstops>
177185
<resources/>
178186
<connections/>
179187
</ui>

‎src/ui/qgsdetaileditemwidgetbase.ui

Lines changed: 95 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,117 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsDetailedItemWidgetBase</class>
3-
<widget class="QWidget" name="QgsDetailedItemWidgetBase" >
4-
<property name="geometry" >
4+
<widget class="QWidget" name="QgsDetailedItemWidgetBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
8-
<width>295</width>
9-
<height>68</height>
9+
<width>312</width>
10+
<height>72</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Form</string>
1415
</property>
15-
<layout class="QGridLayout" >
16-
<property name="leftMargin" >
17-
<number>2</number>
18-
</property>
19-
<property name="topMargin" >
20-
<number>2</number>
21-
</property>
22-
<property name="rightMargin" >
23-
<number>2</number>
24-
</property>
25-
<property name="bottomMargin" >
26-
<number>2</number>
27-
</property>
28-
<property name="horizontalSpacing" >
29-
<number>2</number>
30-
</property>
31-
<property name="verticalSpacing" >
32-
<number>2</number>
33-
</property>
34-
<item row="0" column="0" >
35-
<layout class="QHBoxLayout" >
36-
<item>
37-
<widget class="QCheckBox" name="cbx" >
38-
<property name="sizePolicy" >
39-
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
40-
<horstretch>0</horstretch>
41-
<verstretch>0</verstretch>
42-
</sizepolicy>
43-
</property>
44-
<property name="text" >
45-
<string/>
46-
</property>
47-
</widget>
48-
</item>
49-
<item>
50-
<widget class="QLabel" name="lblIcon" >
51-
<property name="sizePolicy" >
52-
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
53-
<horstretch>0</horstretch>
54-
<verstretch>0</verstretch>
55-
</sizepolicy>
56-
</property>
57-
<property name="minimumSize" >
58-
<size>
59-
<width>0</width>
60-
<height>0</height>
61-
</size>
62-
</property>
63-
<property name="maximumSize" >
64-
<size>
65-
<width>80</width>
66-
<height>80</height>
67-
</size>
68-
</property>
69-
<property name="text" >
70-
<string/>
71-
</property>
72-
<property name="pixmap" >
73-
<pixmap>../../images/icons/qgis-icon-16x16.png</pixmap>
74-
</property>
75-
<property name="alignment" >
76-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
77-
</property>
78-
</widget>
79-
</item>
80-
<item>
81-
<widget class="QLabel" name="lblTitle" >
82-
<property name="sizePolicy" >
83-
<sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
84-
<horstretch>0</horstretch>
85-
<verstretch>0</verstretch>
86-
</sizepolicy>
87-
</property>
88-
<property name="font" >
89-
<font>
90-
<pointsize>15</pointsize>
91-
<weight>75</weight>
92-
<bold>true</bold>
93-
</font>
94-
</property>
95-
<property name="text" >
96-
<string>Heading Label</string>
97-
</property>
98-
<property name="alignment" >
99-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
100-
</property>
101-
<property name="wordWrap" >
102-
<bool>true</bool>
103-
</property>
104-
</widget>
105-
</item>
106-
</layout>
16+
<layout class="QGridLayout" name="gridLayout">
17+
<item row="0" column="0">
18+
<widget class="QLabel" name="lblIcon">
19+
<property name="sizePolicy">
20+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
21+
<horstretch>0</horstretch>
22+
<verstretch>0</verstretch>
23+
</sizepolicy>
24+
</property>
25+
<property name="minimumSize">
26+
<size>
27+
<width>0</width>
28+
<height>0</height>
29+
</size>
30+
</property>
31+
<property name="maximumSize">
32+
<size>
33+
<width>150</width>
34+
<height>80</height>
35+
</size>
36+
</property>
37+
<property name="text">
38+
<string/>
39+
</property>
40+
<property name="pixmap">
41+
<pixmap>../../images/icons/qgis-icon-16x16.png</pixmap>
42+
</property>
43+
<property name="alignment">
44+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
45+
</property>
46+
</widget>
47+
</item>
48+
<item row="0" column="1">
49+
<widget class="QLabel" name="lblTitle">
50+
<property name="sizePolicy">
51+
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
52+
<horstretch>0</horstretch>
53+
<verstretch>0</verstretch>
54+
</sizepolicy>
55+
</property>
56+
<property name="font">
57+
<font>
58+
<pointsize>15</pointsize>
59+
<weight>75</weight>
60+
<bold>true</bold>
61+
</font>
62+
</property>
63+
<property name="text">
64+
<string>Heading Label</string>
65+
</property>
66+
<property name="alignment">
67+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
68+
</property>
69+
<property name="wordWrap">
70+
<bool>true</bool>
71+
</property>
72+
</widget>
73+
</item>
74+
<item row="0" column="2">
75+
<widget class="QCheckBox" name="cbx">
76+
<property name="sizePolicy">
77+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
78+
<horstretch>0</horstretch>
79+
<verstretch>0</verstretch>
80+
</sizepolicy>
81+
</property>
82+
<property name="text">
83+
<string/>
84+
</property>
85+
</widget>
86+
</item>
87+
<item row="1" column="0">
88+
<widget class="QWidget" name="widget" native="true">
89+
<property name="sizePolicy">
90+
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
91+
<horstretch>0</horstretch>
92+
<verstretch>0</verstretch>
93+
</sizepolicy>
94+
</property>
95+
</widget>
10796
</item>
108-
<item row="1" column="0" >
109-
<widget class="QLabel" name="lblDetail" >
110-
<property name="sizePolicy" >
111-
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
97+
<item row="1" column="1">
98+
<widget class="QLabel" name="lblDetail">
99+
<property name="sizePolicy">
100+
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
112101
<horstretch>0</horstretch>
113102
<verstretch>0</verstretch>
114103
</sizepolicy>
115104
</property>
116-
<property name="text" >
105+
<property name="text">
117106
<string>Detail label</string>
118107
</property>
119-
<property name="scaledContents" >
108+
<property name="scaledContents">
120109
<bool>false</bool>
121110
</property>
122-
<property name="alignment" >
111+
<property name="alignment">
123112
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
124113
</property>
125-
<property name="wordWrap" >
114+
<property name="wordWrap">
126115
<bool>true</bool>
127116
</property>
128117
</widget>

‎src/ui/qgsfieldcalculatorbase.ui

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
<item row="6" column="0" colspan="3">
286286
<widget class="QTextEdit" name="mExpressionTextEdit"/>
287287
</item>
288-
<item row="7" column="1">
288+
<item row="7" column="2">
289289
<widget class="QDialogButtonBox" name="mButtonBox">
290290
<property name="orientation">
291291
<enum>Qt::Horizontal</enum>
@@ -297,6 +297,40 @@
297297
</item>
298298
</layout>
299299
</widget>
300+
<tabstops>
301+
<tabstop>mUpdateExistingFieldCheckBox</tabstop>
302+
<tabstop>mExistingFieldComboBox</tabstop>
303+
<tabstop>mOnlyUpdateSelectedCheckBox</tabstop>
304+
<tabstop>mOutputFieldNameLineEdit</tabstop>
305+
<tabstop>mOutputFieldTypeComboBox</tabstop>
306+
<tabstop>mOuputFieldWidthSpinBox</tabstop>
307+
<tabstop>mOutputFieldPrecisionSpinBox</tabstop>
308+
<tabstop>mFieldsListWidget</tabstop>
309+
<tabstop>mValueListWidget</tabstop>
310+
<tabstop>mSamplePushButton</tabstop>
311+
<tabstop>mAllPushButton</tabstop>
312+
<tabstop>mPlusPushButton</tabstop>
313+
<tabstop>mMultiplyPushButton</tabstop>
314+
<tabstop>mSqrtButton</tabstop>
315+
<tabstop>mSinButton</tabstop>
316+
<tabstop>mTanButton</tabstop>
317+
<tabstop>mACosButton</tabstop>
318+
<tabstop>mOpenBracketPushButton</tabstop>
319+
<tabstop>mMinusPushButton</tabstop>
320+
<tabstop>mDividePushButton</tabstop>
321+
<tabstop>mExpButton</tabstop>
322+
<tabstop>mCosButton</tabstop>
323+
<tabstop>mASinButton</tabstop>
324+
<tabstop>mATanButton</tabstop>
325+
<tabstop>mCloseBracketPushButton</tabstop>
326+
<tabstop>mToRealButton</tabstop>
327+
<tabstop>mToIntButton</tabstop>
328+
<tabstop>mToStringButton</tabstop>
329+
<tabstop>mLengthButton</tabstop>
330+
<tabstop>mAreaButton</tabstop>
331+
<tabstop>mExpressionTextEdit</tabstop>
332+
<tabstop>mButtonBox</tabstop>
333+
</tabstops>
300334
<resources/>
301335
<connections>
302336
<connection>
@@ -306,8 +340,8 @@
306340
<slot>accept()</slot>
307341
<hints>
308342
<hint type="sourcelabel">
309-
<x>248</x>
310-
<y>254</y>
343+
<x>321</x>
344+
<y>676</y>
311345
</hint>
312346
<hint type="destinationlabel">
313347
<x>157</x>
@@ -322,8 +356,8 @@
322356
<slot>reject()</slot>
323357
<hints>
324358
<hint type="sourcelabel">
325-
<x>316</x>
326-
<y>260</y>
359+
<x>321</x>
360+
<y>676</y>
327361
</hint>
328362
<hint type="destinationlabel">
329363
<x>286</x>

‎src/ui/qgsgenericprojectionselectorbase.ui

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,71 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsGenericProjectionSelectorBase</class>
3-
<widget class="QDialog" name="QgsGenericProjectionSelectorBase" >
4-
<property name="geometry" >
4+
<widget class="QDialog" name="QgsGenericProjectionSelectorBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
89
<width>605</width>
910
<height>563</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Coordinate Reference System Selector</string>
1415
</property>
15-
<property name="windowIcon" >
16+
<property name="windowIcon">
1617
<iconset>
1718
<normaloff/>
1819
</iconset>
1920
</property>
20-
<property name="modal" >
21+
<property name="modal">
2122
<bool>true</bool>
2223
</property>
23-
<layout class="QGridLayout" >
24-
<item row="0" column="0" >
25-
<widget class="QTextEdit" name="textEdit" >
26-
<property name="sizePolicy" >
27-
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
24+
<layout class="QGridLayout">
25+
<item row="0" column="0">
26+
<widget class="QTextEdit" name="textEdit">
27+
<property name="sizePolicy">
28+
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
2829
<horstretch>0</horstretch>
2930
<verstretch>0</verstretch>
3031
</sizepolicy>
3132
</property>
32-
<property name="maximumSize" >
33+
<property name="maximumSize">
3334
<size>
3435
<width>16777215</width>
3536
<height>160</height>
3637
</size>
3738
</property>
38-
<property name="focusPolicy" >
39+
<property name="focusPolicy">
3940
<enum>Qt::NoFocus</enum>
4041
</property>
41-
<property name="acceptDrops" >
42+
<property name="acceptDrops">
4243
<bool>false</bool>
4344
</property>
44-
<property name="lineWidth" >
45+
<property name="lineWidth">
4546
<number>2</number>
4647
</property>
47-
<property name="readOnly" >
48+
<property name="readOnly">
4849
<bool>true</bool>
4950
</property>
5051
</widget>
5152
</item>
52-
<item row="1" column="0" >
53-
<widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
53+
<item row="1" column="0">
54+
<widget class="QgsProjectionSelector" name="projectionSelector" native="true"/>
5455
</item>
55-
<item row="2" column="0" >
56-
<widget class="QDialogButtonBox" name="buttonBox" >
57-
<property name="standardButtons" >
58-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
56+
<item row="2" column="0">
57+
<widget class="QDialogButtonBox" name="buttonBox">
58+
<property name="standardButtons">
59+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
60+
</property>
61+
<property name="centerButtons">
62+
<bool>false</bool>
5963
</property>
6064
</widget>
6165
</item>
6266
</layout>
6367
</widget>
64-
<layoutdefault spacing="6" margin="11" />
68+
<layoutdefault spacing="6" margin="11"/>
6569
<customwidgets>
6670
<customwidget>
6771
<class>QgsProjectionSelector</class>
@@ -74,33 +78,33 @@
7478
<connections>
7579
<connection>
7680
<sender>buttonBox</sender>
77-
<signal>rejected()</signal>
81+
<signal>accepted()</signal>
7882
<receiver>QgsGenericProjectionSelectorBase</receiver>
79-
<slot>reject()</slot>
83+
<slot>accept()</slot>
8084
<hints>
81-
<hint type="sourcelabel" >
82-
<x>475</x>
85+
<hint type="sourcelabel">
86+
<x>409</x>
8387
<y>534</y>
8488
</hint>
85-
<hint type="destinationlabel" >
86-
<x>493</x>
87-
<y>523</y>
89+
<hint type="destinationlabel">
90+
<x>417</x>
91+
<y>559</y>
8892
</hint>
8993
</hints>
9094
</connection>
9195
<connection>
9296
<sender>buttonBox</sender>
93-
<signal>accepted()</signal>
97+
<signal>rejected()</signal>
9498
<receiver>QgsGenericProjectionSelectorBase</receiver>
95-
<slot>accept()</slot>
99+
<slot>reject()</slot>
96100
<hints>
97-
<hint type="sourcelabel" >
98-
<x>566</x>
99-
<y>534</y>
101+
<hint type="sourcelabel">
102+
<x>471</x>
103+
<y>537</y>
100104
</hint>
101-
<hint type="destinationlabel" >
102-
<x>600</x>
103-
<y>530</y>
105+
<hint type="destinationlabel">
106+
<x>594</x>
107+
<y>563</y>
104108
</hint>
105109
</hints>
106110
</connection>

‎src/ui/qgsgraduatedsymboldialogbase.ui

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
<tabstop>numberofclassesspinbox</tabstop>
220220
<tabstop>mClassifyButton</tabstop>
221221
<tabstop>mDeleteClassButton</tabstop>
222+
<tabstop>mClassListWidget</tabstop>
222223
</tabstops>
223224
<resources/>
224225
<connections/>

‎src/ui/qgslabeldialogbase.ui

Lines changed: 437 additions & 475 deletions
Large diffs are not rendered by default.

‎src/ui/qgsludialogbase.ui

Lines changed: 56 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,75 @@
1-
<ui version="4.0" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
23
<class>QgsLUDialogBase</class>
3-
<widget class="QDialog" name="QgsLUDialogBase" >
4-
<property name="geometry" >
4+
<widget class="QDialog" name="QgsLUDialogBase">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
8-
<width>324</width>
9-
<height>133</height>
9+
<width>227</width>
10+
<height>117</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Enter class bounds</string>
1415
</property>
15-
<property name="modal" >
16+
<property name="modal">
1617
<bool>true</bool>
1718
</property>
18-
<layout class="QGridLayout" >
19-
<property name="leftMargin" >
20-
<number>4</number>
21-
</property>
22-
<property name="topMargin" >
23-
<number>4</number>
24-
</property>
25-
<property name="rightMargin" >
26-
<number>4</number>
27-
</property>
28-
<property name="bottomMargin" >
29-
<number>4</number>
30-
</property>
31-
<property name="horizontalSpacing" >
32-
<number>-1</number>
33-
</property>
34-
<property name="verticalSpacing" >
35-
<number>-1</number>
36-
</property>
37-
<item row="0" column="0" >
38-
<widget class="QLabel" name="mLowerLabel" >
39-
<property name="text" >
40-
<string>Lower value</string>
41-
</property>
42-
<property name="buddy" >
43-
<cstring>mLowerEdit</cstring>
44-
</property>
45-
</widget>
19+
<layout class="QVBoxLayout" name="verticalLayout">
20+
<item>
21+
<layout class="QFormLayout" name="formLayout">
22+
<item row="0" column="0">
23+
<widget class="QLabel" name="mLowerLabel">
24+
<property name="text">
25+
<string>Lower value</string>
26+
</property>
27+
<property name="buddy">
28+
<cstring>mLowerEdit</cstring>
29+
</property>
30+
</widget>
31+
</item>
32+
<item row="0" column="1">
33+
<widget class="QLineEdit" name="mLowerEdit"/>
34+
</item>
35+
<item row="1" column="0">
36+
<widget class="QLabel" name="mUpperLabel">
37+
<property name="text">
38+
<string>Upper value</string>
39+
</property>
40+
<property name="buddy">
41+
<cstring>mUpperEdit</cstring>
42+
</property>
43+
</widget>
44+
</item>
45+
<item row="1" column="1">
46+
<widget class="QLineEdit" name="mUpperEdit"/>
47+
</item>
48+
</layout>
4649
</item>
47-
<item row="0" column="1" >
48-
<spacer>
49-
<property name="orientation" >
50-
<enum>Qt::Horizontal</enum>
51-
</property>
52-
<property name="sizeType" >
53-
<enum>QSizePolicy::Expanding</enum>
50+
<item>
51+
<spacer name="verticalSpacer">
52+
<property name="orientation">
53+
<enum>Qt::Vertical</enum>
5454
</property>
55-
<property name="sizeHint" >
55+
<property name="sizeHint" stdset="0">
5656
<size>
57-
<width>16</width>
58-
<height>49</height>
57+
<width>20</width>
58+
<height>10</height>
5959
</size>
6060
</property>
6161
</spacer>
6262
</item>
63-
<item row="0" column="2" >
64-
<widget class="QLabel" name="mUpperLabel" >
65-
<property name="text" >
66-
<string>Upper value</string>
67-
</property>
68-
<property name="buddy" >
69-
<cstring>mUpperEdit</cstring>
70-
</property>
71-
</widget>
72-
</item>
73-
<item row="1" column="0" >
74-
<widget class="QLineEdit" name="mLowerEdit" />
75-
</item>
76-
<item row="1" column="1" >
77-
<widget class="QLabel" name="mBetweenLabel" >
78-
<property name="text" >
79-
<string>-</string>
80-
</property>
81-
<property name="textFormat" >
82-
<enum>Qt::AutoText</enum>
83-
</property>
84-
</widget>
85-
</item>
86-
<item row="1" column="2" >
87-
<widget class="QLineEdit" name="mUpperEdit" />
88-
</item>
89-
<item row="2" column="0" colspan="3" >
90-
<widget class="QDialogButtonBox" name="buttonBox" >
91-
<property name="standardButtons" >
92-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
63+
<item>
64+
<widget class="QDialogButtonBox" name="buttonBox">
65+
<property name="standardButtons">
66+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
9367
</property>
9468
</widget>
9569
</item>
9670
</layout>
9771
</widget>
98-
<layoutdefault spacing="6" margin="11" />
72+
<layoutdefault spacing="6" margin="11"/>
9973
<resources/>
10074
<connections>
10175
<connection>
@@ -104,11 +78,11 @@
10478
<receiver>QgsLUDialogBase</receiver>
10579
<slot>accept()</slot>
10680
<hints>
107-
<hint type="sourcelabel" >
108-
<x>285</x>
81+
<hint type="sourcelabel">
82+
<x>163</x>
10983
<y>120</y>
11084
</hint>
111-
<hint type="destinationlabel" >
85+
<hint type="destinationlabel">
11286
<x>321</x>
11387
<y>35</y>
11488
</hint>
@@ -120,11 +94,11 @@
12094
<receiver>QgsLUDialogBase</receiver>
12195
<slot>reject()</slot>
12296
<hints>
123-
<hint type="sourcelabel" >
124-
<x>209</x>
97+
<hint type="sourcelabel">
98+
<x>163</x>
12599
<y>116</y>
126100
</hint>
127-
<hint type="destinationlabel" >
101+
<hint type="destinationlabel">
128102
<x>151</x>
129103
<y>7</y>
130104
</hint>

‎src/ui/qgsmeasurebase.ui

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>275</width>
9+
<width>281</width>
1010
<height>272</height>
1111
</rect>
1212
</property>
@@ -154,6 +154,13 @@
154154
</layout>
155155
</widget>
156156
<layoutdefault spacing="6" margin="11"/>
157+
<tabstops>
158+
<tabstop>mTable</tabstop>
159+
<tabstop>editTotal</tabstop>
160+
<tabstop>btnHelp</tabstop>
161+
<tabstop>mRestartButton</tabstop>
162+
<tabstop>mCloseButton</tabstop>
163+
</tabstops>
157164
<resources/>
158165
<connections/>
159166
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.