diff --git a/data/gfx/gui/misc/startwindowbg.png b/data/gfx/gui/misc/startwindowbg.png deleted file mode 100644 index d72929f4..00000000 Binary files a/data/gfx/gui/misc/startwindowbg.png and /dev/null differ diff --git a/data/gfx/gui/misc/startwindowbg_800x480.png b/data/gfx/gui/misc/startwindowbg_800x480.png deleted file mode 100644 index afb8ab94..00000000 Binary files a/data/gfx/gui/misc/startwindowbg_800x480.png and /dev/null differ diff --git a/data/gfx/gui/misc/startwindowbg_desktop.png b/data/gfx/gui/misc/startwindowbg_desktop.png new file mode 100644 index 00000000..3a89e91e Binary files /dev/null and b/data/gfx/gui/misc/startwindowbg_desktop.png differ diff --git a/data/gfx/gui/misc/startwindowbg_mobile.png b/data/gfx/gui/misc/startwindowbg_mobile.png new file mode 100644 index 00000000..6b5fa93e Binary files /dev/null and b/data/gfx/gui/misc/startwindowbg_mobile.png differ diff --git a/data/gfx/gui/misc/startwindowbg_old.png b/data/gfx/gui/misc/startwindowbg_old.png deleted file mode 100644 index e0b5d212..00000000 Binary files a/data/gfx/gui/misc/startwindowbg_old.png and /dev/null differ diff --git a/data/gfx/gui/misc/welcomepokerth.png b/data/gfx/gui/misc/welcomepokerth.png deleted file mode 100644 index 9dea569c..00000000 Binary files a/data/gfx/gui/misc/welcomepokerth.png and /dev/null differ diff --git a/data/gfx/gui/misc/welcomepokerth_desktop.png b/data/gfx/gui/misc/welcomepokerth_desktop.png new file mode 100644 index 00000000..7756e67e Binary files /dev/null and b/data/gfx/gui/misc/welcomepokerth_desktop.png differ diff --git a/data/gfx/gui/misc/welcomepokerth_mobile.png b/data/gfx/gui/misc/welcomepokerth_mobile.png new file mode 100644 index 00000000..7c258baf Binary files /dev/null and b/data/gfx/gui/misc/welcomepokerth_mobile.png differ diff --git a/data/gfx/gui/misc/welcomepokerth_old.png b/data/gfx/gui/misc/welcomepokerth_old.png deleted file mode 100644 index 3d015a58..00000000 Binary files a/data/gfx/gui/misc/welcomepokerth_old.png and /dev/null differ diff --git a/src/gui/qt/resources/pokerth_android.qrc b/src/gui/qt/resources/pokerth_android.qrc index ac0cd6d0..e103c536 100644 --- a/src/gui/qt/resources/pokerth_android.qrc +++ b/src/gui/qt/resources/pokerth_android.qrc @@ -1,7 +1,7 @@ view-fullscreen.png - loader.gif + loader.gif swbuttoninternetgame.png swbuttoncreatenetworkgame.png swbuttonjoinnetworkgame.png @@ -361,11 +361,8 @@ 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/startwindowbg_mobile.png + android-data/gfx/gui/misc/welcomepokerth_mobile.png android-data/gfx/gui/misc/windowicon.png android-data/fonts/DejaVuSans-Bold.ttf android-data/fonts/n019003l.pfb diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 3a7e8f04..5be35710 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -109,12 +109,12 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) if(customStartWindowBgFile.exists()) { centralwidget->setStyleSheet(".QWidget { background-image: url("+QFileInfo(customStartWindowBgFile).absoluteFilePath()+"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); } else { - QPixmap pix(":/android/android-data/gfx/gui/misc/startwindowbg_800x480.png"); + QPixmap pix(":/android/android-data/gfx/gui/misc/startwindowbg_mobile.png"); pix = pix.scaled(screenWidth, screenHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); if(pix.save(customStartWindowBgFileString)) { centralwidget->setStyleSheet(".QWidget { background-image: url("+QFileInfo(customStartWindowBgFile).absoluteFilePath()+"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); } else { - 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;}"); + centralwidget->setStyleSheet(".QWidget { background-image: url(:/android/android-data/gfx/gui/misc/startwindowbg_mobile.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); } } @@ -137,29 +137,29 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l) #else // Maemo 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;}"); + centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg_desktop.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); #endif // All mobile GUI's - 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;}"); - 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_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_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;}"); + 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: #3C2F29; color: #FDC942; 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: #3C2F29; color: #FDC942; 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: #3C2F29; color: #FDC942; 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: #3C2F29; color: #FDC942; 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: #3C2F29; color: #FDC942; 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: #3C2F29; color: #FDC942; 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: #3C2F29; color: #FDC942; font-size:22px; border-width: 0px;}"); connect( pushButton_about, SIGNAL( clicked() ), this, SLOT( callAboutPokerthDialog() ) ); connect( pushButton_configure, SIGNAL( clicked() ), this, SLOT( callSettingsDialogFromStartwindow() ) ); #else //Desktop - this->menubar->setStyleSheet("QMenuBar { background-color: #4B4B4B; font-size:12px; border-width: 0px;} QMenuBar::item { color: #F0F0F0; }"); - centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); + this->menubar->setStyleSheet("QMenuBar { background-color: #3C2F29; font-size:12px; border-width: 0px;} QMenuBar::item { color: #FDC942; }"); + centralwidget->setStyleSheet(".QWidget { background-image: url(\""+myAppDataPath+"gfx/gui/misc/startwindowbg_desktop.png\"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}"); - pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); - pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); - pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); - pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); - pushButton_Logs->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #4B4B4B; color: #F0F0F0; font-size:12px; border-width: 0px;}"); + pushButtonStart_Local_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #3C2F29; color: #FDC942; font-size:12px; border-width: 0px;}"); + pushButtonInternet_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #3C2F29; color: #FDC942; font-size:12px; border-width: 0px;}"); + pushButton_Create_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #3C2F29; color: #FDC942; font-size:12px; border-width: 0px;}"); + pushButton_Join_Network_Game->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #3C2F29; color: #FDC942; font-size:12px; border-width: 0px;}"); + pushButton_Logs->setStyleSheet("QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px; background-color: #3C2F29; color: #FDC942; font-size:12px; border-width: 0px;}"); connect( actionAbout_PokerTH, SIGNAL( triggered() ), this, SLOT( callAboutPokerthDialog() ) ); connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialogFromStartwindow() ) ); diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 5a1b9d69..524edb1a 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -138,10 +138,12 @@ 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) }"); - QPixmap pixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth.png"); #ifdef ANDROID QDesktopWidget dw; - pixmap = pixmap.scaled(dw.screenGeometry().width(), dw.screenGeometry().height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + QPixmap pixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth_mobile.png"); + pixmap = pixmap.scaled(dw.screenGeometry().width(), dw.screenGeometry().height(), Qt::KeepAspectRatio, Qt::SmoothTransformation); +#else + QPixmap pixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth_desktop.png"); #endif StartSplash splash(pixmap); if(!myConfig->readConfigInt("DisableSplashScreenOnStartup")) {