Next steps on getting 800x480 gui running on Android. The first time on Motorola Defy (Android 2.2) the gametable looks nice and is really useable ;-)

This commit is contained in:
doitux
2012-05-04 01:06:04 +00:00
parent bdb43f68da
commit 4802529ec4
27 changed files with 560 additions and 48 deletions
+3
View File
@@ -0,0 +1,3 @@
[Dolphin]
PreviewsShown=true
Timestamp=2012,5,3,23,1,35
Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 KiB

After

Width:  |  Height:  |  Size: 401 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 643 KiB

After

Width:  |  Height:  |  Size: 286 KiB

+5
View File
@@ -0,0 +1,5 @@
[Dolphin]
AdditionalInfoV2=Details_Size,Details_Date,CustomizedDetails
Timestamp=2011,12,28,0,5,0
Version=2
ViewMode=1
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+36
View File
@@ -6,3 +6,39 @@ SUBDIRS = pokerth_protocol.pro pokerth_db.pro pokerth_lib.pro pokerth_game.pro
SUBDIRS += pokerth_server.pro chatcleaner.pro
}
CONFIG += ordered
OTHER_FILES += \
android/src/org/kde/necessitas/origo/QtActivity.java \
android/src/org/kde/necessitas/origo/QtApplication.java \
android/src/org/kde/necessitas/ministro/IMinistro.aidl \
android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
android/res/values-pl/strings.xml \
android/res/values-es/strings.xml \
android/res/values-it/strings.xml \
android/res/values-ru/strings.xml \
android/res/values-et/strings.xml \
android/res/values-rs/strings.xml \
android/res/values-ja/strings.xml \
android/res/values-fa/strings.xml \
android/res/values-ro/strings.xml \
android/res/values-zh-rTW/strings.xml \
android/res/drawable-ldpi/icon.png \
android/res/values-nl/strings.xml \
android/res/drawable/icon.png \
android/res/drawable/logo.png \
android/res/values-zh-rCN/strings.xml \
android/res/values-pt-rBR/strings.xml \
android/res/values-el/strings.xml \
android/res/layout/splash.xml \
android/res/values-fr/strings.xml \
android/res/drawable-mdpi/icon.png \
android/res/drawable-hdpi/icon.png \
android/res/values-id/strings.xml \
android/res/values-ms/strings.xml \
android/res/values-de/strings.xml \
android/res/values-nb/strings.xml \
android/res/values/strings.xml \
android/res/values/libs.xml \
android/version.xml \
android/AndroidManifest.xml
+9 -1
View File
@@ -23,7 +23,14 @@ DEFINES += PREFIX=\"$${PREFIX}\"
TARGET = pokerth
# PRECOMPILED_HEADER = src/pch_game.h
RESOURCES = src/gui/qt/resources/pokerth.qrc
android{
RESOURCES = src/gui/qt/resources/pokerth_android.qrc
}
!android{
RESOURCES = src/gui/qt/resources/pokerth.qrc
}
INCLUDEPATH += . \
src \
src/engine \
@@ -603,3 +610,4 @@ android{
# sqlite3 is included directly.
INCLUDEPATH += src/third_party/sqlite3
}
+18 -3
View File
@@ -75,6 +75,11 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
setupUi(this);
#ifdef ANDROID
this->setAttribute(Qt::WA_LockLandscapeOrientation);
this->showFullScreen();
#endif
//Sound
mySDLPlayer = new SDLPlayer(myConfig);
mySoundEventHandler = new SoundEvents(myConfig);
@@ -504,7 +509,11 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
myUniversalMessageDialog = new myMessageDialogImpl(myConfig, this);
myUniversalMessageDialog->setParent(this);
//hide left and right icon from maemo gui for ANDROID
#ifdef ANDROID
fullscreenButton->hide();
tabsButton->hide();
#endif
//Connects
#ifdef GUI_800x480
@@ -4228,10 +4237,15 @@ void gameTableImpl::saveGameTableGeometry()
void gameTableImpl::restoreGameTableGeometry()
{
#ifdef ANDROID
this->showFullScreen();
refreshGameTableStyle();
this->showFullScreen();
#else
if(myConfig->readConfigInt("GameTableFullScreenSave")) {
#ifndef GUI_800x480
#ifndef GUI_800x480
if(actionFullScreen->isEnabled()) this->showFullScreen();
#endif
#endif
} else {
//resize only if style size allow this and if NOT fixed windows size
if(!myGameTableStyle->getIfFixedWindowSize().toInt() && myConfig->readConfigInt("GameTableHeightSave") <= myGameTableStyle->getMaximumWindowHeight().toInt() && myConfig->readConfigInt("GameTableHeightSave") >= myGameTableStyle->getMinimumWindowHeight().toInt() && myConfig->readConfigInt("GameTableWidthSave") <= myGameTableStyle->getMaximumWindowWidth().toInt() && myConfig->readConfigInt("GameTableWidthSave") >= myGameTableStyle->getMinimumWindowWidth().toInt()) {
@@ -4239,6 +4253,7 @@ void gameTableImpl::restoreGameTableGeometry()
this->resize(myConfig->readConfigInt("GameTableWidthSave"), myConfig->readConfigInt("GameTableHeightSave"));
}
}
#endif
}
void gameTableImpl::netClientPlayerLeft(unsigned /*playerId*/)
+8 -8
View File
@@ -4255,7 +4255,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/preferences-desktop_50x50.png</normaloff>:/gfx/preferences-desktop_50x50.png</iconset>
</property>
<property name="iconSize">
@@ -4396,7 +4396,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">
@@ -4496,7 +4496,7 @@ p, li { white-space: pre-wrap; }
<property name="minimumSize">
<size>
<width>220</width>
<height>16</height>
<height>60</height>
</size>
</property>
<property name="maximumSize">
@@ -4564,7 +4564,7 @@ p, li { white-space: pre-wrap; }
<x>0</x>
<y>0</y>
<width>1024</width>
<height>21</height>
<height>26</height>
</rect>
</property>
<property name="minimumSize">
@@ -4631,7 +4631,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">
@@ -4689,7 +4689,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">
@@ -4698,7 +4698,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">
@@ -4770,7 +4770,7 @@ p, li { white-space: pre-wrap; }
</customwidget>
</customwidgets>
<resources>
<include location="../resources/pokerth.qrc"/>
<include location="../resources/pokerth_android.qrc"/>
</resources>
<connections/>
</ui>
+16 -16
View File
@@ -18,8 +18,8 @@
</property>
<property name="maximumSize">
<size>
<width>800</width>
<height>480</height>
<width>1024</width>
<height>600</height>
</size>
</property>
<property name="windowTitle">
@@ -34,8 +34,8 @@
</property>
<property name="maximumSize">
<size>
<width>800</width>
<height>424</height>
<width>1024</width>
<height>600</height>
</size>
</property>
<layout class="QGridLayout" name="gridLayout_2">
@@ -134,7 +134,7 @@
<string>&amp;1 Start 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>
<property name="iconSize">
@@ -175,7 +175,7 @@
<string>&amp;2 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>
<property name="iconSize">
@@ -216,7 +216,7 @@
<string>&amp;3 Create Network Game</string>
</property>
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/swbuttoncreatenetworkgame.png</normaloff>:/gfx/swbuttoncreatenetworkgame.png</iconset>
</property>
<property name="iconSize">
@@ -245,7 +245,7 @@
<string>&amp;4 Join 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>
<property name="iconSize">
@@ -277,7 +277,7 @@
</property>
<property name="maximumSize">
<size>
<width>800</width>
<width>1024</width>
<height>56</height>
</size>
</property>
@@ -298,7 +298,7 @@
</widget>
<action name="actionStart_Local_Game">
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/swbuttonlocalgame.png</normaloff>:/gfx/swbuttonlocalgame.png</iconset>
</property>
<property name="text">
@@ -310,7 +310,7 @@
</action>
<action name="actionInternet_Game">
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/swbuttoninternetgame.png</normaloff>:/gfx/swbuttoninternetgame.png</iconset>
</property>
<property name="text">
@@ -332,7 +332,7 @@
</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">
@@ -348,7 +348,7 @@
</action>
<action name="actionQuit">
<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">
@@ -363,7 +363,7 @@
<bool>true</bool>
</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>
<property name="text">
@@ -372,7 +372,7 @@
</action>
<action name="actionCreate_Network_Game">
<property name="icon">
<iconset resource="../resources/pokerth.qrc">
<iconset resource="../resources/pokerth_android.qrc">
<normaloff>:/gfx/swbuttoncreatenetworkgame.png</normaloff>:/gfx/swbuttoncreatenetworkgame.png</iconset>
</property>
<property name="text">
@@ -381,7 +381,7 @@
</action>
</widget>
<resources>
<include location="../resources/pokerth.qrc"/>
<include location="../resources/pokerth_android.qrc"/>
</resources>
<connections>
<connection>
+1
View File
@@ -0,0 +1 @@
../../../../data/
+423
View File
@@ -0,0 +1,423 @@
<RCC>
<qresource prefix="/gfx">
<file>view-fullscreen.png</file>
<file>swbuttoninternetgame.png</file>
<file>swbuttoncreatenetworkgame.png</file>
<file>swbuttonjoinnetworkgame.png</file>
<file>media_podcast.png</file>
<file>system_users_big.png</file>
<file>swbuttonlocalgame.png</file>
<file>tools_wizard.png</file>
<file>speaker.png</file>
<file>arrow_right_double.png</file>
<file>view_refresh.png</file>
<file>arrow_left_double.png</file>
<file>list_remove_user.png</file>
<file>user.png</file>
<file>application_exit.png</file>
<file>system_users.png</file>
<file>list_add_user.png</file>
<file>list_add.png</file>
<file>audio_input_microphone.png</file>
<file>utilities-log-viewer.png</file>
<file>preferences-desktop.png</file>
<file>dialog_close.png</file>
<file>systemsettings.png</file>
<file>editdelete.png</file>
<file>user_properties.png</file>
<file>printer1.png</file>
<file>pdf.png</file>
<file>preferences_desktop_user.png</file>
<file>dialog_ok_apply.png</file>
<file>filesave.png</file>
<file>fill-color.png</file>
<file>lock.png</file>
<file>cup.png</file>
<file>registered.png</file>
<file>games-endturn.png</file>
<file>go-next-view.png</file>
<file>go-previous-view.png</file>
<file>list-remove.png</file>
<file>transform-rotate.png</file>
<file>player_play.png</file>
<file>logoChip3D.png</file>
<file>ktip.png</file>
<file>system_help_64.png</file>
<file>list_add_user_64.png</file>
<file>im-ban-user.png</file>
<file>im-ban-user_64.png</file>
<file>text-html.png</file>
<file>text-plain.png</file>
<file>document-open-folder.png</file>
<file>emblem-important.png</file>
<file>emblem-important-64.png</file>
<file>dialog-information.png</file>
<file>view-statistics.png</file>
<file>document-revert.png</file>
<file>view-fullscreen_50x50.png</file>
<file>preferences-desktop_50x50.png</file>
</qresource>
<qresource prefix="/cflags">
<file>cflags/ad.png</file>
<file>cflags/ae.png</file>
<file>cflags/af.png</file>
<file>cflags/ag.png</file>
<file>cflags/ai.png</file>
<file>cflags/al.png</file>
<file>cflags/am.png</file>
<file>cflags/an.png</file>
<file>cflags/ao.png</file>
<file>cflags/ar.png</file>
<file>cflags/as.png</file>
<file>cflags/at.png</file>
<file>cflags/au.png</file>
<file>cflags/aw.png</file>
<file>cflags/ax.png</file>
<file>cflags/az.png</file>
<file>cflags/ba.png</file>
<file>cflags/bb.png</file>
<file>cflags/bd.png</file>
<file>cflags/be.png</file>
<file>cflags/bf.png</file>
<file>cflags/bg.png</file>
<file>cflags/bh.png</file>
<file>cflags/bi.png</file>
<file>cflags/bj.png</file>
<file>cflags/bm.png</file>
<file>cflags/bn.png</file>
<file>cflags/bo.png</file>
<file>cflags/br.png</file>
<file>cflags/bs.png</file>
<file>cflags/bt.png</file>
<file>cflags/bv.png</file>
<file>cflags/bw.png</file>
<file>cflags/by.png</file>
<file>cflags/bz.png</file>
<file>cflags/ca.png</file>
<file>cflags/catalonia.png</file>
<file>cflags/cc.png</file>
<file>cflags/cd.png</file>
<file>cflags/cf.png</file>
<file>cflags/cg.png</file>
<file>cflags/ci.png</file>
<file>cflags/ck.png</file>
<file>cflags/cl.png</file>
<file>cflags/cm.png</file>
<file>cflags/cn.png</file>
<file>cflags/co.png</file>
<file>cflags/cr.png</file>
<file>cflags/cs.png</file>
<file>cflags/cu.png</file>
<file>cflags/cv.png</file>
<file>cflags/cx.png</file>
<file>cflags/cy.png</file>
<file>cflags/cz.png</file>
<file>cflags/de.png</file>
<file>cflags/dj.png</file>
<file>cflags/dk.png</file>
<file>cflags/dm.png</file>
<file>cflags/do.png</file>
<file>cflags/dz.png</file>
<file>cflags/ec.png</file>
<file>cflags/ee.png</file>
<file>cflags/eg.png</file>
<file>cflags/eh.png</file>
<file>cflags/england.png</file>
<file>cflags/er.png</file>
<file>cflags/es.png</file>
<file>cflags/et.png</file>
<file>cflags/europeanunion.png</file>
<file>cflags/fam.png</file>
<file>cflags/fi.png</file>
<file>cflags/fj.png</file>
<file>cflags/fk.png</file>
<file>cflags/fm.png</file>
<file>cflags/fo.png</file>
<file>cflags/fr.png</file>
<file>cflags/ga.png</file>
<file>cflags/gb.png</file>
<file>cflags/gd.png</file>
<file>cflags/ge.png</file>
<file>cflags/gf.png</file>
<file>cflags/gh.png</file>
<file>cflags/gi.png</file>
<file>cflags/gl.png</file>
<file>cflags/gm.png</file>
<file>cflags/gn.png</file>
<file>cflags/gp.png</file>
<file>cflags/gq.png</file>
<file>cflags/gr.png</file>
<file>cflags/gs.png</file>
<file>cflags/gt.png</file>
<file>cflags/gu.png</file>
<file>cflags/gw.png</file>
<file>cflags/gy.png</file>
<file>cflags/hk.png</file>
<file>cflags/hm.png</file>
<file>cflags/hn.png</file>
<file>cflags/hr.png</file>
<file>cflags/ht.png</file>
<file>cflags/hu.png</file>
<file>cflags/id.png</file>
<file>cflags/ie.png</file>
<file>cflags/il.png</file>
<file>cflags/in.png</file>
<file>cflags/io.png</file>
<file>cflags/iq.png</file>
<file>cflags/ir.png</file>
<file>cflags/is.png</file>
<file>cflags/it.png</file>
<file>cflags/jm.png</file>
<file>cflags/jo.png</file>
<file>cflags/jp.png</file>
<file>cflags/ke.png</file>
<file>cflags/kg.png</file>
<file>cflags/kh.png</file>
<file>cflags/ki.png</file>
<file>cflags/km.png</file>
<file>cflags/kn.png</file>
<file>cflags/kp.png</file>
<file>cflags/kr.png</file>
<file>cflags/kw.png</file>
<file>cflags/ky.png</file>
<file>cflags/kz.png</file>
<file>cflags/la.png</file>
<file>cflags/lb.png</file>
<file>cflags/lc.png</file>
<file>cflags/li.png</file>
<file>cflags/lk.png</file>
<file>cflags/lr.png</file>
<file>cflags/ls.png</file>
<file>cflags/lt.png</file>
<file>cflags/lu.png</file>
<file>cflags/lv.png</file>
<file>cflags/ly.png</file>
<file>cflags/ma.png</file>
<file>cflags/mc.png</file>
<file>cflags/md.png</file>
<file>cflags/me.png</file>
<file>cflags/mg.png</file>
<file>cflags/mh.png</file>
<file>cflags/mk.png</file>
<file>cflags/ml.png</file>
<file>cflags/mm.png</file>
<file>cflags/mn.png</file>
<file>cflags/mo.png</file>
<file>cflags/mp.png</file>
<file>cflags/mq.png</file>
<file>cflags/mr.png</file>
<file>cflags/ms.png</file>
<file>cflags/mt.png</file>
<file>cflags/mu.png</file>
<file>cflags/mv.png</file>
<file>cflags/mw.png</file>
<file>cflags/mx.png</file>
<file>cflags/my.png</file>
<file>cflags/mz.png</file>
<file>cflags/na.png</file>
<file>cflags/nc.png</file>
<file>cflags/ne.png</file>
<file>cflags/nf.png</file>
<file>cflags/ng.png</file>
<file>cflags/ni.png</file>
<file>cflags/nl.png</file>
<file>cflags/no.png</file>
<file>cflags/nr.png</file>
<file>cflags/nu.png</file>
<file>cflags/nz.png</file>
<file>cflags/om.png</file>
<file>cflags/pa.png</file>
<file>cflags/pe.png</file>
<file>cflags/pf.png</file>
<file>cflags/pg.png</file>
<file>cflags/ph.png</file>
<file>cflags/pk.png</file>
<file>cflags/pl.png</file>
<file>cflags/pm.png</file>
<file>cflags/pn.png</file>
<file>cflags/pr.png</file>
<file>cflags/ps.png</file>
<file>cflags/pt.png</file>
<file>cflags/pw.png</file>
<file>cflags/py.png</file>
<file>cflags/qa.png</file>
<file>cflags/re.png</file>
<file>cflags/ro.png</file>
<file>cflags/rs.png</file>
<file>cflags/ru.png</file>
<file>cflags/rw.png</file>
<file>cflags/sa.png</file>
<file>cflags/sb.png</file>
<file>cflags/sc.png</file>
<file>cflags/scotland.png</file>
<file>cflags/sd.png</file>
<file>cflags/se.png</file>
<file>cflags/sg.png</file>
<file>cflags/sh.png</file>
<file>cflags/si.png</file>
<file>cflags/sj.png</file>
<file>cflags/sk.png</file>
<file>cflags/sl.png</file>
<file>cflags/sm.png</file>
<file>cflags/sn.png</file>
<file>cflags/so.png</file>
<file>cflags/sr.png</file>
<file>cflags/st.png</file>
<file>cflags/sv.png</file>
<file>cflags/sy.png</file>
<file>cflags/sz.png</file>
<file>cflags/tc.png</file>
<file>cflags/td.png</file>
<file>cflags/tf.png</file>
<file>cflags/tg.png</file>
<file>cflags/th.png</file>
<file>cflags/tj.png</file>
<file>cflags/tk.png</file>
<file>cflags/tl.png</file>
<file>cflags/tm.png</file>
<file>cflags/tn.png</file>
<file>cflags/to.png</file>
<file>cflags/tr.png</file>
<file>cflags/tt.png</file>
<file>cflags/tv.png</file>
<file>cflags/tw.png</file>
<file>cflags/tz.png</file>
<file>cflags/ua.png</file>
<file>cflags/ug.png</file>
<file>cflags/um.png</file>
<file>cflags/us.png</file>
<file>cflags/uy.png</file>
<file>cflags/uz.png</file>
<file>cflags/va.png</file>
<file>cflags/vc.png</file>
<file>cflags/ve.png</file>
<file>cflags/vg.png</file>
<file>cflags/vi.png</file>
<file>cflags/vn.png</file>
<file>cflags/vu.png</file>
<file>cflags/wales.png</file>
<file>cflags/wf.png</file>
<file>cflags/ws.png</file>
<file>cflags/ye.png</file>
<file>cflags/yt.png</file>
<file>cflags/za.png</file>
<file>cflags/zm.png</file>
<file>cflags/zw.png</file>
<file>cflags/ch.png</file>
<file>cflags/np.png</file>
<file>cflags/undefined.png</file>
</qresource>
<qresource prefix="/android">
<file>android-data/gfx/gui/misc/actionpics/action_allin.png</file>
<file>android-data/gfx/gui/misc/actionpics/action_bet.png</file>
<file>android-data/gfx/gui/misc/actionpics/action_call.png</file>
<file>android-data/gfx/gui/misc/actionpics/action_check.png</file>
<file>android-data/gfx/gui/misc/actionpics/action_fold.png</file>
<file>android-data/gfx/gui/misc/actionpics/action_raise.png</file>
<file>android-data/gfx/gui/misc/actionpics/action_winner.png</file>
<file>android-data/gfx/cards/default/0.png</file>
<file>android-data/gfx/cards/default/1.png</file>
<file>android-data/gfx/cards/default/2.png</file>
<file>android-data/gfx/cards/default/3.png</file>
<file>android-data/gfx/cards/default/4.png</file>
<file>android-data/gfx/cards/default/5.png</file>
<file>android-data/gfx/cards/default/6.png</file>
<file>android-data/gfx/cards/default/7.png</file>
<file>android-data/gfx/cards/default/8.png</file>
<file>android-data/gfx/cards/default/9.png</file>
<file>android-data/gfx/cards/default/10.png</file>
<file>android-data/gfx/cards/default/11.png</file>
<file>android-data/gfx/cards/default/12.png</file>
<file>android-data/gfx/cards/default/13.png</file>
<file>android-data/gfx/cards/default/14.png</file>
<file>android-data/gfx/cards/default/15.png</file>
<file>android-data/gfx/cards/default/16.png</file>
<file>android-data/gfx/cards/default/17.png</file>
<file>android-data/gfx/cards/default/18.png</file>
<file>android-data/gfx/cards/default/19.png</file>
<file>android-data/gfx/cards/default/20.png</file>
<file>android-data/gfx/cards/default/21.png</file>
<file>android-data/gfx/cards/default/22.png</file>
<file>android-data/gfx/cards/default/23.png</file>
<file>android-data/gfx/cards/default/24.png</file>
<file>android-data/gfx/cards/default/25.png</file>
<file>android-data/gfx/cards/default/26.png</file>
<file>android-data/gfx/cards/default/27.png</file>
<file>android-data/gfx/cards/default/28.png</file>
<file>android-data/gfx/cards/default/29.png</file>
<file>android-data/gfx/cards/default/30.png</file>
<file>android-data/gfx/cards/default/31.png</file>
<file>android-data/gfx/cards/default/32.png</file>
<file>android-data/gfx/cards/default/33.png</file>
<file>android-data/gfx/cards/default/34.png</file>
<file>android-data/gfx/cards/default/35.png</file>
<file>android-data/gfx/cards/default/36.png</file>
<file>android-data/gfx/cards/default/37.png</file>
<file>android-data/gfx/cards/default/38.png</file>
<file>android-data/gfx/cards/default/39.png</file>
<file>android-data/gfx/cards/default/40.png</file>
<file>android-data/gfx/cards/default/41.png</file>
<file>android-data/gfx/cards/default/42.png</file>
<file>android-data/gfx/cards/default/43.png</file>
<file>android-data/gfx/cards/default/44.png</file>
<file>android-data/gfx/cards/default/45.png</file>
<file>android-data/gfx/cards/default/46.png</file>
<file>android-data/gfx/cards/default/47.png</file>
<file>android-data/gfx/cards/default/48.png</file>
<file>android-data/gfx/cards/default/49.png</file>
<file>android-data/gfx/cards/default/50.png</file>
<file>android-data/gfx/cards/default/51.png</file>
<file>android-data/gfx/cards/default/defaultdeckstyle.xml</file>
<file>android-data/gfx/cards/default/flipside_tux.png</file>
<file>android-data/gfx/cards/default/flipside.png</file>
<file>android-data/gfx/cards/default/preview.png</file>
<file>android-data/gfx/gui/table/default_800x480/bigblindPuck.png</file>
<file>android-data/gfx/gui/table/default_800x480/cardholder_flop.png</file>
<file>android-data/gfx/gui/table/default_800x480/cardholder_river.png</file>
<file>android-data/gfx/gui/table/default_800x480/cardholder_turn.png</file>
<file>android-data/gfx/gui/table/default_800x480/dealerPuck.png</file>
<file>android-data/gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml</file>
<file>android-data/gfx/gui/table/default_800x480/genereticAvatar.png</file>
<file>android-data/gfx/gui/table/default_800x480/handranking_template.xcf</file>
<file>android-data/gfx/gui/table/default_800x480/handranking.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_blue_checked_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_blue_checked.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_blue_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_blue.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_green_checked_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_green_checked.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_green_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_green.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_orange_checked_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_orange_checked.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_orange_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_orange.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_purple_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_purple.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_red_checked_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_red_checked.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_red_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/playeraction_red.png</file>
<file>android-data/gfx/gui/table/default_800x480/playerSeatActive.png</file>
<file>android-data/gfx/gui/table/default_800x480/playerSeatInactive.png</file>
<file>android-data/gfx/gui/table/default_800x480/preview.png</file>
<file>android-data/gfx/gui/table/default_800x480/radiobutton_checked_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/radiobutton_checked.png</file>
<file>android-data/gfx/gui/table/default_800x480/radiobutton_pressed.png</file>
<file>android-data/gfx/gui/table/default_800x480/radiobutton_unchecked_hover.png</file>
<file>android-data/gfx/gui/table/default_800x480/radiobutton_unchecked.png</file>
<file>android-data/gfx/gui/table/default_800x480/smallblindPuck.png</file>
<file>android-data/gfx/gui/table/default_800x480/table.png</file>
<file>android-data/gfx/gui/table/default_800x480/toolboxbg.png</file>
<file>android-data/gfx/gui/misc/1px.png</file>
<file>android-data/gfx/gui/misc/background_gamelist.png</file>
<file>android-data/gfx/gui/misc/fileopen16.png</file>
<file>android-data/gfx/gui/misc/rating.png</file>
<file>android-data/gfx/gui/misc/startwindowbg_800x480.png</file>
<file>android-data/gfx/gui/misc/startwindowbg_old.png</file>
<file>android-data/gfx/gui/misc/startwindowbg.png</file>
<file>android-data/gfx/gui/misc/welcomepokerth_old.png</file>
<file>android-data/gfx/gui/misc/welcomepokerth.png</file>
<file>android-data/gfx/gui/misc/windowicon.png</file>
</qresource>
</RCC>
+7 -3
View File
@@ -75,9 +75,13 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
#ifdef GUI_800x480
this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }");
centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg_800x480.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
#ifdef ANDROID
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->setAttribute(Qt::WA_LockLandscapeOrientation);
this->showFullScreen();
#else
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:20px; 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:20px; 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:20px; border-width: 0px;}");
+9 -5
View File
@@ -36,7 +36,11 @@ CardDeckStyleReader::~CardDeckStyleReader()
void CardDeckStyleReader::readStyleFile(QString file)
{
#ifdef ANDROID
//on Android we use just the defaul style packed with the binary via qrc
currentFileName = ":/android//android-data/gfx/cards/default/defaultdeckstyle.xml";
currentDir = ":/android/android-data/gfx/cards/default/";
#else
//if style file failed --> default style fallback
if(QFile(file).exists()) {
currentFileName = file;
@@ -45,12 +49,12 @@ void CardDeckStyleReader::readStyleFile(QString file)
fallBack = 1;
}
QFile myFile(currentFileName);
myFile.open(QIODevice::ReadOnly);
fileContent = myFile.readAll();
QFileInfo info(currentFileName);
currentDir = info.absolutePath()+"/";
#endif
QFile myFile(currentFileName);
myFile.open(QIODevice::ReadOnly);
fileContent = myFile.readAll();
//start reading the file and fill vars
string tempString1("");
+16 -7
View File
@@ -71,7 +71,11 @@ GameTableStyleReader::~GameTableStyleReader()
void GameTableStyleReader::readStyleFile(QString file)
{
#ifdef ANDROID
//on Android we use just the defaul style packed with the binary via qrc
currentFileName = ":/android/android-data/gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml";
currentDir = ":/android/android-data/gfx/gui/table/default_800x480/";
#else
//if style file failed --> default style fallback
if(QFile(file).exists()) {
currentFileName = QFile(file).fileName();
@@ -80,12 +84,13 @@ void GameTableStyleReader::readStyleFile(QString file)
fallBack = 1;
}
QFile myFile(currentFileName);
myFile.open(QIODevice::ReadOnly);
fileContent = myFile.readAll();
QFileInfo info(currentFileName);
currentDir = info.absolutePath()+"/";
#endif
QFile myFile(currentFileName);
myFile.open(QIODevice::ReadOnly);
fileContent = myFile.readAll();
//start reading the file and fill vars
string tempString1("");
@@ -1609,13 +1614,17 @@ void GameTableStyleReader::setSliderStyle(QSlider *s)
QString height("");
#ifdef GUI_800x480
height = " height: 10px;";
height = " height: 10px;";
#else
height = " height: 3px;";
#endif
#if QT_VERSION >= 0x040700
s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+";"+height+" background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 12px; margin: -7px 0; border-radius: 4px;}");
#ifdef GUI_800x480
s->setStyleSheet("QSlider::groove:horizontal { border: 2px solid #"+BetSpeedSliderGrooveBorderColor+";"+height+" background: #"+BetSpeedSliderGrooveBgColor+"; margin: 2px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 2px solid #"+BetSpeedSliderHandleBorderColor+"; width: 40px; margin: -16px 0; border-radius: 4px;}");
#else
s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+";"+height+" background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 12px; margin: -7px 0; border-radius: 4px;}");
#endif
#else
s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+";"+height+" background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 12px; margin: -2px 0; border-radius: 4px;}");
#endif
+9 -5
View File
@@ -88,12 +88,12 @@ int main( int argc, char **argv )
//create defaultconfig
ConfigFile *myConfig = new ConfigFile(argv[0], false);
Log *myLog = new Log(myConfig);
#ifndef ANDROID
// set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets
a.setStyle(new QPlastiqueStyle);
QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
//set QApplication default font
#endif
QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
//set QApplication default font
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb");
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
@@ -112,12 +112,16 @@ int main( int argc, char **argv )
#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) }");
#ifdef ANDROID
a.setAttribute(Qt::WA_LockLandscapeOrientation);
#else
QPixmap *pixmap = new QPixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth.png");
StartSplash splash(*pixmap);
if(!myConfig->readConfigInt("DisableSplashScreenOnStartup")) {
splash.show();
splash.showMessage(QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING), 0x0042, QColor(240,240,240));
}
}
#endif
//Set translations
QTranslator qtTranslator;