Corrected login & registartion UI for Target device (bigger things).

diff --git a/Client/carmainwindow.ui b/Client/carmainwindow.ui
index e295657..36f82be 100644 (file)
--- a/Client/carmainwindow.ui
+++ b/Client/carmainwindow.ui
@@ -18,13 +18,13 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>0</y>
+      <y>10</y>
       <width>781</width>
       <height>361</height>
      </rect>
     </property>
     <property name="currentIndex">
-     <number>3</number>
+     <number>2</number>
     </property>
     <widget class="QWidget" name="StartTab">
      <attribute name="title">
@@ -125,7 +125,7 @@
       </layout>
      </widget>
     </widget>
-    <widget class="QWidget" name="tabTop">
+    <widget class="QWidget" name="tab">
      <attribute name="title">
       <string>Top</string>
      </attribute>
@@ -227,9 +227,9 @@
       <property name="geometry">
        <rect>
         <x>20</x>
-        <y>30</y>
-        <width>141</width>
-        <height>17</height>
+        <y>40</y>
+        <width>561</width>
+        <height>31</height>
        </rect>
       </property>
       <property name="text">
@@ -240,163 +240,14 @@
       <property name="geometry">
        <rect>
         <x>20</x>
-        <y>60</y>
-        <width>93</width>
-        <height>27</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Set User</string>
-      </property>
-     </widget>
-    </widget>
-    <widget class="QWidget" name="tabMeasureResult">
-     <attribute name="title">
-      <string>Measure</string>
-     </attribute>
-     <widget class="QPushButton" name="pushButtonMeasureTabAbort">
-      <property name="geometry">
-       <rect>
-        <x>40</x>
-        <y>240</y>
-        <width>161</width>
-        <height>51</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Abort</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="labelMeasureTabHeader">
-      <property name="geometry">
-       <rect>
-        <x>40</x>
-        <y>10</y>
-        <width>261</width>
+        <y>110</y>
+        <width>191</width>
         <height>41</height>
        </rect>
       </property>
-      <property name="font">
-       <font>
-        <family>Bitstream Charter</family>
-        <weight>75</weight>
-        <bold>true</bold>
-       </font>
-      </property>
-      <property name="text">
-       <string>Accelerate to 40 km/h</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="labelMeasureTabResultHeader">
-      <property name="geometry">
-       <rect>
-        <x>370</x>
-        <y>10</y>
-        <width>101</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <property name="font">
-       <font>
-        <family>Bitstream Charter</family>
-        <weight>75</weight>
-        <bold>true</bold>
-       </font>
-      </property>
-      <property name="text">
-       <string>Results:</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pushButtonSendResult">
-      <property name="geometry">
-       <rect>
-        <x>370</x>
-        <y>240</y>
-        <width>161</width>
-        <height>51</height>
-       </rect>
-      </property>
       <property name="text">
-       <string>Send result</string>
-      </property>
-     </widget>
-     <widget class="QWidget" name="">
-      <property name="geometry">
-       <rect>
-        <x>40</x>
-        <y>60</y>
-        <width>171</width>
-        <height>61</height>
-       </rect>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayoutMeasureTabTime">
-       <item>
-        <widget class="QLabel" name="labelMeasureTabTimeHeader">
-         <property name="text">
-          <string>Time:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelMeasureTabTime">
-         <property name="text">
-          <string>0</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="">
-      <property name="geometry">
-       <rect>
-        <x>40</x>
-        <y>160</y>
-        <width>171</width>
-        <height>61</height>
-       </rect>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayoutMeasureTabSpeed">
-       <item>
-        <widget class="QLabel" name="labelMeasureTabSpeedHeader">
-         <property name="text">
-          <string>Speed:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelMeasureTabSpeed">
-         <property name="text">
-          <string>0</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="">
-      <property name="geometry">
-       <rect>
-        <x>370</x>
-        <y>60</y>
-        <width>151</width>
-        <height>61</height>
-       </rect>
+       <string>Set User</string>
       </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QLabel" name="labelMeasureTabResultHeader_2">
-         <property name="text">
-          <string>Time:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelMeasureTabResult">
-         <property name="text">
-          <string>0</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
      </widget>
     </widget>
    </widget>
@@ -443,10 +294,10 @@
    <widget class="QPushButton" name="registratePushButton">
     <property name="geometry">
      <rect>
-      <x>690</x>
+      <x>632</x>
       <y>0</y>
-      <width>93</width>
-      <height>27</height>
+      <width>151</width>
+      <height>41</height>
      </rect>
     </property>
     <property name="text">

diff --git a/Client/loginwindow.cpp b/Client/loginwindow.cpp
index a74c8dc..faa535d 100644 (file)
--- a/Client/loginwindow.cpp
+++ b/Client/loginwindow.cpp
@@ -16,7 +16,7 @@ LoginWindow::LoginWindow(QWidget *parent) :
     ui(new Ui::LoginWindow)
 {
     ui->setupUi(this);
-    this->setWindowTitle("Login to Speed Freak server");
+    this->setWindowTitle("Setting username");
 }
 
 LoginWindow::~LoginWindow()

diff --git a/Client/loginwindow.ui b/Client/loginwindow.ui
index c387c6f..4857728 100644 (file)
--- a/Client/loginwindow.ui
+++ b/Client/loginwindow.ui
@@ -16,75 +16,86 @@
   <widget class="QPushButton" name="loginPushButton">
    <property name="geometry">
     <rect>
-     <x>60</x>
-     <y>130</y>
-     <width>75</width>
-     <height>23</height>
+     <x>170</x>
+     <y>230</y>
+     <width>91</width>
+     <height>41</height>
     </rect>
    </property>
    <property name="text">
-    <string>Login</string>
+    <string>Set</string>
    </property>
   </widget>
   <widget class="QPushButton" name="cancelPushButton">
    <property name="geometry">
     <rect>
-     <x>150</x>
-     <y>130</y>
-     <width>75</width>
-     <height>23</height>
+     <x>330</x>
+     <y>230</y>
+     <width>91</width>
+     <height>41</height>
     </rect>
    </property>
    <property name="text">
     <string>Cancel</string>
    </property>
   </widget>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QLineEdit" name="userNameLineEdit">
    <property name="geometry">
     <rect>
-     <x>51</x>
-     <y>62</y>
-     <width>193</width>
-     <height>48</height>
+     <x>220</x>
+     <y>60</y>
+     <width>311</width>
+     <height>51</height>
     </rect>
    </property>
-   <layout class="QFormLayout" name="formLayout">
-    <item row="0" column="0">
-     <widget class="QLabel" name="userNameLabel">
-      <property name="text">
-       <string>Username:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLineEdit" name="userNameLineEdit">
-      <property name="maxLength">
-       <number>12</number>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="passwordLabel">
-      <property name="text">
-       <string>Password:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="passwordLineEdit">
-      <property name="maxLength">
-       <number>255</number>
-      </property>
-      <property name="echoMode">
-       <enum>QLineEdit::Password</enum>
-      </property>
-     </widget>
-    </item>
-   </layout>
+   <property name="maxLength">
+    <number>12</number>
+   </property>
+  </widget>
+  <widget class="QLabel" name="passwordLabel">
+   <property name="geometry">
+    <rect>
+     <x>70</x>
+     <y>140</y>
+     <width>141</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Password:</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="userNameLabel">
+   <property name="geometry">
+    <rect>
+     <x>70</x>
+     <y>70</y>
+     <width>141</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Username:</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="passwordLineEdit">
+   <property name="geometry">
+    <rect>
+     <x>220</x>
+     <y>130</y>
+     <width>311</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="maxLength">
+    <number>255</number>
+   </property>
+   <property name="echoMode">
+    <enum>QLineEdit::Password</enum>
+   </property>
   </widget>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>
-

diff --git a/Client/registration.ui b/Client/registration.ui
index 176d1f6..b96e824 100644 (file)
--- a/Client/registration.ui
+++ b/Client/registration.ui
@@ -13,114 +13,112 @@
   <property name="windowTitle">
    <string>Registration</string>
   </property>
-  <widget class="QLabel" name="infoLabel">
+  <widget class="QPushButton" name="registratePushButton">
    <property name="geometry">
     <rect>
-     <x>40</x>
-     <y>20</y>
-     <width>381</width>
-     <height>16</height>
+     <x>120</x>
+     <y>270</y>
+     <width>121</width>
+     <height>41</height>
     </rect>
    </property>
    <property name="text">
-    <string>Give your new username (max. 12 characters) and password  for registration.</string>
+    <string>Registrate</string>
    </property>
   </widget>
-  <widget class="QLabel" name="infoLabel_2">
+  <widget class="QPushButton" name="cancelPushButton">
    <property name="geometry">
     <rect>
-     <x>40</x>
-     <y>40</y>
-     <width>181</width>
-     <height>16</height>
+     <x>300</x>
+     <y>270</y>
+     <width>121</width>
+     <height>41</height>
     </rect>
    </property>
    <property name="text">
-    <string>Give also your valid email address.</string>
+    <string>Cancel</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="registratePushButton">
+  <widget class="QLineEdit" name="eMailLineEdit">
    <property name="geometry">
     <rect>
-     <x>60</x>
+     <x>270</x>
      <y>180</y>
-     <width>75</width>
-     <height>23</height>
+     <width>301</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="maxLength">
+    <number>255</number>
+   </property>
+  </widget>
+  <widget class="QLabel" name="eMailLabel">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>190</y>
+     <width>201</width>
+     <height>31</height>
     </rect>
    </property>
    <property name="text">
-    <string>Registrate</string>
+    <string>Your Email:</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="cancelPushButton">
+  <widget class="QLabel" name="newUserNameLabel">
    <property name="geometry">
     <rect>
-     <x>160</x>
-     <y>180</y>
-     <width>75</width>
-     <height>23</height>
+     <x>40</x>
+     <y>70</y>
+     <width>221</width>
+     <height>31</height>
     </rect>
    </property>
    <property name="text">
-    <string>Cancel</string>
+    <string>Your new username:</string>
+   </property>
+  </widget>
+  <widget class="QLineEdit" name="newPasswordLineEdit">
+   <property name="geometry">
+    <rect>
+     <x>270</x>
+     <y>120</y>
+     <width>301</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="maxLength">
+    <number>255</number>
+   </property>
+   <property name="echoMode">
+    <enum>QLineEdit::Password</enum>
    </property>
   </widget>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QLineEdit" name="newUsernameLineEdit">
+   <property name="geometry">
+    <rect>
+     <x>270</x>
+     <y>60</y>
+     <width>301</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="maxLength">
+    <number>12</number>
+   </property>
+  </widget>
+  <widget class="QLabel" name="newPasswordLabel">
    <property name="geometry">
     <rect>
      <x>40</x>
-     <y>80</y>
-     <width>239</width>
-     <height>95</height>
+     <y>130</y>
+     <width>221</width>
+     <height>31</height>
     </rect>
    </property>
-   <layout class="QFormLayout" name="formLayout">
-    <item row="0" column="0">
-     <widget class="QLabel" name="newUserNameLabel">
-      <property name="text">
-       <string>Your new username:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLineEdit" name="newUsernameLineEdit">
-      <property name="maxLength">
-       <number>12</number>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="newPasswordLabel">
-      <property name="text">
-       <string>Your new password:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="newPasswordLineEdit">
-      <property name="maxLength">
-       <number>255</number>
-      </property>
-      <property name="echoMode">
-       <enum>QLineEdit::Password</enum>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="eMailLabel">
-      <property name="text">
-       <string>Your Email:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="eMailLineEdit">
-      <property name="maxLength">
-       <number>255</number>
-      </property>
-     </widget>
-    </item>
-   </layout>
+   <property name="text">
+    <string>Your new password:</string>
+   </property>
   </widget>
  </widget>
  <layoutdefault spacing="6" margin="11"/>