Skip to content
Snippets Groups Projects
Commit b294fe43 authored by Hugo Hörnquist's avatar Hugo Hörnquist
Browse files

Merge branch 'kassa-splitter'

Only affects kassa/widget.ui.
Places the two halves in a draggable splitter. That was WAY harder than
it should have been.
parents 58fcd857 db38777d
Branches
Tags
No related merge requests found
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>923</width> <width>704</width>
<height>733</height> <height>590</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -30,12 +30,17 @@ ...@@ -30,12 +30,17 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QSplitter" name="mainSplitter">
<item> <property name="orientation">
<layout class="QVBoxLayout" name="verticalLayout_7"> <enum>Qt::Horizontal</enum>
<property name="leftMargin"> </property>
<number>10</number> <property name="childrenCollapsible">
<bool>false</bool>
</property> </property>
<widget class="QWidget" name="layoutWidget">
<layout class="QHBoxLayout" name="LeftHalf">
<item>
<layout class="QVBoxLayout" name="buyLayout">
<item> <item>
<widget class="QTreeView" name="productList"> <widget class="QTreeView" name="productList">
<property name="autoScroll"> <property name="autoScroll">
...@@ -123,7 +128,7 @@ ...@@ -123,7 +128,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="buttonLayout">
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
...@@ -199,24 +204,40 @@ ...@@ -199,24 +204,40 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</widget>
<widget class="QWidget" name="RightHalfLayout" native="true">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QTabWidget" name="RightHalf"> <widget class="QTabWidget" name="RightHalf">
<property name="tabPosition"> <property name="tabPosition">
<enum>QTabWidget::East</enum> <enum>QTabWidget::East</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="logTab"> <widget class="QWidget" name="logTab">
<attribute name="title"> <attribute name="title">
<string>Logg</string> <string>Logg</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="topMargin">
<number>9</number>
</property>
<item> <item>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="logSplitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
...@@ -367,6 +388,8 @@ ...@@ -367,6 +388,8 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</widget>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment