android tweaks

src/gui/qt/gui_800x480/aboutpokerth_800x480.ui

@@ -61,7 +61,7 @@
        <item row="0" column="1" rowspan="2">
         <widget class="QLabel" name="label_logo">
          <property name="pixmap">
-          <pixmap resource="../resources/pokerth.qrc">:/gfx/logoChip3D.png</pixmap>
+          <pixmap resource="../resources/pokerth_android.qrc">:/gfx/logoChip3D.png</pixmap>
          </property>
         </widget>
        </item>
@@ -274,7 +274,7 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <resources>
-  <include location="../resources/pokerth.qrc"/>
+  <include location="../resources/pokerth_android.qrc"/>
  </resources>
  <connections>
   <connection>

src/gui/qt/gui_800x480/createinternetgamedialog_800x480.ui

@@ -150,7 +150,7 @@
             <string>Standard</string>
            </property>
            <property name="icon">
-            <iconset resource="../resources/pokerth.qrc">
+            <iconset resource="../resources/pokerth_android.qrc">
              <normaloff>:/gfx/player_play.png</normaloff>:/gfx/player_play.png</iconset>
            </property>
           </item>
@@ -204,9 +204,11 @@
           <property name="text">
            <string>Password:</string>
           </property>
-          <property name="icon">
+          <property name="iconSize">
-           <iconset resource="../resources/pokerth.qrc">
+           <size>
-            <normaloff>:/gfx/lock.png</normaloff>:/gfx/lock.png</iconset>
+            <width>32</width>
+            <height>32</height>
+           </size>
           </property>
          </widget>
         </item>

src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui

@@ -134,7 +134,7 @@
                 <string>&amp;Leave Game</string>
                </property>
                <property name="icon">
-                <iconset resource="../resources/pokerth.qrc">
+                <iconset resource="../resources/pokerth_android.qrc">
                  <normaloff>:/gfx/go-previous-view.png</normaloff>:/gfx/go-previous-view.png</iconset>
                </property>
               </widget>
@@ -196,7 +196,7 @@
                 <string>&amp;Start Game</string>
                </property>
                <property name="icon">
-                <iconset resource="../resources/pokerth.qrc">
+                <iconset resource="../resources/pokerth_android.qrc">
                  <normaloff>:/gfx/dialog_ok_apply.png</normaloff>:/gfx/dialog_ok_apply.png</iconset>
                </property>
               </widget>
@@ -232,7 +232,7 @@
                 <string>&amp;Kick Player</string>
                </property>
                <property name="icon">
-                <iconset resource="../resources/pokerth.qrc">
+                <iconset resource="../resources/pokerth_android.qrc">
                  <normaloff>:/gfx/list-remove.png</normaloff>:/gfx/list-remove.png</iconset>
                </property>
               </widget>
@@ -330,7 +330,7 @@
                 <string>Join &amp;any game</string>
                </property>
                <property name="icon">
-                <iconset resource="../resources/pokerth.qrc">
+                <iconset resource="../resources/pokerth_android.qrc">
                  <normaloff>:/gfx/transform-rotate.png</normaloff>:/gfx/transform-rotate.png</iconset>
                </property>
               </widget>
@@ -369,7 +369,7 @@
                 <string>&amp;Create Game</string>
                </property>
                <property name="icon">
-                <iconset resource="../resources/pokerth.qrc">
+                <iconset resource="../resources/pokerth_android.qrc">
                  <normaloff>:/gfx/list_add.png</normaloff>:/gfx/list_add.png</iconset>
                </property>
               </widget>
@@ -395,7 +395,7 @@
                 <string>&amp;Join Game</string>
                </property>
                <property name="icon">
-                <iconset resource="../resources/pokerth.qrc">
+                <iconset resource="../resources/pokerth_android.qrc">
                  <normaloff>:/gfx/go-next-view.png</normaloff>:/gfx/go-next-view.png</iconset>
                </property>
               </widget>
@@ -535,8 +535,8 @@
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>292</width>
+                 <width>288</width>
-                 <height>197</height>
+                 <height>195</height>
                 </rect>
                </property>
                <layout class="QGridLayout" name="gridLayout">
@@ -619,9 +619,6 @@
                 </item>
                 <item row="1" column="1">
                  <widget class="QLabel" name="label_StartCash">
-                  <property name="styleSheet">
-                   <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-                  </property>
                   <property name="alignment">
                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
                   </property>
@@ -648,9 +645,6 @@
                 </item>
                 <item row="2" column="1">
                  <widget class="QLabel" name="label_SmallBlind">
-                  <property name="styleSheet">
-                   <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-                  </property>
                   <property name="alignment">
                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
                   </property>
@@ -677,9 +671,6 @@
                 </item>
                 <item row="3" column="1">
                  <widget class="QLabel" name="label_blindsRaiseIntervall">
-                  <property name="styleSheet">
-                   <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-                  </property>
                   <property name="alignment">
                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
                   </property>
@@ -706,9 +697,6 @@
                 </item>
                 <item row="4" column="1">
                  <widget class="QLabel" name="label_blindsRaiseMode">
-                  <property name="styleSheet">
-                   <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-                  </property>
                   <property name="text">
                    <string/>
                   </property>
@@ -738,9 +726,6 @@
                 </item>
                 <item row="5" column="1">
                  <widget class="QLabel" name="label_blindsList">
-                  <property name="styleSheet">
-                   <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-                  </property>
                   <property name="text">
                    <string/>
                   </property>
@@ -770,9 +755,6 @@
                 </item>
                 <item row="6" column="1">
                  <widget class="QLabel" name="label_GameTiming">
-                  <property name="styleSheet">
-                   <string notr="true">QLabel { color:rgb(0, 0, 255); }</string>
-                  </property>
                   <property name="alignment">
                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
                   </property>
@@ -815,7 +797,7 @@
                  <string>Fill up with computer opponents</string>
                 </property>
                 <property name="icon">
-                 <iconset resource="../resources/pokerth.qrc">
+                 <iconset resource="../resources/pokerth_android.qrc">
                   <normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset>
                 </property>
                </widget>
@@ -1002,8 +984,8 @@
                <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Nimbus Sans L'; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Sans'; font-size:18px; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
              </widget>
             </item>
@@ -1098,20 +1080,10 @@ p, li { white-space: pre-wrap; }
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="label_rankings">
        <property name="styleSheet">
         <string notr="true">QObject {font: 14px}</string>
        </property>
-       <property name="text">
-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body&gt;
-&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
-&lt;tr&gt;
-&lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://online-ranking.pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Click here to view the online rankings&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@@ -1135,13 +1107,6 @@ p, li { white-space: pre-wrap; }
        <property name="styleSheet">
         <string notr="true">QObject {font: 14px}</string>
        </property>
-       <property name="text">
-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.pokerth.net&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@@ -1164,7 +1129,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>pushButton_Leave</tabstop>
  </tabstops>
  <resources>
-  <include location="../resources/pokerth.qrc"/>
+  <include location="../resources/pokerth_android.qrc"/>
  </resources>
  <connections/>
 </ui>

src/gui/qt/gui_800x480/gametable_800x480.ui

@@ -18,16 +18,13 @@
   </property>
   <property name="maximumSize">
    <size>
-    <width>1024</width>
+    <width>1980</width>
-    <height>600</height>
+    <height>1200</height>
    </size>
   </property>
   <property name="mouseTracking">
    <bool>false</bool>
   </property>
-  <property name="windowTitle">
-   <string>PokerTH 0.6-beta - The Open-Source Texas Holdem Engine</string>
-  </property>
   <property name="styleSheet">
    <string notr="true">QStatusbar { height:0px; }</string>
   </property>
@@ -40,8 +37,8 @@
    </property>
    <property name="maximumSize">
     <size>
-     <width>1024</width>
+     <width>1980</width>
-     <height>600</height>
+     <height>1200</height>
     </size>
    </property>
    <layout class="QGridLayout" name="gridLayout_4">
@@ -4441,7 +4438,7 @@ p, li { white-space: pre-wrap; }
               <string/>
              </property>
              <property name="icon">
-              <iconset resource="../resources/pokerth.qrc">
+              <iconset resource="../resources/pokerth_android.qrc">
                <normaloff>:/gfx/view-fullscreen_50x50.png</normaloff>:/gfx/view-fullscreen_50x50.png</iconset>
              </property>
              <property name="iconSize">
@@ -4618,7 +4615,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>26</height>
+     <height>20</height>
     </rect>
    </property>
    <property name="minimumSize">
@@ -4685,7 +4682,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionFullScreen">
    <property name="icon">
-    <iconset resource="../resources/pokerth.qrc">
+    <iconset resource="../resources/pokerth_android.qrc">
      <normaloff>:/gfx/view-fullscreen.png</normaloff>:/gfx/view-fullscreen.png</iconset>
    </property>
    <property name="text">
@@ -4743,7 +4740,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionConfigure_PokerTH">
    <property name="icon">
-    <iconset resource="../resources/pokerth.qrc">
+    <iconset resource="../resources/pokerth_android.qrc">
      <normaloff>:/gfx/systemsettings.png</normaloff>:/gfx/systemsettings.png</iconset>
    </property>
    <property name="text">
@@ -4752,7 +4749,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionClose">
    <property name="icon">
-    <iconset resource="../resources/pokerth.qrc">
+    <iconset resource="../resources/pokerth_android.qrc">
      <normaloff>:/gfx/application_exit.png</normaloff>:/gfx/application_exit.png</iconset>
    </property>
    <property name="text">
@@ -4824,7 +4821,7 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../resources/pokerth.qrc"/>
+  <include location="../resources/pokerth_android.qrc"/>
  </resources>
  <connections/>
 </ui>

src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui

@@ -101,20 +101,10 @@
    <item row="4" column="0" colspan="3">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="label_createAnAccount">
        <property name="styleSheet">
         <string notr="true">font: bold 30px</string>
        </property>
-       <property name="text">
-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body&gt;
-&lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
-&lt;tr&gt;
-&lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://create-gaming-account.pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Create new user account&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>

src/gui/qt/gui_800x480/logfiledialog_800x480.ui

@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>618</width>
+    <width>800</width>
-    <height>392</height>
+    <height>424</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>800</width>
+    <height>424</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
@@ -22,9 +28,15 @@
         <string>Export as HTML</string>
        </property>
        <property name="icon">
-        <iconset resource="resources/pokerth.qrc">
+        <iconset resource="../resources/pokerth.qrc">
          <normaloff>:/gfx/text-html.png</normaloff>:/gfx/text-html.png</iconset>
        </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -33,9 +45,15 @@
         <string>Export as txt</string>
        </property>
        <property name="icon">
-        <iconset resource="resources/pokerth.qrc">
+        <iconset resource="../resources/pokerth.qrc">
          <normaloff>:/gfx/text-plain.png</normaloff>:/gfx/text-plain.png</iconset>
        </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -44,9 +62,15 @@
         <string>Save as ...</string>
        </property>
        <property name="icon">
-        <iconset resource="resources/pokerth.qrc">
+        <iconset resource="../resources/pokerth.qrc">
          <normaloff>:/gfx/filesave.png</normaloff>:/gfx/filesave.png</iconset>
        </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -55,9 +79,15 @@
         <string>Delete</string>
        </property>
        <property name="icon">
-        <iconset resource="resources/pokerth.qrc">
+        <iconset resource="../resources/pokerth.qrc">
          <normaloff>:/gfx/editdelete.png</normaloff>:/gfx/editdelete.png</iconset>
        </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
       </widget>
      </item>
     </layout>
@@ -85,6 +115,12 @@
    </item>
    <item row="4" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>32</height>
+      </size>
+     </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
@@ -132,7 +168,7 @@
        </property>
        <property name="maximumSize">
         <size>
-         <width>200</width>
+         <width>250</width>
          <height>16777215</height>
         </size>
        </property>
@@ -173,15 +209,21 @@
       <string>Analyse Logfile ...</string>
      </property>
      <property name="icon">
-      <iconset resource="resources/pokerth.qrc">
+      <iconset resource="../resources/pokerth.qrc">
        <normaloff>:/gfx/view-statistics.png</normaloff>:/gfx/view-statistics.png</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>32</width>
+       <height>32</height>
+      </size>
+     </property>
     </widget>
    </item>
   </layout>
  </widget>
  <resources>
-  <include location="resources/pokerth.qrc"/>
+  <include location="../resources/pokerth.qrc"/>
  </resources>
  <connections>
   <connection>

src/gui/qt/gui_800x480/selectavatardialog_800x480.ui

@@ -98,7 +98,7 @@
          </size>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/document-open-folder.png</normaloff>:/gfx/document-open-folder.png</iconset>
         </property>
         <property name="iconSize">
@@ -136,7 +136,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../resources/pokerth.qrc"/>
+  <include location="../resources/pokerth_android.qrc"/>
  </resources>
  <connections>
   <connection>

src/gui/qt/gui_800x480/settingsdialog_800x480.ui

@@ -68,7 +68,7 @@
          <string>Interface</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/preferences-desktop.png</normaloff>:/gfx/preferences-desktop.png</iconset>
         </property>
        </item>
@@ -77,7 +77,7 @@
          <string>Style</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/fill-color.png</normaloff>:/gfx/fill-color.png</iconset>
         </property>
        </item>
@@ -86,7 +86,7 @@
          <string>Sound</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/speaker.png</normaloff>:/gfx/speaker.png</iconset>
         </property>
        </item>
@@ -95,7 +95,7 @@
          <string>Local Game</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset>
         </property>
        </item>
@@ -104,7 +104,7 @@
          <string>Network Game</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/swbuttonjoinnetworkgame.png</normaloff>:/gfx/swbuttonjoinnetworkgame.png</iconset>
         </property>
        </item>
@@ -113,7 +113,7 @@
          <string>Internet Game</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/swbuttoninternetgame.png</normaloff>:/gfx/swbuttoninternetgame.png</iconset>
         </property>
        </item>
@@ -122,7 +122,7 @@
          <string>Nicks/Avatars</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/system_users.png</normaloff>:/gfx/system_users.png</iconset>
         </property>
        </item>
@@ -131,7 +131,7 @@
          <string>Log Messages</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/utilities-log-viewer.png</normaloff>:/gfx/utilities-log-viewer.png</iconset>
         </property>
        </item>
@@ -140,15 +140,10 @@
          <string>Factory Settings</string>
         </property>
         <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
+         <iconset resource="../resources/pokerth_android.qrc">
           <normaloff>:/gfx/document-revert.png</normaloff>:/gfx/document-revert.png</iconset>
         </property>
        </item>
-       <item>
-        <property name="text">
-         <string>New Item</string>
-        </property>
-       </item>
       </widget>
      </item>
      <item row="0" column="1">
@@ -755,7 +750,7 @@ p, li { white-space: pre-wrap; }
                     </size>
                    </property>
                    <property name="icon">
-                    <iconset resource="../resources/pokerth.qrc">
+                    <iconset resource="../resources/pokerth_android.qrc">
                      <normaloff>:/gfx/document-open-folder.png</normaloff>:/gfx/document-open-folder.png</iconset>
                    </property>
                   </widget>
@@ -2004,7 +1999,7 @@ p, li { white-space: pre-wrap; }
                    <string>Standard</string>
                   </property>
                   <property name="icon">
-                   <iconset resource="../resources/pokerth.qrc">
+                   <iconset resource="../resources/pokerth_android.qrc">
                     <normaloff>:/gfx/player_play.png</normaloff>:/gfx/player_play.png</iconset>
                   </property>
                  </item>
