next steps on Android port

This commit is contained in:
doitux
2012-05-06 20:57:04 +00:00
parent 7cf2203f33
commit a24b07c82c
6 changed files with 14 additions and 22 deletions
-7
View File
@@ -75,11 +75,6 @@ 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);
@@ -4239,8 +4234,6 @@ void gameTableImpl::restoreGameTableGeometry()
{
#ifdef ANDROID
this->showFullScreen();
// refreshGameTableStyle();
// this->showFullScreen();
#else
if(myConfig->readConfigInt("GameTableFullScreenSave")) {
#ifndef GUI_800x480
+1 -1
View File
@@ -346,7 +346,7 @@ public slots:
void sendShowMyCardsSignal();
void closeMessageBoxes();
void hide();
void hide();
void soundEvent_blindsWereSet(int);
void enableCallCheckPushButton();
+2 -4
View File
@@ -124,8 +124,7 @@ void MyCardsPixmapLabel::startFlipCards(int speed, const QPixmap &frontPix, cons
}
if(speed > 8 && speed <= 10) {
flipCardsScaleIntervall = 0.5;
}
//
}
if(speed != 11) {
flipCardsAction1 = TRUE;
@@ -158,9 +157,8 @@ void MyCardsPixmapLabel::nextFlipCardsFrame()
} else {
//dann front vergrößern
if (frameFlipCardsAction2Size < 0.9 ) {
frameFlipCardsAction2Size += flipCardsScaleIntervall;
update();
update();
} else {
flipCardsAction2 = FALSE;
flipCardsTimer->stop();
+1 -2
View File
@@ -75,9 +75,8 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
#ifdef GUI_800x480
#ifdef ANDROID
this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { font-size:30px; color: #F0F0F0; }");
this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { font-size:20px; color: #F0F0F0; }");
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
this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:20px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }");