Skip to content

Commit 99de4ab

Browse files
author
telwertowski
committed
Set modal property to true for modal dialogs. Mac modal dialogs need this set to have the right appearance in Qt 4.2. Calling exec() alone provides modal behavior but not modal appearance on a Mac.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6298 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 124f5ff commit 99de4ab

18 files changed

+101
-108
lines changed

‎src/plugins/grass/qgsgrassselectbase.ui‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsGrassSelectBase</class>
63
<widget class="QDialog" name="QgsGrassSelectBase" >
74
<property name="geometry" >
@@ -26,6 +23,9 @@
2623
<property name="sizeGripEnabled" >
2724
<bool>true</bool>
2825
</property>
26+
<property name="modal" >
27+
<bool>true</bool>
28+
</property>
2929
<layout class="QHBoxLayout" >
3030
<property name="margin" >
3131
<number>5</number>
@@ -186,10 +186,9 @@
186186
<customwidgets>
187187
<customwidget>
188188
<class>Q3Frame</class>
189-
<extends></extends>
189+
<extends>QFrame</extends>
190190
<header>Qt3Support/Q3Frame</header>
191191
<container>1</container>
192-
<pixmap></pixmap>
193192
</customwidget>
194193
</customwidgets>
195194
<resources/>

‎src/plugins/spit/qgsconnectiondialogbase.ui‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsConnectionDialogBase</class>
63
<widget class="QDialog" name="QgsConnectionDialogBase" >
74
<property name="geometry" >
@@ -18,6 +15,9 @@
1815
<property name="sizeGripEnabled" >
1916
<bool>true</bool>
2017
</property>
18+
<property name="modal" >
19+
<bool>true</bool>
20+
</property>
2121
<layout class="QVBoxLayout" >
2222
<property name="margin" >
2323
<number>9</number>

‎src/plugins/spit/qgseditreservedwordsbase.ui‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsEditReservedWordsBase</class>
63
<widget class="QDialog" name="QgsEditReservedWordsBase" >
74
<property name="geometry" >
@@ -18,6 +15,9 @@
1815
<property name="sizeGripEnabled" >
1916
<bool>true</bool>
2017
</property>
18+
<property name="modal" >
19+
<bool>true</bool>
20+
</property>
2121
<layout class="QGridLayout" >
2222
<property name="margin" >
2323
<number>9</number>

‎src/ui/qgsdbsourceselectbase.ui‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsDbSourceSelectBase</class>
63
<widget class="QDialog" name="QgsDbSourceSelectBase" >
74
<property name="geometry" >
85
<rect>
96
<x>0</x>
107
<y>0</y>
11-
<width>433</width>
8+
<width>494</width>
129
<height>481</height>
1310
</rect>
1411
</property>
@@ -21,6 +18,9 @@
2118
<property name="sizeGripEnabled" >
2219
<bool>true</bool>
2320
</property>
21+
<property name="modal" >
22+
<bool>true</bool>
23+
</property>
2424
<layout class="QGridLayout" >
2525
<property name="margin" >
2626
<number>9</number>
@@ -210,7 +210,6 @@
210210
</layout>
211211
</widget>
212212
<layoutdefault spacing="6" margin="11" />
213-
<pixmapfunction></pixmapfunction>
214213
<tabstops>
215214
<tabstop>cmbConnections</tabstop>
216215
<tabstop>btnConnect</tabstop>

‎src/ui/qgsgeomtypedialogbase.ui‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsGeomTypeDialogBase</class>
63
<widget class="QDialog" name="QgsGeomTypeDialogBase" >
74
<property name="geometry" >
85
<rect>
96
<x>0</x>
107
<y>0</y>
11-
<width>383</width>
8+
<width>400</width>
129
<height>427</height>
1310
</rect>
1411
</property>
1512
<property name="windowTitle" >
1613
<string>New Vector Layer</string>
1714
</property>
15+
<property name="modal" >
16+
<bool>true</bool>
17+
</property>
1818
<layout class="QGridLayout" >
1919
<property name="margin" >
2020
<number>9</number>
@@ -180,10 +180,8 @@
180180
<customwidgets>
181181
<customwidget>
182182
<class>Q3ListView</class>
183-
<extends></extends>
183+
<extends>Q3Frame</extends>
184184
<header>q3listview.h</header>
185-
<container>0</container>
186-
<pixmap></pixmap>
187185
</customwidget>
188186
</customwidgets>
189187
<tabstops>

‎src/ui/qgslayerprojectionselectorbase.ui‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsLayerProjectionSelectorBase</class>
63
<widget class="QDialog" name="QgsLayerProjectionSelectorBase" >
74
<property name="geometry" >
@@ -18,6 +15,9 @@
1815
<property name="windowIcon" >
1916
<iconset/>
2017
</property>
18+
<property name="modal" >
19+
<bool>true</bool>
20+
</property>
2121
<layout class="QGridLayout" >
2222
<property name="margin" >
2323
<number>9</number>
@@ -26,7 +26,7 @@
2626
<number>6</number>
2727
</property>
2828
<item row="1" column="0" colspan="2" >
29-
<widget class="QgsProjectionSelector" name="projectionSelector" />
29+
<widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
3030
</item>
3131
<item row="0" column="0" colspan="2" >
3232
<widget class="QTextEdit" name="textEdit" >
@@ -87,14 +87,12 @@
8787
</layout>
8888
</widget>
8989
<layoutdefault spacing="6" margin="11" />
90-
<pixmapfunction></pixmapfunction>
9190
<customwidgets>
9291
<customwidget>
9392
<class>QgsProjectionSelector</class>
9493
<extends>QWidget</extends>
9594
<header>qgsprojectionselector.h</header>
9695
<container>1</container>
97-
<pixmap></pixmap>
9896
</customwidget>
9997
</customwidgets>
10098
<resources/>

‎src/ui/qgslinestyledialogbase.ui‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsLineStyleDialogBase</class>
63
<widget class="QDialog" name="QgsLineStyleDialogBase" >
74
<property name="geometry" >
@@ -15,6 +12,9 @@
1512
<property name="windowTitle" >
1613
<string>Select a line style</string>
1714
</property>
15+
<property name="modal" >
16+
<bool>true</bool>
17+
</property>
1818
<layout class="QGridLayout" >
1919
<property name="margin" >
2020
<number>10</number>
@@ -192,10 +192,9 @@
192192
<customwidgets>
193193
<customwidget>
194194
<class>Q3ButtonGroup</class>
195-
<extends></extends>
195+
<extends>Q3GroupBox</extends>
196196
<header>Qt3Support/Q3ButtonGroup</header>
197197
<container>1</container>
198-
<pixmap></pixmap>
199198
</customwidget>
200199
</customwidgets>
201200
<tabstops>

‎src/ui/qgsludialogbase.ui‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsLUDialogBase</class>
63
<widget class="QDialog" name="QgsLUDialogBase" >
74
<property name="geometry" >
@@ -15,6 +12,9 @@
1512
<property name="windowTitle" >
1613
<string>Enter class bounds</string>
1714
</property>
15+
<property name="modal" >
16+
<bool>true</bool>
17+
</property>
1818
<layout class="QGridLayout" >
1919
<property name="margin" >
2020
<number>10</number>

‎src/ui/qgsmapserverexportbase.ui‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsMapserverExportBase</class>
63
<widget class="QDialog" name="QgsMapserverExportBase" >
74
<property name="geometry" >
85
<rect>
96
<x>0</x>
107
<y>0</y>
11-
<width>481</width>
12-
<height>386</height>
8+
<width>483</width>
9+
<height>433</height>
1310
</rect>
1411
</property>
1512
<property name="windowTitle" >
@@ -18,6 +15,9 @@
1815
<property name="sizeGripEnabled" >
1916
<bool>true</bool>
2017
</property>
18+
<property name="modal" >
19+
<bool>true</bool>
20+
</property>
2121
<layout class="QGridLayout" >
2222
<property name="margin" >
2323
<number>10</number>
@@ -336,10 +336,9 @@
336336
<customwidgets>
337337
<customwidget>
338338
<class>Q3GroupBox</class>
339-
<extends></extends>
339+
<extends>QGroupBox</extends>
340340
<header>Qt3Support/Q3GroupBox</header>
341341
<container>1</container>
342-
<pixmap></pixmap>
343342
</customwidget>
344343
</customwidgets>
345344
<tabstops>

‎src/ui/qgsmessageviewer.ui‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<ui version="4.0" >
2-
<author></author>
3-
<comment></comment>
4-
<exportmacro></exportmacro>
52
<class>QgsMessageViewer</class>
63
<widget class="QDialog" name="QgsMessageViewer" >
74
<property name="geometry" >
@@ -15,6 +12,9 @@
1512
<property name="windowTitle" >
1613
<string>QGIS Message</string>
1714
</property>
15+
<property name="modal" >
16+
<bool>true</bool>
17+
</property>
1818
<layout class="QGridLayout" >
1919
<property name="margin" >
2020
<number>9</number>

0 commit comments

Comments
 (0)