database changes, lots of core work

1 files changed, 96 insertions, 50 deletions

diff --git a/productinventory.ui b/productinventory.ui
index 2837b39..fe3ecb7 100644
--- a/productinventory.ui
+++ b/productinventory.ui
@@ -68,13 +68,6 @@
         </item>
         <item row="2" column="0">
          <layout class="QFormLayout" name="formLayout">
-          <item row="1" column="0">
-           <widget class="QLineEdit" name="usernameInput">
-            <property name="text">
-             <string>inventory</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="usernameLabel">
             <property name="text">
@@ -89,6 +82,13 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QLineEdit" name="usernameInput">
+            <property name="text">
+             <string>inventory</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="1">
            <widget class="QLineEdit" name="passwordInput">
             <property name="font">
@@ -104,10 +104,10 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QPushButton" name="connectButton">
+          <item row="2" column="0">
+           <widget class="QLabel" name="databaseLabel">
             <property name="text">
-             <string>Connect</string>
+             <string>Database</string>
             </property>
            </widget>
           </item>
@@ -118,10 +118,24 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="databaseLabel">
+          <item row="6" column="0">
+           <widget class="QPushButton" name="connectButton">
             <property name="text">
-             <string>Database</string>
+             <string>Connect</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="imagesDirLabel">
+            <property name="text">
+             <string>Images directory</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="imagesDirInput">
+            <property name="text">
+             <string>https://192.168.1.17/inventory/images/</string>
             </property>
            </widget>
           </item>
@@ -136,20 +150,6 @@
        <layout class="QFormLayout" name="formLayout_6">
         <item row="0" column="0">
          <layout class="QGridLayout" name="gridLayout_4">
-          <item row="1" column="0">
-           <widget class="QLabel" name="filterBrandsLabel">
-            <property name="text">
-             <string>Filter brands</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="IncludesTextBrandsLabel">
-            <property name="text">
-             <string>Includes text:</string>
-            </property>
-           </widget>
-          </item>
           <item row="3" column="1">
            <spacer name="verticalSpacer">
             <property name="orientation">
@@ -163,6 +163,13 @@
             </property>
            </spacer>
           </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="filterBrandsLabel">
+            <property name="text">
+             <string>Filter brands</string>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="1">
            <widget class="QLineEdit" name="includesTextBrandsInput">
             <property name="minimumSize">
@@ -173,6 +180,38 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="IncludesTextBrandsLabel">
+            <property name="text">
+             <string>Includes text:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="1" column="0">
+         <widget class="QPushButton" name="pushButton">
+          <property name="text">
+           <string>Filter</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <layout class="QFormLayout" name="formLayout_5">
+          <item row="0" column="0">
+           <widget class="QLabel" name="statsLabel">
+            <property name="text">
+             <string>Stats:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="statsHereLabel">
+            <property name="text">
+             <string>STATS_PLACEHOLDER</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item row="0" column="1">
@@ -207,14 +246,14 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item row="3" column="0">
            <widget class="QLabel" name="includesTextProductsLabel">
             <property name="text">
              <string>Includes text:</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="3" column="1">
            <widget class="QLineEdit" name="includesTextProductsInput">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -230,7 +269,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
+          <item row="5" column="0">
            <widget class="QCheckBox" name="mustHaveImagesCheckBox">
             <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
@@ -243,35 +282,42 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
+          <item row="6" column="0">
            <widget class="QCheckBox" name="mustNotHaveImagesCheckBox">
             <property name="text">
              <string>Must not have images</string>
             </property>
            </widget>
           </item>
-         </layout>
-        </item>
-        <item row="1" column="0">
-         <widget class="QPushButton" name="pushButton">
-          <property name="text">
-           <string>Filter</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <layout class="QFormLayout" name="formLayout_5">
-          <item row="0" column="0">
-           <widget class="QLabel" name="statsLabel">
+          <item row="4" column="0" colspan="2">
+           <widget class="QScrollArea" name="filterCategoryScrollArea">
+            <property name="widgetResizable">
+             <bool>true</bool>
+            </property>
+            <widget class="QWidget" name="scrollAreaWidgetContents_2">
+             <property name="geometry">
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>318</width>
+               <height>68</height>
+              </rect>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_3"/>
+            </widget>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QCheckBox" name="newestFirstCheckBox">
             <property name="text">
-             <string>Stats:</string>
+             <string>Newest first</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="statsHereLabel">
+          <item row="6" column="1">
+           <widget class="QCheckBox" name="oldestFirstCheckBox">
             <property name="text">
-             <string>STATS_PLACEHOLDER</string>
+             <string>Oldest first</string>
             </property>
            </widget>
           </item>
@@ -291,8 +337,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>563</width>
-         <height>165</height>
+         <width>549</width>
+         <height>118</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout">