diff --git a/data/gfx/gui/misc/.directory b/data/gfx/gui/misc/.directory new file mode 100644 index 00000000..91049689 --- /dev/null +++ b/data/gfx/gui/misc/.directory @@ -0,0 +1,3 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2012,5,3,23,1,35 diff --git a/data/gfx/gui/misc/startwindowbg_800x480.png b/data/gfx/gui/misc/startwindowbg_800x480.png index a07d6836..afb8ab94 100644 Binary files a/data/gfx/gui/misc/startwindowbg_800x480.png and b/data/gfx/gui/misc/startwindowbg_800x480.png differ diff --git a/data/gfx/gui/misc/startwindowbg_old.png b/data/gfx/gui/misc/startwindowbg_old.png new file mode 100644 index 00000000..e0b5d212 Binary files /dev/null and b/data/gfx/gui/misc/startwindowbg_old.png differ diff --git a/data/gfx/gui/misc/welcomepokerth_old.png b/data/gfx/gui/misc/welcomepokerth_old.png new file mode 100644 index 00000000..3d015a58 Binary files /dev/null and b/data/gfx/gui/misc/welcomepokerth_old.png differ diff --git a/data/gfx/gui/table/default_800x480/table.png b/data/gfx/gui/table/default_800x480/table.png index d66af61f..661f24e0 100755 Binary files a/data/gfx/gui/table/default_800x480/table.png and b/data/gfx/gui/table/default_800x480/table.png differ diff --git a/data/sounds/default/.directory b/data/sounds/default/.directory new file mode 100644 index 00000000..c78244ef --- /dev/null +++ b/data/sounds/default/.directory @@ -0,0 +1,5 @@ +[Dolphin] +AdditionalInfoV2=Details_Size,Details_Date,CustomizedDetails +Timestamp=2011,12,28,0,5,0 +Version=2 +ViewMode=1 diff --git a/data/translations/qt_ar.qm b/data/translations/qt_ar.qm new file mode 100755 index 00000000..e524d5b7 Binary files /dev/null and b/data/translations/qt_ar.qm differ diff --git a/data/translations/qt_cs.qm b/data/translations/qt_cs.qm new file mode 100755 index 00000000..983bfaec Binary files /dev/null and b/data/translations/qt_cs.qm differ diff --git a/data/translations/qt_da.qm b/data/translations/qt_da.qm new file mode 100755 index 00000000..7c7b5f80 Binary files /dev/null and b/data/translations/qt_da.qm differ diff --git a/data/translations/qt_gl.qm b/data/translations/qt_gl.qm new file mode 100755 index 00000000..a079a446 Binary files /dev/null and b/data/translations/qt_gl.qm differ diff --git a/data/translations/qt_he.qm b/data/translations/qt_he.qm new file mode 100755 index 00000000..4ff507e0 Binary files /dev/null and b/data/translations/qt_he.qm differ diff --git a/data/translations/qt_hu.qm b/data/translations/qt_hu.qm new file mode 100755 index 00000000..fe78c348 Binary files /dev/null and b/data/translations/qt_hu.qm differ diff --git a/data/translations/qt_ja.qm b/data/translations/qt_ja.qm new file mode 100755 index 00000000..f3917e25 Binary files /dev/null and b/data/translations/qt_ja.qm differ diff --git a/data/translations/qt_sl.qm b/data/translations/qt_sl.qm new file mode 100755 index 00000000..4a0b43fc Binary files /dev/null and b/data/translations/qt_sl.qm differ diff --git a/data/translations/qt_uk.qm b/data/translations/qt_uk.qm new file mode 100755 index 00000000..b40c701b Binary files /dev/null and b/data/translations/qt_uk.qm differ diff --git a/data/translations/qt_zh_TW.qm b/data/translations/qt_zh_TW.qm new file mode 100755 index 00000000..a9a25b20 Binary files /dev/null and b/data/translations/qt_zh_TW.qm differ diff --git a/pokerth.pro b/pokerth.pro index ed4db1ed..d99ff6f7 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -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 + diff --git a/pokerth_game.pro b/pokerth_game.pro index 9467f006..a9adf80b 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -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 } + diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 0e315541..1ba3f381 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -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*/) diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 316b0c6a..898f1604 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -4255,7 +4255,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/preferences-desktop_50x50.png:/gfx/preferences-desktop_50x50.png @@ -4396,7 +4396,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/view-fullscreen_50x50.png:/gfx/view-fullscreen_50x50.png @@ -4496,7 +4496,7 @@ p, li { white-space: pre-wrap; } 220 - 16 + 60 @@ -4564,7 +4564,7 @@ p, li { white-space: pre-wrap; } 0 0 1024 - 21 + 26 @@ -4631,7 +4631,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/view-fullscreen.png:/gfx/view-fullscreen.png @@ -4689,7 +4689,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/systemsettings.png:/gfx/systemsettings.png @@ -4698,7 +4698,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/application_exit.png:/gfx/application_exit.png @@ -4770,7 +4770,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/src/gui/qt/gui_800x480/startwindow_800x480.ui b/src/gui/qt/gui_800x480/startwindow_800x480.ui index c9cab3cd..769c8d7d 100755 --- a/src/gui/qt/gui_800x480/startwindow_800x480.ui +++ b/src/gui/qt/gui_800x480/startwindow_800x480.ui @@ -18,8 +18,8 @@ - 800 - 480 + 1024 + 600 @@ -34,8 +34,8 @@ - 800 - 424 + 1024 + 600 @@ -134,7 +134,7 @@ &1 Start Local Game - + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png @@ -175,7 +175,7 @@ &2 Internet Game - + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png @@ -216,7 +216,7 @@ &3 Create Network Game - + :/gfx/swbuttoncreatenetworkgame.png:/gfx/swbuttoncreatenetworkgame.png @@ -245,7 +245,7 @@ &4 Join Network Game - + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png @@ -277,7 +277,7 @@ - 800 + 1024 56 @@ -298,7 +298,7 @@ - + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png @@ -310,7 +310,7 @@ - + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png @@ -332,7 +332,7 @@ - + :/gfx/systemsettings.png:/gfx/systemsettings.png @@ -348,7 +348,7 @@ - + :/gfx/application_exit.png:/gfx/application_exit.png @@ -363,7 +363,7 @@ true - + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png @@ -372,7 +372,7 @@ - + :/gfx/swbuttoncreatenetworkgame.png:/gfx/swbuttoncreatenetworkgame.png @@ -381,7 +381,7 @@ - + diff --git a/src/gui/qt/resources/android-data b/src/gui/qt/resources/android-data new file mode 120000 index 00000000..8703455c --- /dev/null +++ b/src/gui/qt/resources/android-data @@ -0,0 +1 @@ +../../../../data/ \ No newline at end of file diff --git a/src/gui/qt/resources/pokerth_android.qrc b/src/gui/qt/resources/pokerth_android.qrc new file mode 100644 index 00000000..ff3c4654 --- /dev/null +++ b/src/gui/qt/resources/pokerth_android.qrc @@ -0,0 +1,423 @@ + + + view-fullscreen.png + swbuttoninternetgame.png + swbuttoncreatenetworkgame.png + swbuttonjoinnetworkgame.png + media_podcast.png + system_users_big.png + swbuttonlocalgame.png + tools_wizard.png + speaker.png + arrow_right_double.png + view_refresh.png + arrow_left_double.png + list_remove_user.png + user.png + application_exit.png + system_users.png + list_add_user.png + list_add.png + audio_input_microphone.png + utilities-log-viewer.png + preferences-desktop.png + dialog_close.png + systemsettings.png + editdelete.png + user_properties.png + printer1.png + pdf.png + preferences_desktop_user.png + dialog_ok_apply.png + filesave.png + fill-color.png + lock.png + cup.png + registered.png + games-endturn.png + go-next-view.png + go-previous-view.png + list-remove.png + transform-rotate.png + player_play.png + logoChip3D.png + ktip.png + system_help_64.png + list_add_user_64.png + im-ban-user.png + im-ban-user_64.png + text-html.png + text-plain.png + document-open-folder.png + emblem-important.png + emblem-important-64.png + dialog-information.png + view-statistics.png + document-revert.png + view-fullscreen_50x50.png + preferences-desktop_50x50.png + + + cflags/ad.png + cflags/ae.png + cflags/af.png + cflags/ag.png + cflags/ai.png + cflags/al.png + cflags/am.png + cflags/an.png + cflags/ao.png + cflags/ar.png + cflags/as.png + cflags/at.png + cflags/au.png + cflags/aw.png + cflags/ax.png + cflags/az.png + cflags/ba.png + cflags/bb.png + cflags/bd.png + cflags/be.png + cflags/bf.png + cflags/bg.png + cflags/bh.png + cflags/bi.png + cflags/bj.png + cflags/bm.png + cflags/bn.png + cflags/bo.png + cflags/br.png + cflags/bs.png + cflags/bt.png + cflags/bv.png + cflags/bw.png + cflags/by.png + cflags/bz.png + cflags/ca.png + cflags/catalonia.png + cflags/cc.png + cflags/cd.png + cflags/cf.png + cflags/cg.png + cflags/ci.png + cflags/ck.png + cflags/cl.png + cflags/cm.png + cflags/cn.png + cflags/co.png + cflags/cr.png + cflags/cs.png + cflags/cu.png + cflags/cv.png + cflags/cx.png + cflags/cy.png + cflags/cz.png + cflags/de.png + cflags/dj.png + cflags/dk.png + cflags/dm.png + cflags/do.png + cflags/dz.png + cflags/ec.png + cflags/ee.png + cflags/eg.png + cflags/eh.png + cflags/england.png + cflags/er.png + cflags/es.png + cflags/et.png + cflags/europeanunion.png + cflags/fam.png + cflags/fi.png + cflags/fj.png + cflags/fk.png + cflags/fm.png + cflags/fo.png + cflags/fr.png + cflags/ga.png + cflags/gb.png + cflags/gd.png + cflags/ge.png + cflags/gf.png + cflags/gh.png + cflags/gi.png + cflags/gl.png + cflags/gm.png + cflags/gn.png + cflags/gp.png + cflags/gq.png + cflags/gr.png + cflags/gs.png + cflags/gt.png + cflags/gu.png + cflags/gw.png + cflags/gy.png + cflags/hk.png + cflags/hm.png + cflags/hn.png + cflags/hr.png + cflags/ht.png + cflags/hu.png + cflags/id.png + cflags/ie.png + cflags/il.png + cflags/in.png + cflags/io.png + cflags/iq.png + cflags/ir.png + cflags/is.png + cflags/it.png + cflags/jm.png + cflags/jo.png + cflags/jp.png + cflags/ke.png + cflags/kg.png + cflags/kh.png + cflags/ki.png + cflags/km.png + cflags/kn.png + cflags/kp.png + cflags/kr.png + cflags/kw.png + cflags/ky.png + cflags/kz.png + cflags/la.png + cflags/lb.png + cflags/lc.png + cflags/li.png + cflags/lk.png + cflags/lr.png + cflags/ls.png + cflags/lt.png + cflags/lu.png + cflags/lv.png + cflags/ly.png + cflags/ma.png + cflags/mc.png + cflags/md.png + cflags/me.png + cflags/mg.png + cflags/mh.png + cflags/mk.png + cflags/ml.png + cflags/mm.png + cflags/mn.png + cflags/mo.png + cflags/mp.png + cflags/mq.png + cflags/mr.png + cflags/ms.png + cflags/mt.png + cflags/mu.png + cflags/mv.png + cflags/mw.png + cflags/mx.png + cflags/my.png + cflags/mz.png + cflags/na.png + cflags/nc.png + cflags/ne.png + cflags/nf.png + cflags/ng.png + cflags/ni.png + cflags/nl.png + cflags/no.png + cflags/nr.png + cflags/nu.png + cflags/nz.png + cflags/om.png + cflags/pa.png + cflags/pe.png + cflags/pf.png + cflags/pg.png + cflags/ph.png + cflags/pk.png + cflags/pl.png + cflags/pm.png + cflags/pn.png + cflags/pr.png + cflags/ps.png + cflags/pt.png + cflags/pw.png + cflags/py.png + cflags/qa.png + cflags/re.png + cflags/ro.png + cflags/rs.png + cflags/ru.png + cflags/rw.png + cflags/sa.png + cflags/sb.png + cflags/sc.png + cflags/scotland.png + cflags/sd.png + cflags/se.png + cflags/sg.png + cflags/sh.png + cflags/si.png + cflags/sj.png + cflags/sk.png + cflags/sl.png + cflags/sm.png + cflags/sn.png + cflags/so.png + cflags/sr.png + cflags/st.png + cflags/sv.png + cflags/sy.png + cflags/sz.png + cflags/tc.png + cflags/td.png + cflags/tf.png + cflags/tg.png + cflags/th.png + cflags/tj.png + cflags/tk.png + cflags/tl.png + cflags/tm.png + cflags/tn.png + cflags/to.png + cflags/tr.png + cflags/tt.png + cflags/tv.png + cflags/tw.png + cflags/tz.png + cflags/ua.png + cflags/ug.png + cflags/um.png + cflags/us.png + cflags/uy.png + cflags/uz.png + cflags/va.png + cflags/vc.png + cflags/ve.png + cflags/vg.png + cflags/vi.png + cflags/vn.png + cflags/vu.png + cflags/wales.png + cflags/wf.png + cflags/ws.png + cflags/ye.png + cflags/yt.png + cflags/za.png + cflags/zm.png + cflags/zw.png + cflags/ch.png + cflags/np.png + cflags/undefined.png + + + android-data/gfx/gui/misc/actionpics/action_allin.png + android-data/gfx/gui/misc/actionpics/action_bet.png + android-data/gfx/gui/misc/actionpics/action_call.png + android-data/gfx/gui/misc/actionpics/action_check.png + android-data/gfx/gui/misc/actionpics/action_fold.png + android-data/gfx/gui/misc/actionpics/action_raise.png + android-data/gfx/gui/misc/actionpics/action_winner.png + android-data/gfx/cards/default/0.png + android-data/gfx/cards/default/1.png + android-data/gfx/cards/default/2.png + android-data/gfx/cards/default/3.png + android-data/gfx/cards/default/4.png + android-data/gfx/cards/default/5.png + android-data/gfx/cards/default/6.png + android-data/gfx/cards/default/7.png + android-data/gfx/cards/default/8.png + android-data/gfx/cards/default/9.png + android-data/gfx/cards/default/10.png + android-data/gfx/cards/default/11.png + android-data/gfx/cards/default/12.png + android-data/gfx/cards/default/13.png + android-data/gfx/cards/default/14.png + android-data/gfx/cards/default/15.png + android-data/gfx/cards/default/16.png + android-data/gfx/cards/default/17.png + android-data/gfx/cards/default/18.png + android-data/gfx/cards/default/19.png + android-data/gfx/cards/default/20.png + android-data/gfx/cards/default/21.png + android-data/gfx/cards/default/22.png + android-data/gfx/cards/default/23.png + android-data/gfx/cards/default/24.png + android-data/gfx/cards/default/25.png + android-data/gfx/cards/default/26.png + android-data/gfx/cards/default/27.png + android-data/gfx/cards/default/28.png + android-data/gfx/cards/default/29.png + android-data/gfx/cards/default/30.png + android-data/gfx/cards/default/31.png + android-data/gfx/cards/default/32.png + android-data/gfx/cards/default/33.png + android-data/gfx/cards/default/34.png + android-data/gfx/cards/default/35.png + android-data/gfx/cards/default/36.png + android-data/gfx/cards/default/37.png + android-data/gfx/cards/default/38.png + android-data/gfx/cards/default/39.png + android-data/gfx/cards/default/40.png + android-data/gfx/cards/default/41.png + android-data/gfx/cards/default/42.png + android-data/gfx/cards/default/43.png + android-data/gfx/cards/default/44.png + android-data/gfx/cards/default/45.png + android-data/gfx/cards/default/46.png + android-data/gfx/cards/default/47.png + android-data/gfx/cards/default/48.png + android-data/gfx/cards/default/49.png + android-data/gfx/cards/default/50.png + android-data/gfx/cards/default/51.png + android-data/gfx/cards/default/defaultdeckstyle.xml + android-data/gfx/cards/default/flipside_tux.png + android-data/gfx/cards/default/flipside.png + android-data/gfx/cards/default/preview.png + android-data/gfx/gui/table/default_800x480/bigblindPuck.png + android-data/gfx/gui/table/default_800x480/cardholder_flop.png + android-data/gfx/gui/table/default_800x480/cardholder_river.png + android-data/gfx/gui/table/default_800x480/cardholder_turn.png + android-data/gfx/gui/table/default_800x480/dealerPuck.png + android-data/gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml + android-data/gfx/gui/table/default_800x480/genereticAvatar.png + android-data/gfx/gui/table/default_800x480/handranking_template.xcf + android-data/gfx/gui/table/default_800x480/handranking.png + android-data/gfx/gui/table/default_800x480/playeraction_blue_checked_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_blue_checked.png + android-data/gfx/gui/table/default_800x480/playeraction_blue_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_blue.png + android-data/gfx/gui/table/default_800x480/playeraction_green_checked_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_green_checked.png + android-data/gfx/gui/table/default_800x480/playeraction_green_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_green.png + android-data/gfx/gui/table/default_800x480/playeraction_orange_checked_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_orange_checked.png + android-data/gfx/gui/table/default_800x480/playeraction_orange_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_orange.png + android-data/gfx/gui/table/default_800x480/playeraction_purple_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_purple.png + android-data/gfx/gui/table/default_800x480/playeraction_red_checked_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_red_checked.png + android-data/gfx/gui/table/default_800x480/playeraction_red_hover.png + android-data/gfx/gui/table/default_800x480/playeraction_red.png + android-data/gfx/gui/table/default_800x480/playerSeatActive.png + android-data/gfx/gui/table/default_800x480/playerSeatInactive.png + android-data/gfx/gui/table/default_800x480/preview.png + android-data/gfx/gui/table/default_800x480/radiobutton_checked_hover.png + android-data/gfx/gui/table/default_800x480/radiobutton_checked.png + android-data/gfx/gui/table/default_800x480/radiobutton_pressed.png + android-data/gfx/gui/table/default_800x480/radiobutton_unchecked_hover.png + android-data/gfx/gui/table/default_800x480/radiobutton_unchecked.png + android-data/gfx/gui/table/default_800x480/smallblindPuck.png + android-data/gfx/gui/table/default_800x480/table.png + android-data/gfx/gui/table/default_800x480/toolboxbg.png + android-data/gfx/gui/misc/1px.png + android-data/gfx/gui/misc/background_gamelist.png + android-data/gfx/gui/misc/fileopen16.png + android-data/gfx/gui/misc/rating.png + android-data/gfx/gui/misc/startwindowbg_800x480.png + android-data/gfx/gui/misc/startwindowbg_old.png + android-data/gfx/gui/misc/startwindowbg.png + android-data/gfx/gui/misc/welcomepokerth_old.png + android-data/gfx/gui/misc/welcomepokerth.png + android-data/gfx/gui/misc/windowicon.png + + diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 6c22bb06..db0113d5 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -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;}"); diff --git a/src/gui/qt/styles/carddeckstylereader.cpp b/src/gui/qt/styles/carddeckstylereader.cpp index b13fa62c..d5a1b491 100644 --- a/src/gui/qt/styles/carddeckstylereader.cpp +++ b/src/gui/qt/styles/carddeckstylereader.cpp @@ -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(""); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index 281149e3..fc22e126 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -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 diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 8ed72ea7..644006b5 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -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;