sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

F1-F4 key indicator dynamical displayed on buttons now.

Browse Source
This commit is contained in:
doitux
2009-03-27 00:33:26 +00:00
parent b096149678
commit dd16cdee48
9 changed files with 202 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+3 -1
View File
@@ -11,7 +11,7 @@ CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug #CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
#####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt) #####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt)
#QTPLUGIN += qjpeg qgif QTPLUGIN += qjpeg qgif
UI_DIR = uics UI_DIR = uics
MOC_DIR = mocs MOC_DIR = mocs
@@ -152,6 +152,7 @@ HEADERS += \
src/gui/qt/gametable/gametableimpl.h \ src/gui/qt/gametable/gametableimpl.h \
src/gui/qt/gametable/mycardspixmaplabel.h \ src/gui/qt/gametable/mycardspixmaplabel.h \
src/gui/qt/gametable/mysetlabel.h \ src/gui/qt/gametable/mysetlabel.h \
src/gui/qt/gametable/myactionbutton.h \
src/gui/qt/gametable/mystatuslabel.h \ src/gui/qt/gametable/mystatuslabel.h \
src/gui/qt/gametable/myavatarlabel.h \ src/gui/qt/gametable/myavatarlabel.h \
src/gui/qt/gametable/myrighttabwidget.h \ src/gui/qt/gametable/myrighttabwidget.h \
@@ -215,6 +216,7 @@ SOURCES += \
src/gui/qt/gametable/gametableimpl.cpp \ src/gui/qt/gametable/gametableimpl.cpp \
src/gui/qt/gametable/mycardspixmaplabel.cpp \ src/gui/qt/gametable/mycardspixmaplabel.cpp \
src/gui/qt/gametable/mysetlabel.cpp \ src/gui/qt/gametable/mysetlabel.cpp \
src/gui/qt/gametable/myactionbutton.cpp \
src/gui/qt/gametable/mystatuslabel.cpp \ src/gui/qt/gametable/mystatuslabel.cpp \
src/gui/qt/gametable/myavatarlabel.cpp \ src/gui/qt/gametable/myavatarlabel.cpp \
src/gui/qt/gametable/myrighttabwidget.cpp \ src/gui/qt/gametable/myrighttabwidget.cpp \
src/gui/qt/gametable.ui
+9 -4
View File
@@ -2763,7 +2763,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton_AllIn"> <widget class="MyActionButton" name="pushButton_AllIn">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
@@ -2897,7 +2897,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QPushButton" name="pushButton_BetRaise"> <widget class="MyActionButton" name="pushButton_BetRaise">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -2922,7 +2922,7 @@
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QPushButton" name="pushButton_CallCheck"> <widget class="MyActionButton" name="pushButton_CallCheck">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -2947,7 +2947,7 @@
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QPushButton" name="pushButton_Fold"> <widget class="MyActionButton" name="pushButton_Fold">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -3683,6 +3683,11 @@
<extends>QLabel</extends> <extends>QLabel</extends>
<header>mychancelabel.h</header> <header>mychancelabel.h</header>
</customwidget> </customwidget>
<customwidget>
<class>MyActionButton</class>
<extends>QPushButton</extends>
<header>myactionbutton.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="resources/pokerth.qrc"/> <include location="resources/pokerth.qrc"/>
src/gui/qt/gametable/gametableimpl.cpp
+37
View File
@@ -27,6 +27,7 @@
#include "mycardspixmaplabel.h" #include "mycardspixmaplabel.h"
#include "mysetlabel.h" #include "mysetlabel.h"
#include "myavatarlabel.h" #include "myavatarlabel.h"
#include "myactionbutton.h"
#include "mychancelabel.h" #include "mychancelabel.h"
#include "log.h" #include "log.h"
#include "chat.h" #include "chat.h"
@@ -428,6 +429,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
pushButton_AllIn->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}"); pushButton_AllIn->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
// away radiobuttons // away radiobuttons
// QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }"); // QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }");
QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px;} QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png);} QRadioButton::indicator::unchecked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_unchecked.png);} QRadioButton::indicator:unchecked:hover { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_unchecked_hover.png);} QRadioButton::indicator:unchecked:pressed { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_pressed.png);} QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png);} QRadioButton::indicator:checked:hover { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked_hover.png);} QRadioButton::indicator:checked:pressed { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_pressed.png);}"); QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px;} QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png);} QRadioButton::indicator::unchecked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_unchecked.png);} QRadioButton::indicator:unchecked:hover { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_unchecked_hover.png);} QRadioButton::indicator:unchecked:pressed { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_pressed.png);} QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png);} QRadioButton::indicator:checked:hover { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked_hover.png);} QRadioButton::indicator:checked:pressed { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_pressed.png);}");
@@ -1389,6 +1392,8 @@ void gameTableImpl::provideMyActions(int mode) {
lineEdit_betValue->setDisabled(TRUE); lineEdit_betValue->setDisabled(TRUE);
myButtonsCheckable(FALSE); myButtonsCheckable(FALSE);
refreshActionButtonFKeyIndicator(1);
} }
else { else {
pushButton_AllIn->setEnabled(TRUE); pushButton_AllIn->setEnabled(TRUE);
@@ -1407,6 +1412,7 @@ void gameTableImpl::provideMyActions(int mode) {
pushButtonFoldString = "Fold"; pushButtonFoldString = "Fold";
refreshActionButtonFKeyIndicator();
} }
else { // flop,turn,river else { // flop,turn,river
@@ -1425,6 +1431,7 @@ void gameTableImpl::provideMyActions(int mode) {
pushButtonBetRaiseString = "Raise $"+QString::number(getMyBetAmount()); pushButtonBetRaiseString = "Raise $"+QString::number(getMyBetAmount());
} }
} }
refreshActionButtonFKeyIndicator();
} }
if(mode == 0) { if(mode == 0) {
@@ -1433,6 +1440,8 @@ void gameTableImpl::provideMyActions(int mode) {
pushButtonCallCheckString = "Check"; pushButtonCallCheckString = "Check";
if( (currentGame->getActivePlayerList()->size() > 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_SMALL_BLIND ) || ( currentGame->getActivePlayerList()->size() <= 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_BIG_BLIND)) { pushButtonFoldString = "Fold"; } if( (currentGame->getActivePlayerList()->size() > 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_SMALL_BLIND ) || ( currentGame->getActivePlayerList()->size() <= 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_BIG_BLIND)) { pushButtonFoldString = "Fold"; }
else { pushButtonFoldString = "Check / Fold"; } else { pushButtonFoldString = "Check / Fold"; }
refreshActionButtonFKeyIndicator();
} }
else { else {
pushButtonBetRaiseString = ""; pushButtonBetRaiseString = "";
@@ -1443,6 +1452,8 @@ void gameTableImpl::provideMyActions(int mode) {
lineEdit_betValue->setDisabled(TRUE); lineEdit_betValue->setDisabled(TRUE);
myButtonsCheckable(FALSE); myButtonsCheckable(FALSE);
refreshActionButtonFKeyIndicator(1);
} }
} }
@@ -2934,6 +2945,8 @@ void gameTableImpl::resetMyButtonsCheckStateMemory() {
void gameTableImpl::clearMyButtons() { void gameTableImpl::clearMyButtons() {
refreshActionButtonFKeyIndicator(1);
pushButton_BetRaise->setText(""); pushButton_BetRaise->setText("");
pushButton_CallCheck->setText(""); pushButton_CallCheck->setText("");
pushButton_Fold->setText(""); pushButton_Fold->setText("");
@@ -3232,3 +3245,27 @@ void gameTableImpl::refreshCardsChance(GameState bero)
delete myCardsValue; delete myCardsValue;
} }
void gameTableImpl::refreshActionButtonFKeyIndicator(bool clear)
{
if(clear) {
pushButton_AllIn->setFKeyText("");
pushButton_BetRaise->setFKeyText("");
pushButton_CallCheck->setFKeyText("");
pushButton_Fold->setFKeyText("");
}
else {
if(myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0 ){
pushButton_AllIn->setFKeyText("F4");
pushButton_BetRaise->setFKeyText("F3");
pushButton_CallCheck->setFKeyText("F2");
pushButton_Fold->setFKeyText("F1");
}
else {
pushButton_AllIn->setFKeyText("F1");
pushButton_BetRaise->setFKeyText("F2");
pushButton_CallCheck->setFKeyText("F3");
pushButton_Fold->setFKeyText("F4");
}
}
}
src/gui/qt/gametable/gametableimpl.h
+1
View File
@@ -139,6 +139,7 @@ public slots:
void refreshGameLabels(int); void refreshGameLabels(int);
void refreshButton(); void refreshButton();
void refreshPlayerAvatar(); void refreshPlayerAvatar();
void refreshActionButtonFKeyIndicator(bool =0);
void setPlayerAvatar(int myID, QString myAvatar); void setPlayerAvatar(int myID, QString myAvatar);
void guiUpdateDone(); void guiUpdateDone();
src/gui/qt/gametable/myactionbutton.cpp
+39
View File
@@ -0,0 +1,39 @@
//
// C++ Implementation: mycardspixmaplabel
//
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "myactionbutton.h"
using namespace std;
MyActionButton::MyActionButton(QGroupBox* parent)
: QPushButton(parent)
{
}
MyActionButton::~MyActionButton()
{
}
void MyActionButton::paintEvent(QPaintEvent * event) {
QPushButton::paintEvent(event);
QPainter painter(this);
painter.setPen(QColor(240,240,240));
painter.setOpacity(0.5);
QFont f= painter.font();
f.setPixelSize(9);
painter.setFont(f);
painter.drawText(8,11,15,15,Qt::AlignLeft,fKeyText);
}
src/gui/qt/gametable/myactionbutton.h
+33
View File
@@ -0,0 +1,33 @@
//
// C++ Interface: mycardspixmaplabel
//
// Description:
//
//
// Author: FThauer FHammer <f.thauer@web.de>, (C) 2007
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef MYACTIONBUTTON_H
#define MYACTIONBUTTON_H
#include <QtGui>
#include <QtCore>
class MyActionButton : public QPushButton
{
public:
MyActionButton(QGroupBox*);
~MyActionButton();
void paintEvent(QPaintEvent * event);
void setFKeyText ( const QString& theValue ){fKeyText = theValue;}
private:
QString fKeyText;
};
#endif
src/gui/qt/resources/fill-color.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

src/gui/qt/resources/pokerth.qrc
+35 -34
View File
@@ -1,36 +1,37 @@
<RCC> <RCC>
<qresource prefix="gfx" > <qresource prefix="/gfx" >
<file>view-fullscreen.png</file> <file>view-fullscreen.png</file>
<file>pokerth.qrc</file> <file>pokerth.qrc</file>
<file>swbuttoninternetgame.png</file> <file>swbuttoninternetgame.png</file>
<file>swbuttoncreatenetworkgame.png</file> <file>swbuttoncreatenetworkgame.png</file>
<file>swbuttonjoinnetworkgame.png</file> <file>swbuttonjoinnetworkgame.png</file>
<file>media_podcast.png</file> <file>media_podcast.png</file>
<file>system_users_big.png</file> <file>system_users_big.png</file>
<file>swbuttonlocalgame.png</file> <file>swbuttonlocalgame.png</file>
<file>tools_wizard.png</file> <file>tools_wizard.png</file>
<file>speaker.png</file> <file>speaker.png</file>
<file>player_play.png</file> <file>player_play.png</file>
<file>arrow_right_double.png</file> <file>arrow_right_double.png</file>
<file>view_refresh.png</file> <file>view_refresh.png</file>
<file>arrow_left_double.png</file> <file>arrow_left_double.png</file>
<file>list_remove_user.png</file> <file>list_remove_user.png</file>
<file>user.png</file> <file>user.png</file>
<file>application_exit.png</file> <file>application_exit.png</file>
<file>system_users.png</file> <file>system_users.png</file>
<file>list_add_user.png</file> <file>list_add_user.png</file>
<file>list_add.png</file> <file>list_add.png</file>
<file>audio_input_microphone.png</file> <file>audio_input_microphone.png</file>
<file>utilities-log-viewer.png</file> <file>utilities-log-viewer.png</file>
<file>preferences-desktop.png</file> <file>preferences-desktop.png</file>
<file>dialog_close.png</file> <file>dialog_close.png</file>
<file>systemsettings.png</file> <file>systemsettings.png</file>
<file>editdelete.png</file> <file>editdelete.png</file>
<file>user_properties.png</file> <file>user_properties.png</file>
<file>printer1.png</file> <file>printer1.png</file>
<file>pdf.png</file> <file>pdf.png</file>
<file>preferences_desktop_user.png</file> <file>preferences_desktop_user.png</file>
<file>dialog_ok_apply.png</file> <file>dialog_ok_apply.png</file>
<file>filesave.png</file> <file>filesave.png</file>
</qresource> <file>fill-color.png</file>
</qresource>
</RCC> </RCC>
src/gui/qt/settingsdialog.ui
+44
View File
@@ -57,6 +57,15 @@
<normaloff>:/gfx/preferences-desktop.png</normaloff>:/gfx/preferences-desktop.png</iconset> <normaloff>:/gfx/preferences-desktop.png</normaloff>:/gfx/preferences-desktop.png</iconset>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Style</string>
</property>
<property name="icon">
<iconset resource="resources/pokerth.qrc">
<normaloff>:/gfx/fill-color.png</normaloff>:/gfx/fill-color.png</iconset>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Sound</string> <string>Sound</string>
@@ -372,6 +381,41 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_8">
<layout class="QGridLayout" name="gridLayout_12">
<item row="0" column="0">
<widget class="QLabel" name="label_28">
<property name="styleSheet">
<string notr="true">QLabel { font-weight: bold; }</string>
</property>
<property name="text">
<string>Style</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Line" name="line_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_11">
<property name="title">
<string>Game Table Styles</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="groupBox_12">
<property name="title">
<string>Card Decks</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_6"> <widget class="QWidget" name="page_6">
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">