Merge branch 'development/ui'

diff --git a/Client/Graphics/info.png b/Client/Graphics/info.png
new file mode 100755 (executable)
index 0000000..8664c95
Binary files /dev/null and b/Client/Graphics/info.png differ

diff --git a/Client/Graphics/route_play.png b/Client/Graphics/route_play.png
index 2689e38..9046471 100755 (executable)
Binary files a/Client/Graphics/route_play.png and b/Client/Graphics/route_play.png differ

diff --git a/Client/Graphics/route_stop.png b/Client/Graphics/route_stop.png
index d017a95..ab1b03e 100755 (executable)
Binary files a/Client/Graphics/route_stop.png and b/Client/Graphics/route_stop.png differ

diff --git a/Client/creditsdialog.ui b/Client/creditsdialog.ui
index eaf031b..05fc8ce 100644 (file)
--- a/Client/creditsdialog.ui
+++ b/Client/creditsdialog.ui
@@ -66,7 +66,7 @@
     <set>Qt::AlignCenter</set>
    </property>
   </widget>
-  <widget class="QWidget" name="">
+  <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>20</x>
@@ -198,13 +198,13 @@
     </item>
    </layout>
   </widget>
-  <widget class="QWidget" name="">
+  <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>20</x>
      <y>300</y>
      <width>751</width>
-     <height>41</height>
+     <height>42</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout_2">
@@ -223,7 +223,7 @@
       </property>
      </widget>
     </item>
-    <item row="0" column="1">
+    <item row="0" column="2">
      <widget class="QLabel" name="label_16">
       <property name="font">
        <font>
@@ -238,7 +238,7 @@
       </property>
      </widget>
     </item>
-    <item row="0" column="2">
+    <item row="0" column="3">
      <widget class="QLabel" name="label_15">
       <property name="font">
        <font>
@@ -253,6 +253,96 @@
       </property>
      </widget>
     </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="label_18">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Gentleface.com</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2">
+     <widget class="QLabel" name="label_19">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Harwen</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="3">
+     <widget class="QLabel" name="label_20">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>silvestre herrera</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QLabel" name="label_21">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>DevCom</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QLabel" name="label_22">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Icons-Land</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="4">
+     <widget class="QLabel" name="label_23">
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Ken Saunders</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>

diff --git a/Client/graphics.qrc b/Client/graphics.qrc
index 69f30cb..5c0e44e 100644 (file)
--- a/Client/graphics.qrc
+++ b/Client/graphics.qrc
@@ -10,5 +10,6 @@
         <file>Graphics/applications_internet.png</file>
         <file>Graphics/Speedometer.png</file>
         <file>Graphics/Speedometer2.png</file>
+        <file>Graphics/info.png</file>
     </qresource>
 </RCC>

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index 324f3f6..3f33cb9 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -53,6 +53,8 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->pushButtonSettings->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
     ui->pushButtonWWW->setAutoFillBackground(true);
     ui->pushButtonWWW->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+    ui->pushButtonCredits->setAutoFillBackground(true);
+    ui->pushButtonCredits->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
 }
 
 MainWindow::~MainWindow()

diff --git a/Client/mainwindow.ui b/Client/mainwindow.ui
index 5ad3ad8..a9cc987 100644 (file)
--- a/Client/mainwindow.ui
+++ b/Client/mainwindow.ui
@@ -139,14 +139,24 @@
    <widget class="QPushButton" name="pushButtonCredits">
     <property name="geometry">
      <rect>
-      <x>640</x>
+      <x>670</x>
       <y>10</y>
-      <width>151</width>
-      <height>41</height>
+      <width>105</width>
+      <height>105</height>
      </rect>
     </property>
     <property name="text">
-     <string>Credits</string>
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset resource="graphics.qrc">
+      <normaloff>:/new/prefix1/Graphics/info.png</normaloff>:/new/prefix1/Graphics/info.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>100</width>
+      <height>100</height>
+     </size>
     </property>
    </widget>
   </widget>