summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2014-03-12 19:01:25 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-03-12 10:14:17 -0700
commit7ee1884f6e68b33a20f1490e8d6ff236a5858aa5 (patch)
tree52f3628f9e6b71827f368e69dce8d5e0430518f0
parent809a6e784c61364b2f2078cdd1acf452da7550a1 (diff)
downloadsubsurface-7ee1884f6e68b33a20f1490e8d6ff236a5858aa5.tar.gz
Make some dialogs modal to MainWindow
For most dialogs it would be much safer to make them Qt::WindowModal to the parent (MainWindow). For now we are not doing this for the preferences dialog as there are situations where the user might want to be able to move it around and even interact with the main window. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/divecomputermanagementdialog.ui3
-rw-r--r--qt-ui/renumber.ui31
-rw-r--r--qt-ui/shiftimagetimes.ui3
-rw-r--r--qt-ui/shifttimes.ui25
4 files changed, 55 insertions, 7 deletions
diff --git a/qt-ui/divecomputermanagementdialog.ui b/qt-ui/divecomputermanagementdialog.ui
index 59be88122..9af67bfb9 100644
--- a/qt-ui/divecomputermanagementdialog.ui
+++ b/qt-ui/divecomputermanagementdialog.ui
@@ -2,6 +2,9 @@
<ui version="4.0">
<class>DiveComputerManagementDialog</class>
<widget class="QDialog" name="DiveComputerManagementDialog">
+ <property name="windowModality">
+ <enum>Qt::WindowModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
diff --git a/qt-ui/renumber.ui b/qt-ui/renumber.ui
index fef9ec0cf..00e7b84bb 100644
--- a/qt-ui/renumber.ui
+++ b/qt-ui/renumber.ui
@@ -2,6 +2,9 @@
<ui version="4.0">
<class>RenumberDialog</class>
<widget class="QDialog" name="RenumberDialog">
+ <property name="windowModality">
+ <enum>Qt::WindowModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
@@ -22,7 +25,16 @@
<property name="spacing">
<number>1</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
<number>3</number>
</property>
<item>
@@ -31,17 +43,26 @@
<string>New starting number</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QSpinBox" name="spinBox">
- <property name="value">
- <number>1</number>
- </property>
<property name="maximum">
<number>99999</number>
</property>
+ <property name="value">
+ <number>1</number>
+ </property>
</widget>
</item>
</layout>
diff --git a/qt-ui/shiftimagetimes.ui b/qt-ui/shiftimagetimes.ui
index 0e91ad63f..ee05c6362 100644
--- a/qt-ui/shiftimagetimes.ui
+++ b/qt-ui/shiftimagetimes.ui
@@ -2,6 +2,9 @@
<ui version="4.0">
<class>ShiftImageTimesDialog</class>
<widget class="QDialog" name="ShiftImageTimesDialog">
+ <property name="windowModality">
+ <enum>Qt::WindowModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
diff --git a/qt-ui/shifttimes.ui b/qt-ui/shifttimes.ui
index 33977dbc0..55932a2d3 100644
--- a/qt-ui/shifttimes.ui
+++ b/qt-ui/shifttimes.ui
@@ -2,6 +2,9 @@
<ui version="4.0">
<class>ShiftTimesDialog</class>
<widget class="QDialog" name="ShiftTimesDialog">
+ <property name="windowModality">
+ <enum>Qt::WindowModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
@@ -28,7 +31,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
<number>9</number>
</property>
<item alignment="Qt::AlignTop">
@@ -40,7 +52,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
<number>9</number>
</property>
<item>