From 4739be12f89ee5e94c0a6b1dd37e1252b99a12c0 Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 22 Dec 2013 11:23:59 +0100 Subject: [PATCH] some more gui tweaks for android --- src/gui/qt/gui_800x480/tabs_800x480.ui | 157 ++++++++++++++++++--- src/gui/qt/resources/pokerth_android.qrc | 3 +- src/gui/qt/resources/systemsettings.png | Bin 2420 -> 4042 bytes src/gui/qt/startwindow/startwindowimpl.cpp | 5 +- 4 files changed, 146 insertions(+), 19 deletions(-) mode change 100644 => 100755 src/gui/qt/resources/systemsettings.png diff --git a/src/gui/qt/gui_800x480/tabs_800x480.ui b/src/gui/qt/gui_800x480/tabs_800x480.ui index c35a84d7..77f804aa 100644 --- a/src/gui/qt/gui_800x480/tabs_800x480.ui +++ b/src/gui/qt/gui_800x480/tabs_800x480.ui @@ -29,7 +29,16 @@ true - + + 0 + + + 0 + + + 0 + + 0 @@ -47,7 +56,16 @@ QFrame::Plain - + + 0 + + + 0 + + + 0 + + 0 @@ -81,7 +99,16 @@ true - + + 4 + + + 4 + + + 4 + + 4 @@ -103,7 +130,16 @@ Hands - + + 0 + + + 0 + + + 0 + + 0 @@ -123,7 +159,16 @@ Chat - + + 0 + + + 0 + + + 0 + + 0 @@ -159,15 +204,24 @@ Kick + + 5 + + + 5 + + + 5 + + + 5 + 0 6 - - 5 - @@ -312,12 +366,21 @@ Player info + + 6 + + + 6 + + + 6 + + + 6 + 3 - - 6 - @@ -357,15 +420,24 @@ true + + 4 + + + 4 + + + 4 + + + 4 + 1 2 - - 4 - @@ -385,7 +457,16 @@ Log - + + 0 + + + 0 + + + 0 + + 0 @@ -555,7 +636,16 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 @@ -580,6 +670,41 @@ + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + + 60 + 60 + + + + + 60 + 60 + + + + QPushButton { border:none; background-image: url(":/gfx/systemsettings.png"); background-repeat: no-repeat; background-position: center center;} + + + diff --git a/src/gui/qt/resources/pokerth_android.qrc b/src/gui/qt/resources/pokerth_android.qrc index 861af7ea..24947bdd 100644 --- a/src/gui/qt/resources/pokerth_android.qrc +++ b/src/gui/qt/resources/pokerth_android.qrc @@ -366,7 +366,6 @@ android-data/gfx/gui/misc/welcomepokerth10_mobile.png android-data/gfx/gui/misc/windowicon.png android-data/fonts/DejaVuSans-Bold.ttf - android-data/fonts/n019003l.pfb android-data/gfx/avatars/default/misc/00a0b3d26a67841239b8883183b7a8f0.png android-data/gfx/avatars/default/misc/0f2ca195ebaec613ffc8626185415b18.png android-data/gfx/avatars/default/misc/2b0fca47b50e2cc4f910eba9ffa858a9.png @@ -556,7 +555,9 @@ android-data/translations/pokerth_sv.qm android-data/translations/pokerth_ta.qm android-data/translations/pokerth_tr.qm + android-data/translations/pokerth_vi.qm android-data/translations/pokerth_zhcn.qm + android-data/misc/third_party_libs.txt emotes/face-angel.png diff --git a/src/gui/qt/resources/systemsettings.png b/src/gui/qt/resources/systemsettings.png old mode 100644 new mode 100755 index 860e424ff6885fe21eb8e67ba9c43d981ea0a248..06740ba1152ee681b57484017840f19c4acf6b29 GIT binary patch delta 4020 zcmV;l4@>a$63QPTiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj!~3k5L% z00l7tx9uoWkwzzf4@XHvK~#9!#aRhhj_DeHr%kd%qej*tB{LXXDTPD}hUj318DtV= zYiKbuF^r*OUy5vzvNWo}q(rGOGNR>g6-tX1NlE+qKj(hG`8t;~=N}=?>ALQ#`oHh} z{^x$*=eeKdV?^|S2Yx;PzT38KTj=ZS zyUW|#d!3h;*TV7R$M@pb#Cv4g^zwt0oLpV4Jv=-t@V9cyqW5fkJ7Z(x{`>duKNWo~ zx>=GWp-0(|C^s*ca&vPiCpSkbkt95{v$NCX_sX*8-w)cpefyV1Po6ZFmX=EI#>Y#R zELk#ylj7HZ-Kd zkB4RF=F+}>9?x)H1CW2myWe5|UA=m>sI;t1Fg_0(GIEm*MN7_N5)yJO61bM=)96Ib>i8z_b zkFc#IxWe`6)5qAy=eRU2Jq>(?neCzon!YA7ZqrV?^DyDcXnZdT`+GiN#n2meN~vA6$pq0(oZgn-h2 zvQk1W2*iCK0`jsG9v~9?t8aDy`T>^1M~>V#d(Ianw{PD@pylC+t9h{1AjvFzTM}Y! z`Dod)Wr2}Vk#za;Wx^?N*@P<<(-XK;VNoICFQL}j+Ukpz?-31G0NPtwSq*Sn>trUn z;s>&JNC{8}^b{2pms(g(&X6P}Q65NtRN{C`N=h1zA3yH!Hi0dEsn*Xw|NQ7m_+^TY zj;7?~WXgM-M~{I#C=$;HnVApifY*U$N5_>v;eIthb+P?ovlG6@6MTJ7@XwFnvo3(# ztI~TX;1giJ@z`;ajEoFU0%}pgrM7X$jvY=S3Hdkie_dT&6Br@A6c$Q}P`XEdk9g+I zp@PDEdid}G-M^nf={S{;(2IyYFIv0SizEKL@Q4Un?czeS zzMMx79^A)?BtZoeDCSlSojm1#OMCb3;r9ur<>TW+E-p^xs;a89#2}Y@oiA+0;;w8asX* zoec<}yK#5ucI+P@aFYT81L(-n!vfi$pdi||ZL1Ul5XapcP-%&Q*Co+^53n{EV-$`P zkQN|&<{(>x1ligyJ}mmG!YiJkGG)q?IsX1C@=W-8&Q&9Vxhw-$_5fR|xh)hYpdGvr~Q7u3hcX$x& za%937E`ReE*qoN7-Qrq*MW7dQNo-3#1Vi+Ab=m{5jgx?<2_v4T0>eUGH z|HYq2&bmL4sj4QeTf&J2}x& zZ*SUzfOT8vMr+o8tj4t!gnS`IEmo?grpCo$9PkmKD5E2LD-xQ3nURr^HwY+5wm$RtRdcN{hCX#ERmMn3|Y>nC#EZ&8@3O$&rM_bPuOt zJ!?)nc0Tg~-0Rk@TOc)sOeamC5hF)%Jr@Y9U%$R-#flY0=H}+%a6O*1Y=NnO0Weq; z4h=v>rpk!~+Dbwl7>7b|7k0V^KO{*?ri6q(*66 zQMQUDvk5SNL{t|wQT3Ewr?Gz*&542-SY!3{^ma%jk{VvYqWs_mAcAxWcHfeQ3>{49 zo9OJ>vxHK*x?8ty>#@cd=p|I4$- zc^JNlP{h@D@7{gi?|uuyLbi|pf$w}<`-^vBe8;(S=h{U?MART);T}Jd!I;rBZ1`tn z@34#y351vk2neJdJ9pLHxx6X$MfzT8nrEj5FB`U!um8WCKuZ&}Xwjn8*RNl%=ZWcu zAHFAlGmA-NWITrY_5YZL4jl?TcNAL1)U7hdD9ViKlTQcH$dMxn%@6NyrL*RIQC(mBD>Y_mQ{5wV zs(N5WHKDz!@FXLzC2S8@p11Du-m z2A7jP4Y=nHE3Mjq_kvBD7ZT0HaC)3i>=;qCvsC#CT#bh(V=LhQQP=Brd zJi`jA^W%>{=JA1)Mn`7tXV3C)Z)cR_%jm^9MzxV3kjAJX8~?{KD!a+(`E4f6k7W5V zUW$iQRaw{9mDe}Xc{MjTw;(7DpPcc3(m*hNjFBO#N^R=hyEmcY6l!-&nM+a2*ox(V zu96a)f6#{IUH+amOAau~J&)aw1A!byjd=nQ0Zql0ly&+;3SGm()YXMrOR+T)ubXMr zq2ZytC<_Y2{U6y85?bY0ycONgZH+hOz>4 zbG2f3ul|!YWpfgD|0K{{h~I?c?oY=!r+N}SpNW9Yc9zA;WK79Ca z3@S}Jefl&?VPm1LF)-Ap0oq!GVvI1S5sXKH)--P1xV>06x@F`cW7454P7_QWr?RjV z7+G=+ae$Mk&%#MOn*$P#R2ipCW$}y>y%}9`VR_R=vA=yk@VE6o+BdC#lP6EcJ%0R{ zjvhTq#t2ky{AdGx(i+g8RJ*7W-k=D^qv4jKlsF|0V$}foRw`Icd3pAa@b#=N6S<)9 z5`s7u!Tk^qZE7|v6huBG!+KE$}f}nubvn0sy>5Z_hGy+hZ*|WP(f|<^hcpQ z;Kp~NL4yX-g$oyi-A7%YAT}W~RO6MBtPWVLv1CyZ>zTA50y!anoKY5xEsfzM22pL^ zOsWEjDoAeHX+~GSXBErMh1Rlt%lG_;@t=SGxjx#xY&7fi2d2{qT<#w5c?0U#?_=uJ zsUv>(6XM~P zs5%4c^b4aXH&)|+K97CgLgL>#&jS{N+&mc8v~}y&{K=CiUsqQ|BqyOkwb}XzY!x9!G6JDc zTUp(fS%lYQud#l~3USGhn{6v-3TkxDcd&JVDW&J9oHiRcdHx@B!1n zmyWY71A^|rq}lrHRH!R!%DoKZqi_;%nTg-OGtQdr<`L<>R`ooh~-H;VWG&x1Up=YpyjSogQ6@NWD3xr^C?>WkRd~M%1Tsi zhwQ2sFc{XCZT|IJR+F*^!RvwG-OcJ|nXui$CW;==vPcQg#zf2w1~>4={KSb91oaV& z$CPb*CnpG~%Scr3i$qsoR3A0w=wr_$=-htC|BHZ;FK^<1w21s-yLRoC+S=NN;azPq z`rY$#a&k+>5s12sMD@N&aGSIMebMl~K*yIoK-L0nzzCQq8mKP)nyvTKkqq*bHEGADj~_ySN>6G9B5;jdEvb$8>kSrBl<++G6TTwne5ML^CoJDiM;vM7fA~;BXEgM-Nwl zbDsS}Xw)cicJ?>({_~sndA{HGxqRQ}RU*Rw<5Nm0K;N~0T)-{BDfa;Cx;ATfz4zX< zHLtvq4Yc07=>dT?-rnAQHf`Dz@kHnoZ}<=O57BD19i7fj^W{sI6O>X}BI3N$Mw^ZW|qc&_66J?9Y0G0fW225a93sSEJE*NhxI#5!V9-z%XadoDGkTdh`)5FE0!R z0}42MHn%+|C+GUHW5-UGm6crqv_R)iDagpkI35uhIp67Wq0?%W(r6Bh9Xs|hrIh&r z)6sX>uz<(_e}CK!2Hf2}a5x;U<;$19U0+}SHE;!gs0Z#!fer{ckeXVOapHtzojxsB zE3e6ds72oZo_B`pe&P4=@d+}SjylceYht(CrM0z1Dk>`4fDpjYldo=L12B5#%$d7l z&0%ji>=lslP6Dp8qjnT z?K-r74p4VF0EX)I`ly-D&$?7nQX)-FO)__W#HmS>CVAhF1ki8w>eUBNe))yu<>g7W zrCKbOYB8J5lKRnsrr6ln=Yf82ZG3CN2OsRdxN6m^Re+nOI}ak#0a)AH+cUp7aoo6U z`R~53t*aw-|Gp^!!vakU7cTTwO8vCIr~E&EHu|wSdcA=`g9cGqS&75ZNJ~pI0RaJh z$BiFrI)38#)oD|veP*}YN95<{-vqRGIqa%>2ax~Wx8J-P8xx!3a5&hpW9xWtAHS1E zqcNZ-5=trUOE10joUgA>|Kdv}oXR@IsjO2RK6;eqmS)`D-5D^zOV_V&zd_a2)s&Tg zm)GUy=AH%Gf99;K>RW(<@4owXT}({umk7N1=If&edi^GI{rdGmJ&@=-YSg0%!9l^C z%g>{vq?j4gr*Y)-Lv(gJvD@t^1$KJ_Wo4zVuQI>d1=NX%tH+Rbk!S@jWM`jQ9~~WS z>f5J}BqSJv9|{V}OioT7)lEVvrC+^&di9IbrcHk~ICv!CJ=+iY%VJ+)to)sLHn&X3~nAAK5Sxmz;KF-i^Xx%(SGB9<_$+q zcFu>TrKP)ps%|+}z0nz^lpY9D;eVJgVW{0 z_;Laki={3qw6gke(y-}32hh7aq_;XhaNxj!@4ox)7ez%yvUKSZ2@4;8CljBYC>0eI zl6x*sDu3ASYQDN#%2PaL-ye7laO;il`xc>6N)s9yI(Y5cwTD7OLnmz6`gf`=)i`cA zSiCrf^78WL4GF{b{yy8>oYx1@W@(_Z{6@nIf8h!9bu9P0O@EbuQc4pZ9`2Wzm}v6z z^Bc2s=MJnk8`tX_h>wqd$IZ>H$(EgT{N;$&s6oTf^wUF!6K*y_;RTLY-{Nh35QVX^ zH2xBiU(^AmlxF($>4EFktxMNxwISPgY@@c;hSh2#Zpl)-yu8}BZQGU{pl@w{rii&A zx9|{u=oZq}HVelsq7;v(JJs^ooKxu2Dd&M+FOIQ z4+U2(PFZU8d^Lq7N~xPaBhf>_X``c~pUTe8wxp!|OXfwqAmJ0j#NU6YEL*lr($dm8 zXU&?m3mDGr(Mkh<3leuTl?qX$0& zkBf_YHa9o7{+*rg$P4r5N?7=K8R9oY=FOWYCX>k(9UZ+N2m*BX*y@0XHZLZp=mVtg zYb9;v9@1`IBFzPZTIivjMw1DN{ZN@|P#iCjB`)Sq#acFQbjK0ipzCy|WTs979N zU^j`Mz}K!_8+q~K#in!T&dJtoTV=w8--@rVkBk{JM$*&MB{4Da4Dcji_%*!%2J|s7 zfA-1iPfAK!o|&0x2c`hQvuDpZ3^25v0RBSnN3lvFxE4@YQhp6%^odx!gyL7*PY5LqbC8bUK|_t=5{P zq@=Y#KG1YORlB3J1ZV`#C8qNGPe0;9V+*)k&}gkk@9Lz;MgibdfZol`Ep*SGJz1Wf zo;9t1t*vK7WNvM3EgLp$Sm$s!jsp$y;IE|abo2op-xSSzv%-1GYXDN?z&v3cQ9zOE z3YYi9i4*@A6BCo*bUJl5o6Wj+@7}*vRaG6KYj%53@OwzO1HoZIJRj)CfRD5J1SkdC zl!%~|(gJ?KXrLcp2Fd{Y{{nsw2_4Y4>sK=w&?zGFUtxmcFADJhkpKVy07*qoM6N<$ Eg8l2C-v9sr diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 8c4149dc..4d7b3c78 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -97,7 +97,9 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) #ifdef GUI_800x480 #ifdef ANDROID - this->menubar->hide(); + this->setMenuBar(0); +// this->menubar->clear(); +// this->menubar->hide(); //check if custom background picture for the resolution is there. Otherwise create it! QString UserDataDir = QString::fromUtf8(myConfig->readConfigString("UserDataDir").c_str()); @@ -655,7 +657,6 @@ void startWindowImpl::showNetworkStartDialog() myStartNetworkGameDialog->exec(); if (myStartNetworkGameDialog->result() == QDialog::Accepted ) { - this->hide(); //some gui modifications myGuiInterface->getMyW()->networkGameModification();