From fc2ed29d2505ed8f3a5e8ba32b0427a42b17f9d6 Mon Sep 17 00:00:00 2001
From: Zdenek Jonak <zdenek.jonak@gmail.com>
Date: Mon, 24 Apr 2017 19:50:04 +0200
Subject: [PATCH] Changed layout to three columns. Closes #297

---
 shop/shopform.cpp |  4 ++++
 shop/shopform.ui  | 34 ++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/shop/shopform.cpp b/shop/shopform.cpp
index afe8098..f5442be 100644
--- a/shop/shopform.cpp
+++ b/shop/shopform.cpp
@@ -46,6 +46,10 @@ void ShopForm::loadLast()
         m_itemsModel->setTranslations(Context::instance().plugin("SHOP")->translations());
         ui->actualReceipt->setModel(m_itemsModel);
         ui->actualReceipt->setColumnHidden(0, true);
+        ui->actualReceipt->setColumnHidden(3, true);
+        ui->actualReceipt->setColumnHidden(4, true);
+        ui->actualReceipt->setColumnHidden(5, true);
+        ui->actualReceipt->setColumnHidden(6, true);
         ui->actualReceipt->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
     }
 
diff --git a/shop/shopform.ui b/shop/shopform.ui
index 380e31b..9c02e50 100644
--- a/shop/shopform.ui
+++ b/shop/shopform.ui
@@ -153,25 +153,31 @@
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QWidget" name="widget_2" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_6">
+         <item>
+          <widget class="QLabel" name="receipt">
+           <property name="text">
+            <string>Receipt</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="receiptCombo"/>
+         </item>
+         <item>
+          <widget class="QTableView" name="actualReceipt"/>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QWidget" name="widgetReceipt" native="true">
      <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QLabel" name="receipt">
-        <property name="text">
-         <string>Receipt</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="receiptCombo"/>
-      </item>
-      <item>
-       <widget class="QTableView" name="actualReceipt"/>
-      </item>
       <item>
        <widget class="QWidget" name="widget_7" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -376,8 +382,8 @@
   </layout>
  </widget>
  <resources>
-  <include location="../core/rc.qrc"/>
   <include location="shoprc.qrc"/>
+  <include location="../core/rc.qrc"/>
  </resources>
  <connections/>
 </ui>