@@ -2013,7 +2008,7 @@ p, li { white-space: pre-wrap; }
                    <string>Registered players only</string>
                   </property>
                   <property name="icon">
-                   <iconset resource="../resources/pokerth.qrc">
+                   <iconset resource="../resources/pokerth_android.qrc">
                     <normaloff>:/gfx/registered.png</normaloff>:/gfx/registered.png</iconset>
                   </property>
                  </item>
@@ -2022,7 +2017,7 @@ p, li { white-space: pre-wrap; }
                    <string>Invited players only</string>
                   </property>
                   <property name="icon">
-                   <iconset resource="../resources/pokerth.qrc">
+                   <iconset resource="../resources/pokerth_android.qrc">
                     <normaloff>:/gfx/list_add_user.png</normaloff>:/gfx/list_add_user.png</iconset>
                   </property>
                  </item>
@@ -2031,7 +2026,7 @@ p, li { white-space: pre-wrap; }
                    <string>Ranking game</string>
                   </property>
                   <property name="icon">
-                   <iconset resource="../resources/pokerth.qrc">
+                   <iconset resource="../resources/pokerth_android.qrc">
                     <normaloff>:/gfx/cup.png</normaloff>:/gfx/cup.png</iconset>
                   </property>
                  </item>
@@ -2050,7 +2045,7 @@ p, li { white-space: pre-wrap; }
                   <string>Use password for private game:</string>
                  </property>
                  <property name="icon">
-                  <iconset resource="../resources/pokerth.qrc">
+                  <iconset resource="../resources/pokerth_android.qrc">
                    <normaloff>:/gfx/lock.png</normaloff>:/gfx/lock.png</iconset>
                  </property>
                 </widget>
@@ -2115,7 +2110,7 @@ p, li { white-space: pre-wrap; }
                 <string>Remove Player</string>
                </property>
                <property name="icon">
-                <iconset resource="../resources/pokerth.qrc">
+                <iconset resource="../resources/pokerth_android.qrc">
                  <normaloff>:/gfx/list-remove.png</normaloff>:/gfx/list-remove.png</iconset>
                </property>
               </widget>
@@ -3625,7 +3620,7 @@ p, li { white-space: pre-wrap; }
                  </size>
                 </property>
                 <property name="icon">
-                 <iconset resource="../resources/pokerth.qrc">
+                 <iconset resource="../resources/pokerth_android.qrc">
                   <normaloff>:/gfx/document-open-folder.png</normaloff>:/gfx/document-open-folder.png</iconset>
                 </property>
                </widget>
@@ -3717,7 +3712,7 @@ p, li { white-space: pre-wrap; }
               <string>Export as HTML</string>
              </property>
              <property name="icon">
-              <iconset resource="../resources/pokerth.qrc">
+              <iconset resource="../resources/pokerth_android.qrc">
                <normaloff>:/gfx/text-html.png</normaloff>:/gfx/text-html.png</iconset>
              </property>
             </widget>
@@ -3728,7 +3723,7 @@ p, li { white-space: pre-wrap; }
               <string>Export as txt</string>
              </property>
              <property name="icon">
-              <iconset resource="../resources/pokerth.qrc">
+              <iconset resource="../resources/pokerth_android.qrc">
                <normaloff>:/gfx/text-plain.png</normaloff>:/gfx/text-plain.png</iconset>
              </property>
             </widget>
@@ -3739,7 +3734,7 @@ p, li { white-space: pre-wrap; }
               <string>Save as ...</string>
              </property>
              <property name="icon">
-              <iconset resource="../resources/pokerth.qrc">
+              <iconset resource="../resources/pokerth_android.qrc">
                <normaloff>:/gfx/filesave.png</normaloff>:/gfx/filesave.png</iconset>
              </property>
             </widget>
@@ -3750,7 +3745,7 @@ p, li { white-space: pre-wrap; }
               <string>Delete</string>
              </property>
              <property name="icon">
-              <iconset resource="../resources/pokerth.qrc">
+              <iconset resource="../resources/pokerth_android.qrc">
                <normaloff>:/gfx/editdelete.png</normaloff>:/gfx/editdelete.png</iconset>
              </property>
             </widget>
@@ -3876,276 +3871,6 @@ p, li { white-space: pre-wrap; }
          </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="page_6">
-        <layout class="QGridLayout" name="gridLayout_23">
-         <item row="0" column="0">
-          <widget class="QScrollArea" name="scrollArea">
-           <property name="widgetResizable">
-            <bool>true</bool>
-           </property>
-           <widget class="QWidget" name="scrollAreaWidgetContents">
-            <property name="geometry">
-             <rect>
-              <x>0</x>
-              <y>0</y>
-              <width>580</width>
-              <height>371</height>
-             </rect>
-            </property>
-            <widget class="QCheckBox" name="checkBox_2">
-             <property name="geometry">
-              <rect>
-               <x>80</x>
-               <y>20</y>
-               <width>82</width>
-               <height>21</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>CheckBox</string>
-             </property>
-            </widget>
-            <widget class="QWidget" name="layoutWidget">
-             <property name="geometry">
-              <rect>
-               <x>20</x>
-               <y>10</y>
-               <width>829</width>
-               <height>798</height>
-              </rect>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_5">
-              <item>
-               <widget class="QCheckBox" name="checkBox">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_3">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_4">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_5">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_6">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_11">
-                <property name="text">
-                 <string>aasdasd asdasdj asklasjda lkjasdl asd asd asd asd</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_7">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_9">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_12">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_10">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_8">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_13">
-                <property name="text">
-                 <string>asd asd asdasdakdja sasljf asd ajsdklja askljd asdjlka sdjasdj alskjd asdjasd jaslkdj asld as da a sd a</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_14">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_15">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_16">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_17">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_18">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_19">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_20">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_21">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_22">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_23">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_24">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_25">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_26">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_27">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_28">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_29">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_30">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_31">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_32">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBox_33">
-                <property name="text">
-                 <string>CheckBox</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </widget>
       </widget>
      </item>
     </layout>
