diff --git a/data/gfx/gui/misc/fileopen16.png b/data/gfx/gui/misc/fileopen16.png
index 037c2da9..49518cf9 100644
Binary files a/data/gfx/gui/misc/fileopen16.png and b/data/gfx/gui/misc/fileopen16.png differ
diff --git a/data/gfx/gui/misc/lock.png b/data/gfx/gui/misc/lock.png
index 46b9f656..3d121290 100644
Binary files a/data/gfx/gui/misc/lock.png and b/data/gfx/gui/misc/lock.png differ
diff --git a/data/gfx/gui/misc/radiobutton_checked.png b/data/gfx/gui/misc/radiobutton_checked.png
index 282a3379..b43921e3 100644
Binary files a/data/gfx/gui/misc/radiobutton_checked.png and b/data/gfx/gui/misc/radiobutton_checked.png differ
diff --git a/data/gfx/gui/misc/radiobutton_checked_hover.png b/data/gfx/gui/misc/radiobutton_checked_hover.png
index 3825752e..684bc5f4 100644
Binary files a/data/gfx/gui/misc/radiobutton_checked_hover.png and b/data/gfx/gui/misc/radiobutton_checked_hover.png differ
diff --git a/data/gfx/gui/misc/radiobutton_pressed.png b/data/gfx/gui/misc/radiobutton_pressed.png
index f3a2a982..8a4aaa2e 100644
Binary files a/data/gfx/gui/misc/radiobutton_pressed.png and b/data/gfx/gui/misc/radiobutton_pressed.png differ
diff --git a/data/gfx/gui/misc/radiobutton_unchecked.png b/data/gfx/gui/misc/radiobutton_unchecked.png
index 9e881223..93b091cd 100644
Binary files a/data/gfx/gui/misc/radiobutton_unchecked.png and b/data/gfx/gui/misc/radiobutton_unchecked.png differ
diff --git a/data/gfx/gui/misc/radiobutton_unchecked_hover.png b/data/gfx/gui/misc/radiobutton_unchecked_hover.png
index 0acd0453..d39e4366 100644
Binary files a/data/gfx/gui/misc/radiobutton_unchecked_hover.png and b/data/gfx/gui/misc/radiobutton_unchecked_hover.png differ
diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui
index 3befd6f7..14b8378a 100644
--- a/src/gui/qt/mainwindow.ui
+++ b/src/gui/qt/mainwindow.ui
@@ -2926,7 +2926,7 @@
0
-
-
+
@@ -2997,7 +2997,7 @@
-
-
+
18
@@ -3385,7 +3385,7 @@
horizontalSlider_speed
valueChanged(int)
- label_11
+ label_speedValue
setNum(int)
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 57847bc2..c2ba3ed9 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -369,11 +369,13 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
//Widgets Grafiken per Stylesheets setzen
this->setStyleSheet("QMainWindow { background-image: url(" + myAppDataPath +"gfx/gui/table/default/table.png); background-position: bottom center; background-origin: content;}");
- menubar->setStyleSheet("QMenuBar { background-color: #145300; } QMenuBar::item { color: #669800; }");
+ menubar->setStyleSheet("QMenuBar { background-color: #145300; } QMenuBar::item { color: #88BE00; }");
- pushButton_break->setStyleSheet("QPushButton:enabled { background-color: #145300; color: white;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
+ pushButton_break->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #88BE00;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
+ label_speedString->setStyleSheet("QLabel { color: #88BE00;}");
+ label_speedValue->setStyleSheet("QLabel { color: #88BE00;}");
- statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: white; }");
+ statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #88BE00; }");
//Groupbox Background
for (i=1; isetStyleSheet("QLineEdit { "+ font2String +" font-size: 10px; font-weight: bold; background-color: #1D3B00; color: #F0F0F0; } QLineEdit:disabled { background-color: #316300; color: #6d7b5f }");
- pushButton_AllIn->setStyleSheet("QPushButton:enabled { background-color: #145300; color: white;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
+ pushButton_AllIn->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #88BE00;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
// away radiobuttons
- QString radioButtonString("QRadioButton { color: #F0F0F0; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }");
+ QString radioButtonString("QRadioButton { color: #88BE00; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }");
radioButton_manualAction->setStyleSheet(radioButtonString);
radioButton_autoCheckFold->setStyleSheet(radioButtonString);
@@ -2904,7 +2906,7 @@ void mainWindowImpl::nextRoundCleanGui() {
//Clean breakbutton
if(mySession->getGameType() == Session::GAME_TYPE_LOCAL) {
blinkingStartButtonAnimationTimer->stop();
- pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}");
+ pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: #88BE00;}");
blinkingStartButtonAnimationTimer->stop();
QFontMetrics tempMetrics = this->fontMetrics();
int width = tempMetrics.width(tr("Stop"));
@@ -2991,7 +2993,7 @@ void mainWindowImpl::breakButtonClicked() {
blinkingStartButtonAnimationTimer->stop();
//Set default Color
- pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}");
+ pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: #88BE00;}");
QFontMetrics tempMetrics = this->fontMetrics();
int width = tempMetrics.width(tr("Stop"));
pushButton_break->setMinimumSize(width+10,20);
@@ -3466,7 +3468,7 @@ void mainWindowImpl::blinkingStartButtonAnimationAction() {
pushButton_break->setStyleSheet("QPushButton { background-color: #6E9E00; color: black;}");
}
else {
- pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: white;}");
+ pushButton_break->setStyleSheet("QPushButton { background-color: #145300; color: #88BE00;}");
}
}
diff --git a/src/gui/qt/mainwindow/mylefttabwidget.cpp b/src/gui/qt/mainwindow/mylefttabwidget.cpp
index 409b3b96..41461a72 100644
--- a/src/gui/qt/mainwindow/mylefttabwidget.cpp
+++ b/src/gui/qt/mainwindow/mylefttabwidget.cpp
@@ -43,7 +43,7 @@ MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent)
QTabBar *myTabBar = this->tabBar();
- myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
+ myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #88BE00; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
}
diff --git a/src/gui/qt/mainwindow/myrighttabwidget.cpp b/src/gui/qt/mainwindow/myrighttabwidget.cpp
index d807969d..314fc2cb 100644
--- a/src/gui/qt/mainwindow/myrighttabwidget.cpp
+++ b/src/gui/qt/mainwindow/myrighttabwidget.cpp
@@ -44,7 +44,7 @@ MyRightTabWidget::MyRightTabWidget(QGroupBox *parent)
QTabBar *myTabBar = this->tabBar();
- myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: white; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
+ myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #88BE00; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
}
diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp
index ac2d995f..89a127f1 100644
--- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp
+++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp
@@ -271,7 +271,7 @@ void StartSplash::paintEvent(QPaintEvent * /*event*/) {
//even draw version number
painter.setOpacity(1.0);
painter.setFont(versionFont);
- painter.setPen(QColor(102,153,0));
+ painter.setPen(QColor(136,190,0));
painter.drawText(305,225,100,20,4,QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING));
painter.setOpacity(opacity);