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

Merge branch 'master' of github.com:/pokerth/pokerth

Browse Source
This commit is contained in:
lotodore
2013-10-11 23:54:56 +02:00
parent 0368b57432 d142bc8cdc
commit 0dcc43812d
8 changed files with 55 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
-2
View File
@@ -200,7 +200,6 @@ HEADERS += src/engine/game.h \
src/gui/generic/serverguiwrapper.h \ src/gui/generic/serverguiwrapper.h \
src/gui/qt/gametable/mychancelabel.h \ src/gui/qt/gametable/mychancelabel.h \
src/gui/qt/serverlistdialog/serverlistdialogimpl.h \ src/gui/qt/serverlistdialog/serverlistdialogimpl.h \
src/gui/qt/gametable/mymenubar.h \
src/gui/qt/gametable/mytimeoutlabel.h \ src/gui/qt/gametable/mytimeoutlabel.h \
src/gui/qt/gametable/mynamelabel.h \ src/gui/qt/gametable/mynamelabel.h \
src/gui/qt/settingsdialog/mystylelistitem.h \ src/gui/qt/settingsdialog/mystylelistitem.h \
@@ -277,7 +276,6 @@ SOURCES += src/pokerth.cpp \
src/core/common/loghelper_client.cpp \ src/core/common/loghelper_client.cpp \
src/gui/qt/gametable/mychancelabel.cpp \ src/gui/qt/gametable/mychancelabel.cpp \
src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp \ src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp \
src/gui/qt/gametable/mymenubar.cpp \
src/gui/qt/gametable/mytimeoutlabel.cpp \ src/gui/qt/gametable/mytimeoutlabel.cpp \
src/gui/qt/gametable/mynamelabel.cpp \ src/gui/qt/gametable/mynamelabel.cpp \
src/gui/qt/settingsdialog/mystylelistitem.cpp \ src/gui/qt/settingsdialog/mystylelistitem.cpp \
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+16 -10
View File
@@ -563,16 +563,6 @@ void gameLobbyDialogImpl::updateGameItem(QList <QStandardItem*> itemList, unsign
PlayerIdList::const_iterator end = info.players.end(); PlayerIdList::const_iterator end = info.players.end();
while (i != end) { while (i != end) {
//mark players as active
int it1 = 0;
while (myNickListModel->item(it1)) {
if (myNickListModel->item(it1, 0)->data(Qt::UserRole) == *i) {
myNickListModel->item(it1, 0)->setData("active", 34);
break;
}
++it1;
}
if(myPlayerId == *i) { if(myPlayerId == *i) {
itemList.at(0)->setData( "MeInThisGame", 16); itemList.at(0)->setData( "MeInThisGame", 16);
itemList.at(0)->setBackground(QBrush(QColor(0, 255, 0, 127))); itemList.at(0)->setBackground(QBrush(QColor(0, 255, 0, 127)));
@@ -594,6 +584,22 @@ void gameLobbyDialogImpl::updateGameItem(QList <QStandardItem*> itemList, unsign
++i; ++i;
} }
//reset players iterator
i = info.players.begin();
end = info.players.end();
while (i != end) {
//mark players as active
int it1 = 0;
while (myNickListModel->item(it1)) {
if (myNickListModel->item(it1, 0)->data(Qt::UserRole) == *i) {
myNickListModel->item(it1, 0)->setData("active", 34);
break;
}
++it1;
}
++i;
}
QString playerStr; QString playerStr;
playerStr.sprintf("%u/%u", (unsigned)info.players.size(), (unsigned)info.data.maxNumberOfPlayers); playerStr.sprintf("%u/%u", (unsigned)info.players.size(), (unsigned)info.data.maxNumberOfPlayers);
itemList.at(1)->setData(playerStr, Qt::DisplayRole); itemList.at(1)->setData(playerStr, Qt::DisplayRole);
src/gui/qt/gametable.ui
+1 -6
View File
@@ -4583,7 +4583,7 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="MyMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@@ -4786,11 +4786,6 @@ p, li { white-space: pre-wrap; }
<extends>QPushButton</extends> <extends>QPushButton</extends>
<header>myactionbutton.h</header> <header>myactionbutton.h</header>
</customwidget> </customwidget>
<customwidget>
<class>MyMenuBar</class>
<extends>QMenuBar</extends>
<header>mymenubar.h</header>
</customwidget>
<customwidget> <customwidget>
<class>MyTimeoutLabel</class> <class>MyTimeoutLabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>
src/gui/qt/gametable/gametableimpl.cpp
-1
View File
@@ -43,7 +43,6 @@
#include "mynamelabel.h" #include "mynamelabel.h"
#include "mychancelabel.h" #include "mychancelabel.h"
#include "mytimeoutlabel.h" #include "mytimeoutlabel.h"
#include "mymenubar.h"
#include "guilog.h" #include "guilog.h"
#include "chattools.h" #include "chattools.h"
src/gui/qt/gametable/mymenubar.cpp
-46
View File
@@ -1,46 +0,0 @@
/*****************************************************************************
* PokerTH - The open source texas holdem engine *
* Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Affero General Public License for more details. *
* *
* You should have received a copy of the GNU Affero General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* *
* *
* Additional permission under GNU AGPL version 3 section 7 *
* *
* If you modify this program, or any covered work, by linking or *
* combining it with the OpenSSL project's OpenSSL library (or a *
* modified version of that library), containing parts covered by the *
* terms of the OpenSSL or SSLeay licenses, the authors of PokerTH *
* (Felix Hammer, Florian Thauer, Lothar May) grant you additional *
* permission to convey the resulting work. *
* Corresponding Source for a non-source form of such a combination *
* shall include the source code for the parts of OpenSSL used as well *
* as that of the covered work. *
*****************************************************************************/
#include "mymenubar.h"
MyMenuBar::MyMenuBar(QMainWindow* parent)
: QMenuBar(parent)
{
#if (QT_VERSION >= 0x040501)
this->setAttribute(Qt::WA_TranslucentBackground);
this->setStyleSheet("QMenuBar { border-width: 0px; border-style: none;} ");
#endif
}
void MyMenuBar::paintEvent(QPaintEvent *e)
{
QMenuBar::paintEvent(e);
}
src/gui/qt/gametable/mymenubar.h
-49
View File
@@ -1,49 +0,0 @@
/*****************************************************************************
* PokerTH - The open source texas holdem engine *
* Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Affero General Public License for more details. *
* *
* You should have received a copy of the GNU Affero General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* *
* *
* Additional permission under GNU AGPL version 3 section 7 *
* *
* If you modify this program, or any covered work, by linking or *
* combining it with the OpenSSL project's OpenSSL library (or a *
* modified version of that library), containing parts covered by the *
* terms of the OpenSSL or SSLeay licenses, the authors of PokerTH *
* (Felix Hammer, Florian Thauer, Lothar May) grant you additional *
* permission to convey the resulting work. *
* Corresponding Source for a non-source form of such a combination *
* shall include the source code for the parts of OpenSSL used as well *
* as that of the covered work. *
*****************************************************************************/
#ifndef MYMENUBAR_H
#define MYMENUBAR_H
#include <QtGui>
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#endif
class MyMenuBar : public QMenuBar
{
Q_OBJECT
public:
MyMenuBar(QMainWindow*);
void paintEvent(QPaintEvent * event);
};
#endif
src/gui/qt/gui_800x480/gametable_800x480.ui
+37 -15
View File
@@ -54,7 +54,16 @@
</size> </size>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@@ -2749,7 +2758,16 @@ p, li { white-space: pre-wrap; }
<string notr="true">QGroupBox {border-style:none;}</string> <string notr="true">QGroupBox {border-style:none;}</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@@ -4262,7 +4280,16 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@@ -4621,13 +4648,13 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="MyMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>20</height> <height>19</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@@ -4781,11 +4808,6 @@ p, li { white-space: pre-wrap; }
</action> </action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>Slider</class>
<extends>QSlider</extends>
<header>myslider.h</header>
</customwidget>
<customwidget> <customwidget>
<class>MySetLabel</class> <class>MySetLabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>
@@ -4811,11 +4833,6 @@ p, li { white-space: pre-wrap; }
<extends>QPushButton</extends> <extends>QPushButton</extends>
<header>myactionbutton.h</header> <header>myactionbutton.h</header>
</customwidget> </customwidget>
<customwidget>
<class>MyMenuBar</class>
<extends>QMenuBar</extends>
<header>mymenubar.h</header>
</customwidget>
<customwidget> <customwidget>
<class>MyTimeoutLabel</class> <class>MyTimeoutLabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>
@@ -4826,6 +4843,11 @@ p, li { white-space: pre-wrap; }
<extends>QLabel</extends> <extends>QLabel</extends>
<header>mynamelabel.h</header> <header>mynamelabel.h</header>
</customwidget> </customwidget>
<customwidget>
<class>Slider</class>
<extends>QSlider</extends>
<header>myslider.h</header>
</customwidget>
<customwidget> <customwidget>
<class>MyCashLabel</class> <class>MyCashLabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>
src/gui/qt/styles/gametablestylereader.cpp
+1
View File
@@ -1409,6 +1409,7 @@ void GameTableStyleReader::setCardHolderStyle(QLabel *l, int bero)
void GameTableStyleReader::setMenuBarStyle(QMenuBar *mb) void GameTableStyleReader::setMenuBarStyle(QMenuBar *mb)
{ {
mb->setAttribute(Qt::WA_TranslucentBackground);
mb->setStyleSheet("QMenuBar { background-color: #"+MenuBgColor+"; font-size:12px; border-width: 0px;} QMenuBar::item { background: transparent; color: #"+MenuTextColor+"; } QMenuBar::item:selected { background: #"+MenuTextColor+"; color: #"+MenuBgColor+"; } QMenuBar::item:pressed { background: #"+MenuTextColor+"; color: #"+MenuBgColor+"; }"); mb->setStyleSheet("QMenuBar { background-color: #"+MenuBgColor+"; font-size:12px; border-width: 0px;} QMenuBar::item { background: transparent; color: #"+MenuTextColor+"; } QMenuBar::item:selected { background: #"+MenuTextColor+"; color: #"+MenuBgColor+"; } QMenuBar::item:pressed { background: #"+MenuTextColor+"; color: #"+MenuBgColor+"; }");
} }