[PATCH 2/4] Make some dialogs modal to MainWindow

[Lubomir I. Ivanov]

From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

For some dialogs like Preferences and Renumber it would be
much safer to make them Qt::WindowModal to the parent (MainWindow).

Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
note that QtCreator (2.6.2 from Qt4.8.x) adds some XML noise
in the lines of some margin changes which seem harmless,
but i really don't want to edit the files by hand.
---
 qt-ui/divecomputermanagementdialog.ui |  3 +++
 qt-ui/preferences.ui                  |  3 +++
 qt-ui/renumber.ui                     | 31 ++++++++++++++++++++++++++-----
 qt-ui/shiftimagetimes.ui              |  3 +++
 qt-ui/shifttimes.ui                   | 25 +++++++++++++++++++++++--
 5 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/qt-ui/divecomputermanagementdialog.ui b/qt-ui/divecomputermanagementdialog.ui
index 59be881..9af67bf 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/preferences.ui b/qt-ui/preferences.ui
index 988c548..c81e1bd 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>PreferencesDialog</class>
  <widget class="QDialog" name="PreferencesDialog">
+  <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 fef9ec0..00e7b84 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 0e91ad6..ee05c63 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 33977db..55932a2 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>
-- 
1.7.11.msysgit.0