Merge pull request #1 from sagidayan/master

Some Eye Candy for you...

main/mainscreen.cpp

@@ -219,9 +219,20 @@ void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
 }
 void MainScreen::on_actionCredits_triggered()
 {
-    QMessageBox credits;
+    QMessageBox::about(this, "About", " A tiny application to calculate your grades average. <br><br>"
-    credits.setText(" A tiny application to calculate your grades average. \n Made by Liran Ben Gida \n Thanks to: Sagi Dayan, Nadav Luzzato");
+                       "This software is licensed under the <br>GNU LESSER GENERAL PUBLIC LICENSE V2<br>"
-    credits.exec();
+                       "The source code is available at github:<br>"
+                       "<a href='https://github.com/liranbg/jceAverageCalculator'>jceAverageCalculator Repository</a>"
+                       "<br><br>This front end is Powered by <a href='https://github.com/liranbg/jceConnection'>Jce Connection</a><br><br>"
+                       "Made by:"
+                       "<ul>"
+                       "<li><a href='mailto:liranbg@gmail.com'>Liran Ben Gida</a></li>"
+                       "</ul>"
+                       "Thanks to: "
+                       "<ul>"
+                       "<li><a href='mailto:sagidayan@gmail.com'>Sagi Dayan</a></li>"
+                       "<li><a href='mailto:nadav2051@gmail.com'>Nadav Luzzato</a></li>"
+                       "</ul>");
 }
 
 void MainScreen::on_clearTableButton_clicked()

main/mainscreen.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>737</width>
+    <width>676</width>
-    <height>500</height>
+    <height>717</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -94,24 +94,15 @@ border: none;
        <attribute name="title">
         <string>Login</string>
        </attribute>
-       <layout class="QFormLayout" name="formLayout">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
-        <property name="leftMargin">
-         <number>200</number>
-        </property>
-        <property name="topMargin">
-         <number>80</number>
-        </property>
-        <property name="rightMargin">
-         <number>200</number>
-        </property>
-        <property name="bottomMargin">
-         <number>80</number>
-        </property>
-        <item row="0" column="0" colspan="2">
        <widget class="QFrame" name="LoginFrame">
+        <property name="geometry">
+         <rect>
+          <x>200</x>
+          <y>230</y>
+          <width>301</width>
+          <height>146</height>
+         </rect>
+        </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -181,11 +172,8 @@ font-size: 15px;
             <number>0</number>
            </property>
            <item>
-              <layout class="QHBoxLayout" name="usrnmHorizontalLayout" stretch="0,0">
+            <layout class="QGridLayout" name="gridLayout_5">
-               <property name="spacing">
+             <item row="0" column="0">
-                <number>10</number>
-               </property>
-               <item>
               <widget class="QLabel" name="usrnmLabel">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -194,11 +182,17 @@ font-size: 15px;
                 </sizepolicy>
                </property>
                <property name="text">
-                  <string>Username</string>
+                <string>&lt;color=#000000&gt;Username</string>
+               </property>
+               <property name="textFormat">
+                <enum>Qt::RichText</enum>
+               </property>
+               <property name="buddy">
+                <cstring></cstring>
                </property>
               </widget>
              </item>
-               <item>
+             <item row="0" column="1">
               <widget class="QLineEdit" name="usrnmLineEdit">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -238,6 +232,9 @@ font-size: 15px;
                <property name="text">
                 <string>Password</string>
                </property>
+               <property name="textFormat">
+                <enum>Qt::RichText</enum>
+               </property>
               </widget>
              </item>
              <item>
@@ -301,8 +298,24 @@ font-size: 15px;
          </item>
         </layout>
        </widget>
-        </item>
+       <widget class="QLabel" name="label_2">
-       </layout>
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>650</width>
+          <height>600</height>
+         </rect>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="pixmap">
+         <pixmap resource="../resources/connectionstatus.qrc">:/icons/AVG_LOGO.png</pixmap>
+        </property>
+       </widget>
+       <zorder>label_2</zorder>
+       <zorder>LoginFrame</zorder>
       </widget>
       <widget class="QWidget" name="CoursesTab">
        <property name="enabled">
@@ -314,15 +327,8 @@ font-size: 15px;
        <attribute name="title">
         <string>Courses</string>
        </attribute>
-       <widget class="QWidget" name="layoutWidget">
+       <layout class="QGridLayout" name="gridLayout_4">
-        <property name="geometry">
+        <item row="0" column="0">
-         <rect>
-          <x>2</x>
-          <y>5</y>
-          <width>711</width>
-          <height>371</height>
-         </rect>
-        </property>
          <layout class="QGridLayout" name="courseGrid">
           <property name="leftMargin">
            <number>0</number>
@@ -399,7 +405,8 @@ font-size: 15px;
            </layout>
           </item>
          </layout>
-       </widget>
+        </item>
+       </layout>
       </widget>
       <widget class="QWidget" name="SettingsTab">
        <property name="enabled">
@@ -645,7 +652,7 @@ font-size: 15px;
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>737</width>
+     <width>676</width>
      <height>29</height>
     </rect>
    </property>

resources/connectionstatus.qrc

@@ -4,5 +4,8 @@
         <file>greenStatusIcon.png</file>
         <file>redStatusIcon.png</file>
         <file>icon.png</file>
+        <file>AVG_LOGO.png</file>
+
     </qresource>
+
 </RCC>