diff --git a/src/cards/1px.png b/src/gui/qt/cards/1px.png similarity index 100% rename from src/cards/1px.png rename to src/gui/qt/cards/1px.png diff --git a/src/cards/logo1-140x100_neu.png b/src/gui/qt/cards/logo1-140x100_neu.png similarity index 100% rename from src/cards/logo1-140x100_neu.png rename to src/gui/qt/cards/logo1-140x100_neu.png diff --git a/src/cards/mycards/0.png b/src/gui/qt/cards/mycards/0.png similarity index 100% rename from src/cards/mycards/0.png rename to src/gui/qt/cards/mycards/0.png diff --git a/src/cards/mycards/1.png b/src/gui/qt/cards/mycards/1.png similarity index 100% rename from src/cards/mycards/1.png rename to src/gui/qt/cards/mycards/1.png diff --git a/src/cards/mycards/10.png b/src/gui/qt/cards/mycards/10.png similarity index 100% rename from src/cards/mycards/10.png rename to src/gui/qt/cards/mycards/10.png diff --git a/src/cards/mycards/11.png b/src/gui/qt/cards/mycards/11.png similarity index 100% rename from src/cards/mycards/11.png rename to src/gui/qt/cards/mycards/11.png diff --git a/src/cards/mycards/12.png b/src/gui/qt/cards/mycards/12.png similarity index 100% rename from src/cards/mycards/12.png rename to src/gui/qt/cards/mycards/12.png diff --git a/src/cards/mycards/13.png b/src/gui/qt/cards/mycards/13.png similarity index 100% rename from src/cards/mycards/13.png rename to src/gui/qt/cards/mycards/13.png diff --git a/src/cards/mycards/14.png b/src/gui/qt/cards/mycards/14.png similarity index 100% rename from src/cards/mycards/14.png rename to src/gui/qt/cards/mycards/14.png diff --git a/src/cards/mycards/15.png b/src/gui/qt/cards/mycards/15.png similarity index 100% rename from src/cards/mycards/15.png rename to src/gui/qt/cards/mycards/15.png diff --git a/src/cards/mycards/16.png b/src/gui/qt/cards/mycards/16.png similarity index 100% rename from src/cards/mycards/16.png rename to src/gui/qt/cards/mycards/16.png diff --git a/src/cards/mycards/17.png b/src/gui/qt/cards/mycards/17.png similarity index 100% rename from src/cards/mycards/17.png rename to src/gui/qt/cards/mycards/17.png diff --git a/src/cards/mycards/18.png b/src/gui/qt/cards/mycards/18.png similarity index 100% rename from src/cards/mycards/18.png rename to src/gui/qt/cards/mycards/18.png diff --git a/src/cards/mycards/19.png b/src/gui/qt/cards/mycards/19.png similarity index 100% rename from src/cards/mycards/19.png rename to src/gui/qt/cards/mycards/19.png diff --git a/src/cards/mycards/2.png b/src/gui/qt/cards/mycards/2.png similarity index 100% rename from src/cards/mycards/2.png rename to src/gui/qt/cards/mycards/2.png diff --git a/src/cards/mycards/20.png b/src/gui/qt/cards/mycards/20.png similarity index 100% rename from src/cards/mycards/20.png rename to src/gui/qt/cards/mycards/20.png diff --git a/src/cards/mycards/21.png b/src/gui/qt/cards/mycards/21.png similarity index 100% rename from src/cards/mycards/21.png rename to src/gui/qt/cards/mycards/21.png diff --git a/src/cards/mycards/22.png b/src/gui/qt/cards/mycards/22.png similarity index 100% rename from src/cards/mycards/22.png rename to src/gui/qt/cards/mycards/22.png diff --git a/src/cards/mycards/23.png b/src/gui/qt/cards/mycards/23.png similarity index 100% rename from src/cards/mycards/23.png rename to src/gui/qt/cards/mycards/23.png diff --git a/src/cards/mycards/24.png b/src/gui/qt/cards/mycards/24.png similarity index 100% rename from src/cards/mycards/24.png rename to src/gui/qt/cards/mycards/24.png diff --git a/src/cards/mycards/25.png b/src/gui/qt/cards/mycards/25.png similarity index 100% rename from src/cards/mycards/25.png rename to src/gui/qt/cards/mycards/25.png diff --git a/src/cards/mycards/26.png b/src/gui/qt/cards/mycards/26.png similarity index 100% rename from src/cards/mycards/26.png rename to src/gui/qt/cards/mycards/26.png diff --git a/src/cards/mycards/27.png b/src/gui/qt/cards/mycards/27.png similarity index 100% rename from src/cards/mycards/27.png rename to src/gui/qt/cards/mycards/27.png diff --git a/src/cards/mycards/28.png b/src/gui/qt/cards/mycards/28.png similarity index 100% rename from src/cards/mycards/28.png rename to src/gui/qt/cards/mycards/28.png diff --git a/src/cards/mycards/29.png b/src/gui/qt/cards/mycards/29.png similarity index 100% rename from src/cards/mycards/29.png rename to src/gui/qt/cards/mycards/29.png diff --git a/src/cards/mycards/3.png b/src/gui/qt/cards/mycards/3.png similarity index 100% rename from src/cards/mycards/3.png rename to src/gui/qt/cards/mycards/3.png diff --git a/src/cards/mycards/30.png b/src/gui/qt/cards/mycards/30.png similarity index 100% rename from src/cards/mycards/30.png rename to src/gui/qt/cards/mycards/30.png diff --git a/src/cards/mycards/31.png b/src/gui/qt/cards/mycards/31.png similarity index 100% rename from src/cards/mycards/31.png rename to src/gui/qt/cards/mycards/31.png diff --git a/src/cards/mycards/32.png b/src/gui/qt/cards/mycards/32.png similarity index 100% rename from src/cards/mycards/32.png rename to src/gui/qt/cards/mycards/32.png diff --git a/src/cards/mycards/33.png b/src/gui/qt/cards/mycards/33.png similarity index 100% rename from src/cards/mycards/33.png rename to src/gui/qt/cards/mycards/33.png diff --git a/src/cards/mycards/34.png b/src/gui/qt/cards/mycards/34.png similarity index 100% rename from src/cards/mycards/34.png rename to src/gui/qt/cards/mycards/34.png diff --git a/src/cards/mycards/35.png b/src/gui/qt/cards/mycards/35.png similarity index 100% rename from src/cards/mycards/35.png rename to src/gui/qt/cards/mycards/35.png diff --git a/src/cards/mycards/36.png b/src/gui/qt/cards/mycards/36.png similarity index 100% rename from src/cards/mycards/36.png rename to src/gui/qt/cards/mycards/36.png diff --git a/src/cards/mycards/37.png b/src/gui/qt/cards/mycards/37.png similarity index 100% rename from src/cards/mycards/37.png rename to src/gui/qt/cards/mycards/37.png diff --git a/src/cards/mycards/38.png b/src/gui/qt/cards/mycards/38.png similarity index 100% rename from src/cards/mycards/38.png rename to src/gui/qt/cards/mycards/38.png diff --git a/src/cards/mycards/39.png b/src/gui/qt/cards/mycards/39.png similarity index 100% rename from src/cards/mycards/39.png rename to src/gui/qt/cards/mycards/39.png diff --git a/src/cards/mycards/4.png b/src/gui/qt/cards/mycards/4.png similarity index 100% rename from src/cards/mycards/4.png rename to src/gui/qt/cards/mycards/4.png diff --git a/src/cards/mycards/40.png b/src/gui/qt/cards/mycards/40.png similarity index 100% rename from src/cards/mycards/40.png rename to src/gui/qt/cards/mycards/40.png diff --git a/src/cards/mycards/41.png b/src/gui/qt/cards/mycards/41.png similarity index 100% rename from src/cards/mycards/41.png rename to src/gui/qt/cards/mycards/41.png diff --git a/src/cards/mycards/42.png b/src/gui/qt/cards/mycards/42.png similarity index 100% rename from src/cards/mycards/42.png rename to src/gui/qt/cards/mycards/42.png diff --git a/src/cards/mycards/43.png b/src/gui/qt/cards/mycards/43.png similarity index 100% rename from src/cards/mycards/43.png rename to src/gui/qt/cards/mycards/43.png diff --git a/src/cards/mycards/44.png b/src/gui/qt/cards/mycards/44.png similarity index 100% rename from src/cards/mycards/44.png rename to src/gui/qt/cards/mycards/44.png diff --git a/src/cards/mycards/45.png b/src/gui/qt/cards/mycards/45.png similarity index 100% rename from src/cards/mycards/45.png rename to src/gui/qt/cards/mycards/45.png diff --git a/src/cards/mycards/46.png b/src/gui/qt/cards/mycards/46.png similarity index 100% rename from src/cards/mycards/46.png rename to src/gui/qt/cards/mycards/46.png diff --git a/src/cards/mycards/47.png b/src/gui/qt/cards/mycards/47.png similarity index 100% rename from src/cards/mycards/47.png rename to src/gui/qt/cards/mycards/47.png diff --git a/src/cards/mycards/48.png b/src/gui/qt/cards/mycards/48.png similarity index 100% rename from src/cards/mycards/48.png rename to src/gui/qt/cards/mycards/48.png diff --git a/src/cards/mycards/49.png b/src/gui/qt/cards/mycards/49.png similarity index 100% rename from src/cards/mycards/49.png rename to src/gui/qt/cards/mycards/49.png diff --git a/src/cards/mycards/5.png b/src/gui/qt/cards/mycards/5.png similarity index 100% rename from src/cards/mycards/5.png rename to src/gui/qt/cards/mycards/5.png diff --git a/src/cards/mycards/50.png b/src/gui/qt/cards/mycards/50.png similarity index 100% rename from src/cards/mycards/50.png rename to src/gui/qt/cards/mycards/50.png diff --git a/src/cards/mycards/51.png b/src/gui/qt/cards/mycards/51.png similarity index 100% rename from src/cards/mycards/51.png rename to src/gui/qt/cards/mycards/51.png diff --git a/src/cards/mycards/6.png b/src/gui/qt/cards/mycards/6.png similarity index 100% rename from src/cards/mycards/6.png rename to src/gui/qt/cards/mycards/6.png diff --git a/src/cards/mycards/7.png b/src/gui/qt/cards/mycards/7.png similarity index 100% rename from src/cards/mycards/7.png rename to src/gui/qt/cards/mycards/7.png diff --git a/src/cards/mycards/8.png b/src/gui/qt/cards/mycards/8.png similarity index 100% rename from src/cards/mycards/8.png rename to src/gui/qt/cards/mycards/8.png diff --git a/src/cards/mycards/9.png b/src/gui/qt/cards/mycards/9.png similarity index 100% rename from src/cards/mycards/9.png rename to src/gui/qt/cards/mycards/9.png diff --git a/src/cards/mycards/flipside.png b/src/gui/qt/cards/mycards/flipside.png similarity index 100% rename from src/cards/mycards/flipside.png rename to src/gui/qt/cards/mycards/flipside.png diff --git a/src/cards/othercards/0.png b/src/gui/qt/cards/othercards/0.png similarity index 100% rename from src/cards/othercards/0.png rename to src/gui/qt/cards/othercards/0.png diff --git a/src/cards/othercards/1.png b/src/gui/qt/cards/othercards/1.png similarity index 100% rename from src/cards/othercards/1.png rename to src/gui/qt/cards/othercards/1.png diff --git a/src/cards/othercards/10.png b/src/gui/qt/cards/othercards/10.png similarity index 100% rename from src/cards/othercards/10.png rename to src/gui/qt/cards/othercards/10.png diff --git a/src/cards/othercards/11.png b/src/gui/qt/cards/othercards/11.png similarity index 100% rename from src/cards/othercards/11.png rename to src/gui/qt/cards/othercards/11.png diff --git a/src/cards/othercards/12.png b/src/gui/qt/cards/othercards/12.png similarity index 100% rename from src/cards/othercards/12.png rename to src/gui/qt/cards/othercards/12.png diff --git a/src/cards/othercards/13.png b/src/gui/qt/cards/othercards/13.png similarity index 100% rename from src/cards/othercards/13.png rename to src/gui/qt/cards/othercards/13.png diff --git a/src/cards/othercards/14.png b/src/gui/qt/cards/othercards/14.png similarity index 100% rename from src/cards/othercards/14.png rename to src/gui/qt/cards/othercards/14.png diff --git a/src/cards/othercards/15.png b/src/gui/qt/cards/othercards/15.png similarity index 100% rename from src/cards/othercards/15.png rename to src/gui/qt/cards/othercards/15.png diff --git a/src/cards/othercards/16.png b/src/gui/qt/cards/othercards/16.png similarity index 100% rename from src/cards/othercards/16.png rename to src/gui/qt/cards/othercards/16.png diff --git a/src/cards/othercards/17.png b/src/gui/qt/cards/othercards/17.png similarity index 100% rename from src/cards/othercards/17.png rename to src/gui/qt/cards/othercards/17.png diff --git a/src/cards/othercards/18.png b/src/gui/qt/cards/othercards/18.png similarity index 100% rename from src/cards/othercards/18.png rename to src/gui/qt/cards/othercards/18.png diff --git a/src/cards/othercards/19.png b/src/gui/qt/cards/othercards/19.png similarity index 100% rename from src/cards/othercards/19.png rename to src/gui/qt/cards/othercards/19.png diff --git a/src/cards/othercards/2.png b/src/gui/qt/cards/othercards/2.png similarity index 100% rename from src/cards/othercards/2.png rename to src/gui/qt/cards/othercards/2.png diff --git a/src/cards/othercards/20.png b/src/gui/qt/cards/othercards/20.png similarity index 100% rename from src/cards/othercards/20.png rename to src/gui/qt/cards/othercards/20.png diff --git a/src/cards/othercards/21.png b/src/gui/qt/cards/othercards/21.png similarity index 100% rename from src/cards/othercards/21.png rename to src/gui/qt/cards/othercards/21.png diff --git a/src/cards/othercards/22.png b/src/gui/qt/cards/othercards/22.png similarity index 100% rename from src/cards/othercards/22.png rename to src/gui/qt/cards/othercards/22.png diff --git a/src/cards/othercards/23.png b/src/gui/qt/cards/othercards/23.png similarity index 100% rename from src/cards/othercards/23.png rename to src/gui/qt/cards/othercards/23.png diff --git a/src/cards/othercards/24.png b/src/gui/qt/cards/othercards/24.png similarity index 100% rename from src/cards/othercards/24.png rename to src/gui/qt/cards/othercards/24.png diff --git a/src/cards/othercards/25.png b/src/gui/qt/cards/othercards/25.png similarity index 100% rename from src/cards/othercards/25.png rename to src/gui/qt/cards/othercards/25.png diff --git a/src/cards/othercards/26.png b/src/gui/qt/cards/othercards/26.png similarity index 100% rename from src/cards/othercards/26.png rename to src/gui/qt/cards/othercards/26.png diff --git a/src/cards/othercards/27.png b/src/gui/qt/cards/othercards/27.png similarity index 100% rename from src/cards/othercards/27.png rename to src/gui/qt/cards/othercards/27.png diff --git a/src/cards/othercards/28.png b/src/gui/qt/cards/othercards/28.png similarity index 100% rename from src/cards/othercards/28.png rename to src/gui/qt/cards/othercards/28.png diff --git a/src/cards/othercards/29.png b/src/gui/qt/cards/othercards/29.png similarity index 100% rename from src/cards/othercards/29.png rename to src/gui/qt/cards/othercards/29.png diff --git a/src/cards/othercards/3.png b/src/gui/qt/cards/othercards/3.png similarity index 100% rename from src/cards/othercards/3.png rename to src/gui/qt/cards/othercards/3.png diff --git a/src/cards/othercards/30.png b/src/gui/qt/cards/othercards/30.png similarity index 100% rename from src/cards/othercards/30.png rename to src/gui/qt/cards/othercards/30.png diff --git a/src/cards/othercards/31.png b/src/gui/qt/cards/othercards/31.png similarity index 100% rename from src/cards/othercards/31.png rename to src/gui/qt/cards/othercards/31.png diff --git a/src/cards/othercards/32.png b/src/gui/qt/cards/othercards/32.png similarity index 100% rename from src/cards/othercards/32.png rename to src/gui/qt/cards/othercards/32.png diff --git a/src/cards/othercards/33.png b/src/gui/qt/cards/othercards/33.png similarity index 100% rename from src/cards/othercards/33.png rename to src/gui/qt/cards/othercards/33.png diff --git a/src/cards/othercards/34.png b/src/gui/qt/cards/othercards/34.png similarity index 100% rename from src/cards/othercards/34.png rename to src/gui/qt/cards/othercards/34.png diff --git a/src/cards/othercards/35.png b/src/gui/qt/cards/othercards/35.png similarity index 100% rename from src/cards/othercards/35.png rename to src/gui/qt/cards/othercards/35.png diff --git a/src/cards/othercards/36.png b/src/gui/qt/cards/othercards/36.png similarity index 100% rename from src/cards/othercards/36.png rename to src/gui/qt/cards/othercards/36.png diff --git a/src/cards/othercards/37.png b/src/gui/qt/cards/othercards/37.png similarity index 100% rename from src/cards/othercards/37.png rename to src/gui/qt/cards/othercards/37.png diff --git a/src/cards/othercards/38.png b/src/gui/qt/cards/othercards/38.png similarity index 100% rename from src/cards/othercards/38.png rename to src/gui/qt/cards/othercards/38.png diff --git a/src/cards/othercards/39.png b/src/gui/qt/cards/othercards/39.png similarity index 100% rename from src/cards/othercards/39.png rename to src/gui/qt/cards/othercards/39.png diff --git a/src/cards/othercards/4.png b/src/gui/qt/cards/othercards/4.png similarity index 100% rename from src/cards/othercards/4.png rename to src/gui/qt/cards/othercards/4.png diff --git a/src/cards/othercards/40.png b/src/gui/qt/cards/othercards/40.png similarity index 100% rename from src/cards/othercards/40.png rename to src/gui/qt/cards/othercards/40.png diff --git a/src/cards/othercards/41.png b/src/gui/qt/cards/othercards/41.png similarity index 100% rename from src/cards/othercards/41.png rename to src/gui/qt/cards/othercards/41.png diff --git a/src/cards/othercards/42.png b/src/gui/qt/cards/othercards/42.png similarity index 100% rename from src/cards/othercards/42.png rename to src/gui/qt/cards/othercards/42.png diff --git a/src/cards/othercards/43.png b/src/gui/qt/cards/othercards/43.png similarity index 100% rename from src/cards/othercards/43.png rename to src/gui/qt/cards/othercards/43.png diff --git a/src/cards/othercards/44.png b/src/gui/qt/cards/othercards/44.png similarity index 100% rename from src/cards/othercards/44.png rename to src/gui/qt/cards/othercards/44.png diff --git a/src/cards/othercards/45.png b/src/gui/qt/cards/othercards/45.png similarity index 100% rename from src/cards/othercards/45.png rename to src/gui/qt/cards/othercards/45.png diff --git a/src/cards/othercards/46.png b/src/gui/qt/cards/othercards/46.png similarity index 100% rename from src/cards/othercards/46.png rename to src/gui/qt/cards/othercards/46.png diff --git a/src/cards/othercards/47.png b/src/gui/qt/cards/othercards/47.png similarity index 100% rename from src/cards/othercards/47.png rename to src/gui/qt/cards/othercards/47.png diff --git a/src/cards/othercards/48.png b/src/gui/qt/cards/othercards/48.png similarity index 100% rename from src/cards/othercards/48.png rename to src/gui/qt/cards/othercards/48.png diff --git a/src/cards/othercards/49.png b/src/gui/qt/cards/othercards/49.png similarity index 100% rename from src/cards/othercards/49.png rename to src/gui/qt/cards/othercards/49.png diff --git a/src/cards/othercards/5.png b/src/gui/qt/cards/othercards/5.png similarity index 100% rename from src/cards/othercards/5.png rename to src/gui/qt/cards/othercards/5.png diff --git a/src/cards/othercards/50.png b/src/gui/qt/cards/othercards/50.png similarity index 100% rename from src/cards/othercards/50.png rename to src/gui/qt/cards/othercards/50.png diff --git a/src/cards/othercards/51.png b/src/gui/qt/cards/othercards/51.png similarity index 100% rename from src/cards/othercards/51.png rename to src/gui/qt/cards/othercards/51.png diff --git a/src/cards/othercards/6.png b/src/gui/qt/cards/othercards/6.png similarity index 100% rename from src/cards/othercards/6.png rename to src/gui/qt/cards/othercards/6.png diff --git a/src/cards/othercards/7.png b/src/gui/qt/cards/othercards/7.png similarity index 100% rename from src/cards/othercards/7.png rename to src/gui/qt/cards/othercards/7.png diff --git a/src/cards/othercards/8.png b/src/gui/qt/cards/othercards/8.png similarity index 100% rename from src/cards/othercards/8.png rename to src/gui/qt/cards/othercards/8.png diff --git a/src/cards/othercards/9.png b/src/gui/qt/cards/othercards/9.png similarity index 100% rename from src/cards/othercards/9.png rename to src/gui/qt/cards/othercards/9.png diff --git a/src/cards/othercards/flipside.png b/src/gui/qt/cards/othercards/flipside.png similarity index 100% rename from src/cards/othercards/flipside.png rename to src/gui/qt/cards/othercards/flipside.png diff --git a/src/gui/qt/log.cpp b/src/gui/qt/log.cpp index c79454e3..627d8c88 100644 --- a/src/gui/qt/log.cpp +++ b/src/gui/qt/log.cpp @@ -25,6 +25,7 @@ using namespace std; Log::Log(mainWindowImpl* w) : myW(w) { + myW->setLog(this); } @@ -32,7 +33,7 @@ Log::~Log() { } -void Log::showPlayerActionLogMsg(string playerName, int &action, int &setValue) const { +void Log::showPlayerActionLogMsg(string playerName, int action, int setValue) const { QString msg; msg = QString::fromStdString(playerName); diff --git a/src/gui/qt/log.h b/src/gui/qt/log.h index 4e414647..af1392c8 100644 --- a/src/gui/qt/log.h +++ b/src/gui/qt/log.h @@ -35,7 +35,7 @@ public: ~Log(); - void showPlayerActionLogMsg(std::string playName, int &action, int &setValue) const; + void showPlayerActionLogMsg(std::string playName, int action, int setValue) const; private: diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index d599fb75..2cee13df 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -509,7 +509,7 @@ 6 - + Qt::Vertical @@ -522,7 +522,7 @@ - + 0 @@ -530,51 +530,6 @@ 6 - - - - 0 - - - 6 - - - - - Qt::Vertical - - - - 121 - 101 - - - - - - - - - 140 - 100 - - - - - 140 - 100 - - - - true - - - - - - - - @@ -1479,11 +1434,20 @@ - + + + false + 211 - 180 + 190 + + + + + 211 + 190 @@ -1553,152 +1517,13 @@ true - - QFrame::StyledPanel - - - QFrame::Raised - - 5 + 6 - 5 + 3 - - - - - - - - - 203 - 237 - 180 - - - - - - - - - 203 - 237 - 180 - - - - - - - - - 203 - 237 - 180 - - - - - - - - 1 - - - 10 - - - 5 - - - Qt::Horizontal - - - - - - - 0 - - - 6 - - - - - Speed: - - - - - - - - 16 - 0 - - - - - - - - - - - - - - 40 - 20 - - - - - - - - - 203 - 237 - 180 - - - - - - - - - 203 - 237 - 180 - - - - - - - - - 203 - 237 - 180 - - - - - - - - Stop - - - @@ -1774,23 +1599,23 @@ - 9 + 5 - 6 + 0 - 100 - 60 + 181 + 110 - 200 - 97 + 181 + 110 @@ -1925,6 +1750,142 @@ + + + + + 40 + 20 + + + + + + + + + 203 + 237 + 180 + + + + + + + + + 203 + 237 + 180 + + + + + + + + + 203 + 237 + 180 + + + + + + + + Stop + + + false + + + + + + + + + + + + 203 + 237 + 180 + + + + + + + + + 203 + 237 + 180 + + + + + + + + + 203 + 237 + 180 + + + + + + + + 0 + + + 10 + + + 5 + + + Qt::Horizontal + + + + + + + 0 + + + 6 + + + + + Speed: + + + + + + + + 16 + 0 + + + + + + + + + @@ -1932,23 +1893,910 @@ - - - - Qt::Vertical + + + + 0 - - QSizePolicy::MinimumExpanding + + 6 - - - 20 - 20 - - - + + + + Qt::Vertical + + + + 121 + 101 + + + + + + + + + 140 + 100 + + + + + 140 + 100 + + + + true + + + :/mycards/cards/logo1-140x100_neu.png + + + + - + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + + 0 + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 103 + 141 + 178 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + + 0 + 0 + 0 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 103 + 141 + 178 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + + 128 + 128 + 128 + + + + + + + 221 + 223 + 228 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 85 + 85 + 85 + + + + + + + 199 + 199 + 199 + + + + + + + 199 + 199 + 199 + + + + + + + 255 + 255 + 255 + + + + + + + 128 + 128 + 128 + + + + + + + 74 + 131 + 83 + + + + + + + 74 + 131 + 83 + + + + + + + 0 + 0 + 0 + + + + + + + 86 + 117 + 148 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 238 + + + + + + + 82 + 24 + 139 + + + + + + + 232 + 232 + 232 + + + + + + + + true + + + + + + + 9 + + + 6 + + + + + + 0 + 0 + 0 + 0 + + + + + 104 + 114 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 4 + + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 0 + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + true + + + + + + + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + true + + + + + + + + + + 0 + + + 4 + + + + + + 0 + 26 + + + + + 16777215 + 26 + + + + + + + + + 0 + 26 + + + + + 16777215 + 26 + + + + + + + + + + + + + + 0 + 0 + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 9 + + + 6 + + + + + + 57 + 80 + + + + + 57 + 80 + + + + + + + + + + + + 57 + 80 + + + + + 57 + 80 + + + + + + + + + + + + 57 + 80 + + + + + 57 + 80 + + + + + + + + + + + + 57 + 80 + + + + + 57 + 80 + + + + + + + + + + + + 57 + 80 + + + + + 57 + 80 + + + + + + + + + + + + + + 0 + + + 6 + + + + + + 95 + 16 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 0 + + + + + + + + + + + + 95 + 36 + + + + true + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 0 + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + 0 @@ -3118,863 +3966,21 @@ - - - - 0 + + + + Qt::Vertical - - 6 + + QSizePolicy::MinimumExpanding - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 86 - 170 - 86 - - - - - - - 0 - 0 - 0 - - - - - - - 103 - 141 - 178 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - - 0 - 0 - 0 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 86 - 170 - 86 - - - - - - - 0 - 0 - 0 - - - - - - - 103 - 141 - 178 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - - 128 - 128 - 128 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 199 - 199 - 199 - - - - - - - 255 - 255 - 255 - - - - - - - 128 - 128 - 128 - - - - - - - 86 - 170 - 86 - - - - - - - 86 - 170 - 86 - - - - - - - 0 - 0 - 0 - - - - - - - 86 - 117 - 148 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - true - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - 104 - 114 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 4 - - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 4 - - - 0 - - - - - - 0 - 30 - - - - - 16777215 - 30 - - - - true - - - - - - - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - true - - - - - - - - - - 0 - - - 4 - - - - - - 0 - 26 - - - - - 16777215 - 26 - - - - - - - - - 0 - 26 - - - - - 16777215 - 26 - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 9 - - - 6 - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - 57 - 80 - - - - - 57 - 80 - - - - - - - - - - - - - - 0 - - - 6 - - - - - - 95 - 16 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 0 - - - - - - - - - - - - 95 - 36 - - - - true - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 3 - - - 0 - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - + + + 20 + 20 + + + @@ -4031,10 +4037,6 @@ pushButton_set spinBox_set pushButton_allin - horizontalSlider_speed - pushButton - tabWidget - textBrowser_Log @@ -4047,12 +4049,12 @@ setNum(int) - 720 - 619 + 775 + 616 - 699 - 616 + 717 + 614 diff --git a/src/gui/qt/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp index cbda7707..01554ce5 100755 --- a/src/gui/qt/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindowimpl.cpp @@ -29,6 +29,7 @@ #include "game.h" #include "session.h" +#include "log.h" // #include "player.h" // #include "board.h" @@ -44,7 +45,7 @@ const int maxQuantityPlayersConst = 5; using namespace std; mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name) - : QMainWindow(parent, name), actualGame(0), actualHand(0), mySession(0), maxQuantityPlayers(maxQuantityPlayersConst), gameSpeed(0), debugMode(0) + : QMainWindow(parent, name), actualGame(0), actualHand(0), mySession(0), maxQuantityPlayers(maxQuantityPlayersConst), gameSpeed(0), debugMode(0), breakAfterActualHand(FALSE) { setupUi(this); @@ -82,27 +83,6 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name) //Timer Objekt erstellen potDistributeTimer = new QTimer(this); -// gameSpeed = new int; -// dealCardsSpeed = new int; -// postRiverRunAnimationSpeed = new int; -// winnerBlinkSpeed = new int; -// newRoundSpeed = new int; -// nextPlayerSpeed1 = new int; -// nextPlayerSpeed2 = new int; -// nextPlayerSpeed3 = new int; -// preflopNextPlayerSpeed = new int; -// nextOpponentSpeed = new int; -// // int *dealCardsSpeed; -// // int *postRiverRunAnimationSpeed; -// // int *winnerBlinkSpeed; -// // int *newRoundSpeed; -// // int *nextPlayerSpeed1; -// // int *nextPlayerSpeed2; -// // int *nextPlayerSpeed3; -// // int *preflopNextPlayerSpeed; -// // int *nextOpponentSpeed; - - // buttonLabelArray init buttonLabelArray[0] = textLabel_Button0; buttonLabelArray[1] = textLabel_Button1; @@ -188,8 +168,8 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name) connect( pushButton_allin, SIGNAL( clicked() ), this, SLOT( myAllIn() ) ); connect ( horizontalSlider_speed, SIGNAL( valueChanged(int)), this, SLOT ( setGameSpeed(int) ) ); + connect ( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakAfterThisHand() ) ); -// tabWidget_2->hide(); } @@ -217,6 +197,12 @@ void mainWindowImpl::callNewGameDialog() { gameSpeed = v->spinBox_gameSpeed->value()*10; // debugMode = v->checkBox_debugMode->isChecked(); + //Tools und Board aufhellen und enablen + QPalette tempPalette = groupBox_board->palette(); + tempPalette.setColor(QPalette::Window, active); + groupBox_board->setPalette(tempPalette); + groupBox_tools->setDisabled(FALSE); + //Speeds setSpeeds(); //positioning Slider @@ -243,6 +229,8 @@ void mainWindowImpl::setHand(HandInterface* br) { actualHand = br; } void mainWindowImpl::setSession(Session* s) { mySession = s; } +void mainWindowImpl::setLog(Log* l) { myLog = l; } + //refresh-Funktionen void mainWindowImpl::refreshSet() { @@ -375,7 +363,7 @@ void mainWindowImpl::highlightRoundLabel(string tempround) { frame_handLabel->setPalette(tempPalette); textLabel_handLabel->setText("

"+round+"

"); - textLabel_gameNumber->setText("

Game: "+QString::number(actualHand->getMyID(),10)+"

"); + textLabel_gameNumber->setText("

Hand: "+QString::number(actualHand->getMyID(),10)+"

"); } @@ -465,7 +453,7 @@ void mainWindowImpl::dealFlopCards0() { if( !newRoundTimerBlock ){ - QTimer::singleShot(500, this, SLOT( dealFlopCards1() )); + QTimer::singleShot(dealCardsSpeed*2, this, SLOT( dealFlopCards1() )); } else { newRoundTimerBlock=FALSE; } } @@ -554,11 +542,11 @@ if( !newRoundTimerBlock ){ // stable // wenn alle All In if(actualHand->getAllInCondition()) { - QTimer::singleShot(1000, this, SLOT( handSwitchRounds() )); + QTimer::singleShot(dealCardsSpeed*4, this, SLOT( handSwitchRounds() )); } // sonst normale Variante else { - QTimer::singleShot(1, this, SLOT( handSwitchRounds() )); + QTimer::singleShot(dealCardsSpeed, this, SLOT( handSwitchRounds() )); } } @@ -571,7 +559,7 @@ void mainWindowImpl::dealTurnCards0() { if( !newRoundTimerBlock ){ - QTimer::singleShot(500, this, SLOT( dealTurnCards1() )); + QTimer::singleShot(dealCardsSpeed*2, this, SLOT( dealTurnCards1() )); } else { newRoundTimerBlock=FALSE; } } @@ -603,11 +591,11 @@ if( !newRoundTimerBlock ){ // stable // wenn alle All In if(actualHand->getAllInCondition()) { - QTimer::singleShot(1000, this, SLOT( handSwitchRounds() )); + QTimer::singleShot(dealCardsSpeed*4, this, SLOT( handSwitchRounds() )); } // sonst normale Variante else { - QTimer::singleShot(1, this, SLOT( handSwitchRounds() )); + QTimer::singleShot(dealCardsSpeed, this, SLOT( handSwitchRounds() )); } } else { newRoundTimerBlock=FALSE; } @@ -619,7 +607,7 @@ void mainWindowImpl::dealRiverCards0() { if( !newRoundTimerBlock ){ - QTimer::singleShot(500, this, SLOT( dealRiverCards1() )); + QTimer::singleShot(dealCardsSpeed*2, this, SLOT( dealRiverCards1() )); } else { newRoundTimerBlock=FALSE; } } @@ -652,11 +640,11 @@ if( !newRoundTimerBlock ){ // stable // wenn alle All In if(actualHand->getAllInCondition()) { - QTimer::singleShot(1000, this, SLOT( handSwitchRounds() )); + QTimer::singleShot(dealCardsSpeed*4, this, SLOT( handSwitchRounds() )); } // sonst normale Variante else { - QTimer::singleShot(1, this, SLOT( handSwitchRounds() )); + QTimer::singleShot(dealCardsSpeed, this, SLOT( handSwitchRounds() )); } } @@ -762,6 +750,9 @@ void mainWindowImpl::myFold(){ actualHand->getPlayerArray()[0]->setMyAction(1); actualHand->getPlayerArray()[0]->setMyTurn(0); + //Action in LogWindow + myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet()); + disableMyButtons(); //Spiel läuft weiter @@ -773,6 +764,9 @@ void mainWindowImpl::myCheck() { actualHand->getPlayerArray()[0]->setMyAction(2); actualHand->getPlayerArray()[0]->setMyTurn(0); + //Action in LogWindow + myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet()); + disableMyButtons(); //Spiel läuft weiter @@ -809,6 +803,9 @@ void mainWindowImpl::myCall(){ actualHand->getBoard()->collectSets(); refreshPot(); + //Action in LogWindow + myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet()); + disableMyButtons(); //Spiel läuft weiter @@ -909,6 +906,9 @@ void mainWindowImpl::mySet(){ actualHand->getBoard()->collectSets(); refreshPot(); + //Action in LogWindow + myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet()); + disableMyButtons(); //Spiel läuft weiter @@ -939,8 +939,11 @@ void mainWindowImpl::myAllIn(){ actualHand->getBoard()->collectSets(); refreshPot(); - disableMyButtons(); + //Action in LogWindow + myLog->showPlayerActionLogMsg(actualHand->getPlayerArray()[0]->getMyName(), actualHand->getPlayerArray()[0]->getMyAction(), actualHand->getPlayerArray()[0]->getMySet()); + disableMyButtons(); + //Spiel läuft weiter nextPlayerAnimation(); } @@ -1173,11 +1176,16 @@ else { newRoundTimerBlock=FALSE; } void mainWindowImpl::startNewHand() { -if( !newRoundTimerBlock ){ +if( !newRoundTimerBlock && !breakAfterActualHand){ actualGame->startHand(); } -else { newRoundTimerBlock=FALSE; } +else { + newRoundTimerBlock=FALSE; + pushButton_break->setDisabled(FALSE); + breakAfterActualHand=FALSE; +} + } @@ -1257,3 +1265,10 @@ void mainWindowImpl::setSpeeds() { nextPlayerSpeed3 = gameSpeed*7; // Zeit bis zwischen Aufhellen und Aktion preflopNextPlayerSpeed = gameSpeed*10; // Zeit bis zwischen Aufhellen und Aktion im Preflop (etwas langsamer da nicht gerechnet wird. ) } + +void mainWindowImpl::breakAfterThisHand() { + + pushButton_break->setDisabled(TRUE); + breakAfterActualHand=TRUE; +} + diff --git a/src/gui/qt/mainwindowimpl.h b/src/gui/qt/mainwindowimpl.h index 538adcfa..66484fc2 100755 --- a/src/gui/qt/mainwindowimpl.h +++ b/src/gui/qt/mainwindowimpl.h @@ -29,6 +29,7 @@ class Game; class Session; +class Log; class BoardInterface; class HandInterface; @@ -41,10 +42,11 @@ class mainWindowImpl: public QMainWindow, public Ui::mainWindow { Q_OBJECT public: mainWindowImpl(QMainWindow *parent = 0, const char *name = 0 ); + void setGame(Game*); void setHand(HandInterface*); void setSession(Session*); - + void setLog(Log*); int getMaxQuantityPlayers() const { return maxQuantityPlayers; } @@ -150,12 +152,14 @@ public slots: void userWidgetsBackgroudColor(); void timerBlockerFalse(); + void breakAfterThisHand(); private: Game *actualGame; HandInterface *actualHand; Session *mySession; + Log *myLog; QTimer *potDistributeTimer; @@ -200,6 +204,7 @@ private: bool firstCallNewGame; bool newRoundTimerBlock; bool debugMode; + bool breakAfterActualHand; QColor active; QColor inactive;