@@ -4315,7 +4040,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../resources/pokerth.qrc"/>
+  <include location="../resources/pokerth_android.qrc"/>
  </resources>
  <connections>
   <connection>

src/gui/qt/gui_800x480/startwindow_800x480.ui

@@ -16,12 +16,6 @@
     <height>480</height>
    </size>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>1024</width>
-    <height>600</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>PokerTH - The Open-Source Texas Holdem Engine</string>
   </property>
@@ -32,12 +26,6 @@
      <height>424</height>
     </size>
    </property>
-   <property name="maximumSize">
-    <size>
-     <width>1024</width>
-     <height>600</height>
-    </size>
-   </property>
    <layout class="QGridLayout" name="gridLayout_2">
     <item row="0" column="1">
      <spacer>
@@ -52,7 +40,7 @@
       </property>
      </spacer>
     </item>
-    <item row="1" column="0">
+    <item row="1" column="0" rowspan="2">
      <spacer>
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -67,6 +55,70 @@
     </item>
     <item row="1" column="1">
      <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="1">
+       <widget class="QPushButton" name="pushButton_Create_Network_Game">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>350</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>350</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string>&amp;3 Create Network Game</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../resources/pokerth.qrc">
+          <normaloff>:/gfx/swbuttoncreatenetworkgame.png</normaloff>:/gfx/swbuttoncreatenetworkgame.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>48</width>
+          <height>48</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="pushButton_Join_Network_Game">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string>&amp;4 Join Network Game</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../resources/pokerth.qrc">
+          <normaloff>:/gfx/swbuttonjoinnetworkgame.png</normaloff>:/gfx/swbuttonjoinnetworkgame.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>48</width>
+          <height>48</height>
+         </size>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="0">
        <widget class="QPushButton" name="pushButtonStart_Local_Game">
         <property name="sizePolicy">
@@ -98,12 +150,6 @@
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
-        <property name="autoFillBackground">
-         <bool>false</bool>
-        </property>
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
         <property name="text">
          <string>&amp;1 Start Local Game</string>
         </property>
@@ -113,110 +159,8 @@
         </property>
         <property name="iconSize">
          <size>
-          <width>37</width>
+          <width>48</width>
-          <height>32</height>
+          <height>48</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="pushButton_Create_Network_Game">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>350</width>
-          <height>80</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>350</width>
-          <height>80</height>
-         </size>
-        </property>
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <property name="text">
-         <string>&amp;3 Create Network Game</string>
-        </property>
-        <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
-          <normaloff>:/gfx/swbuttoncreatenetworkgame.png</normaloff>:/gfx/swbuttoncreatenetworkgame.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>37</width>
-          <height>32</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="pushButtonInternet_Game">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>350</width>
-          <height>80</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>350</width>
-          <height>80</height>
-         </size>
-        </property>
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <property name="text">
-         <string>&amp;2 Internet Game</string>
-        </property>
-        <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
-          <normaloff>:/gfx/swbuttoninternetgame.png</normaloff>:/gfx/swbuttoninternetgame.png</iconset>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="pushButton_Join_Network_Game">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
-        <property name="text">
-         <string>&amp;4 Join Network Game</string>
-        </property>
-        <property name="icon">
-         <iconset resource="../resources/pokerth.qrc">
-          <normaloff>:/gfx/swbuttonjoinnetworkgame.png</normaloff>:/gfx/swbuttonjoinnetworkgame.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>37</width>
-          <height>32</height>
          </size>
         </property>
        </widget>
@@ -247,8 +191,49 @@
         </property>
         <property name="iconSize">
          <size>
-          <width>37</width>
+          <width>48</width>
-          <height>32</height>
+          <height>48</height>
+         </size>
+        </property>
+        <property name="shortcut">
+         <string>Return</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QPushButton" name="pushButtonInternet_Game">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>350</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>350</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string>&amp;2 Internet Game</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../resources/pokerth.qrc">
+          <normaloff>:/gfx/swbuttoninternetgame.png</normaloff>:/gfx/swbuttoninternetgame.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>48</width>
+          <height>48</height>
          </size>
         </property>
        </widget>
@@ -273,15 +258,15 @@
         </property>
         <property name="iconSize">
          <size>
-          <width>37</width>
+          <width>48</width>
-          <height>32</height>
+          <height>48</height>
          </size>
         </property>
        </widget>
       </item>
      </layout>
     </item>
