diff --git a/pokerth_game.pro b/pokerth_game.pro index c9103b4d..9f67e91e 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -1,314 +1,322 @@ # QMake pro-file for PokerTH game - -isEmpty( PREFIX ){ - PREFIX =/usr -} - +isEmpty( PREFIX ):PREFIX = /usr TEMPLATE = app CODECFORSRC = UTF-8 -CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release -#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug - -#####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt) -#QTPLUGIN += qjpeg qgif +# CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release +CONFIG += qt \ + thread \ + embed_manifest_exe \ + exceptions \ + rtti \ + stl \ + warn_on \ + debug +# ####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt) +# QTPLUGIN += qjpeg qgif UI_DIR = uics MOC_DIR = mocs OBJECTS_DIR = obj DEFINES += ENABLE_IPV6 DEFINES += PREFIX=\"$${PREFIX}\" TARGET = pokerth - RESOURCES = src/gui/qt/resources/pokerth.qrc - INCLUDEPATH += . \ - src \ - src/engine \ - src/gui \ - src/net \ - src/engine/local_engine \ - src/engine/network_engine \ - src/config \ - src/third_party/tinyxml \ - src/gui/qt \ - src/gui/qt/connecttoserverdialog \ - src/core \ - src/gui/qt/sound \ - src/gui/qt/qttools \ - src/gui/qt/chattools \ - src/gui/qt/qttools/qthelper \ - src/gui/qt/gametable \ - src/gui/qt/gametable/startsplash \ - src/gui/qt/gametable/log \ - src/gui/qt/gametable/chat \ - src/gui/qt/aboutpokerth \ - src/gui/qt/createnetworkgamedialog \ - src/gui/qt/createinternetgamedialog \ - src/gui/qt/joinnetworkgamedialog \ - src/gui/qt/newlocalgamedialog \ - src/gui/qt/settingsdialog \ - src/gui/qt/settingsdialog/selectavatardialog \ - src/gui/qt/settingsdialog/manualblindsorderdialog \ - src/gui/qt/startnetworkgamedialog \ - src/gui/qt/startwindow \ - src/gui/qt/serverlistdialog \ - src/gui/qt/styles \ - src/gui/qt/changehumanplayernamedialog \ - src/gui/qt/changecompleteblindsdialog \ - src/gui/qt/mymessagedialog \ - src/gui/qt/gamelobbydialog \ - src/gui/qt/gamelobbydialog/lobbychat \ - src/gui/qt/timeoutmsgbox - + src \ + src/engine \ + src/gui \ + src/net \ + src/engine/local_engine \ + src/engine/network_engine \ + src/config \ + src/third_party/tinyxml \ + src/gui/qt \ + src/gui/qt/connecttoserverdialog \ + src/core \ + src/gui/qt/sound \ + src/gui/qt/qttools \ + src/gui/qt/chattools \ + src/gui/qt/qttools/qthelper \ + src/gui/qt/gametable \ + src/gui/qt/gametable/startsplash \ + src/gui/qt/gametable/log \ + src/gui/qt/gametable/chat \ + src/gui/qt/aboutpokerth \ + src/gui/qt/createnetworkgamedialog \ + src/gui/qt/createinternetgamedialog \ + src/gui/qt/joinnetworkgamedialog \ + src/gui/qt/newlocalgamedialog \ + src/gui/qt/settingsdialog \ + src/gui/qt/settingsdialog/selectavatardialog \ + src/gui/qt/settingsdialog/manualblindsorderdialog \ + src/gui/qt/startnetworkgamedialog \ + src/gui/qt/startwindow \ + src/gui/qt/serverlistdialog \ + src/gui/qt/styles \ + src/gui/qt/changehumanplayernamedialog \ + src/gui/qt/changecompleteblindsdialog \ + src/gui/qt/mymessagedialog \ + src/gui/qt/gamelobbydialog \ + src/gui/qt/gamelobbydialog/lobbychat \ + src/gui/qt/timeoutmsgbox DEPENDPATH += . \ - src \ - src/config \ - src/core \ - src/engine \ - src/gui \ - src/net \ - src/core/common \ - src/third_party/tinyxml \ - src/engine/local_engine \ - src/engine/network_engine \ - src/gui/qt \ - src/net/common \ - src/gui/qt/sound \ - src/gui/qt/chattools \ - src/gui/qt/gametable \ - src/gui/qt/gametable/startsplash \ - src/gui/qt/gametable/log \ - src/gui/qt/gametable/chat \ - src/gui/qt/aboutpokerth \ - src/gui/qt/connecttoserverdialog \ - src/gui/qt/createinternetgamedialog \ - src/gui/qt/createnetworkgamedialog \ - src/gui/qt/joinnetworkgamedialog \ - src/gui/qt/qttools \ - src/gui/qt/qttools/qthelper \ - src/gui/qt/newlocalgamedialog \ - src/gui/qt/settingsdialog \ - src/gui/qt/settingsdialog/selectavatardialog \ - src/gui/qt/settingsdialog/manualblindsorderdialog \ - src/gui/qt/startnetworkgamedialog \ - src/gui/qt/startwindow \ - src/gui/qt/serverlistdialog \ - src/gui/qt/styles \ - src/gui/qt/changehumanplayernamedialog \ - src/gui/qt/changecompleteblindsdialog \ - src/gui/qt/mymessagedialog \ - src/gui/qt/gamelobbydialog \ - src/gui/qt/gamelobbydialog/lobbychat \ - src/gui/qt/timeoutmsgbox + src \ + src/config \ + src/core \ + src/engine \ + src/gui \ + src/net \ + src/core/common \ + src/third_party/tinyxml \ + src/engine/local_engine \ + src/engine/network_engine \ + src/gui/qt \ + src/net/common \ + src/gui/qt/sound \ + src/gui/qt/chattools \ + src/gui/qt/gametable \ + src/gui/qt/gametable/startsplash \ + src/gui/qt/gametable/log \ + src/gui/qt/gametable/chat \ + src/gui/qt/aboutpokerth \ + src/gui/qt/connecttoserverdialog \ + src/gui/qt/createinternetgamedialog \ + src/gui/qt/createnetworkgamedialog \ + src/gui/qt/joinnetworkgamedialog \ + src/gui/qt/qttools \ + src/gui/qt/qttools/qthelper \ + src/gui/qt/newlocalgamedialog \ + src/gui/qt/settingsdialog \ + src/gui/qt/settingsdialog/selectavatardialog \ + src/gui/qt/settingsdialog/manualblindsorderdialog \ + src/gui/qt/startnetworkgamedialog \ + src/gui/qt/startwindow \ + src/gui/qt/serverlistdialog \ + src/gui/qt/styles \ + src/gui/qt/changehumanplayernamedialog \ + src/gui/qt/changecompleteblindsdialog \ + src/gui/qt/mymessagedialog \ + src/gui/qt/gamelobbydialog \ + src/gui/qt/gamelobbydialog/lobbychat \ + src/gui/qt/timeoutmsgbox # Input -HEADERS += \ - src/game.h \ - src/session.h \ - src/playerdata.h \ - src/gamedata.h \ - src/config/configfile.h \ - src/core/thread.h \ - src/core/loghelper.h \ - src/engine/boardinterface.h \ - src/engine/enginefactory.h \ - src/engine/handinterface.h \ - src/engine/playerinterface.h \ - src/engine/berointerface.h \ - src/gui/guiinterface.h \ - src/net/clientcallback.h \ - src/net/clientcontext.h \ - src/net/clientexception.h \ - src/net/clientstate.h \ - src/net/clientthread.h \ - src/net/genericsocket.h \ - src/net/netpacket.h \ - src/net/resolverthread.h \ - src/net/senderthread.h \ - src/net/serveracceptthread.h \ - src/net/serverlobbythread.h \ - src/net/socket_helper.h \ - src/net/socket_msg.h \ - src/net/socket_startup.h \ - src/net/net_helper.h \ - src/third_party/tinyxml/tinystr.h \ - src/third_party/tinyxml/tinyxml.h \ - src/engine/local_engine/cardsvalue.h \ - src/engine/local_engine/localboard.h \ - src/engine/local_engine/localenginefactory.h \ - src/engine/local_engine/localhand.h \ - src/engine/local_engine/localplayer.h \ - src/engine/local_engine/localberopreflop.h \ - src/engine/local_engine/localberoflop.h \ - src/engine/local_engine/localberoturn.h \ - src/engine/local_engine/localberoriver.h \ - src/engine/local_engine/localberopostriver.h \ - src/engine/local_engine/tools.h \ - src/engine/local_engine/localbero.h \ - src/engine/network_engine/clientboard.h \ - src/engine/network_engine/clientenginefactory.h \ - src/engine/network_engine/clienthand.h \ - src/engine/network_engine/clientplayer.h \ - src/engine/network_engine/clientbero.h \ - src/gui/qt/chattools/chattools.h \ - src/gui/qt/sound/sdlplayer.h \ - src/gui/qt/gametable/gametableimpl.h \ - src/gui/qt/gametable/mycardspixmaplabel.h \ - src/gui/qt/gametable/mysetlabel.h \ - src/gui/qt/gametable/myactionbutton.h \ - src/gui/qt/gametable/mystatuslabel.h \ - src/gui/qt/gametable/myavatarlabel.h \ - src/gui/qt/gametable/myrighttabwidget.h \ - src/gui/qt/gametable/mylefttabwidget.h \ - src/gui/qt/gametable/startsplash/startsplash.h \ - src/gui/qt/gametable/log/log.h \ - src/gui/qt/gametable/chat/chat.h \ - src/gui/qt/guiwrapper.h \ - src/gui/qt/aboutpokerth/aboutpokerthimpl.h \ - src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h \ - src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h \ - src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h \ - src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h \ - src/gui/qt/newlocalgamedialog/newgamedialogimpl.h \ - src/gui/qt/settingsdialog/settingsdialogimpl.h \ - src/gui/qt/settingsdialog/myavatarbutton.h \ - src/gui/qt/settingsdialog/myhpavatarbutton.h \ - src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h \ - src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h \ - src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.h \ - src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \ - src/gui/qt/startwindow/startwindowimpl.h \ - src/gui/qt/styles/gametablestylereader.h \ - src/gui/qt/styles/carddeckstylereader.h \ - src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.h \ - src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h \ - src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h \ - src/gui/qt/gamelobbydialog/mygamelisttreewidget.h \ - src/gui/qt/gamelobbydialog/lobbychat/lobbychat.h \ - src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h \ - src/gui/qt/mymessagedialog/mymessagedialogimpl.h \ - src/gui/qttoolsinterface.h \ - src/gui/qt/qttools/qttoolswrapper.h \ - src/gui/qt/qttools/qthelper/qthelper.h \ - src/gui/generic/serverguiwrapper.h \ - src/gui/qt/gametable/mychancelabel.h \ - src/gui/qt/serverlistdialog/serverlistdialogimpl.h - -FORMS += \ - src/gui/qt/gametable.ui \ - src/gui/qt/aboutpokerth.ui \ - src/gui/qt/connecttoserverdialog.ui \ - src/gui/qt/createnetworkgamedialog.ui \ - src/gui/qt/createinternetgamedialog.ui \ - src/gui/qt/joinnetworkgamedialog.ui \ - src/gui/qt/newgamedialog.ui \ - src/gui/qt/settingsdialog.ui \ - src/gui/qt/selectavatardialog.ui \ - src/gui/qt/startnetworkgamedialog.ui \ - src/gui/qt/startwindow.ui \ - src/gui/qt/changehumanplayernamedialog.ui \ - src/gui/qt/changecompleteblindsdialog.ui \ - src/gui/qt/gamelobbydialog.ui \ - src/gui/qt/mymessagedialog.ui \ - src/gui/qt/manualblindsorderdialog.ui \ - src/gui/qt/serverlistdialog.ui - -SOURCES += \ - src/pokerth.cpp \ - src/gui/qt/chattools/chattools.cpp \ - src/gui/qt/sound/sdlplayer.cpp \ - src/gui/qt/guiwrapper.cpp \ - src/gui/qt/qttools/qttoolswrapper.cpp \ - src/gui/qt/qttools/qthelper/qthelper.cpp \ - src/gui/qt/gametable/gametableimpl.cpp \ - src/gui/qt/gametable/mycardspixmaplabel.cpp \ - src/gui/qt/gametable/mysetlabel.cpp \ - src/gui/qt/gametable/myactionbutton.cpp \ - src/gui/qt/gametable/mystatuslabel.cpp \ - src/gui/qt/gametable/myavatarlabel.cpp \ - src/gui/qt/gametable/myrighttabwidget.cpp \ - src/gui/qt/gametable/mylefttabwidget.cpp \ - src/gui/qt/gametable/startsplash/startsplash.cpp \ - src/gui/qt/gametable/log/log.cpp \ - src/gui/qt/gametable/chat/chat.cpp \ - src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp \ - src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp \ - src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp \ - src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp \ - src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp \ - src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp \ - src/gui/qt/settingsdialog/settingsdialogimpl.cpp \ - src/gui/qt/settingsdialog/myavatarbutton.cpp \ - src/gui/qt/settingsdialog/myhpavatarbutton.cpp \ - src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp \ - src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp \ - src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp \ - src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \ - src/gui/qt/startwindow/startwindowimpl.cpp \ - src/gui/qt/styles/gametablestylereader.cpp \ - src/gui/qt/styles/carddeckstylereader.cpp \ - src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp \ - src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp \ - src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp \ - src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp \ - src/gui/qt/gamelobbydialog/mygamelisttreewidget.cpp \ - src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp \ - src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.cpp \ - src/net/common/net_helper_client.cpp \ - src/core/common/loghelper_client.cpp \ - src/gui/qt/gametable/mychancelabel.cpp \ - src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp - -TRANSLATIONS = \ - ts/pokerth_bg.ts \ - ts/pokerth_de.ts \ - ts/pokerth_dk.ts \ - ts/pokerth_es.ts \ - ts/pokerth_fr.ts \ - ts/pokerth_hu.ts \ - ts/pokerth_it.ts \ - ts/pokerth_nl.ts \ - ts/pokerth_no.ts \ - ts/pokerth_pl.ts \ - ts/pokerth_ru.ts \ - ts/pokerth_sk.ts \ - ts/pokerth_sv.ts \ - ts/pokerth_tr.ts \ - ts/pokerth_gr.ts \ - ts/pokerth_ptbr.ts \ - ts/pokerth_zhcn.ts \ - ts/pokerth_fi.ts \ - ts/pokerth_START_HERE.ts - -win32 { - QTPLUGIN += qjpeg qgif +HEADERS += src/game.h \ + src/session.h \ + src/playerdata.h \ + src/gamedata.h \ + src/config/configfile.h \ + src/core/thread.h \ + src/core/loghelper.h \ + src/engine/boardinterface.h \ + src/engine/enginefactory.h \ + src/engine/handinterface.h \ + src/engine/playerinterface.h \ + src/engine/berointerface.h \ + src/gui/guiinterface.h \ + src/net/clientcallback.h \ + src/net/clientcontext.h \ + src/net/clientexception.h \ + src/net/clientstate.h \ + src/net/clientthread.h \ + src/net/genericsocket.h \ + src/net/netpacket.h \ + src/net/resolverthread.h \ + src/net/senderthread.h \ + src/net/serveracceptthread.h \ + src/net/serverlobbythread.h \ + src/net/socket_helper.h \ + src/net/socket_msg.h \ + src/net/socket_startup.h \ + src/net/net_helper.h \ + src/third_party/tinyxml/tinystr.h \ + src/third_party/tinyxml/tinyxml.h \ + src/engine/local_engine/cardsvalue.h \ + src/engine/local_engine/localboard.h \ + src/engine/local_engine/localenginefactory.h \ + src/engine/local_engine/localhand.h \ + src/engine/local_engine/localplayer.h \ + src/engine/local_engine/localberopreflop.h \ + src/engine/local_engine/localberoflop.h \ + src/engine/local_engine/localberoturn.h \ + src/engine/local_engine/localberoriver.h \ + src/engine/local_engine/localberopostriver.h \ + src/engine/local_engine/tools.h \ + src/engine/local_engine/localbero.h \ + src/engine/network_engine/clientboard.h \ + src/engine/network_engine/clientenginefactory.h \ + src/engine/network_engine/clienthand.h \ + src/engine/network_engine/clientplayer.h \ + src/engine/network_engine/clientbero.h \ + src/gui/qt/chattools/chattools.h \ + src/gui/qt/sound/sdlplayer.h \ + src/gui/qt/gametable/gametableimpl.h \ + src/gui/qt/gametable/mycardspixmaplabel.h \ + src/gui/qt/gametable/mysetlabel.h \ + src/gui/qt/gametable/myactionbutton.h \ + src/gui/qt/gametable/mystatuslabel.h \ + src/gui/qt/gametable/myavatarlabel.h \ + src/gui/qt/gametable/myrighttabwidget.h \ + src/gui/qt/gametable/mylefttabwidget.h \ + src/gui/qt/gametable/startsplash/startsplash.h \ + src/gui/qt/gametable/log/log.h \ + src/gui/qt/gametable/chat/chat.h \ + src/gui/qt/guiwrapper.h \ + src/gui/qt/aboutpokerth/aboutpokerthimpl.h \ + src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.h \ + src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.h \ + src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.h \ + src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h \ + src/gui/qt/newlocalgamedialog/newgamedialogimpl.h \ + src/gui/qt/settingsdialog/settingsdialogimpl.h \ + src/gui/qt/settingsdialog/myavatarbutton.h \ + src/gui/qt/settingsdialog/myhpavatarbutton.h \ + src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.h \ + src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.h \ + src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.h \ + src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \ + src/gui/qt/startwindow/startwindowimpl.h \ + src/gui/qt/styles/gametablestylereader.h \ + src/gui/qt/styles/carddeckstylereader.h \ + src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.h \ + src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.h \ + src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h \ + src/gui/qt/gamelobbydialog/mygamelisttreewidget.h \ + src/gui/qt/gamelobbydialog/lobbychat/lobbychat.h \ + src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.h \ + src/gui/qt/mymessagedialog/mymessagedialogimpl.h \ + src/gui/qttoolsinterface.h \ + src/gui/qt/qttools/qttoolswrapper.h \ + src/gui/qt/qttools/qthelper/qthelper.h \ + src/gui/generic/serverguiwrapper.h \ + src/gui/qt/gametable/mychancelabel.h \ + src/gui/qt/serverlistdialog/serverlistdialogimpl.h \ + src/gui/qt/gametable/mymenubar.h \ + src/gui/qt/gametable/mytimeoutlabel.h +FORMS += src/gui/qt/gametable.ui \ + src/gui/qt/aboutpokerth.ui \ + src/gui/qt/connecttoserverdialog.ui \ + src/gui/qt/createnetworkgamedialog.ui \ + src/gui/qt/createinternetgamedialog.ui \ + src/gui/qt/joinnetworkgamedialog.ui \ + src/gui/qt/newgamedialog.ui \ + src/gui/qt/settingsdialog.ui \ + src/gui/qt/selectavatardialog.ui \ + src/gui/qt/startnetworkgamedialog.ui \ + src/gui/qt/startwindow.ui \ + src/gui/qt/changehumanplayernamedialog.ui \ + src/gui/qt/changecompleteblindsdialog.ui \ + src/gui/qt/gamelobbydialog.ui \ + src/gui/qt/mymessagedialog.ui \ + src/gui/qt/manualblindsorderdialog.ui \ + src/gui/qt/serverlistdialog.ui +SOURCES += src/pokerth.cpp \ + src/gui/qt/chattools/chattools.cpp \ + src/gui/qt/sound/sdlplayer.cpp \ + src/gui/qt/guiwrapper.cpp \ + src/gui/qt/qttools/qttoolswrapper.cpp \ + src/gui/qt/qttools/qthelper/qthelper.cpp \ + src/gui/qt/gametable/gametableimpl.cpp \ + src/gui/qt/gametable/mycardspixmaplabel.cpp \ + src/gui/qt/gametable/mysetlabel.cpp \ + src/gui/qt/gametable/myactionbutton.cpp \ + src/gui/qt/gametable/mystatuslabel.cpp \ + src/gui/qt/gametable/myavatarlabel.cpp \ + src/gui/qt/gametable/myrighttabwidget.cpp \ + src/gui/qt/gametable/mylefttabwidget.cpp \ + src/gui/qt/gametable/startsplash/startsplash.cpp \ + src/gui/qt/gametable/log/log.cpp \ + src/gui/qt/gametable/chat/chat.cpp \ + src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp \ + src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp \ + src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp \ + src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp \ + src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp \ + src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp \ + src/gui/qt/settingsdialog/settingsdialogimpl.cpp \ + src/gui/qt/settingsdialog/myavatarbutton.cpp \ + src/gui/qt/settingsdialog/myhpavatarbutton.cpp \ + src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp \ + src/gui/qt/settingsdialog/selectavatardialog/myavatarlistitem.cpp \ + src/gui/qt/settingsdialog/manualblindsorderdialog/manualblindsorderdialogimpl.cpp \ + src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \ + src/gui/qt/startwindow/startwindowimpl.cpp \ + src/gui/qt/styles/gametablestylereader.cpp \ + src/gui/qt/styles/carddeckstylereader.cpp \ + src/gui/qt/changehumanplayernamedialog/changehumanplayernamedialogimpl.cpp \ + src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp \ + src/gui/qt/mymessagedialog/mymessagedialogimpl.cpp \ + src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp \ + src/gui/qt/gamelobbydialog/mygamelisttreewidget.cpp \ + src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp \ + src/gui/qt/timeoutmsgbox/timeoutmsgboximpl.cpp \ + src/net/common/net_helper_client.cpp \ + src/core/common/loghelper_client.cpp \ + src/gui/qt/gametable/mychancelabel.cpp \ + src/gui/qt/serverlistdialog/serverlistdialogimpl.cpp \ + src/gui/qt/gametable/mymenubar.cpp \ + src/gui/qt/gametable/mytimeoutlabel.cpp +TRANSLATIONS = ts/pokerth_bg.ts \ + ts/pokerth_de.ts \ + ts/pokerth_dk.ts \ + ts/pokerth_es.ts \ + ts/pokerth_fr.ts \ + ts/pokerth_hu.ts \ + ts/pokerth_it.ts \ + ts/pokerth_nl.ts \ + ts/pokerth_no.ts \ + ts/pokerth_pl.ts \ + ts/pokerth_ru.ts \ + ts/pokerth_sk.ts \ + ts/pokerth_sv.ts \ + ts/pokerth_tr.ts \ + ts/pokerth_gr.ts \ + ts/pokerth_ptbr.ts \ + ts/pokerth_zhcn.ts \ + ts/pokerth_fi.ts \ + ts/pokerth_START_HERE.ts +win32 { + QTPLUGIN += qjpeg \ + qgif DEFINES += CURL_STATICLIB DEFINES += _WIN32_WINNT=0x0501 - DEPENDPATH += src/net/win32/ src/core/win32 - INCLUDEPATH += ../boost/ ../SDL/include ../SDL_mixer - INCLUDEPATH += ../SDL/include/SDL ../SDL_mixer/include ../GnuTLS/include ../curl/include ../zlib - LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../curl/lib ../zlib - + DEPENDPATH += src/net/win32/ \ + src/core/win32 + INCLUDEPATH += ../boost/ \ + ../SDL/include \ + ../SDL_mixer + INCLUDEPATH += ../SDL/include/SDL \ + ../SDL_mixer/include \ + ../GnuTLS/include \ + ../curl/include \ + ../zlib + LIBPATH += ../boost/stage/lib \ + ../GnuTLS/lib \ + ../curl/lib \ + ../zlib LIBS += -lpokerth_lib - - win32-msvc2005 { - LIBPATH += Release/lib ../SDL/VisualC/SDL/Release ../SDL/VisualC/SDLmain/Release ../SDL_mixer/VisualC/Release - #LIBPATH += Debug/lib ../SDL/VisualC/SDL/Debug ../SDL/VisualC/SDLmain/Debug ../SDL_mixer/VisualC/Debug - - LIBS += -llibgnutls-openssl -llibgcrypt + win32-msvc2005 { + LIBPATH += Release/lib \ + ../SDL/VisualC/SDL/Release \ + ../SDL/VisualC/SDLmain/Release \ + ../SDL_mixer/VisualC/Release + + # LIBPATH += Debug/lib ../SDL/VisualC/SDL/Debug ../SDL/VisualC/SDLmain/Debug ../SDL_mixer/VisualC/Debug + LIBS += -llibgnutls-openssl \ + -llibgcrypt LIBS += -llibcurl } - - win32-g++ { - debug { - LIBPATH += Debug/lib - } - release { - LIBPATH += Release/lib - } - LIBPATH += ../SDL/lib ../SDL_mixer/lib - LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error + win32-g++ { + debug:LIBPATH += Debug/lib + release:LIBPATH += Release/lib + LIBPATH += ../SDL/lib \ + ../SDL_mixer/lib + LIBS += -lgnutls-openssl \ + -lgnutls \ + -lgcrypt \ + -ltasn1 \ + -lgpg-error LIBS += -lcurl LIBS += -lz LIBS += -llibboost_thread-mgw43-mt-1_38 @@ -318,130 +326,128 @@ win32 { LIBS += -llibboost_iostreams-mgw43-mt-1_38 LIBS += -llibboost_zlib-mgw43-mt-1_38 } - - LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lsdl -lsdlmain -lsdl_mixer -lwldap32 + LIBS += -lgdi32 \ + -lcomdlg32 \ + -loleaut32 \ + -limm32 \ + -lwinmm \ + -lwinspool \ + -lole32 \ + -luuid \ + -luser32 \ + -lmsimg32 \ + -lshell32 \ + -lkernel32 \ + -lws2_32 \ + -ladvapi32 \ + -lsdl \ + -lsdlmain \ + -lsdl_mixer \ + -lwldap32 RC_FILE = pokerth.rc } -!win32 { - DEPENDPATH += src/net/linux/ src/core/linux -} - -unix { - # workaround for problems with boost_filesystem exceptions - QMAKE_LFLAGS += -no_dead_strip_inits_and_terms -} - -unix : !mac { - - ##### My release static build options - #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections - #QMAKE_LFLAGS += -Wl,--gc-sections - - LIBPATH += lib - - LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 - BOOST_FS = boost_filesystem boost_filesystem-mt - BOOST_THREAD = boost_thread boost_thread-mt - BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt - BOOST_REGEX = boost_regex boost_regex-mt - - # - # searching in $PREFIX/lib and $PREFIX/lib64 - # to override the default '/usr' pass PREFIX - # variable to qmake. - # - for(dir, LIB_DIRS){ - exists($$dir){ - for(lib, BOOST_THREAD){ - exists($${dir}/lib$${lib}.so*){ - message("Found $$lib") - BOOST_THREAD = -l$$lib - } - } - for(lib, BOOST_FS){ - exists($${dir}/lib$${lib}.so*){ - message("Found $$lib") - BOOST_FS = -l$$lib - } - } - for(lib, BOOST_IOSTREAMS){ - exists($${dir}/lib$${lib}.so*){ - message("Found $$lib") - BOOST_IOSTREAMS = -l$$lib - } - } - for(lib, BOOST_REGEX){ - exists($${dir}/lib$${lib}.so*){ - message("Found $$lib") - BOOST_REGEX = -l$$lib - } - } - } +!win32:DEPENDPATH += src/net/linux/ \ + src/core/linux +unix:# workaround for problems with boost_filesystem exceptions +QMAKE_LFLAGS += -no_dead_strip_inits_and_terms +unix:!mac { + # #### My release static build options + # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections + # QMAKE_LFLAGS += -Wl,--gc-sections + LIBPATH += lib + LIB_DIRS = $${PREFIX}/lib \ + $${PREFIX}/lib64 + BOOST_FS = boost_filesystem \ + boost_filesystem-mt + BOOST_THREAD = boost_thread \ + boost_thread-mt + BOOST_IOSTREAMS = boost_iostreams \ + boost_iostreams-mt + BOOST_REGEX = boost_regex \ + boost_regex-mt + + # searching in $PREFIX/lib and $PREFIX/lib64 + # to override the default '/usr' pass PREFIX + # variable to qmake. + for(dir, LIB_DIRS):exists($$dir) { + for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") + BOOST_THREAD = -l$$lib } - BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_IOSTREAMS $$BOOST_REGEX - !count(BOOST_LIBS, 4){ - error("Unable to find boost libraries in PREFIX=$${PREFIX}") + for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") + BOOST_FS = -l$$lib } - - if($$system(sdl-config --version)){ - error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!") + for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") + BOOST_IOSTREAMS = -l$$lib } - - UNAME = $$system(uname -s) - BSD = $$find(UNAME, "BSD") - kFreeBSD = $$find(UNAME, "kFreeBSD") - - LIBS += -lpokerth_lib - LIBS += $$BOOST_LIBS - LIBS += -lSDL_mixer -lcurl - !isEmpty( BSD ) && isEmpty( kFreeBSD ){ - LIBS += -lcrypto - } else { - LIBS += -lgnutls-openssl -lgcrypt + for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) { + message("Found $$lib") + BOOST_REGEX = -l$$lib } - TARGETDEPS += ./lib/libpokerth_lib.a - - ##### My release static libs - #LIBS += -lgcrypt_static -lgpg-error_static -lgnutls-openssl_static -lgnutls_static -lSDL_mixer_static -lSDL -lmikmod -lcurl - - #### INSTALL #### - - binary.path += $${PREFIX}/bin/ - binary.files += pokerth - - data.path += $${PREFIX}/share/pokerth/data/ - data.files += data/* - - pixmap.path += $${PREFIX}/share/pixmaps/ - pixmap.files += pokerth.png - - desktop.path += $${PREFIX}/share/applications/ - desktop.files += pokerth.desktop - - INSTALLS += binary data pixmap desktop } - -mac { - # make it universal - CONFIG += x86 + BOOST_LIBS = $$BOOST_THREAD \ + $$BOOST_FS \ + $$BOOST_IOSTREAMS \ + $$BOOST_REGEX + !count(BOOST_LIBS, 4):error("Unable to find boost libraries in PREFIX=$${PREFIX}") + if($$system(sdl-config --version)):error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!") + UNAME = $$system(uname -s) + BSD = $$find(UNAME, "BSD") + kFreeBSD = $$find(UNAME, "kFreeBSD") + LIBS += -lpokerth_lib + LIBS += $$BOOST_LIBS + LIBS += -lSDL_mixer \ + -lcurl + !isEmpty( BSD ) && isEmpty( kFreeBSD ):LIBS += -lcrypto + else:LIBS += -lgnutls-openssl \ + -lgcrypt + TARGETDEPS += ./lib/libpokerth_lib.a + + # #### My release static libs + # LIBS += -lgcrypt_static -lgpg-error_static -lgnutls-openssl_static -lgnutls_static -lSDL_mixer_static -lSDL -lmikmod -lcurl + # ### INSTALL #### + binary.path += $${PREFIX}/bin/ + binary.files += pokerth + data.path += $${PREFIX}/share/pokerth/data/ + data.files += data/* + pixmap.path += $${PREFIX}/share/pixmaps/ + pixmap.files += pokerth.png + desktop.path += $${PREFIX}/share/applications/ + desktop.files += pokerth.desktop + INSTALLS += binary \ + data \ + pixmap \ + desktop +} +mac { + # make it universal + CONFIG += x86 CONFIG += ppc QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 - + # for universal-compilation on PPC-Mac uncomment the following line # on Intel-Mac you have to comment this line out or build will fail. - # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/ - + # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/ LIBPATH += lib LIBS += -lpokerth_lib + # Qt static (path is standard for self-compiling qt) - #LIBS += /usr/local/Trolltech/Qt-4.2.3/lib/libQtCore.a - #LIBS += /usr/local/Trolltech/Qt-4.2.3/lib/libQtGui.a + # LIBS += /usr/local/Trolltech/Qt-4.2.3/lib/libQtCore.a + # LIBS += /usr/local/Trolltech/Qt-4.2.3/lib/libQtGui.a # QT dynamic linked framework (see also mac_post_make.sh) - LIBS += -framework QtCore - LIBS += -framework QtGui + LIBS += -framework \ + QtCore + LIBS += -framework \ + QtGui + # SDL and SDL_mixer come as frameworks - LIBS += -framework SDL - LIBS += -framework SDL_mixer + LIBS += -framework \ + SDL + LIBS += -framework \ + SDL_mixer + # standard path for darwinports # make sure you have a universal version of boost LIBS += /usr/local/lib/libboost_thread-xgcc40-mt.a @@ -449,8 +455,15 @@ mac { LIBS += /usr/local/lib/libboost_regex-xgcc40-mt.a LIBS += /usr/local/lib/libboost_system-xgcc40-mt.a LIBS += /usr/local/lib/libboost_iostreams-xgcc40-mt.a + # libraries installed on every mac - LIBS += -lcrypto -lssl -lz -lcurl -framework Carbon + LIBS += -lcrypto \ + -lssl \ + -lz \ + -lcurl \ + -framework \ + Carbon + # set the application icon RC_FILE = pokerth.icns LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index 23751164..bb1a4c8a 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -1,7 +1,8 @@ - + + gameTable - - + + 0 0 @@ -9,55 +10,55 @@ 600 - + 1024 600 - + 1920 1280 - + false - + PokerTH 0.6-beta - The Open-Source Texas Holdem Engine - - QStatusbar { height:0px; } + + QStatusbar { height:0px; } - - - + + + 2 - + 0 - + 2 - + 3 - + 0 - - - + + + 0 - - + + Qt::Vertical - + 20 17 @@ -66,24 +67,24 @@ - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -91,24 +92,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -116,24 +117,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -141,24 +142,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -166,21 +167,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -188,27 +189,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -216,12 +217,12 @@ 76 - + true - - + + 110 39 @@ -229,12 +230,12 @@ 76 - + true - - + + 67 55 @@ -242,27 +243,27 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + Qt::Vertical - + 20 13 @@ -271,24 +272,24 @@ - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -296,24 +297,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -321,24 +322,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -346,24 +347,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -371,21 +372,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 16 @@ -393,27 +394,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -421,12 +422,12 @@ 76 - + true - - + + 110 26 @@ -434,12 +435,12 @@ 76 - + true - - + + 67 42 @@ -447,27 +448,27 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + Qt::Vertical - + 20 18 @@ -477,30 +478,30 @@ - - - + + + 0 - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -508,24 +509,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -533,24 +534,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -558,24 +559,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -583,21 +584,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -605,27 +606,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -633,12 +634,12 @@ 76 - + true - - + + 110 39 @@ -646,12 +647,12 @@ 76 - + true - - + + 67 55 @@ -659,40 +660,40 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -700,24 +701,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -725,24 +726,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -750,24 +751,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -775,21 +776,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -797,27 +798,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -825,12 +826,12 @@ 76 - + true - - + + 110 39 @@ -838,12 +839,12 @@ 76 - + true - - + + 67 55 @@ -851,40 +852,40 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -892,24 +893,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -917,24 +918,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -942,24 +943,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -967,21 +968,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -989,27 +990,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -1017,12 +1018,12 @@ 76 - + true - - + + 110 39 @@ -1030,12 +1031,12 @@ 76 - + true - - + + 67 55 @@ -1043,16 +1044,16 @@ 40 - + 0 20 - + - + Qt::AlignCenter @@ -1060,17 +1061,17 @@ - - - + + + 0 - - + + Qt::Vertical - + 20 13 @@ -1079,24 +1080,24 @@ - - + + 190 142 - + 190 142 - + - - + + 13 13 @@ -1104,24 +1105,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 11 @@ -1129,24 +1130,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 119 @@ -1154,24 +1155,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 25 @@ -1179,21 +1180,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 88 @@ -1201,27 +1202,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 39 @@ -1229,12 +1230,12 @@ 76 - + true - - + + 110 39 @@ -1242,12 +1243,12 @@ 76 - + true - - + + 67 55 @@ -1255,27 +1256,27 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + Qt::Vertical - + 20 28 @@ -1284,24 +1285,24 @@ - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -1309,24 +1310,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -1334,24 +1335,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -1359,24 +1360,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -1384,21 +1385,21 @@ 12 - + 35 12 - + 16777215 12 - - + + 18 16 @@ -1406,27 +1407,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -1434,12 +1435,12 @@ 76 - + true - - + + 110 26 @@ -1447,12 +1448,12 @@ 76 - + true - - + + 67 40 @@ -1460,27 +1461,27 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + Qt::Vertical - + 20 18 @@ -1490,12 +1491,12 @@ - - - + + + Qt::Vertical - + 20 40 @@ -1503,14 +1504,14 @@ - - + + - - + + Qt::Horizontal - + 40 20 @@ -1519,110 +1520,110 @@ - - - + + + 0 0 - + 580 94 - + 535 94 - - QGroupBox {border-style:none;} + + QGroupBox {border-style:none;} - - + + 0 - + 0 - - - - + + + + 0 - + 0 - + 8 - + 0 - + 8 - - + + 145 0 - + - + Qt::AlignCenter - - + + 3 - + 2 - + 0 - - - + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + 75 0 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1632,15 +1633,15 @@ - - - + + + Qt::Horizontal - + QSizePolicy::Fixed - + 3 91 @@ -1648,15 +1649,15 @@ - - - + + + Qt::Horizontal - + QSizePolicy::Fixed - + 3 91 @@ -1664,84 +1665,84 @@ - - - + + + 0 - + 8 - + 8 - - + + 142 0 - + Qt::AlignCenter - - + + 90 0 - - + + 3 - + 2 - + 0 - - - + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - + + + - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - + + + 45 0 - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1751,16 +1752,16 @@ - - - + + + 285 0 - - + + 230 10 @@ -1768,12 +1769,12 @@ 76 - + true - - + + 65 10 @@ -1781,12 +1782,12 @@ 76 - + true - - + + 62 7 @@ -1794,12 +1795,12 @@ 82 - + true - - + + 7 7 @@ -1807,12 +1808,12 @@ 82 - + true - - + + 10 10 @@ -1820,12 +1821,12 @@ 76 - + true - - + + 227 7 @@ -1833,12 +1834,12 @@ 82 - + true - - + + 117 7 @@ -1846,12 +1847,12 @@ 82 - + true - - + + 120 10 @@ -1859,12 +1860,12 @@ 76 - + true - - + + 172 7 @@ -1872,12 +1873,12 @@ 82 - + true - - + + 175 10 @@ -1885,7 +1886,7 @@ 76 - + true @@ -1895,11 +1896,11 @@ - - + + Qt::Horizontal - + 40 20 @@ -1909,12 +1910,12 @@ - - - + + + Qt::Vertical - + 20 40 @@ -1922,30 +1923,30 @@ - - - + + + 0 - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -1953,24 +1954,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -1978,24 +1979,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -2003,24 +2004,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -2028,21 +2029,21 @@ 14 - + 35 14 - + 16777215 14 - - + + 18 16 @@ -2050,27 +2051,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -2078,12 +2079,12 @@ 76 - + true - - + + 110 26 @@ -2091,12 +2092,12 @@ 76 - + true - - + + 67 42 @@ -2104,40 +2105,40 @@ 40 - + 0 20 - + - + Qt::AlignCenter - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -2145,24 +2146,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -2170,24 +2171,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -2195,24 +2196,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -2220,21 +2221,21 @@ 12 - + 35 12 - + 16777215 12 - - + + 18 16 @@ -2242,27 +2243,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -2270,12 +2271,12 @@ 76 - + true - - + + 110 26 @@ -2283,12 +2284,12 @@ 76 - + true - - + + 67 42 @@ -2296,40 +2297,53 @@ 40 - + 0 20 - + - + Qt::AlignCenter + + + + 10 + 60 + 50 + 17 + + + + + + - - + + 190 142 - + 190 142 - + - - + + 13 79 @@ -2337,24 +2351,24 @@ 50 - + 50 50 - + 50 50 - + true - - + + 70 117 @@ -2362,24 +2376,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + 70 10 @@ -2387,24 +2401,24 @@ 14 - + 0 14 - + 16777215 14 - + Qt::AlignBottom|Qt::AlignHCenter - - + + 70 104 @@ -2412,21 +2426,21 @@ 12 - + 35 12 - + 16777215 12 - - + + 18 16 @@ -2434,27 +2448,27 @@ 42 - + 40 42 - + 40 42 - + - + true - - + + 86 26 @@ -2462,12 +2476,12 @@ 76 - + true - - + + 110 26 @@ -2475,12 +2489,12 @@ 76 - + true - - + + 67 40 @@ -2488,16 +2502,16 @@ 40 - + 0 20 - + - + Qt::AlignCenter @@ -2505,25 +2519,25 @@ - - + + - - + + 0 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 260 0 @@ -2533,13 +2547,13 @@ - + Qt::Vertical - + QSizePolicy::Expanding - + 0 0 @@ -2548,120 +2562,120 @@ - - + + 260 188 - + 260 188 - - + + 4 - - - + + + Qt::NoFocus - + 0 - - + + Hands - - + + 0 - + 0 - - - + + + Qt::AlignCenter - - + + Chat - - + + 0 - + 0 - - - + + + Qt::NoFocus - + true - + Qt::ScrollBarAlwaysOff - - + + - - + + Kick - - + + 0 - + 6 - + 5 - - - + + + 0 - - + + 5 - - + + Vote started by: - - - + + + 0 0 - + @@ -2669,26 +2683,26 @@ - - + + 5 - - + + Vote Timeout: - - - + + + 0 0 - + @@ -2697,62 +2711,62 @@ - - - - + + + + 0 0 - + - - + + - - + + 80 20 - + Yes - - + + 80 20 - + No - - - + + + - - - + + + Qt::Vertical - + 20 27 @@ -2771,13 +2785,13 @@ - + Qt::Horizontal - + QSizePolicy::MinimumExpanding - + 155 0 @@ -2786,58 +2800,58 @@ - - + + true - - + + 0 0 - + 168 188 - + 168 188 - - QGroupBox {border-style:none;} + + QGroupBox {border-style:none;} - + - - + + 0 - + 1 - + 0 - - - + + + 2 - - + + 0 21 - + 16777215 21 @@ -2846,129 +2860,129 @@ - - + + 95 25 - + 95 25 - + Qt::NoFocus - - - + + + Qt::NoFocus - + 99999 - + 10 - + Qt::Horizontal - + QSlider::NoTicks - + 10 - - - - + + + + 0 0 - + 168 43 - + 168 43 - + Qt::NoFocus - - - - + + + + 0 0 - + 168 43 - + 168 43 - + Qt::NoFocus - - - - + + + + 0 0 - + 168 43 - + 168 43 - + Qt::NoFocus - - - + + + Qt::Vertical - + 20 0 @@ -2976,12 +2990,12 @@ - - - + + + Qt::Vertical - + 20 0 @@ -2994,13 +3008,13 @@ - + Qt::Horizontal - + QSizePolicy::MinimumExpanding - + 155 0 @@ -3009,22 +3023,22 @@ - - + + 0 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 260 0 @@ -3034,13 +3048,13 @@ - + Qt::Vertical - + QSizePolicy::Expanding - + 0 0 @@ -3049,107 +3063,107 @@ - - + + 260 188 - + 260 188 - - + + 1 - + 2 - + 4 - - - + + + Qt::NoFocus - + 0 - - + + Log - - + + 0 - + 0 - - - + + + Qt::NoFocus - + true - + Qt::ScrollBarAlwaysOff - - + + Away - - - - + + + + Qt::NoFocus - + Manual Action (default) - + true - - - + + + Qt::NoFocus - + Auto-Check / Auto-Fold - - - + + + Qt::NoFocus - + Auto-Check / Auto-Call-Any - + - + Qt::Vertical - + 20 40 @@ -3159,29 +3173,29 @@ - - + + Chance - - + + 1 - + 0 - + 1 - + 1 - + 0 - - - + + + @@ -3190,31 +3204,31 @@ - - - + + + 6 - + 0 - - + + - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -3223,18 +3237,18 @@ - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -3243,18 +3257,18 @@ - - - + + + 128 128 128 - - - + + + 199 199 199 @@ -3264,34 +3278,34 @@ - + Speed: - - + + 18 0 - + - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -3300,18 +3314,18 @@ - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -3320,18 +3334,18 @@ - - - + + + 128 128 128 - - - + + + 199 199 199 @@ -3341,45 +3355,45 @@ - + - - - + + + 0 0 - + Qt::NoFocus - + 1 - + 11 - + Qt::Horizontal - - + + true - + 40 20 - + Qt::NoFocus @@ -3395,162 +3409,162 @@ - - + + 0 0 1024 - 23 + 25 - - + + &View - - - - - - - + + + + + + + - - + + &Settings - + - - + + - - + + Start Local Game ... - + Ctrl+N - - + + Quit - + Ctrl+Q - - + + About PokerTH ... - - + + Settings ... - - + + Create Network Game ... - + Ctrl+O - - + + Join Network Game ... - + Ctrl+J - - - + + + :/gfx/view-fullscreen.png:/gfx/view-fullscreen.png - + Fullscreen - + Ctrl+F - - + + Show/Hide Chat Window - + Ctrl+T - - + + Show/Hide Hands Window - + Show/Hide Hands Window - + Show/Hide Hands Window - + Ctrl+H - - + + Show/Hide Log Window - + Ctrl+L - - + + Internet Game ... - + Ctrl+I - - + + Show/Hide Away Window - + Ctrl+A - - - + + + :/gfx/systemsettings.png:/gfx/systemsettings.png - + Configure PokerTH ... - - - + + + :/gfx/application_exit.png:/gfx/application_exit.png - + Close - + Ctrl+X - - + + Show/Hide Chance Window - + Ctrl+C @@ -3598,9 +3612,19 @@ QPushButton
myactionbutton.h
+ + MyMenuBar + QMenuBar +
mymenubar.h
+ + + MyTimeoutLabel + QLabel +
mytimeoutlabel.h
+ - + @@ -3609,11 +3633,11 @@ label_speedValue setNum(int) - + 886 624 - + 800 638 diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index f740cd81..d5300607 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -29,6 +29,8 @@ #include "myavatarlabel.h" #include "myactionbutton.h" #include "mychancelabel.h" +#include "mytimeoutlabel.h" +#include "mymenubar.h" #include "log.h" #include "chat.h" @@ -265,6 +267,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) setLabelArray[8] = textLabel_Set8; setLabelArray[9] = textLabel_Set9; for (i=0; isetMyW(this); } + label_Timeout0->setMyW(this); // statusLabelArray init actionLabelArray[0] = textLabel_Status0; @@ -1497,6 +1500,7 @@ void gameTableImpl::startTimeoutAnimation(int playerId, int timeoutSec) { //beep for player 0 if(playerId) { setLabelArray[playerId]->startTimeOutAnimation(timeoutSec, FALSE); } else { setLabelArray[playerId]->startTimeOutAnimation(timeoutSec, TRUE); } + label_Timeout0->startTimeOutAnimation(timeoutSec, FALSE); } void gameTableImpl::stopTimeoutAnimation(int playerId) { diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h index aea89f15..393342c2 100755 --- a/src/gui/qt/gametable/gametableimpl.h +++ b/src/gui/qt/gametable/gametableimpl.h @@ -40,6 +40,7 @@ class BoardInterface; class PlayerInterface; class MyCardsPixmapLabel; class MyAvatarLabel; +class MyTimeoutLabel; class settingsDialogImpl; class startWindowImpl; diff --git a/src/gui/qt/gametable/mymenubar.cpp b/src/gui/qt/gametable/mymenubar.cpp new file mode 100644 index 00000000..eaaa1956 --- /dev/null +++ b/src/gui/qt/gametable/mymenubar.cpp @@ -0,0 +1,11 @@ +#include "mymenubar.h" + +MyMenuBar::MyMenuBar(QMainWindow* parent) + : QMenuBar(parent) +{ +} + +void MyMenuBar::paintEvent(QPaintEvent * event) { + + QMenuBar::paintEvent(event); +} diff --git a/src/gui/qt/gametable/mymenubar.h b/src/gui/qt/gametable/mymenubar.h new file mode 100644 index 00000000..ea1b3296 --- /dev/null +++ b/src/gui/qt/gametable/mymenubar.h @@ -0,0 +1,16 @@ +#ifndef MYMENUBAR_H +#define MYMENUBAR_H + +#include +#include + +class MyMenuBar : public QMenuBar +{ +Q_OBJECT +public: + MyMenuBar(QMainWindow*); + + void paintEvent(QPaintEvent * event); +}; + +#endif diff --git a/src/gui/qt/gametable/mytimeoutlabel.cpp b/src/gui/qt/gametable/mytimeoutlabel.cpp new file mode 100644 index 00000000..25b3438e --- /dev/null +++ b/src/gui/qt/gametable/mytimeoutlabel.cpp @@ -0,0 +1,127 @@ +// +// C++ Implementation: mycardspixmaplabel +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#include "mytimeoutlabel.h" + +#include "gametableimpl.h" + +using namespace std; + +MyTimeoutLabel::MyTimeoutLabel(QGroupBox* parent) + : QLabel(parent), timeOutAnimation(FALSE), timeOutValue(0), timeOutFrame(0), waitFrames(0), timerIntervall(0), isBeep(0), isBeepPlayed(0) +{ + + timeOutAnimationTimer = new QTimer; + + connect(timeOutAnimationTimer, SIGNAL(timeout()), this, SLOT(nextTimeOutAnimationFrame())); +} + + +MyTimeoutLabel::~MyTimeoutLabel() +{ +} + +void MyTimeoutLabel::startTimeOutAnimation(int secs, bool beep) { + + isBeepPlayed = FALSE; + isBeep = beep; + + timeOutValue = secs; + timeOutFrame = 1; + timeOutAnimationWidth = 50; + + int preTimerIntervall = ((timeOutValue-3) * 1000)/timeOutAnimationWidth; + + timerIntervall = preTimerIntervall; + + //save gfx ressources and never play more the 10 pps + while(timerIntervall < 100) { + if(secs <= 9 && secs >= 6) { + //fix inaccuracies caused by integer division + timerIntervall = timerIntervall + preTimerIntervall + 5; + } + else { + timerIntervall = timerIntervall + preTimerIntervall; + } + } + + waitFrames = 3000/timerIntervall; + + //start the real timer + realTimer.reset(); + realTimer.start(); + +// std::cout << timerIntervall << endl; + timeOutAnimation = TRUE; + timeOutAnimationTimer->start(timerIntervall); +} + +void MyTimeoutLabel::startTimeOutAnimationNow() { + + timeOutAnimation = TRUE; + timeOutAnimationTimer->start(83); + +} + +void MyTimeoutLabel::stopTimeOutAnimation() { + +// timeOutAnimationKickOnTimer->stop(); + timeOutAnimationTimer->stop(); + timeOutAnimation = FALSE; + update(); +} + +void MyTimeoutLabel::nextTimeOutAnimationFrame() { + + if(timeOutAnimationWidth >=0) { + if(timeOutFrame > waitFrames) { + //play beep after waitFrames one time + if(isBeep && !isBeepPlayed) { + myW->getMySDLPlayer()->playSound("yourturn",0); + isBeepPlayed = TRUE; + } + //save gfx ressources and never play more the 10 pps + unsigned int realTimerValue = realTimer.elapsed().total_milliseconds(); + timeOutAnimationWidth = 50-(((realTimerValue-3000)*50)/((timeOutValue-3)*1000)); + + } + timeOutFrame++; + update(); + } + else { + stopTimeOutAnimation(); + // no callback is called here. + // the server initiates any action required. + } +} + + +void MyTimeoutLabel::paintEvent(QPaintEvent * event) { + + if(!timeOutAnimation || timeOutFrame <= waitFrames) { + QLabel::paintEvent(event); + } + + if(timeOutAnimation && timeOutFrame > waitFrames) { + + QPainter painter(this); + + QLinearGradient linearGrad(QPointF(0, 10), QPointF(45, 10)); + linearGrad.setColorAt(0, Qt::red); + linearGrad.setColorAt(0.5, Qt::yellow); + linearGrad.setColorAt(1, Qt::green); + + painter.setBrush(linearGrad); + + painter.setPen(QColor(0,0,0)); + painter.drawRect(0,2,timeOutAnimationWidth-1,8); + } +} diff --git a/src/gui/qt/gametable/mytimeoutlabel.h b/src/gui/qt/gametable/mytimeoutlabel.h new file mode 100644 index 00000000..e850edb3 --- /dev/null +++ b/src/gui/qt/gametable/mytimeoutlabel.h @@ -0,0 +1,70 @@ +// +// C++ Interface: mycardspixmaplabel +// +// Description: +// +// +// Author: FThauer FHammer , (C) 2007 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#ifndef MYTIMEOUTLABEL_H +#define MYTIMEOUTLABEL_H + +#include + +#include +#include +#include +#include "sdlplayer.h" + +class gameTableImpl; + +class MyTimeoutLabel : public QLabel +{ +Q_OBJECT +public: + MyTimeoutLabel(QGroupBox*); + + ~MyTimeoutLabel(); + + + void setMyW ( gameTableImpl* theValue ) { myW = theValue; } + + void startTimeOutAnimation(int secs, bool beep); + void stopTimeOutAnimation(); + + void paintEvent(QPaintEvent * event); + + +public slots: + void startTimeOutAnimationNow(); + void nextTimeOutAnimationFrame(); + + +private: + + gameTableImpl *myW; + QTimer *timeOutAnimationTimer; + QTimer *timeOutAnimationKickOnTimer; + +// boost::shared_ptr mySDLPlayer; + + boost::timers::portable::microsec_timer realTimer; + + bool timeOutAnimation; + + int timeOutAnimationWidth; + int timeOutValue; + int timeOutFrame; + int waitFrames; + int decreaseWidthIntervall; + int timerIntervall; + bool isBeep; + bool isBeepPlayed; + + +}; + +#endif diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index e03dd084..160cc42c 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -562,7 +562,7 @@ void GameTableStyleReader::setCardHolderStyle(QLabel *l, int bero) void GameTableStyleReader::setMenuBarStyle(QMenuBar *mb) { - mb->setStyleSheet("QMenuBar { background-color: #"+MenuBgColor+"; font-size:12px; } QMenuBar::item { color: #"+MenuTextColor+"; }"); + mb->setStyleSheet("QMenuBar { background-color: #"+MenuBgColor+"; font-size:12px; } QMenuBar::item { color: #"+MenuTextColor+"; }"); } void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)