From 08d1246c9579beeeca25ed7b0ccecfec0b42480f Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 25 May 2015 23:22:53 +0200
Subject: [PATCH] GUI: fix tool content's bottom to align with tool selector

Fixes #1194.
---
 ChangeLog                                     |  3 ++
 .../forms/chapter_editor/tool.ui              | 35 ++++++++++-----
 .../forms/header_editor/tool.ui               | 35 ++++++++++-----
 src/mkvtoolnix-gui/forms/jobs/tool.ui         |  3 ++
 src/mkvtoolnix-gui/forms/merge/tool.ui        | 45 +++++++++++++++----
 src/mkvtoolnix-gui/forms/watch_jobs/tool.ui   |  3 ++
 6 files changed, 95 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 391976cac..e235bfce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-05-25  Moritz Bunkus  <moritz@bunkus.org>
 
+        * MKVToolNix GUI: bug fix: fix alignment of the tool contents with
+        the tool selector at the bottom. Fixes #1194.
+
         * MKVToolNix GUI: new feature: added a »help« menu with links to
         several parts of the MKVToolNix documentation. Implements #1195.
 
diff --git a/src/mkvtoolnix-gui/forms/chapter_editor/tool.ui b/src/mkvtoolnix-gui/forms/chapter_editor/tool.ui
index 8631eef3e..7bf7d52ac 100644
--- a/src/mkvtoolnix-gui/forms/chapter_editor/tool.ui
+++ b/src/mkvtoolnix-gui/forms/chapter_editor/tool.ui
@@ -17,25 +17,28 @@
    <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
-   <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="QStackedWidget" name="stack">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="noFilesPage">
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <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="QWidget" name="noFileOpened" native="true">
          <layout class="QVBoxLayout" name="verticalLayout">
@@ -230,6 +233,18 @@
      </widget>
      <widget class="QWidget" name="editorsPage">
       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <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="QTabWidget" name="editors">
          <property name="currentIndex">
diff --git a/src/mkvtoolnix-gui/forms/header_editor/tool.ui b/src/mkvtoolnix-gui/forms/header_editor/tool.ui
index 35e9604c6..39172ff7d 100644
--- a/src/mkvtoolnix-gui/forms/header_editor/tool.ui
+++ b/src/mkvtoolnix-gui/forms/header_editor/tool.ui
@@ -17,25 +17,28 @@
    <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
-   <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="QStackedWidget" name="stack">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="noFilesPage">
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <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="QWidget" name="noFileOpened" native="true">
          <layout class="QVBoxLayout" name="verticalLayout">
@@ -203,6 +206,18 @@
      </widget>
      <widget class="QWidget" name="editorsPage">
       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <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="QTabWidget" name="editors">
          <property name="currentIndex">
diff --git a/src/mkvtoolnix-gui/forms/jobs/tool.ui b/src/mkvtoolnix-gui/forms/jobs/tool.ui
index 06e47646f..c570df0b6 100644
--- a/src/mkvtoolnix-gui/forms/jobs/tool.ui
+++ b/src/mkvtoolnix-gui/forms/jobs/tool.ui
@@ -14,6 +14,9 @@
    <string notr="true">mtx::gui::Jobs::Tool</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QLabel" name="jobQueueLabel">
      <property name="text">
diff --git a/src/mkvtoolnix-gui/forms/merge/tool.ui b/src/mkvtoolnix-gui/forms/merge/tool.ui
index ea9b7c9b0..bbe4fa851 100644
--- a/src/mkvtoolnix-gui/forms/merge/tool.ui
+++ b/src/mkvtoolnix-gui/forms/merge/tool.ui
@@ -17,15 +17,6 @@
    <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
-   <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>
@@ -36,9 +27,33 @@
      </property>
      <widget class="QWidget" name="noMergesPage">
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <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="QWidget" name="noFileOpened" native="true">
          <layout class="QVBoxLayout" name="verticalLayout">
+          <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>
            <spacer name="verticalSpacer">
             <property name="orientation">
@@ -230,6 +245,18 @@
      </widget>
      <widget class="QWidget" name="mergesPage">
       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <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="QTabWidget" name="merges">
          <property name="currentIndex">
diff --git a/src/mkvtoolnix-gui/forms/watch_jobs/tool.ui b/src/mkvtoolnix-gui/forms/watch_jobs/tool.ui
index a35122ef1..89cf397ed 100644
--- a/src/mkvtoolnix-gui/forms/watch_jobs/tool.ui
+++ b/src/mkvtoolnix-gui/forms/watch_jobs/tool.ui
@@ -14,6 +14,9 @@
    <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QTabWidget" name="widgets">
      <property name="currentIndex">