-    <item row="1" column="2">
+    <item row="1" column="2" rowspan="3">
      <spacer>
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -295,6 +280,65 @@
      </spacer>
     </item>
     <item row="2" column="1">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton_Logs">
+        <property name="minimumSize">
+         <size>
+          <width>350</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string>Logs</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../resources/pokerth_android.qrc">
+          <normaloff>:/gfx/text-x-log.png</normaloff>:/gfx/text-x-log.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>48</width>
+          <height>48</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </item>
+    <item row="3" column="1">
      <spacer>
       <property name="orientation">
        <enum>Qt::Vertical</enum>
@@ -428,6 +472,7 @@
  </widget>
  <resources>
   <include location="../resources/pokerth.qrc"/>
+  <include location="../resources/pokerth_android.qrc"/>
  </resources>
  <connections>
   <connection>

src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp

@@ -25,6 +25,11 @@ internetGameLoginDialogImpl::internetGameLoginDialogImpl(QWidget *parent, Config
 {
 	setupUi(this);
 
+    //html stuff
+    QString createAccount(QString("<a href='http://create-gaming-account.pokerth.net'>%1</a>").arg(tr("Create new user account")));
+    label_createAnAccount->setText(createAccount);
+
+
 	connect(groupBox_reguser, SIGNAL(toggled(bool)), this, SLOT(regUserToggled(bool)));
 	connect(checkBox_guest, SIGNAL(toggled(bool)), this, SLOT(guestUserToggled(bool)));
 	connect(lineEdit_password, SIGNAL(textEdited(QString)), this, SLOT(okButtonCheck()));

src/gui/qt/logfiledialog/logfiledialog.cpp

@@ -72,7 +72,11 @@ void LogFileDialog::refreshLogFileList()
 	for (i=0; i < dbFilesList.size(); i++) {
 
 		QTreeWidgetItem *item = new QTreeWidgetItem;
-		item->setText(0, dbFilesList.at(i).fileName());
+#ifdef GUI_800x480
+        item->setText(0, dbFilesList.at(i).fileName().remove("pokerth-log-"));
+#else
+        item->setText(0, dbFilesList.at(i).fileName());
+#endif
 		item->setData(0, Qt::UserRole, dbFilesList.at(i).absoluteFilePath());
 		if(currentSqliteLogFile.fileName() == dbFilesList.at(i).fileName()) {
 			item->setData(0, Qt::BackgroundColorRole, QColor(Qt::red));
@@ -113,7 +117,7 @@ void LogFileDialog::exportLogToHtml()
 	QTreeWidgetItem* selectedItem = ui->treeWidget_logFiles->currentItem();
 
 	if(selectedItem) {
-		QFileInfo fi(selectedItem->text(0));
+        QFileInfo fi(selectedItem->data(0, Qt::UserRole).toString());
 		QString fileName = QFileDialog::getSaveFileName(this, tr("Export PokerTH log file to HTML"),
 						   QDir::homePath()+"/"+fi.baseName()+".html",
 						   tr("PokerTH HTML log (*.html)"));
@@ -129,7 +133,7 @@ void LogFileDialog::exportLogToTxt()
 	QTreeWidgetItem* selectedItem = ui->treeWidget_logFiles->currentItem();
 
 	if(selectedItem) {
-		QFileInfo fi(selectedItem->text(0));
+        QFileInfo fi(selectedItem->data(0, Qt::UserRole).toString());
 		QString fileName = QFileDialog::getSaveFileName(this, tr("Export PokerTH log file to plain text"),
 						   QDir::homePath()+"/"+fi.baseName()+".txt",
 						   tr("PokerTH plain text log (*.txt)"));
@@ -145,7 +149,7 @@ void LogFileDialog::saveLogFileAs()
 	QTreeWidgetItem* selectedItem = ui->treeWidget_logFiles->currentItem();
 
 	if(selectedItem) {
-		QFileInfo fi(selectedItem->text(0));
+        QFileInfo fi(selectedItem->data(0, Qt::UserRole).toString());
 		QString fileName = QFileDialog::getSaveFileName(this, tr("Save PokerTH log file"),
 						   QDir::homePath()+"/"+fi.baseName()+".pdb",
 						   tr("PokerTH SQL log (*.pdb)"));

src/gui/qt/resources/pokerth_android.qrc

@@ -58,6 +58,7 @@
         <file>preferences-desktop_50x50.png</file>
         <file>tab-new-background.png</file>
         <file>tab-close.png</file>
+        <file>text-x-log.png</file>
     </qresource>
     <qresource prefix="/cflags">
         <file>cflags/ad.png</file>
@@ -543,4 +544,31 @@
         <file>android-data/gfx/cards/default_800x480/defaultdeckstyle_800x480.xml</file>
         <file>android-data/gfx/cards/default_800x480/flipside.png</file>
     </qresource>
+    <qresource prefix="/emotes">
+        <file>emotes/face-angel.png</file>
+        <file>emotes/face-angry.png</file>
+        <file>emotes/face-confused.png</file>
+        <file>emotes/face-cool.png</file>
+        <file>emotes/face-crying.png</file>
+        <file>emotes/face-devilish.png</file>
+        <file>emotes/face-embarrassed.png</file>
+        <file>emotes/face-in-love.png</file>
+        <file>emotes/face-kiss.png</file>
+        <file>emotes/face-laugh.png</file>
+        <file>emotes/face-plain.png</file>
+        <file>emotes/face-quiet.png</file>
+        <file>emotes/face-raspberry.png</file>
+        <file>emotes/face-sad.png</file>
+        <file>emotes/face-sick.png</file>
+        <file>emotes/face-sleep.png</file>
+        <file>emotes/face-smile-big.png</file>
+        <file>emotes/face-smile-grin.png</file>
+        <file>emotes/face-smile.png</file>
+        <file>emotes/face-smirk.png</file>
+        <file>emotes/face-surprise.png</file>
+        <file>emotes/face-uncertain.png</file>
+        <file>emotes/face-wink.png</file>
+        <file>emotes/face-worried.png</file>
+        <file>emotes/face-yawn.png</file>
+    </qresource>
 </RCC>

src/gui/qt/settingsdialog/settingsdialogimpl.cpp

@@ -20,11 +20,9 @@
 #include "mystylelistitem.h"
 #include "gametablestylereader.h"
 #include "carddeckstylereader.h"
-
 #include "configfile.h"
 #include <net/socket_startup.h>
 #include <QSet>
-
 enum StyleType { POKERTH_DISTRIBUTED_STYLE, ADDITIONAL_STYLE };
 
 using namespace std;

src/gui/qt/settingsdialog/settingsdialogimpl.h

@@ -38,6 +38,7 @@ class selectAvatarDialogImpl;
 class manualBlindsOrderDialogImpl;
 class MyStyleListItem;
 class guiLog;
+class FlickCharm;
 
 class settingsDialogImpl: public QDialog, public Ui::settingsDialog
 {
@@ -142,6 +143,7 @@ private:
 	bool calledIngame;
 	int changedLanguageIndex;
 	guiLog *myGuiLog;
+    FlickCharm *fc;
 };
 
 #endif

src/gui/qt/startwindow/startwindowimpl.cpp

@@ -80,21 +80,22 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
         this->menubar->hide();
         centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg_800x480.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
         this->showFullScreen();
-        this->setStyle(new QPlastiqueStyle);
     #else
 //        this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }");
         this->menubar->hide();
         centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg_800x480.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
     #endif
-//        pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
+        pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
-//        pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
+        pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
-//        pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
+        pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
-//        pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
+        pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
-//        pushButton_about->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
+        pushButton_about->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
-//        pushButton_configure->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
+        pushButton_configure->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
+        pushButton_Logs->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 3px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:22px; border-width: 0px;}");
 
         connect( pushButton_about, SIGNAL( clicked() ), this, SLOT( callAboutPokerthDialog() ) );
         connect( pushButton_configure, SIGNAL( clicked() ), this, SLOT( callSettingsDialogFromStartwindow() ) );
+        connect( pushButton_Logs, SIGNAL( clicked() ), this, SLOT( callLogFileDialog() ) );
 #else
 	this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:12px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }");
 

src/pokerth.cpp

@@ -44,11 +44,11 @@
 #include <crtdbg.h>
 
 #define ENABLE_LEAK_CHECK() \
-			{ \
+{ \
-				int tmpFlag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); \
+    int tmpFlag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); \
-				tmpFlag |= _CRTDBG_LEAK_CHECK_DF; \
+    tmpFlag |= _CRTDBG_LEAK_CHECK_DF; \
-				_CrtSetDbgFlag(tmpFlag); \
+    _CrtSetDbgFlag(tmpFlag); \
-			}
+    }
 #endif
 #endif
 
@@ -64,89 +64,100 @@ class Game;
 int main( int argc, char **argv )
 {
 
-	//ENABLE_LEAK_CHECK();
+    //ENABLE_LEAK_CHECK();
 
-	//_CrtSetBreakAlloc(49937);
+    //_CrtSetBreakAlloc(49937);
-	socket_startup();
+    socket_startup();
-	curl_global_init(CURL_GLOBAL_NOTHING);
+    curl_global_init(CURL_GLOBAL_NOTHING);
 
-	/////// can be removed for non-qt-guis ////////////
+    /////// can be removed for non-qt-guis ////////////
-	QtSingleApplication a( argc, argv );
+    QtSingleApplication a( argc, argv );
 
     if (a.sendMessage("Wake up!")) {
-		return 0;
+        return 0;
-	}
+    }
 
 #ifdef __APPLE__
-	// The following needs to be done directly after the application is created.
+    // The following needs to be done directly after the application is created.
-	QDir dir(QApplication::applicationDirPath());
+    QDir dir(QApplication::applicationDirPath());
-	dir.cdUp();
+    dir.cdUp();
-	dir.cd("plugins");
+    dir.cd("plugins");
-	QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
+    QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
 #endif
 
-	//create defaultconfig
+    //create defaultconfig
-	ConfigFile *myConfig = new ConfigFile(argv[0], false);
+    ConfigFile *myConfig = new ConfigFile(argv[0], false);
-	Log *myLog = new Log(myConfig);
+    Log *myLog = new Log(myConfig);
 
-        // set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets
+    // set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets
-        a.setStyle(new QPlastiqueStyle);
+    a.setStyle(new QPlastiqueStyle);
+    
+    QString	myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
+    //set QApplication default font
 
-        QString	myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
+    QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb");
-        //set QApplication default font
+    QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
-
+    QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb");
-	QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb");
+    QFontDatabase::addApplicationFont (myAppDataPath +"fonts/DejaVuSans-Bold.ttf");
-	QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
-	QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb");
-	QFontDatabase::addApplicationFont (myAppDataPath +"fonts/DejaVuSans-Bold.ttf");
 
 #ifdef _WIN32
-	QString font1String("QApplication, QWidget, QDialog { font-size: 12px; }");
+    QString font1String("QApplication, QWidget, QDialog { font-size: 12px; }");
 #elif __APPLE__
-//            QString font1String("font-family: \"Lucida Grande\";");
+    //            QString font1String("font-family: \"Lucida Grande\";");
-	QString font1String("QApplication, QWidget, QDialog { font-size: 11px; }");
+    QString font1String("QApplication, QWidget, QDialog { font-size: 11px; }");
 #elif ANDROID
-        QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 26px; }");
+    QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 26px; }");
+    QPalette p = a.palette();
+    p.setColor(QPalette::Button, QColor::fromRgb(80,80,80));
+    p.setColor(QPalette::Base, QColor::fromRgb(80,80,80));
+    p.setColor(QPalette::Window, QColor::fromRgb(50,50,50));
+    p.setColor(QPalette::ButtonText, QColor::fromRgb(255,255,255));
+    p.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgb(100,100,100));
+    p.setColor(QPalette::WindowText, QColor::fromRgb(255,255,255));
+    p.setColor(QPalette::Text, QColor::fromRgb(255,255,255));
+    p.setColor(QPalette::Link, QColor::fromRgb(192,192,255));
+    p.setColor(QPalette::LinkVisited, QColor::fromRgb(192,192,255));
+    a.setPalette(p);
 #else
