Merge branch 'devs' of https://github.com/UnavailableDev/avans-whether-station-Qt into dev-merge-temp

1 files changed, 13 insertions, 50 deletions

diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index f827c85..a31ffdc 100644
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -14,36 +14,18 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QPushButton" name="pushButton">
-    <property name="enabled">
-     <bool>true</bool>
-    </property>
+   <widget class="QLabel" name="label">
     <property name="geometry">
      <rect>
-      <x>310</x>
-      <y>0</y>
-      <width>121</width>
-      <height>41</height>
+      <x>270</x>
+      <y>190</y>
+      <width>181</width>
+      <height>51</height>
      </rect>
     </property>
     <property name="text">
-     <string>DoesSomething</string>
-    </property>
-   </widget>
-   <widget class="QWidget" name="verticalLayoutWidget">
-    <property name="geometry">
-     <rect>
-      <x>-10</x>
-      <y>40</y>
-      <width>801</width>
-      <height>401</height>
-     </rect>
+     <string>Please load data first</string>
     </property>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QTableView" name="tableView"/>
-     </item>
-    </layout>
    </widget>
   </widget>
   <widget class="QMenuBar" name="menubar">
@@ -52,45 +34,33 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>21</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuAbouy">
     <property name="title">
      <string>Home</string>
     </property>
-    <addaction name="actionAbout"/>
     <addaction name="actionRefresh"/>
    </widget>
-   <widget class="QMenu" name="menuTEMP">
-    <property name="title">
-     <string>TEMP</string>
-    </property>
-    <addaction name="actionLOAD"/>
-    <addaction name="actionQuerry"/>
-   </widget>
    <widget class="QMenu" name="menuDatabase">
     <property name="title">
      <string>Database</string>
     </property>
     <addaction name="actionConnection"/>
     <addaction name="actionDisconnenct"/>
-    <addaction name="actionStatus"/>
    </widget>
    <addaction name="menuAbouy"/>
-   <addaction name="menuTEMP"/>
    <addaction name="menuDatabase"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionAbout">
-   <property name="text">
-    <string>About</string>
-   </property>
-  </action>
   <action name="actionRefresh">
    <property name="text">
     <string>Refresh</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+R</string>
+   </property>
   </action>
   <action name="actionLOAD">
    <property name="text">
@@ -106,22 +76,15 @@
    <property name="text">
     <string>Connect</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
   </action>
   <action name="actionDisconnenct">
    <property name="text">
     <string>Disconnenct</string>
    </property>
   </action>
-  <action name="actionQuerry_2">
-   <property name="text">
-    <string>Querry</string>
-   </property>
-  </action>
-  <action name="actionStatus">
-   <property name="text">
-    <string>Status</string>
-   </property>
-  </action>
  </widget>
  <resources/>
  <connections/>