Skip to content

Commit

Permalink
Set modal property to true for modal dialogs. Mac modal dialogs need …
Browse files Browse the repository at this point in the history 
…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
  • Loading branch information
telwertowski committed Dec 22, 2006
1 parent 124f5ff commit 99de4ab
Show file tree
Hide file tree
Showing 18 changed files with 101 additions and 108 deletions.
9 changes: 4 additions & 5 deletions src/plugins/grass/qgsgrassselectbase.ui
View file
@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsGrassSelectBase</class>
<widget class="QDialog" name="QgsGrassSelectBase" >
<property name="geometry" >
Expand All @@ -26,6 +23,9 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>5</number>
Expand Down Expand Up @@ -186,10 +186,9 @@
<customwidgets>
<customwidget>
<class>Q3Frame</class>
<extends></extends>
<extends>QFrame</extends>
<header>Qt3Support/Q3Frame</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<resources/>
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/spit/qgsconnectiondialogbase.ui
View file
@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsConnectionDialogBase</class>
<widget class="QDialog" name="QgsConnectionDialogBase" >
<property name="geometry" >
Expand All @@ -18,6 +15,9 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/spit/qgseditreservedwordsbase.ui
View file
@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsEditReservedWordsBase</class>
<widget class="QDialog" name="QgsEditReservedWordsBase" >
<property name="geometry" >
Expand All @@ -18,6 +15,9 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
Expand Down
9 changes: 4 additions & 5 deletions src/ui/qgsdbsourceselectbase.ui
View file
@@ -1,14 +1,11 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsDbSourceSelectBase</class>
<widget class="QDialog" name="QgsDbSourceSelectBase" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>433</width>
<width>494</width>
<height>481</height>
</rect>
</property>
Expand All @@ -21,6 +18,9 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
Expand Down Expand Up @@ -210,7 +210,6 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>cmbConnections</tabstop>
<tabstop>btnConnect</tabstop>
Expand Down
12 changes: 5 additions & 7 deletions src/ui/qgsgeomtypedialogbase.ui
View file
@@ -1,20 +1,20 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsGeomTypeDialogBase</class>
<widget class="QDialog" name="QgsGeomTypeDialogBase" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>383</width>
<width>400</width>
<height>427</height>
</rect>
</property>
<property name="windowTitle" >
<string>New Vector Layer</string>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
Expand Down Expand Up @@ -180,10 +180,8 @@
<customwidgets>
<customwidget>
<class>Q3ListView</class>
<extends></extends>
<extends>Q3Frame</extends>
<header>q3listview.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
10 changes: 4 additions & 6 deletions src/ui/qgslayerprojectionselectorbase.ui
View file
@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsLayerProjectionSelectorBase</class>
<widget class="QDialog" name="QgsLayerProjectionSelectorBase" >
<property name="geometry" >
Expand All @@ -18,6 +15,9 @@
<property name="windowIcon" >
<iconset/>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
Expand All @@ -26,7 +26,7 @@
<number>6</number>
</property>
<item row="1" column="0" colspan="2" >
<widget class="QgsProjectionSelector" name="projectionSelector" />
<widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
</item>
<item row="0" column="0" colspan="2" >
<widget class="QTextEdit" name="textEdit" >
Expand Down Expand Up @@ -87,14 +87,12 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<customwidgets>
<customwidget>
<class>QgsProjectionSelector</class>
<extends>QWidget</extends>
<header>qgsprojectionselector.h</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<resources/>
Expand Down
9 changes: 4 additions & 5 deletions src/ui/qgslinestyledialogbase.ui
View file
@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsLineStyleDialogBase</class>
<widget class="QDialog" name="QgsLineStyleDialogBase" >
<property name="geometry" >
Expand All @@ -15,6 +12,9 @@
<property name="windowTitle" >
<string>Select a line style</string>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
Expand Down Expand Up @@ -192,10 +192,9 @@
<customwidgets>
<customwidget>
<class>Q3ButtonGroup</class>
<extends></extends>
<extends>Q3GroupBox</extends>
<header>Qt3Support/Q3ButtonGroup</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
6 changes: 3 additions & 3 deletions src/ui/qgsludialogbase.ui
View file
@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsLUDialogBase</class>
<widget class="QDialog" name="QgsLUDialogBase" >
<property name="geometry" >
Expand All @@ -15,6 +12,9 @@
<property name="windowTitle" >
<string>Enter class bounds</string>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
Expand Down
13 changes: 6 additions & 7 deletions src/ui/qgsmapserverexportbase.ui
View file
@@ -1,15 +1,12 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsMapserverExportBase</class>
<widget class="QDialog" name="QgsMapserverExportBase" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>481</width>
<height>386</height>
<width>483</width>
<height>433</height>
</rect>
</property>
<property name="windowTitle" >
Expand All @@ -18,6 +15,9 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
Expand Down Expand Up @@ -336,10 +336,9 @@
<customwidgets>
<customwidget>
<class>Q3GroupBox</class>
<extends></extends>
<extends>QGroupBox</extends>
<header>Qt3Support/Q3GroupBox</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
6 changes: 3 additions & 3 deletions src/ui/qgsmessageviewer.ui
View file
@@ -1,7 +1,4 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsMessageViewer</class>
<widget class="QDialog" name="QgsMessageViewer" >
<property name="geometry" >
Expand All @@ -15,6 +12,9 @@
<property name="windowTitle" >
<string>QGIS Message</string>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
Expand Down
9 changes: 4 additions & 5 deletions src/ui/qgsnewconnectionbase.ui
View file
@@ -1,14 +1,11 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsNewConnectionBase</class>
<widget class="QDialog" name="QgsNewConnectionBase" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>469</width>
<width>509</width>
<height>335</height>
</rect>
</property>
Expand All @@ -26,6 +23,9 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
Expand Down Expand Up @@ -322,7 +322,6 @@
<extends>QGroupBox</extends>
<header>Qt3Support/Q3GroupBox</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
9 changes: 4 additions & 5 deletions src/ui/qgsnewhttpconnectionbase.ui
View file
@@ -1,15 +1,12 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsNewHttpConnectionBase</class>
<widget class="QDialog" name="QgsNewHttpConnectionBase" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>437</width>
<height>255</height>
<height>256</height>
</rect>
</property>
<property name="windowTitle" >
Expand All @@ -18,6 +15,9 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
Expand Down Expand Up @@ -293,7 +293,6 @@
<extends>QGroupBox</extends>
<header>Qt3Support/Q3GroupBox</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
3 changes: 3 additions & 0 deletions src/ui/qgsoptionsbase.ui
View file
Expand Up @@ -18,6 +18,9 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<property name="modal" >
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
Expand Down

0 comments on commit 99de4ab

Please sign in to comment.