-        QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 12px; }");
+    QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 12px; }");
 #endif
-	a.setStyleSheet(font1String + " QDialogButtonBox, QMessageBox { dialogbuttonbox-buttons-have-icons: 1; dialog-ok-icon: url(:/gfx/dialog_ok_apply.png); dialog-cancel-icon: url(:/gfx/dialog_close.png); dialog-close-icon: url(:/gfx/dialog_close.png); dialog-yes-icon: url(:/gfx/dialog_ok_apply.png); dialog-no-icon: url(:/gfx/dialog_close.png) }");
+    a.setStyleSheet(font1String + " QDialogButtonBox, QMessageBox { dialogbuttonbox-buttons-have-icons: 1; dialog-ok-icon: url(:/gfx/dialog_ok_apply.png); dialog-cancel-icon: url(:/gfx/dialog_close.png); dialog-close-icon: url(:/gfx/dialog_close.png); dialog-yes-icon: url(:/gfx/dialog_ok_apply.png); dialog-no-icon: url(:/gfx/dialog_close.png) }");
 
-        QPixmap pixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth.png");
+    QPixmap pixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth.png");
 #ifdef ANDROID
-        QDesktopWidget dw;
+    QDesktopWidget dw;
-        pixmap = pixmap.scaled(dw.screenGeometry().width(), dw.screenGeometry().height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    pixmap = pixmap.scaled(dw.screenGeometry().width(), dw.screenGeometry().height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 #endif
-        StartSplash splash(pixmap);
+    StartSplash splash(pixmap);
-        if(!myConfig->readConfigInt("DisableSplashScreenOnStartup")) {
+    if(!myConfig->readConfigInt("DisableSplashScreenOnStartup")) {
-                splash.show();
+        splash.show();
-		splash.showMessage(QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING), 0x0042, QColor(240,240,240));
+        splash.showMessage(QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING), 0x0042, QColor(255,255,255));
-        }
+    }
 
-	//Set translations
+    //Set translations
-	QTranslator qtTranslator;
+    QTranslator qtTranslator;
-	qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));
+    qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));
-	a.installTranslator(&qtTranslator);
+    a.installTranslator(&qtTranslator);
 
-	QTranslator translator;
+    QTranslator translator;
-	translator.load(QString(myAppDataPath +"translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
+    translator.load(QString(myAppDataPath +"translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
-	a.installTranslator(&translator);
+    a.installTranslator(&translator);
 
-	qRegisterMetaType<unsigned>("unsigned");
+    qRegisterMetaType<unsigned>("unsigned");
-	qRegisterMetaType<boost::shared_ptr<Game> >("boost::shared_ptr<Game>");
+    qRegisterMetaType<boost::shared_ptr<Game> >("boost::shared_ptr<Game>");
-	qRegisterMetaType<ServerStats>("ServerStats");
+    qRegisterMetaType<ServerStats>("ServerStats");
-	qRegisterMetaType<DenyGameInvitationReason>("DenyGameInvitationReason");
+    qRegisterMetaType<DenyGameInvitationReason>("DenyGameInvitationReason");
-	///////////////////////////////////////////////////
+    ///////////////////////////////////////////////////
 
     startWindowImpl mainWin(myConfig,myLog);
     a.setActivationWindow(&mainWin, true);
 
-	int retVal = a.exec();
+    int retVal = a.exec();
 
-	curl_global_cleanup();
+    curl_global_cleanup();
-	socket_cleanup();
+    socket_cleanup();
 
 
-	return retVal;
+    return retVal;
 
 }