pokerth.pro

@@ -17,7 +17,7 @@ HEADERS += tinystr.h \
            aboutpokerthimpl.h \
            settingsdialogimpl.h \
            configfile.h \
-           log.h \
+           logwidgetimpl.h \
            guiinterface.h \
            guiwrapper.h \
            session.h \
@@ -52,7 +52,7 @@ SOURCES += pokerth.cpp \
            aboutpokerthimpl.cpp \
            settingsdialogimpl.cpp \
            configfile.cpp \
-           log.cpp \
+           logwidgetimpl.cpp \
            guiinterface.cpp \
            guiwrapper.cpp \
            session.cpp \

src/gui/qt/cards/mycardspixmaplabel.cpp

@@ -140,6 +140,7 @@ void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) {
 		QPainter painter(this);
 // 		painter.setPen(QColor(74,131,83));
 		painter.setBrush(QColor(74,131,83));
+// 		painter.setBrush(palette().color(QPalette::Background));
 	//  	painter.setBrush(QColor(0,0,0));
 	
 		painter.setOpacity(frameOpacity);

src/gui/qt/guiwrapper.cpp

@@ -24,14 +24,14 @@
 using namespace std;
 
 
-GuiWrapper::GuiWrapper() : myLog(0), myW(0)
+GuiWrapper::GuiWrapper() : myLogWidget(0), myW(0)
 {
 
 
 	myW = new mainWindowImpl;
 	myW->show();
 
-	myLog = new Log(myW);
+	myLogWidget = new LogWidgetImpl(myW);
 
 	myConfig = new ConfigFile;
 
@@ -86,7 +86,7 @@ void GuiWrapper::nextRoundCleanGui() const { myW->nextRoundCleanGui(); }
 
 void GuiWrapper::meInAction() const { myW->meInAction(); }
 
-void GuiWrapper::showPlayerActionLogMsg(string playerName, int action, int setValue) const { myLog->showPlayerActionLogMsg(playerName, action, setValue); }
+void GuiWrapper::showPlayerActionLogMsg(string playerName, int action, int setValue) const { myLogWidget->showPlayerActionLogMsg(playerName, action, setValue); }
 
 
 

src/gui/qt/guiwrapper.h

@@ -22,7 +22,7 @@
 
 #include <guiinterface.h>
 
-#include "log.h"
+#include "logwidgetimpl.h"
 #include "mainwindowimpl.h"
 #include "configfile.h"
 
@@ -87,7 +87,7 @@ public:
 
 private: 
 	
-	Log *myLog;
+	LogWidgetImpl *myLogWidget;
 	mainWindowImpl *myW;
 	ConfigFile *myConfig;
 

src/gui/qt/logwidgetimpl.cpp

@@ -17,23 +17,23 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "log.h"
+#include "logwidgetimpl.h"
 
 #include "mainwindowimpl.h"
 
 using namespace std;
 
-Log::Log(mainWindowImpl* w) : myW(w)
+LogWidgetImpl::LogWidgetImpl(mainWindowImpl* w) : myW(w)
 {
-	myW->setLog(this);
+	myW->setLogWidgetImpl(this);
 	
 }
 
-Log::~Log()
+LogWidgetImpl::~LogWidgetImpl()
 {
 }
 
-void Log::showPlayerActionLogMsg(string playerName, int action, int setValue) const {
+void LogWidgetImpl::showPlayerActionLogMsg(string playerName, int action, int setValue) const {
 	
 	QString msg;
 	msg = QString::fromStdString(playerName);

src/gui/qt/logwidgetimpl.h

@@ -17,27 +17,22 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#ifndef LOG_H
+#ifndef LOGWIDGETIMPL_H
-#define LOG_H
+#define LOGWIDGETIMPL_H
 
 #include <string>
 #include <iostream>
-#include <QtCore>
-
-
 
 class mainWindowImpl;
 
-class Log{
+class LogWidgetImpl{
 public:
-    Log(mainWindowImpl*);
+    LogWidgetImpl(mainWindowImpl*);
-
-    ~Log();
 
+    ~LogWidgetImpl();
 	
 	void showPlayerActionLogMsg(std::string playName, int action, int setValue) const;
 
-
 private:
 
 	mainWindowImpl *myW;

src/gui/qt/mainwindowimpl.cpp

@@ -33,7 +33,7 @@
 #include "game.h"
 #include "session.h"
 
-#include "log.h"
+#include "logwidgetimpl.h"
 #include "configfile.h"
 
 #define FORMATLEFT(X) "<p align='center'>(X)"
@@ -537,7 +537,7 @@ void mainWindowImpl::setHand(HandInterface* br) { actualHand = br; }
 
 void mainWindowImpl::setSession(Session* s) { mySession = s; }
 
-void mainWindowImpl::setLog(Log* l) { myLog = l; }
+void mainWindowImpl::setLogWidgetImpl(LogWidgetImpl* l) { myLogWidget = l; }
 
 //refresh-Funktionen
 void mainWindowImpl::refreshSet() {
@@ -1027,7 +1027,7 @@ void mainWindowImpl::myFold(){
 	actualHand->getPlayerArray()[0]->setMyTurn(0);
 
 	//Action in LogWindow
-	myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
+	myLogWidget->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
 
 	disableMyButtons();
 	
@@ -1041,7 +1041,7 @@ void mainWindowImpl::myCheck() {
 	actualHand->getPlayerArray()[0]->setMyTurn(0);
 
 	//Action in LogWindow
-	myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
+	myLogWidget->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
 
 	disableMyButtons();
 	
@@ -1081,7 +1081,7 @@ void mainWindowImpl::myCall(){
 	refreshPot();
 
 	//Action in LogWindow
-	myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
+	myLogWidget->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
 
 	disableMyButtons();
 
@@ -1184,7 +1184,7 @@ void mainWindowImpl::mySet(){
 	refreshPot();
 
 	//Action in LogWindow
-	myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
+	myLogWidget->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
 
 	disableMyButtons();
 
@@ -1217,7 +1217,7 @@ void mainWindowImpl::myAllIn(){
 	refreshPot();
 
 	//Action in LogWindow
-	myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
+	myLogWidget->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet());
 	
 	disableMyButtons();
 
@@ -1725,7 +1725,7 @@ void mainWindowImpl::paintStartSplash() {
 
 void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
 
-	cout << event->key() << endl;
+// 	cout << event->key() << endl;
 	
 	if (event->key() == 16777220) { if(spinBox_set->hasFocus()) pushButton_set->click(); } //ENTER
 	if (event->key() == 16777265) { switchToolBox(); } //F2

src/gui/qt/mainwindowimpl.h

@@ -29,7 +29,7 @@
 
 class Game;
 class Session;
-class Log;
+class LogWidgetImpl;
 class ConfigFile;
 
 class BoardInterface;
@@ -49,7 +49,7 @@ public:
 	void setGame(Game*);
 	void setHand(HandInterface*);
 	void setSession(Session*);
-	void setLog(Log*);
+	void setLogWidgetImpl(LogWidgetImpl*);
 
 	int getMaxQuantityPlayers() const { return maxQuantityPlayers; }
 
@@ -161,9 +161,11 @@ private:
 	Game *actualGame;
 	HandInterface *actualHand;
 	Session *mySession;
-	Log *myLog;
+               
 	ConfigFile *myConfig;
 
+	LogWidgetImpl *myLogWidget;
+
 	//MyPixmapCardsLabel
 	MyCardsPixmapLabel *pixmapLabel_cardBoard0;
 	MyCardsPixmapLabel *pixmapLabel_cardBoard1;