From e95216fbc47bfee926b518b468dccfe600351663 Mon Sep 17 00:00:00 2001
From: daniel-Jones <daniel@danieljon.es>
Date: Mon, 22 Aug 2016 12:43:10 +0930
Subject: Added new weapon images and other icons. Game integrations now works
 well - gives basic game info such as the weapons in use, ammo, score etc.
 Many other fixes and changes. There exists code for graph integration, but I
 never finished them and thus they are hidden by default.

---
 game_integration_window.ui | 118 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 104 insertions(+), 14 deletions(-)

(limited to 'game_integration_window.ui')

diff --git a/game_integration_window.ui b/game_integration_window.ui
index 07776a5..0212757 100644
--- a/game_integration_window.ui
+++ b/game_integration_window.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>426</width>
+    <height>457</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,44 +19,37 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QFormLayout" name="player_layout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="map_picture_label">
-       <property name="text">
-        <string>map_picture</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="1">
       <layout class="QFormLayout" name="player_info_layout">
-       <item row="0" column="0">
+       <item row="1" column="0">
         <widget class="QLabel" name="player_name_label">
          <property name="text">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;player_name&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="player_team_label">
          <property name="text">
           <string>player_team</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="player_score_label">
          <property name="text">
           <string>player_score</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="kills_label">
          <property name="text">
           <string>kills_count</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="deaths_label">
          <property name="text">
           <string>deaths_count</string>
@@ -65,6 +58,103 @@
        </item>
       </layout>
      </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="map_picture_label">
+       <property name="text">
+        <string>map_picture</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="weapons_label">
+     <property name="text">
+      <string>Weapons</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="weapons_layout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="weapon_1_label">
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::AutoText</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="weapon_2_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QLabel" name="weapon_3_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QLabel" name="weapon_4_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="weapon_5_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="weapon_6_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLabel" name="weapon_7_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLabel" name="weapon_8_label">
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="weapon_9_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="weapon_10_label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
-- 
cgit v1.2.3