Skip to content

Commit

Permalink
GUI: fix tool content's bottom to align with tool selector
Browse files Browse the repository at this point in the history 
Fixes #1194.
  • Loading branch information
@mbunkus
mbunkus committed May 25, 2015
1 parent 9126d36 commit 08d1246
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 29 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
35 changes: 25 additions & 10 deletions src/mkvtoolnix-gui/forms/chapter_editor/tool.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
35 changes: 25 additions & 10 deletions src/mkvtoolnix-gui/forms/header_editor/tool.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
3 changes: 3 additions & 0 deletions src/mkvtoolnix-gui/forms/jobs/tool.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
45 changes: 36 additions & 9 deletions src/mkvtoolnix-gui/forms/merge/tool.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
3 changes: 3 additions & 0 deletions src/mkvtoolnix-gui/forms/watch_jobs/tool.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down

0 comments on commit 08d1246

Please sign in to comment.