diff --git a/data/gfx/gui/misc/startwindowbg.png b/data/gfx/gui/misc/startwindowbg.png index 7550d99a..d72929f4 100644 Binary files a/data/gfx/gui/misc/startwindowbg.png and b/data/gfx/gui/misc/startwindowbg.png differ diff --git a/data/gfx/gui/misc/welcomepokerth.png b/data/gfx/gui/misc/welcomepokerth.png index 3d015a58..9dea569c 100644 Binary files a/data/gfx/gui/misc/welcomepokerth.png and b/data/gfx/gui/misc/welcomepokerth.png differ diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index 3d0eecd1..6fac1a19 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -282,7 +282,7 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -299,7 +299,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -312,7 +312,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -325,7 +325,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -338,7 +338,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -351,7 +351,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -585,7 +585,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -602,7 +602,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -615,7 +615,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -628,7 +628,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -641,7 +641,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -654,7 +654,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -898,7 +898,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -915,7 +915,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -928,7 +928,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -941,7 +941,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -954,7 +954,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -967,7 +967,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1188,7 +1188,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -1205,7 +1205,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1218,7 +1218,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1231,7 +1231,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1244,7 +1244,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1257,7 +1257,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1478,7 +1478,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -1495,7 +1495,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1508,7 +1508,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1521,7 +1521,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1534,7 +1534,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1547,7 +1547,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1788,7 +1788,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -1805,7 +1805,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1818,7 +1818,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1831,7 +1831,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1844,7 +1844,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -1857,7 +1857,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2091,7 +2091,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -2108,7 +2108,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2121,7 +2121,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2134,7 +2134,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2147,7 +2147,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2160,7 +2160,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2856,7 +2856,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -2873,7 +2873,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2886,7 +2886,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2899,7 +2899,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2912,7 +2912,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -2925,7 +2925,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3159,7 +3159,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -3176,7 +3176,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3189,7 +3189,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3202,7 +3202,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3215,7 +3215,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3228,7 +3228,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3449,7 +3449,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> @@ -3466,7 +3466,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3479,7 +3479,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3492,7 +3492,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3505,7 +3505,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> @@ -3518,7 +3518,7 @@ p, li { white-space: pre-wrap; } - <a>&#9734;</a> + <a>&#9734;</a> diff --git a/src/gui/qt/gametable/myavatarlabel.cpp b/src/gui/qt/gametable/myavatarlabel.cpp index 5aa6b54f..f187840b 100644 --- a/src/gui/qt/gametable/myavatarlabel.cpp +++ b/src/gui/qt/gametable/myavatarlabel.cpp @@ -32,7 +32,7 @@ MyAvatarLabel::MyAvatarLabel(QGroupBox* parent) { myContextMenu = new QMenu; - action_EditTip = new QAction(QIcon(), tr("Add/Edit/Remove tooltip"), myContextMenu); + action_EditTip = new QAction(QIcon(":/gfx/user_properties.png"), tr("Add/Edit/Remove tooltip"), myContextMenu); myContextMenu->addAction(action_EditTip); action_VoteForKick = new QAction(QIcon(":/gfx/list_remove_user.png"), tr("Start vote to kick this player"), myContextMenu); myContextMenu->addAction(action_VoteForKick); diff --git a/src/gui/qt/startwindow.ui b/src/gui/qt/startwindow.ui index 27910f40..be86f5f6 100644 --- a/src/gui/qt/startwindow.ui +++ b/src/gui/qt/startwindow.ui @@ -66,9 +66,6 @@ Qt::NoFocus - - QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px;} - &1 Start Local Game @@ -95,9 +92,6 @@ Qt::NoFocus - - QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px;} - &2 Internet Game @@ -124,9 +118,6 @@ Qt::NoFocus - - QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px;} - &3 Create Network Game @@ -154,7 +145,7 @@ Qt::NoFocus - QPushButton { text-align:left; font-weight:bold; padding-left: 1px; padding-bottom: 3px; padding-top: 3px; padding-right: 3px;} + &4 Join Network Game diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index 4d87b780..99234edf 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -70,9 +70,16 @@ startWindowImpl::startWindowImpl(ConfigFile *c) this->setWindowIcon(QIcon(myAppDataPath+"gfx/gui/misc/windowicon.png")); this->setStatusBar(0); + 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;}"); + 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;}"); + + // Dialogs myNewGameDialog = new newGameDialogImpl(this, myConfig); mySelectAvatarDialog = new selectAvatarDialogImpl(this, myConfig); diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 737e0e32..945d8685 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -113,7 +113,7 @@ int main( int argc, char **argv ) StartSplash splash(*pixmap); if(!myConfig->readConfigInt("DisableSplashScreenOnStartup")) { splash.show(); - splash.showMessage(QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING), 0x0042, QColor(153,213,0)); + splash.showMessage(QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING), 0x0042, QColor(240,240,240)); } //Set translations