diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 772d713f..313071d9 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -116,7 +116,11 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) treeView_GameList->setColumnWidth(3,40); treeView_GameList->setColumnWidth(4,40); +#ifdef GUI_800x480 + treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 14px}"); +#else treeView_GameList->setStyleSheet("QTreeView {background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}"); +#endif treeView_GameList->setAutoFillBackground(TRUE); myNickListModel = new QStandardItemModel(this); @@ -1480,9 +1484,13 @@ void gameLobbyDialogImpl::changeGameListFilter(int index) writeDialogSettings(1); +#ifdef GUI_800x480 + if(index) treeView_GameList->setStyleSheet("QTreeView { border-radius: 4px; border: 2px solid blue; background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 14px}"); + else treeView_GameList->setStyleSheet("QTreeView { background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat; color:rgb(0, 0, 0); font: 14px}"); +#else if(index) treeView_GameList->setStyleSheet("QTreeView { border-radius: 4px; border: 2px solid blue; background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}"); else treeView_GameList->setStyleSheet("QTreeView { background-color: white; background-image: url(\""+myAppDataPath +"gfx/gui/misc/background_gamelist.png\"); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}"); - +#endif } void gameLobbyDialogImpl::changeNickListFilter(int state) diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 00918c33..0e315541 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -92,7 +92,13 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) pixmapLabel_card0a->setMyW(this); //set myStyle to widgets wich needs it +#ifdef GUI_800x480 + tabsDiag = new QDialog(this); + tabs.setupUi(tabsDiag); + tabs.label_chance->setMyStyle(myGameTableStyle); +#else label_chance->setMyStyle(myGameTableStyle); +#endif //Flipside festlegen; if (myConfig->readConfigInt("FlipsideOwn") && myConfig->readConfigString("FlipsideOwnFile") != "") { @@ -104,6 +110,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) //Flipside Animation noch nicht erledigt flipHolecardsAllInAlreadyDone = FALSE; +#ifndef GUI_800x480 //Toolboxen verstecken? if (!myConfig->readConfigInt("ShowRightToolBox")) { groupBox_RightToolBox->hide(); @@ -117,6 +124,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) tabWidget_Right->removeTab(2); tabWidget_Right->setCurrentIndex(0); } +#endif // userWidgetsArray init userWidgetsArray[0] = pushButton_BetRaise; @@ -439,11 +447,17 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) //resize stop-button depending on translation QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Stop")); - pushButton_break->setMinimumSize(width+10,20); //Clear Focus +#ifdef GUI_800x480 + tabs.pushButton_break->setMinimumSize(width+10,20); + tabs.groupBox_LeftToolBox->clearFocus(); + tabs.groupBox_RightToolBox->clearFocus(); +#else + pushButton_break->setMinimumSize(width+10,20); groupBox_LeftToolBox->clearFocus(); groupBox_RightToolBox->clearFocus(); +#endif //set Focus to gametable this->setFocus(); @@ -463,14 +477,28 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) } // Dialogs +#ifdef GUI_800x480 + myChat = new ChatTools(tabs.lineEdit_ChatInput, myConfig, INGAME_CHAT, tabs.textBrowser_Chat); +#else myChat = new ChatTools(lineEdit_ChatInput, myConfig, INGAME_CHAT, textBrowser_Chat); +#endif myChat->setMyStyle(myGameTableStyle); +#ifdef GUI_800x480 + tabs.lineEdit_ChatInput->installEventFilter(this); +#else lineEdit_ChatInput->installEventFilter(this); +#endif + this->installEventFilter(this); //set WindowTitle dynamically +#ifdef GUI_800x480 + tabsDiag->setWindowTitle("Tabs"); + this->setWindowTitle(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING))); +#else this->setWindowTitle(QString(tr("PokerTH %1 - The Open-Source Texas Holdem Engine").arg(POKERTH_BETA_RELEASE_STRING))); +#endif // create universal messageDialgo myUniversalMessageDialog = new myMessageDialogImpl(myConfig, this); @@ -479,7 +507,11 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) //Connects +#ifdef GUI_800x480 + connect(tabs.pushButton_tipSave, SIGNAL( clicked(bool) ), playerAvatarLabelArray[0], SLOT ( setPlayerTip() ) ); +#else connect(pushButton_tipSave, SIGNAL( clicked(bool) ), playerAvatarLabelArray[0], SLOT ( setPlayerTip() ) ); +#endif connect(dealFlopCards0Timer, SIGNAL(timeout()), this, SLOT( dealFlopCards1() )); connect(dealFlopCards1Timer, SIGNAL(timeout()), this, SLOT( dealFlopCards2() )); connect(dealFlopCards2Timer, SIGNAL(timeout()), this, SLOT( dealFlopCards3() )); @@ -519,7 +551,11 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) connect( actionConfigure_PokerTH, SIGNAL( triggered() ), this, SLOT( callSettingsDialog() ) ); connect( actionClose, SIGNAL( triggered() ), this, SLOT( closeGameTable()) ); +#ifdef GUI_800x480 + connect( fullscreenButton, SIGNAL( clicked() ), this, SLOT( switchFullscreen() ) ); +#else connect( actionFullScreen, SIGNAL( triggered() ), this, SLOT( switchFullscreen() ) ); +#endif connect( actionShowHideChat, SIGNAL( triggered() ), this, SLOT( switchChatWindow() ) ); connect( actionShowHideHelp, SIGNAL( triggered() ), this, SLOT( switchHelpWindow() ) ); connect( actionShowHideLog, SIGNAL( triggered() ), this, SLOT( switchLogWindow() ) ); @@ -533,6 +569,22 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) connect( horizontalSlider_bet, SIGNAL( valueChanged(int)), this, SLOT ( changeSpinBoxBetValue(int) ) ); connect( spinBox_betValue, SIGNAL( valueChanged(int)), this, SLOT ( spinBoxBetValueChanged(int) ) ); +#ifdef GUI_800x480 + connect( tabs.horizontalSlider_speed, SIGNAL( valueChanged(int)), this, SLOT ( setGameSpeed(int) ) ); + connect( tabs.pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!! + + connect( tabs.tabWidget_Left, SIGNAL( currentChanged(int) ), this, SLOT( tabSwitchAction() ) ); + connect( tabs.lineEdit_ChatInput, SIGNAL( returnPressed () ), this, SLOT( sendChatMessage() ) ); + connect( tabs.lineEdit_ChatInput, SIGNAL( textChanged (QString) ), this, SLOT( checkChatInputLength(QString) ) ); + connect( tabs.lineEdit_ChatInput, SIGNAL( textEdited (QString) ), myChat, SLOT( setChatTextEdited() ) ); + + connect( tabs.radioButton_manualAction, SIGNAL( clicked() ) , this, SLOT( changePlayingMode() ) ); + connect( tabs.radioButton_autoCheckFold, SIGNAL( clicked() ) , this, SLOT( changePlayingMode() ) ); + connect( tabs.radioButton_autoCheckCallAny, SIGNAL( clicked() ), this, SLOT( changePlayingMode() ) ); + + connect( tabs.pushButton_voteOnKickYes, SIGNAL( clicked() ), this, SLOT( voteOnKickYes() ) ); + connect( tabs.pushButton_voteOnKickNo, SIGNAL( clicked() ), this, SLOT( voteOnKickNo() ) ); +#else connect( horizontalSlider_speed, SIGNAL( valueChanged(int)), this, SLOT ( setGameSpeed(int) ) ); connect( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!! @@ -547,6 +599,7 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) connect( pushButton_voteOnKickYes, SIGNAL( clicked() ), this, SLOT( voteOnKickYes() ) ); connect( pushButton_voteOnKickNo, SIGNAL( clicked() ), this, SLOT( voteOnKickNo() ) ); +#endif connect( pushButton_showMyCards, SIGNAL( clicked() ), this, SLOT( sendShowMyCardsSignal() ) ); for(i=0; i<=9; i++)connect( playerTipLabelArray[i], SIGNAL( linkActivated(QString) ), playerAvatarLabelArray[i], SLOT(startChangePlayerTip(QString) ) ); @@ -599,6 +652,10 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) connect(this, SIGNAL(signalEndVoteOnKick()), this, SLOT(endVoteOnKick())); connect(this, SIGNAL(signalNetClientPlayerLeft(unsigned)), this, SLOT(netClientPlayerLeft(unsigned))); + +#ifdef GUI_800x480 + connect( tabsButton, SIGNAL( clicked() ), this, SLOT( tabsButtonClicked() ) ); +#endif } gameTableImpl::~gameTableImpl() @@ -621,6 +678,17 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) //apply game table style myGameTableStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentGameTableStyle").c_str())); + +#ifdef GUI_800x480 + //cardschancemonitor show/hide + if (!myConfig->readConfigInt("ShowCardsChanceMonitor")) { + tabs.tabWidget_Right->removeTab(2); + tabs.tabWidget_Right->setCurrentIndex(0); + } else { + if(tabs.tabWidget_Right->widget(2) != tabs.tab_Chance) + tabs.tabWidget_Right->insertTab(2, tabs.tab_Chance, QString(tr("Chance"))); + } +#else //Toolbox verstecken? if (myConfig->readConfigInt("ShowLeftToolBox")) { groupBox_LeftToolBox->show(); @@ -642,6 +710,7 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) if(tabWidget_Right->widget(2) != tab_Chance) tabWidget_Right->insertTab(2, tab_Chance, QString(tr("Chance"))); } +#endif //Add avatar (if set) myStartWindow->getSession()->addOwnAvatar(QString::fromUtf8(myConfig->readConfigString("MyAvatar").c_str()).toLocal8Bit().constData()); @@ -768,14 +837,21 @@ void gameTableImpl::initGui(int speed) //kill running Singleshots!!! stopTimer(); +#ifndef GUI_800x480 label_Pot->setText(PotString); +#endif label_Total->setText(TotalString+":"); label_Sets->setText(BetsString+":"); label_handNumber->setText(HandString+":"); label_gameNumber->setText(GameString+":"); +#ifdef GUI_800x480 + tabs.groupBox_RightToolBox->setDisabled(FALSE); + tabs.groupBox_LeftToolBox->setDisabled(FALSE); +#else groupBox_RightToolBox->setDisabled(FALSE); groupBox_LeftToolBox->setDisabled(FALSE); +#endif //show human player buttons for(int i=0; i<6; i++) { @@ -783,18 +859,30 @@ void gameTableImpl::initGui(int speed) } //set minimum gui speed to prevent gui lags on fast inet games +#ifdef GUI_800x480 + if( myStartWindow->getSession()->isNetworkClientRunning() ) { + tabs.horizontalSlider_speed->setMinimum(speed); + } else { + tabs.horizontalSlider_speed->setMinimum(1); + } +#else if( myStartWindow->getSession()->isNetworkClientRunning() ) { horizontalSlider_speed->setMinimum(speed); } else { horizontalSlider_speed->setMinimum(1); } +#endif //set speeds for local game and for first network game if( !myStartWindow->getSession()->isNetworkClientRunning() || (myStartWindow->getSession()->isNetworkClientRunning() && !myStartWindow->getSession()->getCurrentGame()) ) { guiGameSpeed = speed; //positioning Slider +#ifdef GUI_800x480 + tabs.horizontalSlider_speed->setValue(guiGameSpeed); +#else horizontalSlider_speed->setValue(guiGameSpeed); +#endif setSpeeds(); } @@ -1710,10 +1798,17 @@ void gameTableImpl::provideMyActions(int mode) resetMyButtonsCheckStateMemory(); } +#ifdef GUI_800x480 + if((myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET || myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_NETWORK) && !tabs.lineEdit_ChatInput->hasFocus() && myConfig->readConfigInt("EnableBetInputFocusSwitch")) { + spinBox_betValue->setFocus(); + spinBox_betValue->selectAll(); + } +#else if((myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET || myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_NETWORK) && !lineEdit_ChatInput->hasFocus() && myConfig->readConfigInt("EnableBetInputFocusSwitch")) { spinBox_betValue->setFocus(); spinBox_betValue->selectAll(); } +#endif if(myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_LOCAL) { spinBox_betValue->setFocus(); @@ -1731,10 +1826,17 @@ void gameTableImpl::meInAction() horizontalSlider_bet->setEnabled(TRUE); spinBox_betValue->setEnabled(TRUE); +#ifdef GUI_800x480 + if((myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET || myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_NETWORK) && tabs.lineEdit_ChatInput->text() == "" && myConfig->readConfigInt("EnableBetInputFocusSwitch")) { + spinBox_betValue->setFocus(); + spinBox_betValue->selectAll(); + } +#else if((myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET || myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_NETWORK) && lineEdit_ChatInput->text() == "" && myConfig->readConfigInt("EnableBetInputFocusSwitch")) { spinBox_betValue->setFocus(); spinBox_betValue->selectAll(); } +#endif // if(this->isMinimized()){ // this->showNormal(); @@ -2092,9 +2194,13 @@ void gameTableImpl::pushButtonBetRaiseClicked(bool checked) pushButtonBetRaiseIsChecked = TRUE; +#ifdef GUI_800x480 + if(!tabs.radioButton_manualAction->isChecked()) + tabs.radioButton_manualAction->click(); +#else if(!radioButton_manualAction->isChecked()) radioButton_manualAction->click(); - +#endif // myLastPreActionBetValue = spinBox_betValue->value(); } else { @@ -2121,8 +2227,13 @@ void gameTableImpl::pushButtonCallCheckClicked(bool checked) pushButtonCallCheckIsChecked = TRUE; +#ifdef GUI_800x480 + if(!tabs.radioButton_manualAction->isChecked()) + tabs.radioButton_manualAction->click(); +#else if(!radioButton_manualAction->isChecked()) radioButton_manualAction->click(); +#endif } else { pushButtonCallCheckIsChecked = FALSE; } @@ -2146,8 +2257,13 @@ void gameTableImpl::pushButtonFoldClicked(bool checked) pushButtonFoldIsChecked = TRUE; +#ifdef GUI_800x480 + if(!tabs.radioButton_manualAction->isChecked()) + tabs.radioButton_manualAction->click(); +#else if(!radioButton_manualAction->isChecked()) radioButton_manualAction->click(); +#endif } else { pushButtonFoldIsChecked = FALSE; } @@ -2171,8 +2287,13 @@ void gameTableImpl::pushButtonAllInClicked(bool checked) pushButtonAllInIsChecked = TRUE; +#ifdef GUI_800x480 + if(!tabs.radioButton_manualAction->isChecked()) + tabs.radioButton_manualAction->click(); +#else if(!radioButton_manualAction->isChecked()) radioButton_manualAction->click(); +#endif } else { pushButtonAllInIsChecked = FALSE; } @@ -2569,7 +2690,9 @@ void gameTableImpl::postRiverRunAnimation5() if (distributePotAnimCounter==0 || distributePotAnimCounter==2 || distributePotAnimCounter==4 || distributePotAnimCounter==6 || distributePotAnimCounter==8) { +#ifndef GUI_800x480 label_Pot->setText(""); +#endif for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) { @@ -2579,7 +2702,9 @@ void gameTableImpl::postRiverRunAnimation5() } } } else { +#ifndef GUI_800x480 label_Pot->setText(PotString); +#endif for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) { @@ -2639,11 +2764,20 @@ void gameTableImpl::postRiverRunAnimation6() if(myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_LOCAL) { currentGameOver = TRUE; +#ifdef GUI_800x480 + tabs.pushButton_break->setDisabled(FALSE); +#else pushButton_break->setDisabled(FALSE); +#endif QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Start")); +#ifdef GUI_800x480 + tabs.pushButton_break->setMinimumSize(width+10,20); + tabs.pushButton_break->setText(tr("Start")); +#else pushButton_break->setMinimumSize(width+10,20); pushButton_break->setText(tr("Start")); +#endif blinkingStartButtonAnimationTimer->start(500); } } else { @@ -2728,13 +2862,22 @@ void gameTableImpl::startNewHand() } else { if(myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_LOCAL) { +#ifdef GUI_800x480 + tabs.pushButton_break->setDisabled(FALSE); +#else pushButton_break->setDisabled(FALSE); +#endif QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Start")); +#ifdef GUI_800x480 + tabs.pushButton_break->setMinimumSize(width+10,20); + tabs.pushButton_break->setText(tr("Start")); +#else pushButton_break->setMinimumSize(width+10,20); - pushButton_break->setText(tr("Start")); +#endif + breakAfterCurrentHand=FALSE; blinkingStartButtonAnimationTimer->start(500); @@ -2781,22 +2924,39 @@ void gameTableImpl::nextRoundCleanGui() //Wenn Pause zwischen den Hands in der Konfiguration steht den Stop Button drücken! if (myConfig->readConfigInt("PauseBetweenHands") /*&& blinkingStartButtonAnimationTimer->isActive() == FALSE*/ && myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_LOCAL) { +#ifdef GUI_800x480 + tabs.pushButton_break->click(); +#else pushButton_break->click(); +#endif } else { //FIX STRG+N Bug +#ifdef GUI_800x480 + tabs.pushButton_break->setEnabled(TRUE); +#else pushButton_break->setEnabled(TRUE); +#endif breakAfterCurrentHand=FALSE; } //Clean breakbutton if(myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_LOCAL) { blinkingStartButtonAnimationTimer->stop(); +#ifdef GUI_800x480 + myGameTableStyle->setBreakButtonStyle(tabs.pushButton_break,0); +#else myGameTableStyle->setBreakButtonStyle(pushButton_break,0); +#endif blinkingStartButtonAnimationTimer->stop(); QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Stop")); +#ifdef GUI_800x480 + tabs.pushButton_break->setMinimumSize(width+10,20); + tabs.pushButton_break->setText(tr("Stop")); +#else pushButton_break->setMinimumSize(width+10,20); pushButton_break->setText(tr("Stop")); +#endif } //Clear Statusbarmessage // statusBar()->clearMessage(); @@ -2870,6 +3030,24 @@ void gameTableImpl::setSpeeds() void gameTableImpl::breakButtonClicked() { +#ifdef GUI_800x480 + if (tabs.pushButton_break->text() == tr("Stop")) { + tabs.pushButton_break->setDisabled(TRUE); + breakAfterCurrentHand=TRUE; + } else if (tabs.pushButton_break->text() == tr("Lobby")) { + tabsButtonClose(); + leaveCurrentNetworkGame(); + } else if (tabs.pushButton_break->text() == tr("Start")) { + + blinkingStartButtonAnimationTimer->stop(); + //Set default Color + myGameTableStyle->setBreakButtonStyle(tabs.pushButton_break,0); + QFontMetrics tempMetrics = this->fontMetrics(); + int width = tempMetrics.width(tr("Stop")); + tabs.pushButton_break->setMinimumSize(width+10,20); + + tabs.pushButton_break->setText(tr("Stop")); +#else if (pushButton_break->text() == tr("Stop")) { pushButton_break->setDisabled(TRUE); breakAfterCurrentHand=TRUE; @@ -2885,6 +3063,7 @@ void gameTableImpl::breakButtonClicked() pushButton_break->setMinimumSize(width+10,20); pushButton_break->setText(tr("Stop")); +#endif if(currentGameOver) { //let the SoundEventHandler know that there is a new game @@ -2944,6 +3123,7 @@ void gameTableImpl::keyPressEvent ( QKeyEvent * event ) pushButton_showMyCards->click(); } +#ifndef GUI_800x480 if (event->key() == Qt::Key_F6) { radioButton_manualAction->click(); } @@ -2978,6 +3158,8 @@ void gameTableImpl::keyPressEvent ( QKeyEvent * event ) keyUpDownChatCounter = 0; } +#endif + //TESTING UNIT // if (event->key() == Qt::Key_M) { showShowMyCardsButton(); } } @@ -2987,6 +3169,17 @@ void gameTableImpl::changePlayingMode() int mode = -1; +#ifdef GUI_800x480 + if(tabs.radioButton_manualAction->isChecked()) { + mode=0; + } + if(tabs.radioButton_autoCheckFold->isChecked()) { + mode=2; + } + if(tabs.radioButton_autoCheckCallAny->isChecked()) { + mode=1; + } +#else if(radioButton_manualAction->isChecked()) { mode=0; } @@ -2996,6 +3189,7 @@ void gameTableImpl::changePlayingMode() if(radioButton_autoCheckCallAny->isChecked()) { mode=1; } +#endif /* switch (mode) { @@ -3036,6 +3230,18 @@ void gameTableImpl::switchChatWindow() { int tab = 1; +#ifdef GUI_800x480 + if (tabs.groupBox_LeftToolBox->isHidden()) { + tabs.tabWidget_Left->setCurrentIndex(tab); + tabs.groupBox_LeftToolBox->show(); + } else { + if (tabs.tabWidget_Left->currentIndex() == tab) { + tabs.groupBox_LeftToolBox->hide(); + } else { + tabs.tabWidget_Left->setCurrentIndex(tab); + } + } +#else if (groupBox_LeftToolBox->isHidden()) { tabWidget_Left->setCurrentIndex(tab); groupBox_LeftToolBox->show(); @@ -3046,12 +3252,25 @@ void gameTableImpl::switchChatWindow() tabWidget_Left->setCurrentIndex(tab); } } +#endif } void gameTableImpl::switchHelpWindow() { int tab = 0; +#ifdef GUI_800x480 + if (tabs.groupBox_LeftToolBox->isHidden()) { + tabs.tabWidget_Left->setCurrentIndex(tab); + tabs.groupBox_LeftToolBox->show(); + } else { + if (tabs.tabWidget_Left->currentIndex() == tab) { + tabs.groupBox_LeftToolBox->hide(); + } else { + tabs.tabWidget_Left->setCurrentIndex(tab); + } + } +#else if (groupBox_LeftToolBox->isHidden()) { tabWidget_Left->setCurrentIndex(tab); groupBox_LeftToolBox->show(); @@ -3062,12 +3281,25 @@ void gameTableImpl::switchHelpWindow() tabWidget_Left->setCurrentIndex(tab); } } +#endif } void gameTableImpl::switchLogWindow() { int tab = 0; +#ifdef GUI_800x480 + if (tabs.groupBox_RightToolBox->isHidden()) { + tabs.tabWidget_Right->setCurrentIndex(tab); + tabs.groupBox_RightToolBox->show(); + } else { + if (tabs.tabWidget_Right->currentIndex() == tab) { + tabs.groupBox_RightToolBox->hide(); + } else { + tabs.tabWidget_Right->setCurrentIndex(tab); + } + } +#else if (groupBox_RightToolBox->isHidden()) { tabWidget_Right->setCurrentIndex(tab); groupBox_RightToolBox->show(); @@ -3078,12 +3310,25 @@ void gameTableImpl::switchLogWindow() tabWidget_Right->setCurrentIndex(tab); } } +#endif } void gameTableImpl::switchAwayWindow() { int tab = 1; +#ifdef GUI_800x480 + if (tabs.groupBox_RightToolBox->isHidden()) { + tabs.tabWidget_Right->setCurrentIndex(tab); + tabs.groupBox_RightToolBox->show(); + } else { + if (tabs.tabWidget_Right->currentIndex() == tab) { + tabs.groupBox_RightToolBox->hide(); + } else { + tabs.tabWidget_Right->setCurrentIndex(tab); + } + } +#else if (groupBox_RightToolBox->isHidden()) { tabWidget_Right->setCurrentIndex(tab); groupBox_RightToolBox->show(); @@ -3094,12 +3339,25 @@ void gameTableImpl::switchAwayWindow() tabWidget_Right->setCurrentIndex(tab); } } +#endif } void gameTableImpl::switchChanceWindow() { int tab = 2; +#ifdef GUI_800x480 + if (tabs.groupBox_RightToolBox->isHidden()) { + tabs.tabWidget_Right->setCurrentIndex(tab); + tabs.groupBox_RightToolBox->show(); + } else { + if (tabs.tabWidget_Right->currentIndex() == tab) { + tabs.groupBox_RightToolBox->hide(); + } else { + tabs.tabWidget_Right->setCurrentIndex(tab); + } + } +#else if (groupBox_RightToolBox->isHidden()) { tabWidget_Right->setCurrentIndex(tab); groupBox_RightToolBox->show(); @@ -3110,6 +3368,7 @@ void gameTableImpl::switchChanceWindow() tabWidget_Right->setCurrentIndex(tab); } } +#endif } void gameTableImpl::switchFullscreen() @@ -3125,12 +3384,24 @@ void gameTableImpl::switchFullscreen() void gameTableImpl::blinkingStartButtonAnimationAction() { +#ifdef GUI_800x480 + QString style = tabs.pushButton_break->styleSheet(); +#else QString style = pushButton_break->styleSheet(); +#endif if(style.contains("QPushButton:enabled { background-color: #"+myGameTableStyle->getBreakLobbyButtonBgColor())) { +#ifdef GUI_800x480 + myGameTableStyle->setBreakButtonStyle(tabs.pushButton_break,1); +#else myGameTableStyle->setBreakButtonStyle(pushButton_break,1); +#endif } else { +#ifdef GUI_800x480 + myGameTableStyle->setBreakButtonStyle(tabs.pushButton_break,0); +#else myGameTableStyle->setBreakButtonStyle(pushButton_break,0); +#endif } } @@ -3147,6 +3418,19 @@ void gameTableImpl::checkChatInputLength(QString string) void gameTableImpl::tabSwitchAction() { +#ifdef GUI_800x480 + switch(tabs.tabWidget_Left->currentIndex()) { + + case 1: { + tabs.lineEdit_ChatInput->setFocus(); + } + break; + default: { + tabs.lineEdit_ChatInput->clearFocus(); + } + + } +#else switch(tabWidget_Left->currentIndex()) { case 1: { @@ -3158,16 +3442,25 @@ void gameTableImpl::tabSwitchAction() } } +#endif + } void gameTableImpl::localGameModification() { +#ifdef GUI_800x480 + tabs.tabWidget_Left->setCurrentIndex(0); + tabs.tabWidget_Left->removeTab(1); + tabs.tabWidget_Left->removeTab(1); + tabs.tabWidget_Left->removeTab(1); +#else tabWidget_Left->setCurrentIndex(0); tabWidget_Left->removeTab(1); tabWidget_Left->removeTab(1); tabWidget_Left->removeTab(1); +#endif int i; for (i=0; isetEnabledContextMenu(FALSE); } +#ifdef GUI_800x480 + tabs.pushButton_break->show(); +#else pushButton_break->show(); +#endif QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Stop")); +#ifdef GUI_800x480 + tabs.pushButton_break->setText(tr("Stop")); + tabs.pushButton_break->setMinimumSize(width+10,20); +#else pushButton_break->setText(tr("Stop")); pushButton_break->setMinimumSize(width+10,20); +#endif //Set the playing mode to "manual" +#ifdef GUI_800x480 + tabs.radioButton_manualAction->click(); +#else radioButton_manualAction->click(); +#endif //restore saved windows geometry restoreGameTableGeometry(); @@ -3196,6 +3502,15 @@ void gameTableImpl::localGameModification() void gameTableImpl::networkGameModification() { +#ifdef GUI_800x480 + if(tabs.tabWidget_Left->widget(1) != tabs.tab_Chat) + tabs.tabWidget_Left->insertTab(1, tabs.tab_Chat, QString(tr("Chat"))); /*TODO text abgeschnitten --> stylesheets*/ + + tabs.tabWidget_Left->removeTab(2); + tabs.tabWidget_Left->removeTab(2); + + tabs.tabWidget_Left->setCurrentIndex(1); +#else if(tabWidget_Left->widget(1) != tab_Chat) tabWidget_Left->insertTab(1, tab_Chat, QString(tr("Chat"))); /*TODO text abgeschnitten --> stylesheets*/ @@ -3203,6 +3518,7 @@ void gameTableImpl::networkGameModification() tabWidget_Left->removeTab(2); tabWidget_Left->setCurrentIndex(1); +#endif myChat->clearChat(); int i; @@ -3213,20 +3529,37 @@ void gameTableImpl::networkGameModification() } if(myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET) { +#ifdef GUI_800x480 + tabs.pushButton_break->show(); +#else pushButton_break->show(); +#endif QFontMetrics tempMetrics = this->fontMetrics(); int width = tempMetrics.width(tr("Lobby")); +#ifdef GUI_800x480 + tabs.pushButton_break->setText(tr("Lobby")); + tabs.pushButton_break->setMinimumSize(width+10,20); + myGameTableStyle->setBreakButtonStyle(tabs.pushButton_break,0); +#else pushButton_break->setText(tr("Lobby")); pushButton_break->setMinimumSize(width+10,20); myGameTableStyle->setBreakButtonStyle(pushButton_break,0); +#endif blinkingStartButtonAnimationTimer->stop(); } if(myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_NETWORK) { - +#ifdef GUI_800x480 + tabs.pushButton_break->hide(); +#else pushButton_break->hide(); +#endif } //Set the playing mode to "manual" +#ifdef GUI_800x480 + tabs.radioButton_manualAction->click(); +#else radioButton_manualAction->click(); +#endif //restore saved windows geometry restoreGameTableGeometry(); @@ -3238,7 +3571,11 @@ void gameTableImpl::networkGameModification() } blinkingStartButtonAnimationTimer->stop(); +#ifdef GUI_800x480 + myGameTableStyle->setBreakButtonStyle(tabs.pushButton_break,0); +#else myGameTableStyle->setBreakButtonStyle(pushButton_break,0); +#endif //let the SoundEventHandler know that there is a new game mySoundEventHandler->newGameStarts(); @@ -3466,6 +3803,16 @@ void gameTableImpl::triggerVoteOnKick(int id) void gameTableImpl::startVoteOnKick(unsigned playerId, unsigned voteStarterPlayerId, int timeoutSec, int numVotesNeededToKick) { +#ifdef GUI_800x480 + if(tabs.tabWidget_Left->widget(2) != tabs.tab_Kick) + tabs.tabWidget_Left->insertTab(2, tabs.tab_Kick, QString(tr("Kick"))); + + tabs.tabWidget_Left->setCurrentIndex(2); + tabs.pushButton_voteOnKickNo->hide(); + tabs.pushButton_voteOnKickYes->hide(); + tabs.label_kickUser->clear(); + tabs.label_kickVoteTimeout->clear(); +#else if(tabWidget_Left->widget(2) != tab_Kick) tabWidget_Left->insertTab(2, tab_Kick, QString(tr("Kick"))); @@ -3474,6 +3821,7 @@ void gameTableImpl::startVoteOnKick(unsigned playerId, unsigned voteStarterPlaye pushButton_voteOnKickYes->hide(); label_kickUser->clear(); label_kickVoteTimeout->clear(); +#endif voteOnKickTimeoutSecs = timeoutSec; @@ -3481,7 +3829,11 @@ void gameTableImpl::startVoteOnKick(unsigned playerId, unsigned voteStarterPlaye refreshVotesMonitor(1, numVotesNeededToKick); PlayerInfo info(myStartWindow->getSession()->getClientPlayerInfo(voteStarterPlayerId)); +#ifdef GUI_800x480 + tabs.label_voteStarterNick->setText(""+QString::fromUtf8(info.playerName.c_str())+""); +#else label_voteStarterNick->setText(""+QString::fromUtf8(info.playerName.c_str())+""); +#endif startVoteOnKickTimeout(); @@ -3496,21 +3848,36 @@ void gameTableImpl::changeVoteOnKickButtonsState(bool showHide) if(showHide) { PlayerInfo info(myStartWindow->getSession()->getClientPlayerInfo(playerAboutToBeKickedId)); +#ifdef GUI_800x480 + tabs.label_kickUser->setText(tr("Do you want to kick %1
from this game?").arg(QString::fromUtf8(info.playerName.c_str()))); + tabs.pushButton_voteOnKickNo->show(); + tabs.pushButton_voteOnKickYes->show(); +#else label_kickUser->setText(tr("Do you want to kick %1
from this game?").arg(QString::fromUtf8(info.playerName.c_str()))); - pushButton_voteOnKickNo->show(); pushButton_voteOnKickYes->show(); +#endif } else { +#ifdef GUI_800x480 + tabs.label_kickUser->clear(); + tabs.pushButton_voteOnKickNo->hide(); + tabs.pushButton_voteOnKickYes->hide(); +#else label_kickUser->clear(); pushButton_voteOnKickNo->hide(); pushButton_voteOnKickYes->hide(); +#endif } } void gameTableImpl::endVoteOnKick() { stopVoteOnKickTimeout(); +#ifdef GUI_800x480 + tabs.tabWidget_Left->removeTab(2); +#else tabWidget_Left->removeTab(2); +#endif int i; for (i=0; i 0) +#ifdef GUI_800x480 + tabs.label_kickVoteTimeout->setText(tr("%1 secs left").arg(voteOnKickTimeoutSecs-voteOnKickRealTimer.elapsed().total_seconds())); +#else label_kickVoteTimeout->setText(tr("%1 secs left").arg(voteOnKickTimeoutSecs-voteOnKickRealTimer.elapsed().total_seconds())); +#endif else +#ifdef GUI_800x480 + tabs.label_kickVoteTimeout->setText(tr("%1 secs left").arg(0)); +#else label_kickVoteTimeout->setText(tr("%1 secs left").arg(0)); +#endif } void gameTableImpl::refreshVotesMonitor(int currentVotes, int numVotesNeededToKick) @@ -3559,9 +3934,17 @@ void gameTableImpl::refreshVotesMonitor(int currentVotes, int numVotesNeededToKi if((*myStartWindow->getSession()->getCurrentGame()->getSeatsList()->begin())->getMyUniqueID() != playerAboutToBeKickedId) { PlayerInfo info(myStartWindow->getSession()->getClientPlayerInfo(playerAboutToBeKickedId)); +#ifdef GUI_800x480 + tabs.label_votesMonitor->setText(tr("Player %1 has %2 %3
against him. %4 vote(s) needed to kick.").arg(QString::fromUtf8(info.playerName.c_str())).arg(currentVotes).arg(currentVotesString).arg(numVotesNeededToKick-currentVotes)); +#else label_votesMonitor->setText(tr("Player %1 has %2 %3
against him. %4 vote(s) needed to kick.").arg(QString::fromUtf8(info.playerName.c_str())).arg(currentVotes).arg(currentVotesString).arg(numVotesNeededToKick-currentVotes)); +#endif } else { +#ifdef GUI_800x480 + tabs.label_votesMonitor->setText(tr("You have %1 %2 against you.
%3 vote(s) needed to kick.").arg(currentVotes).arg(currentVotesString).arg(numVotesNeededToKick-currentVotes)); +#else label_votesMonitor->setText(tr("You have %1 %2 against you.
%3 vote(s) needed to kick.").arg(currentVotes).arg(currentVotesString).arg(numVotesNeededToKick-currentVotes)); +#endif } } @@ -3578,12 +3961,24 @@ void gameTableImpl::refreshCardsChance(GameState bero) myStartWindow->getSession()->getCurrentGame()->getCurrentHand()->getBoard()->getMyCards(boardCards); if(humanPlayer->getMyAction() == PLAYER_ACTION_FOLD) { +#ifdef GUI_800x480 + tabs.label_chance->refreshChance(CardsValue::calcCardsChance(bero, holeCards, boardCards), true); +#else label_chance->refreshChance(CardsValue::calcCardsChance(bero, holeCards, boardCards), true); +#endif } else { +#ifdef GUI_800x480 + tabs.label_chance->refreshChance(CardsValue::calcCardsChance(bero, holeCards, boardCards), false); +#else label_chance->refreshChance(CardsValue::calcCardsChance(bero, holeCards, boardCards), false); +#endif } } else { +#ifdef GUI_800x480 + tabs.label_chance->resetChance(); +#else label_chance->resetChance(); +#endif } } } @@ -3596,6 +3991,7 @@ void gameTableImpl::refreshActionButtonFKeyIndicator(bool clear) pushButton_CallCheck->setFKeyText(""); pushButton_Fold->setFKeyText(""); } else { +#ifndef GUI_800x480 if(myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0 ) { if(!pushButton_AllIn->text().isEmpty()) pushButton_AllIn->setFKeyText("F4"); if(!pushButton_BetRaise->text().isEmpty()) pushButton_BetRaise->setFKeyText("F3"); @@ -3607,16 +4003,24 @@ void gameTableImpl::refreshActionButtonFKeyIndicator(bool clear) if(!pushButton_CallCheck->text().isEmpty()) pushButton_CallCheck->setFKeyText("F3"); if(!pushButton_Fold->text().isEmpty()) pushButton_Fold->setFKeyText("F4"); } +#endif } } void gameTableImpl::refreshGameTableStyle() { myGameTableStyle->setWindowsGeometry(this); +#ifdef GUI_800x480 +// myGameTableStyle->setChatLogStyle(textBrowser_Log); + myGameTableStyle->setChatLogStyle(tabs.textBrowser_Chat); + myGameTableStyle->setChatLogStyle(tabs.textEdit_tipInput); + myGameTableStyle->setChatInputStyle(tabs.lineEdit_ChatInput); +#else myGameTableStyle->setChatLogStyle(textBrowser_Log); myGameTableStyle->setChatLogStyle(textBrowser_Chat); myGameTableStyle->setChatLogStyle(textEdit_tipInput); myGameTableStyle->setChatInputStyle(lineEdit_ChatInput); +#endif int i; for (i=0; isetSmallFontBoardStyle(label_Sets); myGameTableStyle->setSmallFontBoardStyle(label_Total); +#ifdef GUI_800x480 + myGameTableStyle->setBigFontBoardStyle(textLabel_Sets); + myGameTableStyle->setBigFontBoardStyle(textLabel_Pot); + myGameTableStyle->setBigFontBoardStyle(label_handNumber); + myGameTableStyle->setBigFontBoardStyle(label_gameNumber); + myGameTableStyle->setBigFontBoardStyle(label_handNumberValue); + myGameTableStyle->setBigFontBoardStyle(label_gameNumberValue); + myGameTableStyle->setBigFontBoardStyle(textLabel_handLabel); +#else myGameTableStyle->setSmallFontBoardStyle(textLabel_Sets); myGameTableStyle->setSmallFontBoardStyle(textLabel_Pot); myGameTableStyle->setSmallFontBoardStyle(label_handNumber); @@ -3636,12 +4049,27 @@ void gameTableImpl::refreshGameTableStyle() myGameTableStyle->setSmallFontBoardStyle(label_gameNumberValue); myGameTableStyle->setBigFontBoardStyle(textLabel_handLabel); myGameTableStyle->setBigFontBoardStyle(label_Pot); +#endif myGameTableStyle->setCardHolderStyle(label_CardHolder0,0); myGameTableStyle->setCardHolderStyle(label_CardHolder1,0); myGameTableStyle->setCardHolderStyle(label_CardHolder2,0); myGameTableStyle->setCardHolderStyle(label_CardHolder3,1); myGameTableStyle->setCardHolderStyle(label_CardHolder4,2); myGameTableStyle->setTableBackground(this); +#ifdef GUI_800x480 + myGameTableStyle->setBreakButtonStyle(tabs.pushButton_break,0); + myGameTableStyle->setBreakButtonStyle(tabs.pushButton_tipSave,0); + myGameTableStyle->setSpeedStringStyle(tabs.label_speedString); + myGameTableStyle->setSpeedStringStyle(tabs.label_speedValue); + myGameTableStyle->setVoteButtonStyle(tabs.pushButton_voteOnKickYes); + myGameTableStyle->setVoteButtonStyle(tabs.pushButton_voteOnKickNo); + myGameTableStyle->setVoteStringsStyle(tabs.label_timeout); + myGameTableStyle->setVoteStringsStyle(tabs.label_kickVoteTimeout); + myGameTableStyle->setVoteStringsStyle(tabs.label_kickUser); + myGameTableStyle->setVoteStringsStyle(tabs.label_votesMonitor); + myGameTableStyle->setVoteStringsStyle(tabs.label_voteStarterNick); + myGameTableStyle->setVoteStringsStyle(tabs.label_votestartedby); +#else myGameTableStyle->setMenuBarStyle(menubar); myGameTableStyle->setBreakButtonStyle(pushButton_break,0); myGameTableStyle->setBreakButtonStyle(pushButton_tipSave,0); @@ -3655,6 +4083,7 @@ void gameTableImpl::refreshGameTableStyle() myGameTableStyle->setVoteStringsStyle(label_votesMonitor); myGameTableStyle->setVoteStringsStyle(label_voteStarterNick); myGameTableStyle->setVoteStringsStyle(label_votestartedby); +#endif for (i=0; isetBetValueInputStyle(spinBox_betValue); myGameTableStyle->setSliderStyle(horizontalSlider_bet); +#ifdef GUI_800x480 + myGameTableStyle->setSliderStyle(tabs.horizontalSlider_speed); +#else myGameTableStyle->setSliderStyle(horizontalSlider_speed); +#endif // away radiobuttons +#ifdef GUI_800x480 + myGameTableStyle->setAwayRadioButtonsStyle(tabs.radioButton_manualAction); + myGameTableStyle->setAwayRadioButtonsStyle(tabs.radioButton_autoCheckFold); + myGameTableStyle->setAwayRadioButtonsStyle(tabs.radioButton_autoCheckCallAny); + + myGameTableStyle->setToolBoxBackground(tabs.groupBox_RightToolBox); + myGameTableStyle->setToolBoxBackground(tabs.groupBox_LeftToolBox); + + myGameTableStyle->setTabWidgetStyle(tabs.tabWidget_Right, tabs.tabWidget_Right->getMyTabBar()); + myGameTableStyle->setTabWidgetStyle(tabs.tabWidget_Left, tabs.tabWidget_Left->getMyTabBar()); + + tabs.label_Handranking->setPixmap(myGameTableStyle->getHandRanking()); +#else myGameTableStyle->setAwayRadioButtonsStyle(radioButton_manualAction); myGameTableStyle->setAwayRadioButtonsStyle(radioButton_autoCheckFold); myGameTableStyle->setAwayRadioButtonsStyle(radioButton_autoCheckCallAny); @@ -3680,6 +4126,7 @@ void gameTableImpl::refreshGameTableStyle() myGameTableStyle->setTabWidgetStyle(tabWidget_Left, tabWidget_Left->getMyTabBar()); label_Handranking->setPixmap(myGameTableStyle->getHandRanking()); +#endif if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getActionCallI18NString() == "NULL") { CallString = "Call"; @@ -3757,7 +4204,9 @@ void gameTableImpl::refreshGameTableStyle() RiverString = myGameTableStyle->getRiverI18NString(); } +#ifndef GUI_800x480 label_Pot->setText(PotString); +#endif label_Total->setText(TotalString+":"); label_Sets->setText(BetsString+":"); label_handNumber->setText(HandString+":"); @@ -3780,7 +4229,9 @@ void gameTableImpl::saveGameTableGeometry() void gameTableImpl::restoreGameTableGeometry() { if(myConfig->readConfigInt("GameTableFullScreenSave")) { +#ifndef GUI_800x480 if(actionFullScreen->isEnabled()) this->showFullScreen(); +#endif } else { //resize only if style size allow this and if NOT fixed windows size if(!myGameTableStyle->getIfFixedWindowSize().toInt() && myConfig->readConfigInt("GameTableHeightSave") <= myGameTableStyle->getMaximumWindowHeight().toInt() && myConfig->readConfigInt("GameTableHeightSave") >= myGameTableStyle->getMinimumWindowHeight().toInt() && myConfig->readConfigInt("GameTableWidthSave") <= myGameTableStyle->getMaximumWindowWidth().toInt() && myConfig->readConfigInt("GameTableWidthSave") >= myGameTableStyle->getMinimumWindowWidth().toInt()) { @@ -3800,16 +4251,26 @@ void gameTableImpl::netClientPlayerLeft(unsigned /*playerId*/) void gameTableImpl::registeredUserMode() { +#ifdef GUI_800x480 + tabs.lineEdit_ChatInput->clear(); + tabs.lineEdit_ChatInput->setEnabled(true); +#else lineEdit_ChatInput->clear(); lineEdit_ChatInput->setEnabled(true); +#endif guestMode = false; } void gameTableImpl::guestUserMode() { +#ifdef GUI_800x480 + tabs.lineEdit_ChatInput->setText(tr("Chat is only available to registered players.")); + tabs.lineEdit_ChatInput->setDisabled(true); +#else lineEdit_ChatInput->setText(tr("Chat is only available to registered players.")); lineEdit_ChatInput->setDisabled(true); +#endif guestMode = true; } @@ -3838,7 +4299,11 @@ void gameTableImpl::closeMessageBoxes() void gameTableImpl::hide() { //clear log +#ifdef GUI_800x480 + tabs.textBrowser_Log->clear(); +#else textBrowser_Log->clear(); +#endif QWidget::hide(); } @@ -3870,3 +4335,18 @@ void gameTableImpl::enableCallCheckPushButton() { pushButton_CallCheck->setEatMyEvents(false); } + +#ifdef GUI_800x480 +void gameTableImpl::tabsButtonClicked() +{ + tabsDiag->setParent(this, Qt::Dialog); + tabsDiag->show(); + tabsDiag->raise(); + tabsDiag->activateWindow(); +} + +void gameTableImpl::tabsButtonClose() +{ + tabsDiag->close(); +} +#endif diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h index f36cbb48..9c6894cc 100755 --- a/src/gui/qt/gametable/gametableimpl.h +++ b/src/gui/qt/gametable/gametableimpl.h @@ -20,6 +20,7 @@ #ifdef GUI_800x480 #include "ui_gametable_800x480.h" +#include "ui_tabs_800x480.h" #else #include "ui_gametable.h" #endif @@ -97,6 +98,11 @@ public: void setSpeeds(); +#ifdef GUI_800x480 + Ui::tabs tabs; + QDialog *tabsDiag; +#endif + signals: void signalInitGui(int speed); @@ -344,6 +350,11 @@ public slots: void soundEvent_blindsWereSet(int); void enableCallCheckPushButton(); +#ifdef GUI_800x480 + void tabsButtonClicked(); + void tabsButtonClose(); +#endif + private: boost::shared_ptr myServerGuiInterface; diff --git a/src/gui/qt/gametable/log/guilog.cpp b/src/gui/qt/gametable/log/guilog.cpp index 1dbf9ab3..d611cbd1 100644 --- a/src/gui/qt/gametable/log/guilog.cpp +++ b/src/gui/qt/gametable/log/guilog.cpp @@ -86,7 +86,11 @@ guiLog::guiLog(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir( stream_old << "\n"; stream_old << ""; stream_old << "\n"; - stream_old << "\n"; +#ifdef GUI_800x480 + stream_old << "\n"; +#else + stream_old << "\n"; +#endif stream_old << "\n"; stream_old << QString("

Log-File for PokerTH %1 Session started on ").arg(POKERTH_BETA_RELEASE_STRING)+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"

\n"; myHtmlLogFile_old->close(); @@ -166,7 +170,12 @@ void guiLog::logPlayerActionMsg(QString msg, int action, int setValue) msg += "$"+QString::number(setValue,10)+"."; } +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getChatLogTextColor()+";\">"+msg+""); +#else myW->textBrowser_Log->append("getChatLogTextColor()+";\">"+msg+""); +#endif + if(HTML_LOG) { @@ -193,7 +202,11 @@ void guiLog::logNewGameHandMsg(int gameID, int handID) PlayerList activePlayerList = currentHand->getActivePlayerList(); +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getChatLogTextColor()+"; font-size:large; font-weight:bold\">## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##"); +#else myW->textBrowser_Log->append("getChatLogTextColor()+"; font-size:large; font-weight:bold\">## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##"); +#endif if(HTML_LOG) { @@ -220,8 +233,13 @@ void guiLog::logNewBlindsSetsMsg(int sbSet, int bbSet, QString sbName, QString b { // log blinds +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getChatLogTextColor()+";\">"+sbName+" posts small blind ($"+QString::number(sbSet,10)+")"); + myW->tabs.textBrowser_Log->append("getChatLogTextColor()+";\">"+bbName+" posts big blind ($"+QString::number(bbSet,10)+")"); +#else myW->textBrowser_Log->append("getChatLogTextColor()+";\">"+sbName+" posts small blind ($"+QString::number(sbSet,10)+")"); myW->textBrowser_Log->append("getChatLogTextColor()+";\">"+bbName+" posts big blind ($"+QString::number(bbSet,10)+")"); +#endif if(HTML_LOG) { @@ -266,11 +284,19 @@ void guiLog::logNewBlindsSetsMsg(int sbSet, int bbSet, QString sbName, QString b void guiLog::logPlayerWinsMsg(QString playerName, int pot, bool main) { +#ifdef GUI_800x480 + if(main) { + myW->tabs.textBrowser_Log->append("getLogWinnerMainPotColor()+";\">"+playerName+" wins $"+QString::number(pot,10)+""); + } else { + myW->tabs.textBrowser_Log->append("getLogWinnerSidePotColor()+";\">"+playerName+" wins $"+QString::number(pot,10)+" (side pot)"); + } +#else if(main) { myW->textBrowser_Log->append("getLogWinnerMainPotColor()+";\">"+playerName+" wins $"+QString::number(pot,10)+""); } else { myW->textBrowser_Log->append("getLogWinnerSidePotColor()+";\">"+playerName+" wins $"+QString::number(pot,10)+" (side pot)"); } +#endif if(HTML_LOG) { @@ -295,7 +321,11 @@ void guiLog::logPlayerWinsMsg(QString playerName, int pot, bool main) void guiLog::logPlayerSitsOut(QString playerName) { +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getLogPlayerSitsOutColor()+";\">"+playerName+" sits out"); +#else myW->textBrowser_Log->append("getLogPlayerSitsOutColor()+";\">"+playerName+" sits out"); +#endif if(HTML_LOG) { @@ -321,15 +351,27 @@ void guiLog::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, case 1: round = "Flop"; +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+"]"); +#else myW->textBrowser_Log->append("getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+"]"); +#endif break; case 2: round = "Turn"; +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+"]"); +#else myW->textBrowser_Log->append("getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+"]"); +#endif break; case 3: round = "River"; +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+translateCardCode(card5).at(1)+"]"); +#else myW->textBrowser_Log->append("getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+translateCardCode(card5).at(1)+"]"); +#endif break; default: round = "ERROR"; @@ -377,12 +419,18 @@ void guiLog::logFlipHoleCardsMsg(QString playerName, int card1, int card2, int c tempHandName = CardsValue::determineHandName(cardsValueInt,myW->getSession()->getCurrentGame()->getActivePlayerList()).c_str(); +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getChatLogTextColor()+";\">"+playerName+" "+showHas+" ["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+"] - \""+tempHandName+"\""); +#else myW->textBrowser_Log->append("getChatLogTextColor()+";\">"+playerName+" "+showHas+" ["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+"] - \""+tempHandName+"\""); +#endif } else { - +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getChatLogTextColor()+";\">"+playerName+" "+showHas+" ["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+"]"); +#else myW->textBrowser_Log->append("getChatLogTextColor()+";\">"+playerName+" "+showHas+" ["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+"]"); - +#endif } if(HTML_LOG) { @@ -422,7 +470,11 @@ void guiLog::logPlayerLeftMsg(QString playerName, int wasKicked) if(wasKicked) action = "was kicked from"; else action = "has left"; +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append( "getChatLogTextColor()+";\">"+playerName+" "+action+" the game!"); +#else myW->textBrowser_Log->append( "getChatLogTextColor()+";\">"+playerName+" "+action+" the game!"); +#endif if(HTML_LOG) { @@ -442,7 +494,11 @@ void guiLog::logPlayerLeftMsg(QString playerName, int wasKicked) void guiLog::logNewGameAdminMsg(QString playerName) { +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append( "getLogNewGameAdminColor()+";\">"+playerName+" is game admin now!"); +#else myW->textBrowser_Log->append( "getLogNewGameAdminColor()+";\">"+playerName+" is game admin now!"); +#endif if(HTML_LOG) { @@ -461,14 +517,22 @@ void guiLog::logNewGameAdminMsg(QString playerName) void guiLog::logPlayerJoinedMsg(QString playerName) { +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append("getChatLogTextColor()+";\">"+playerName+" has joined the game!"); +#else myW->textBrowser_Log->append("getChatLogTextColor()+";\">"+playerName+" has joined the game!"); +#endif } void guiLog::logPlayerWinGame(QString playerName, int gameID) { +#ifdef GUI_800x480 + myW->tabs.textBrowser_Log->append( ""+playerName+" wins game " + QString::number(gameID,10) +"!
"); +#else myW->textBrowser_Log->append( ""+playerName+" wins game " + QString::number(gameID,10) +"!
"); +#endif if(HTML_LOG) { diff --git a/src/gui/qt/gametable/myavatarlabel.cpp b/src/gui/qt/gametable/myavatarlabel.cpp index 5779c590..6dc6b13c 100644 --- a/src/gui/qt/gametable/myavatarlabel.cpp +++ b/src/gui/qt/gametable/myavatarlabel.cpp @@ -156,6 +156,16 @@ void MyAvatarLabel::setPlayerRating(QString playerInfo) void MyAvatarLabel::startChangePlayerTip(QString playerName) { +#ifdef GUI_800x480 + if(myW->tabs.tabWidget_Left->widget(2) == myW->tabs.tab_Kick) { + myW->tabs.tabWidget_Left->insertTab(3, myW->tabs.tab_editTip, playerName); + myW->tabs.tabWidget_Left->setCurrentIndex(3); + } else { + myW->tabs.tabWidget_Left->insertTab(2, myW->tabs.tab_editTip, playerName); + myW->tabs.tabWidget_Left->setCurrentIndex(2); + } + myW->tabs.textEdit_tipInput->setPlainText(getPlayerTip(playerName)); +#else if(myW->tabWidget_Left->widget(2) == myW->tab_Kick) { myW->tabWidget_Left->insertTab(3, myW->tab_editTip, playerName); myW->tabWidget_Left->setCurrentIndex(3); @@ -164,6 +174,7 @@ void MyAvatarLabel::startChangePlayerTip(QString playerName) myW->tabWidget_Left->setCurrentIndex(2); } myW->textEdit_tipInput->setPlainText(getPlayerTip(playerName)); +#endif } void MyAvatarLabel::refreshStars() @@ -273,10 +284,16 @@ void MyAvatarLabel::setPlayerTip() int found=0; //std::string rating="1"; std::string separator="(!#$%)"; - std::string tip = std::string((const char*)myW->textEdit_tipInput->toPlainText().toUtf8()); std::string playerName; +#ifdef GUI_800x480 + std::string tip = std::string((const char*)myW->tabs.textEdit_tipInput->toPlainText().toUtf8()); + if(myW->tabs.tabWidget_Left->widget(2) == myW->tabs.tab_editTip)playerName = myW->tabs.tabWidget_Left->tabText(2).toUtf8().constData(); + if(myW->tabs.tabWidget_Left->widget(3) == myW->tabs.tab_editTip)playerName = myW->tabs.tabWidget_Left->tabText(3).toUtf8().constData(); +#else + std::string tip = std::string((const char*)myW->textEdit_tipInput->toPlainText().toUtf8()); if(myW->tabWidget_Left->widget(2) == myW->tab_editTip)playerName = myW->tabWidget_Left->tabText(2).toUtf8().constData(); if(myW->tabWidget_Left->widget(3) == myW->tab_editTip)playerName = myW->tabWidget_Left->tabText(3).toUtf8().constData(); +#endif QStringList playerInfo; std::list tipsList = myW->getMyConfig()->readConfigStringList("PlayerTooltips"); std::list result; @@ -296,11 +313,19 @@ void MyAvatarLabel::setPlayerTip() myW->getMyConfig()->writeConfigStringList("PlayerTooltips", result); myW->getMyConfig()->writeBuffer(); +#ifdef GUI_800x480 + if(myW->tabs.tabWidget_Left->widget(3) == myW->tabs.tab_editTip) { + myW->tabs.tabWidget_Left->removeTab(3); + } else if(myW->tabs.tabWidget_Left->widget(2) == myW->tabs.tab_editTip) { + myW->tabs.tabWidget_Left->removeTab(2); + } +#else if(myW->tabWidget_Left->widget(3) == myW->tab_editTip) { myW->tabWidget_Left->removeTab(3); } else if(myW->tabWidget_Left->widget(2) == myW->tab_editTip) { myW->tabWidget_Left->removeTab(2); } +#endif refreshTooltips(); } diff --git a/src/gui/qt/gametable/mychancelabel.cpp b/src/gui/qt/gametable/mychancelabel.cpp index 58c90b32..0868f110 100644 --- a/src/gui/qt/gametable/mychancelabel.cpp +++ b/src/gui/qt/gametable/mychancelabel.cpp @@ -97,88 +97,110 @@ void MyChanceLabel::paintEvent(QPaintEvent * /*event*/) #endif QFont font; font.setFamily(font1String); +#ifdef GUI_800x480 + font.setPixelSize(18); +#else font.setPixelSize(10); +#endif painter.setFont(font); //Draw Texts QColor possible("#"+myStyle->getChanceLabelPossibleColor()); QColor impossible("#"+myStyle->getChanceLabelImpossibleColor()); +#ifdef GUI_800x480 + int start_y = 3; + int height = 27; + int text_width = 140; + int percent_width = 50; + int percent_start = 320; + int bar_height = 13; + int bar_width = 172; +#else + int start_y = 0; + int height = 13; + int text_width = 85; + int percent_width = 40; + int percent_start = 196; + int bar_height = 7; + int bar_width = 108; +#endif + if(RFChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,0), QPointF(85,13)),Qt::AlignRight,"Royal Flush"); - painter.drawText(QRectF(QPointF(196,0), QPointF(236,13)),Qt::AlignRight,QString("%1%").arg(RFChance[0])); + painter.drawText(QRectF(QPointF(2,start_y), QPointF(text_width,start_y+height)),Qt::AlignRight,"Royal Flush"); + painter.drawText(QRectF(QPointF(percent_start,start_y), QPointF(percent_start+percent_width,start_y+height)),Qt::AlignRight,QString("%1%").arg(RFChance[0])); if(SFChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,13), QPointF(85,26)),Qt::AlignRight,"Straight Flush"); - painter.drawText(QRectF(QPointF(196,13), QPointF(236,26)),Qt::AlignRight,QString("%1%").arg(SFChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+height), QPointF(text_width,start_y+2*height)),Qt::AlignRight,"Straight Flush"); + painter.drawText(QRectF(QPointF(percent_start,start_y+height), QPointF(percent_start+percent_width,start_y+2*height)),Qt::AlignRight,QString("%1%").arg(SFChance[0])); if(FOAKChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,26), QPointF(85,39)),Qt::AlignRight,"Four of a Kind"); - painter.drawText(QRectF(QPointF(196,26), QPointF(236,39)),Qt::AlignRight,QString("%1%").arg(FOAKChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+2*height), QPointF(text_width,start_y+3*height)),Qt::AlignRight,"Four of a Kind"); + painter.drawText(QRectF(QPointF(percent_start,start_y+2*height), QPointF(percent_start+percent_width,start_y+3*height)),Qt::AlignRight,QString("%1%").arg(FOAKChance[0])); if(FHChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,39), QPointF(85,52)),Qt::AlignRight,"Full House"); - painter.drawText(QRectF(QPointF(196,39), QPointF(236,52)),Qt::AlignRight,QString("%1%").arg(FHChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+3*height), QPointF(text_width,start_y+4*height)),Qt::AlignRight,"Full House"); + painter.drawText(QRectF(QPointF(percent_start,start_y+3*height), QPointF(percent_start+percent_width,start_y+4*height)),Qt::AlignRight,QString("%1%").arg(FHChance[0])); if(FLChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,52), QPointF(85,65)),Qt::AlignRight,"Flush"); - painter.drawText(QRectF(QPointF(196,52), QPointF(236,65)),Qt::AlignRight,QString("%1%").arg(FLChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+4*height), QPointF(text_width,start_y+5*height)),Qt::AlignRight,"Flush"); + painter.drawText(QRectF(QPointF(percent_start,start_y+4*height), QPointF(percent_start+percent_width,start_y+5*height)),Qt::AlignRight,QString("%1%").arg(FLChance[0])); if(STRChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,65), QPointF(85,78)),Qt::AlignRight,"Straight"); - painter.drawText(QRectF(QPointF(196,65), QPointF(236,78)),Qt::AlignRight,QString("%1%").arg(STRChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+5*height), QPointF(text_width,start_y+6*height)),Qt::AlignRight,"Straight"); + painter.drawText(QRectF(QPointF(percent_start,start_y+5*height), QPointF(percent_start+percent_width,start_y+6*height)),Qt::AlignRight,QString("%1%").arg(STRChance[0])); if(TOAKChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,78), QPointF(85,91)),Qt::AlignRight,"Three of a Kind"); - painter.drawText(QRectF(QPointF(196,78), QPointF(236,91)),Qt::AlignRight,QString("%1%").arg(TOAKChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+6*height), QPointF(text_width,start_y+7*height)),Qt::AlignRight,"Three of a Kind"); + painter.drawText(QRectF(QPointF(percent_start,start_y+6*height), QPointF(percent_start+percent_width,start_y+7*height)),Qt::AlignRight,QString("%1%").arg(TOAKChance[0])); if(TPChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,91), QPointF(85,104)),Qt::AlignRight,"Two Pairs"); - painter.drawText(QRectF(QPointF(196,91), QPointF(236,104)),Qt::AlignRight,QString("%1%").arg(TPChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+7*height), QPointF(text_width,start_y+8*height)),Qt::AlignRight,"Two Pairs"); + painter.drawText(QRectF(QPointF(percent_start,start_y+7*height), QPointF(percent_start+percent_width,start_y+8*height)),Qt::AlignRight,QString("%1%").arg(TPChance[0])); if(OPChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,104), QPointF(85,117)),Qt::AlignRight,"One Pair"); - painter.drawText(QRectF(QPointF(196,104), QPointF(236,117)),Qt::AlignRight,QString("%1%").arg(OPChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+8*height), QPointF(text_width,start_y+9*height)),Qt::AlignRight,"One Pair"); + painter.drawText(QRectF(QPointF(percent_start,start_y+8*height), QPointF(percent_start+percent_width,start_y+9*height)),Qt::AlignRight,QString("%1%").arg(OPChance[0])); if(HCChance[1] == 0 || myFoldState) { painter.setPen(impossible); } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,117), QPointF(85,130)),Qt::AlignRight,"Highest Card"); - painter.drawText(QRectF(QPointF(196,117), QPointF(236,130)),Qt::AlignRight,QString("%1%").arg(HCChance[0])); + painter.drawText(QRectF(QPointF(2,start_y+9*height), QPointF(text_width,start_y+10*height)),Qt::AlignRight,"Highest Card"); + painter.drawText(QRectF(QPointF(percent_start,start_y+9*height), QPointF(percent_start+percent_width,start_y+10*height)),Qt::AlignRight,QString("%1%").arg(HCChance[0])); //Draw gfx painter.setPen(QColor(0,0,0)); - QLinearGradient linearGrad(QPointF(89,3), QPointF(190,10)); + QLinearGradient linearGrad(QPointF(text_width+4,3), QPointF(text_width+4+bar_width,10)); linearGrad.setColorAt(0, Qt::blue); linearGrad.setColorAt(0.5, Qt::yellow); linearGrad.setColorAt(1, Qt::red); @@ -190,16 +212,16 @@ void MyChanceLabel::paintEvent(QPaintEvent * /*event*/) painter.setOpacity(1.0); } - if(RFChance[1] != 0) painter.drawRect(89,3,(108*RFChance[0])/100,7); - if(SFChance[1] != 0) painter.drawRect(89,16,(108*SFChance[0])/100,7); - if(FOAKChance[1] != 0) painter.drawRect(89,29,(108*FOAKChance[0])/100,7); - if(FHChance[1] != 0) painter.drawRect(89,42,(108*FHChance[0])/100,7); - if(FLChance[1] != 0) painter.drawRect(89,55,(108*FLChance[0])/100,7); - if(STRChance[1] != 0) painter.drawRect(89,68,(108*STRChance[0])/100,7); - if(TOAKChance[1] != 0) painter.drawRect(89,81,(108*TOAKChance[0])/100,7); - if(TPChance[1] != 0) painter.drawRect(89,94,(108*TPChance[0])/100,7); - if(OPChance[1] != 0) painter.drawRect(89,107,(108*OPChance[0])/100,7); - if(HCChance[1] != 0) painter.drawRect(89,120,(108*HCChance[0])/100,7); + if(RFChance[1] != 0) painter.drawRect(text_width+4,start_y+0*height+3,(bar_width*RFChance[0])/100,bar_height); + if(SFChance[1] != 0) painter.drawRect(text_width+4,start_y+1*height+3,(bar_width*SFChance[0])/100,bar_height); + if(FOAKChance[1] != 0) painter.drawRect(text_width+4,start_y+2*height+3,(bar_width*FOAKChance[0])/100,bar_height); + if(FHChance[1] != 0) painter.drawRect(text_width+4,start_y+3*height+3,(bar_width*FHChance[0])/100,bar_height); + if(FLChance[1] != 0) painter.drawRect(text_width+4,start_y+4*height+3,(bar_width*FLChance[0])/100,bar_height); + if(STRChance[1] != 0) painter.drawRect(text_width+4,start_y+5*height+3,(bar_width*STRChance[0])/100,bar_height); + if(TOAKChance[1] != 0) painter.drawRect(text_width+4,start_y+6*height+3,(bar_width*TOAKChance[0])/100,bar_height); + if(TPChance[1] != 0) painter.drawRect(text_width+4,start_y+7*height+3,(bar_width*TPChance[0])/100,bar_height); + if(OPChance[1] != 0) painter.drawRect(text_width+4,start_y+8*height+3,(bar_width*OPChance[0])/100,bar_height); + if(HCChance[1] != 0) painter.drawRect(text_width+4,start_y+9*height+3,(bar_width*HCChance[0])/100,bar_height); } diff --git a/src/gui/qt/gametable/myslider.h b/src/gui/qt/gametable/myslider.h index 25195f0f..354a4787 100644 --- a/src/gui/qt/gametable/myslider.h +++ b/src/gui/qt/gametable/myslider.h @@ -15,6 +15,9 @@ * You should have received a copy of the GNU Affero General Public License * * along with this program. If not, see . * *****************************************************************************/ +#ifndef MYSLIDER_H +#define MYSLIDER_H + #include /* * This QSlider Extension was sponsored by: AZEVEDO Filipe aka Nox P@sNox @@ -100,3 +103,6 @@ protected: QSlider::mousePressEvent( ev ); // should not be needed but as we can't update private d pointer it's needed. } }; + +#endif + diff --git a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui index 1c08b5df..ebb95b16 100755 --- a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui +++ b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui @@ -76,23 +76,21 @@ - QLabel {font-size: 18px} + QObject {font-size: 18px} <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans Serif'; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">- Poker engine for the popular &quot;Texas Hold'em&quot; Poker</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">- Singleplayer games with up to 9 computer-opponents</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">- Multiplayer network games<br />- Internet online games<br />- Changeable gui with online style gallery<br />- </span><a href="http://online-ranking.pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0057ae;">Online ranking website</span></a><span style=" font-size:8pt;"> with result tables</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">© 2006-2011, Felix Hammer, Florian Thauer, Lothar May</span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">- Poker engine for the popular &quot;Texas Hold'em&quot; Poker</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">- Singleplayer games with up to 9 computer-opponents</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">- Multiplayer network games<br />- Internet online games<br />- Changeable gui with online style gallery<br />- </span><a href="http://online-ranking.pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; text-decoration: underline; color:#0057ae;">Online ranking website</span></a><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> with result tables</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L'; font-size:14pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">© 2006-2011, Felix Hammer, Florian Thauer, Lothar May</span></p></td></tr></table></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -170,21 +168,19 @@ p, li { white-space: pre-wrap; } <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">Project page: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> </span><a href="http://www.pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">http://www.pokerth.net</span></a></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L'; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">IRC: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> #pokerth (irc.freenode.net)</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L'; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">Authors: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> Felix Hammer (</span><a href="mailto:doitux@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">doitux@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - initial idea, basic architecture, gui implementation, gui graphics editing, linux package</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> Florian Thauer (</span><a href="mailto:floty@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">floty@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - initial idea, basic architecture, engine development</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> Lothar May (</span><a href="mailto:lotodore@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">lotodore@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - basic architecture, network development, windows package, MacOS package</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> Oskar Lindqvist (</span><a href="mailto:tranberry@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; text-decoration: underline; color:#0000ff;">tranberry@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - initial gui graphics design</span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">Project page: </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> </span><a href="http://www.pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; text-decoration: underline; color:#0000ff;">http://www.pokerth.net</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">IRC: </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> #pokerth (irc.freenode.net)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">Authors: </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> Felix Hammer (</span><a href="mailto:doitux@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; text-decoration: underline; color:#0000ff;">doitux@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - initial idea, basic architecture, gui implementation, gui graphics editing, linux package</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> Florian Thauer (</span><a href="mailto:floty@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; text-decoration: underline; color:#0000ff;">floty@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - initial idea, basic architecture, engine development</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> Lothar May (</span><a href="mailto:lotodore@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; text-decoration: underline; color:#0000ff;">lotodore@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - basic architecture, network development, windows package, MacOS package</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> Oskar Lindqvist (</span><a href="mailto:tranberry@pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; text-decoration: underline; color:#0000ff;">tranberry@pokerth.net</span></a><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - initial gui graphics design</span></p></td></tr></table></body></html> true @@ -214,7 +210,8 @@ p, li { white-space: pre-wrap; } <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">translator name - mail address</span></p></td></tr></table></body></html> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html> true @@ -244,26 +241,26 @@ p, li { white-space: pre-wrap; } <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;"> - </span><span style=" font-family:'Nimbus Sans L'; font-size:8pt;">for different popular avatar picture resources</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for people avatar pictures</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">ZeiZei</span><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for &quot;misc&quot; avatar pictures</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for different gpl licensed sounds</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">doc_dos</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for self recorded chip sounds</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">thiger, dunkanx, BerndA, coldz</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for different patches</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">kraut</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for internet-game-server hosting and administration</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">danuxi</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for startwindow background gfx and danuxi1 table background</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">heyn</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for moderating forum and organise bugtracker and feature requests</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:600;">texas_outlaw</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:8pt;"> - for new table sounds</span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;"> - </span><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">for different popular avatar picture resources</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for people avatar pictures</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">ZeiZei</span><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for &quot;misc&quot; avatar pictures</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for different gpl licensed sounds</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">doc_dos</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for self recorded chip sounds</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">thiger, dunkanx, BerndA, coldz</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for different patches</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">kraut</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for internet-game-server hosting and administration</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">danuxi</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for startwindow background gfx and danuxi1 table background</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">heyn</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for moderating forum and organise bugtracker and feature requests</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; font-weight:600;">texas_outlaw</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> - for new table sounds</span></p></td></tr></table></body></html> true diff --git a/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui b/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui index 51695244..e6ff25b2 100644 --- a/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/changecompleteblindsdialog_800x480.ui @@ -209,14 +209,14 @@ 4 - + QObject {font-size: 16px} - + QObject {font-size: 16px} @@ -239,7 +239,7 @@ - + QObject {font-size: 16px} @@ -249,7 +249,7 @@ - + QObject {font-size: 16px} @@ -367,9 +367,6 @@ radioButton_alwaysDoubleBlinds radioButton_manualBlindsOrder listWidget_blinds - spinBox_input - pushButton_add - pushButton_delete radioButton_afterThisAlwaysDoubleBlinds radioButton_afterThisAlwaysRaiseAbout spinBox_afterThisAlwaysRaiseValue diff --git a/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui b/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui index 8b2701a6..baf92fd3 100644 --- a/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/createnetworkgamedialog_800x480.ui @@ -7,19 +7,19 @@ 0 0 800 - 350 + 400 800 - 350 + 400 800 - 350 + 400 diff --git a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui index 45f5432c..0d3d7c7e 100644 --- a/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui +++ b/src/gui/qt/gui_800x480/gamelobbydialog_800x480.ui @@ -6,720 +6,42 @@ 0 0 - 875 - 570 + 800 + 382 - 875 - 570 + 800 + 380 + + + + + 800 + 382 Internet Game Lobby + + + - - 7 - - - 4 - - 5 + 0 - - - - - 0 - 0 - - - - - 165 - 0 - - - - - 165 - 16777215 - - - - search for player ... - - - - - - - - 0 - No game list filter - - - - - 1 - Show open games - - - - - 2 - Show open & non-full games - - - - - 3 - Show open & non-full & non-private games - - - - - 4 - Show open & non-full & private games - - - - - 5 - Show open & non-full & ranking games - - - - - - - - false - - - - 0 - 0 - - - - - 270 - 0 - - - - - 270 - 16777215 - - - - Game Info - - - - 3 - - - 7 - - - 2 - - - 7 - - - 6 - - - - - - 221 - 237 - - - - Qt::CustomContextMenu - - - 1 - - - - 25 - 26 - - - - 15 - - - - Connected Players - - - - - - - - - 252 - 174 - - - - true - - - - - 0 - 0 - 248 - 178 - - - - - -1 - - - 2 - - - 4 - - - - - Game type: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - true - - - - - - - - - - 16 - 16 - - - - - 16 - 16777215 - - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - - - Start Cash: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - true - - - - - - - QLabel { color:rgb(0, 0, 255); } - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - First small blind: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - true - - - - - - - QLabel { color:rgb(0, 0, 255); } - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - Blinds raise interval: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - true - - - - - - - QLabel { color:rgb(0, 0, 255); } - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - Blinds raise mode: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - true - - - - - - - QLabel { color:rgb(0, 0, 255); } - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - Manual blinds list: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - true - - - - - - - QLabel { color:rgb(0, 0, 255); } - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - Timeout for player action (sec): - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - true - - - - - - - QLabel { color:rgb(0, 0, 255); } - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - - - - - - - - 0 - 0 - - - - Fill up with computer opponents - - - - :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 21 - - - - - - - - - - 3 - - - 0 - - - 0 - - - - - false - - - - 0 - 0 - - - - - 0 - 24 - - - - - 16777215 - 24 - - - - &Start Game - - - - :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 24 - - - - - - - - - 0 - 0 - - - - - 0 - 24 - - - - - 16777215 - 24 - - - - &Kick Player - - - - :/gfx/list-remove.png:/gfx/list-remove.png - - - - - - - - - 0 - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 24 - - - - - - - - - 0 - 0 - - - - - 0 - 24 - - - - - 16777215 - 24 - - - - &Leave Game - - - - :/gfx/go-previous-view.png:/gfx/go-previous-view.png - - - - - - - - - - - - - 400 - 0 - - - - Qt::ScrollBarAlwaysOff - - - QAbstractItemView::NoEditTriggers - - - false - - - 5 - - - false - - - true - - - - - - - 6 - - - 0 - - - - - Join &any game - - - - :/gfx/transform-rotate.png:/gfx/transform-rotate.png - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 181 - 20 - - - - - - - - &Create Game - - - - :/gfx/list_add.png:/gfx/list_add.png - - - - - - - &Join Game - - - - :/gfx/go-next-view.png:/gfx/go-next-view.png - - - - - - - - - - 400 - 223 - - - - - 16777215 - 230 - - - - Lobby-Chat - - - - 7 - - - 2 - - - 7 - - - 7 - - - 0 - - - - - - - - - - - + + 0 + + + + QObject {font: 12px} + @@ -727,6 +49,9 @@ + + QObject {font: 12px} + @@ -740,29 +65,19 @@ 0 + + QObject {font: 12px} + - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - + + QObject {font: 12px} + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -796,6 +111,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 12px} + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -810,81 +128,1017 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - + + - 165 - 0 + 800 + 360 - 165 - 16777215 + 800 + 360 - - Qt::CustomContextMenu + + QObject {font: bold 18px} - - QAbstractItemView::NoEditTriggers + + 0 - - false - - - true - - - - - - - - Sort alphabetically + + + - - - - Sort by country - - - - - Display idle players - - + + Games + + + + 0 + + + 0 + + + + + + + 0 + + + + + 0 + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 24 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 310 + 24 + + + + + 300 + 24 + + + + QObject {font: bold 16px} + + + &Leave Game + + + + :/gfx/go-previous-view.png:/gfx/go-previous-view.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 3 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + + 0 + 0 + + + + + 150 + 24 + + + + + 150 + 24 + + + + QObject {font: bold 16px} + + + &Start Game + + + + :/gfx/dialog_ok_apply.png:/gfx/dialog_ok_apply.png + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 24 + + + + + + + + + 0 + 0 + + + + + 150 + 24 + + + + + 150 + 24 + + + + QObject {font: bold 16px} + + + &Kick Player + + + + :/gfx/list-remove.png:/gfx/list-remove.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QObject {font: 14px} + + + + 0 - No game list filter + + + + + 1 - Show open games + + + + + 2 - Show open & non-full games + + + + + 3 - Show open & non-full & non-private games + + + + + 4 - Show open & non-full & private games + + + + + 5 - Show open & non-full & ranking games + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + Qt::ScrollBarAlwaysOff + + + QAbstractItemView::NoEditTriggers + + + false + + + 5 + + + false + + + true + + + + + + + 6 + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QObject {font: bold 14px} + + + Join &any game + + + + :/gfx/transform-rotate.png:/gfx/transform-rotate.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QObject {font: bold 14px} + + + &Create Game + + + + :/gfx/list_add.png:/gfx/list_add.png + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QObject {font: bold 14px} + + + &Join Game + + + + :/gfx/go-next-view.png:/gfx/go-next-view.png + + + + + + + + + + + false + + + + 0 + 0 + + + + + 300 + 0 + + + + + 300 + 16777215 + + + + QObject {font: bold 16px} + + + Game Info + + + + 0 + + + 0 + + + + + + 221 + 0 + + + + Qt::CustomContextMenu + + + QObject {font: 14px} + + + 1 + + + + 25 + 26 + + + + 15 + + + + Connected Players + + + + + + + + + 252 + 190 + + + + + 16777215 + 190 + + + + QObject {font: 14px} + + + true + + + + + 0 + 0 + 288 + 184 + + + + + -1 + + + 2 + + + 4 + + + + + + + + Game type: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + true + + + + + + + + + + 16 + 16 + + + + + 16 + 16777215 + + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + + + + Start Cash: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + true + + + + + + + QLabel { color:rgb(0, 0, 255); } + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + + First small blind: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + true + + + + + + + QLabel { color:rgb(0, 0, 255); } + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + + Blinds raise interval: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + true + + + + + + + QLabel { color:rgb(0, 0, 255); } + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + + Blinds raise mode: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + true + + + + + + + QLabel { color:rgb(0, 0, 255); } + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + + Manual blinds list: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + true + + + + + + + QLabel { color:rgb(0, 0, 255); } + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + + Timeout for player action (sec): + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + true + + + + + + + QLabel { color:rgb(0, 0, 255); } + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + + + + + + 0 + 0 + + + + QObject {font: 14px} + + + Fill up with computer opponents + + + + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png + + + + + + + + + + + + + + + Lobby-Chat + + + + 0 + + + 0 + + + + + + + + + + 0 + 0 + + + + + 230 + 0 + + + + + 230 + 16777215 + + + + QObject {font: 14 px} + + + search for player ... + + + + + + + + 0 + 0 + + + + + 230 + 0 + + + + + 230 + 16777215 + + + + Qt::CustomContextMenu + + + QObject {font: 14 px} + + + QAbstractItemView::NoEditTriggers + + + false + + + true + + + + + + + + 230 + 0 + + + + + 230 + 16777215 + + + + QObject {font: 14 px} + + + + Sort alphabetically + + + + + Sort by country + + + + + Display idle players + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QObject {font: bold 16px} + + + + + + + 7 + + + 2 + + + 7 + + + 7 + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QObject {color:rgb(255, 255, 255); font: 14px} + + + + + + + QObject {font: 14 px} + + + + + + + + + + - lineEdit_searchForPlayers - treeView_NickList - comboBox_nickListFilter - comboBox_gameListFilter - treeView_GameList pushButton_joinAnyGame pushButton_CreateGame pushButton_JoinGame textBrowser_ChatDisplay lineEdit_ChatInput treeWidget_connectedPlayers - scrollArea_gameInfos checkBox_fillUpWithComputerOpponents pushButton_StartGame pushButton_Kick pushButton_Leave - + diff --git a/src/gui/qt/gui_800x480/gametable_800x480.ui b/src/gui/qt/gui_800x480/gametable_800x480.ui index 6fac1a19..826cb75d 100644 --- a/src/gui/qt/gui_800x480/gametable_800x480.ui +++ b/src/gui/qt/gui_800x480/gametable_800x480.ui @@ -6,20 +6,20 @@ 0 0 - 1024 - 600 + 800 + 480 - 1024 - 600 + 800 + 424 - 1920 - 1280 + 800 + 480 @@ -32,27 +32,94 @@ QStatusbar { height:0px; } + + + 800 + 424 + + + + + 800 + 480 + + - - 2 - - + 0 - - 2 - - - 3 - 0 - + 0 + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 60 + 19 + + + + + 60 + 19 + + + + QObject {font: bold 20px} + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 19 + + + + + 60 + 19 + + + + QObject {font: bold 20px} + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + @@ -70,14 +137,14 @@ - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -86,8 +153,8 @@ - 13 - 13 + 12 + 25 50 50 @@ -111,22 +178,22 @@ - 70 - 11 - 104 - 14 + 12 + 6 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -139,69 +206,72 @@ - 70 - 119 - 104 - 14 + 60 + 104 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 25 - 104 - 14 + 50 + 20 + 86 + 9 - 35 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 88 - 40 - 42 + 21 + 86 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -214,12 +284,24 @@ - 86 - 39 - 48 - 76 + 68 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -227,12 +309,24 @@ - 110 - 39 - 48 - 76 + 90 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -240,16 +334,22 @@ - 67 - 56 - 111 + 52 + 46 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -263,11 +363,23 @@ 12 - 75 - 52 - 10 + 77 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -275,8 +387,8 @@ - 70 - 50 + 12 + 25 16 17 @@ -293,59 +405,59 @@ p, li { white-space: pre-wrap; } 33 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 62 + 70 12 12 @@ -373,14 +485,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -389,8 +501,8 @@ p, li { white-space: pre-wrap; } - 13 - 79 + 12 + 46 50 50 @@ -414,22 +526,22 @@ p, li { white-space: pre-wrap; } - 70 - 117 - 104 - 14 + 12 + 100 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -442,69 +554,72 @@ p, li { white-space: pre-wrap; } - 70 + 60 10 - 104 - 14 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 104 - 104 - 14 + 50 + 92 + 86 + 9 - 35 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 16 - 40 - 42 + 21 + 7 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -517,12 +632,24 @@ p, li { white-space: pre-wrap; } - 86 - 26 - 48 - 76 + 68 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -530,12 +657,24 @@ p, li { white-space: pre-wrap; } - 110 - 26 - 48 - 76 + 90 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -543,16 +682,22 @@ p, li { white-space: pre-wrap; } - 67 - 43 - 111 + 52 + 35 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -566,11 +711,23 @@ p, li { white-space: pre-wrap; } 12 - 57 - 52 - 10 + 37 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -578,8 +735,8 @@ p, li { white-space: pre-wrap; } - 70 - 79 + 12 + 46 16 17 @@ -596,65 +753,65 @@ p, li { white-space: pre-wrap; } 13 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 33 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> @@ -683,14 +840,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -699,8 +856,8 @@ p, li { white-space: pre-wrap; } - 13 - 13 + 12 + 25 50 50 @@ -724,22 +881,22 @@ p, li { white-space: pre-wrap; } - 70 - 11 - 104 - 14 + 12 + 6 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -755,69 +912,72 @@ p, li { white-space: pre-wrap; } - 70 - 119 - 104 - 14 + 60 + 104 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 25 - 104 - 14 + 50 + 20 + 86 + 9 - 35 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 88 - 40 - 42 + 21 + 86 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -830,12 +990,24 @@ p, li { white-space: pre-wrap; } - 86 - 39 - 48 - 76 + 68 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -843,12 +1015,24 @@ p, li { white-space: pre-wrap; } - 110 - 39 - 48 - 76 + 90 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -856,16 +1040,22 @@ p, li { white-space: pre-wrap; } - 67 - 56 - 111 + 52 + 46 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -879,11 +1069,23 @@ p, li { white-space: pre-wrap; } 12 - 75 - 52 - 10 + 77 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -891,8 +1093,8 @@ p, li { white-space: pre-wrap; } - 70 - 50 + 12 + 25 16 17 @@ -909,65 +1111,65 @@ p, li { white-space: pre-wrap; } 33 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> @@ -976,14 +1178,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -992,8 +1194,8 @@ p, li { white-space: pre-wrap; } - 13 - 13 + 12 + 25 50 50 @@ -1017,22 +1219,22 @@ p, li { white-space: pre-wrap; } - 70 - 11 - 104 - 14 + 12 + 6 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -1045,69 +1247,72 @@ p, li { white-space: pre-wrap; } - 70 - 119 - 104 - 14 + 60 + 104 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 25 - 104 - 14 + 50 + 20 + 86 + 9 - 35 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 88 - 40 - 42 + 21 + 86 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -1120,12 +1325,24 @@ p, li { white-space: pre-wrap; } - 86 - 39 - 48 - 76 + 68 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -1133,12 +1350,24 @@ p, li { white-space: pre-wrap; } - 110 - 39 - 48 - 76 + 90 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -1146,16 +1375,22 @@ p, li { white-space: pre-wrap; } - 67 - 56 - 111 + 52 + 46 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -1169,11 +1404,23 @@ p, li { white-space: pre-wrap; } 12 - 75 - 52 - 10 + 77 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -1181,8 +1428,8 @@ p, li { white-space: pre-wrap; } - 70 - 50 + 12 + 25 16 17 @@ -1199,65 +1446,65 @@ p, li { white-space: pre-wrap; } 33 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> @@ -1266,14 +1513,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -1282,8 +1529,8 @@ p, li { white-space: pre-wrap; } - 13 - 13 + 12 + 25 50 50 @@ -1307,22 +1554,22 @@ p, li { white-space: pre-wrap; } - 70 - 11 - 104 - 14 + 12 + 6 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -1335,69 +1582,72 @@ p, li { white-space: pre-wrap; } - 70 - 119 - 104 - 14 + 60 + 104 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 25 - 104 - 14 + 50 + 20 + 86 + 9 - 35 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 88 - 40 - 42 + 21 + 86 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -1410,12 +1660,24 @@ p, li { white-space: pre-wrap; } - 86 - 39 - 48 - 76 + 68 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -1423,12 +1685,24 @@ p, li { white-space: pre-wrap; } - 110 - 39 - 48 - 76 + 90 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -1436,16 +1710,22 @@ p, li { white-space: pre-wrap; } - 67 - 56 - 111 + 52 + 46 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -1459,11 +1739,23 @@ p, li { white-space: pre-wrap; } 12 - 75 - 52 - 10 + 77 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -1471,8 +1763,8 @@ p, li { white-space: pre-wrap; } - 70 - 50 + 12 + 25 16 17 @@ -1489,76 +1781,140 @@ p, li { white-space: pre-wrap; } 33 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> - + 0 + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 60 + 19 + + + + + 60 + 19 + + + + QLabel {font: bold 20px} + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 19 + + + + + 60 + 19 + + + + QLabel {font: bold 20px} + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + @@ -1576,14 +1932,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -1592,8 +1948,8 @@ p, li { white-space: pre-wrap; } - 13 - 13 + 12 + 25 50 50 @@ -1617,22 +1973,22 @@ p, li { white-space: pre-wrap; } - 70 - 11 - 104 - 14 + 12 + 6 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -1645,69 +2001,72 @@ p, li { white-space: pre-wrap; } - 70 - 119 - 104 - 14 + 60 + 104 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 25 - 104 - 14 + 50 + 20 + 86 + 9 - 35 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 88 - 40 - 42 + 21 + 86 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -1720,12 +2079,24 @@ p, li { white-space: pre-wrap; } - 86 - 39 - 48 - 76 + 68 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -1733,12 +2104,24 @@ p, li { white-space: pre-wrap; } - 110 - 39 - 48 - 76 + 90 + 30 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -1746,16 +2129,22 @@ p, li { white-space: pre-wrap; } - 67 - 56 - 111 + 52 + 46 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -1769,11 +2158,23 @@ p, li { white-space: pre-wrap; } 12 - 75 - 52 - 10 + 77 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -1781,8 +2182,8 @@ p, li { white-space: pre-wrap; } - 70 - 50 + 12 + 25 16 17 @@ -1799,65 +2200,65 @@ p, li { white-space: pre-wrap; } 33 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 62 + 70 12 12 - <a>&#9734;</a> + <a>&#9734;</a> @@ -1879,14 +2280,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -1895,8 +2296,8 @@ p, li { white-space: pre-wrap; } - 13 - 79 + 12 + 46 50 50 @@ -1920,22 +2321,22 @@ p, li { white-space: pre-wrap; } - 70 - 117 - 104 - 14 + 12 + 100 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -1948,69 +2349,72 @@ p, li { white-space: pre-wrap; } - 70 + 60 10 - 104 - 14 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 104 - 104 - 12 + 50 + 92 + 86 + 9 - 35 - 12 + 86 + 9 - 16777215 - 12 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 16 - 40 - 42 + 21 + 7 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -2023,12 +2427,24 @@ p, li { white-space: pre-wrap; } - 86 - 26 - 48 - 76 + 68 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -2036,12 +2452,24 @@ p, li { white-space: pre-wrap; } - 110 - 26 - 48 - 76 + 90 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -2049,16 +2477,22 @@ p, li { white-space: pre-wrap; } - 67 - 43 - 111 + 52 + 35 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -2072,11 +2506,23 @@ p, li { white-space: pre-wrap; } 12 - 57 - 52 - 10 + 37 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -2084,8 +2530,8 @@ p, li { white-space: pre-wrap; } - 70 - 79 + 12 + 46 16 17 @@ -2102,65 +2548,65 @@ p, li { white-space: pre-wrap; } 33 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> @@ -2198,19 +2644,6 @@ p, li { white-space: pre-wrap; } 0 - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -2221,14 +2654,14 @@ p, li { white-space: pre-wrap; } - 600 - 94 + 390 + 100 - 600 - 94 + 390 + 100 @@ -2241,142 +2674,41 @@ p, li { white-space: pre-wrap; } 0 - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 3 - 91 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 3 - 91 - - - - - - - - 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 - - - - - - - - - + - 285 - 0 + 390 + 100 + + + + + 390 + 100 - 230 - 10 - 48 - 76 + 326 + 1 + 62 + 98 + + + 62 + 98 + + + + + 62 + 98 + + true @@ -2384,12 +2716,24 @@ p, li { white-space: pre-wrap; } - 65 - 10 - 48 - 76 + 83 + 1 + 62 + 98 + + + 62 + 98 + + + + + 62 + 98 + + true @@ -2397,12 +2741,24 @@ p, li { white-space: pre-wrap; } - 62 - 7 - 54 - 82 + 81 + 0 + 66 + 100 + + + 66 + 100 + + + + + 66 + 100 + + true @@ -2410,12 +2766,24 @@ p, li { white-space: pre-wrap; } - 7 - 7 - 54 - 82 + 0 + 0 + 66 + 100 + + + 66 + 100 + + + + + 66 + 100 + + true @@ -2423,12 +2791,24 @@ p, li { white-space: pre-wrap; } - 10 - 10 - 48 - 76 + 2 + 1 + 62 + 98 + + + 62 + 98 + + + + + 62 + 98 + + true @@ -2436,12 +2816,24 @@ p, li { white-space: pre-wrap; } - 227 - 7 - 54 - 82 + 324 + 0 + 66 + 100 + + + 66 + 100 + + + + + 66 + 100 + + true @@ -2449,12 +2841,24 @@ p, li { white-space: pre-wrap; } - 117 - 7 - 54 - 82 + 162 + 0 + 66 + 100 + + + 66 + 100 + + + + + 66 + 100 + + true @@ -2462,12 +2866,24 @@ p, li { white-space: pre-wrap; } - 120 - 10 - 48 - 76 + 164 + 1 + 62 + 98 + + + 62 + 98 + + + + + 62 + 98 + + true @@ -2475,12 +2891,24 @@ p, li { white-space: pre-wrap; } - 172 - 7 - 54 - 82 + 243 + 0 + 66 + 100 + + + 66 + 100 + + + + + 66 + 100 + + true @@ -2488,125 +2916,91 @@ p, li { white-space: pre-wrap; } - 175 - 10 - 48 - 76 + 245 + 1 + 62 + 98 + + + 62 + 98 + + + + + 62 + 98 + + true - - - - - 0 - - - 0 - - - 8 - - - 0 - - - 8 - - - - - 0 - - - - - - 144 - 0 - - - - - - - Qt::AlignCenter - - - - - - - Qt::Horizontal - - - - 17 - 17 - - - - - - - - - - 3 - - - 2 - - - 0 - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 90 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - + + + + + + -1 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 50 + 14 + + + + + 50 + 14 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 100 + 21 + + + + + 100 + 21 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -2620,9 +3014,92 @@ p, li { white-space: pre-wrap; } + + + + + 120 + 21 + + + + + 120 + 21 + + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 50 + 14 + + + + + 50 + 14 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 100 + 21 + + + + + 100 + 21 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - + Qt::Vertical @@ -2635,7 +3112,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -2644,14 +3121,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -2660,8 +3137,8 @@ p, li { white-space: pre-wrap; } - 13 - 79 + 12 + 46 50 50 @@ -2685,22 +3162,22 @@ p, li { white-space: pre-wrap; } - 70 - 117 - 104 - 14 + 12 + 100 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -2713,69 +3190,72 @@ p, li { white-space: pre-wrap; } - 70 + 60 10 - 104 - 14 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 104 - 104 - 14 + 50 + 92 + 86 + 9 - 35 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 16 - 40 - 42 + 21 + 7 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -2788,12 +3268,24 @@ p, li { white-space: pre-wrap; } - 86 - 26 - 48 - 76 + 68 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -2801,12 +3293,24 @@ p, li { white-space: pre-wrap; } - 110 - 26 - 48 - 76 + 90 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -2814,16 +3318,22 @@ p, li { white-space: pre-wrap; } - 67 - 43 - 111 + 52 + 35 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -2837,11 +3347,23 @@ p, li { white-space: pre-wrap; } 12 - 57 - 52 - 10 + 37 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -2849,8 +3371,8 @@ p, li { white-space: pre-wrap; } - 70 - 79 + 12 + 46 16 17 @@ -2867,65 +3389,65 @@ p, li { white-space: pre-wrap; } 33 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> @@ -2934,14 +3456,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -2950,8 +3472,8 @@ p, li { white-space: pre-wrap; } - 13 - 79 + 12 + 46 50 50 @@ -2975,22 +3497,22 @@ p, li { white-space: pre-wrap; } - 70 - 117 - 104 - 14 + 12 + 100 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -3003,69 +3525,75 @@ p, li { white-space: pre-wrap; } - 70 + 60 10 - 104 - 14 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 104 - 104 - 12 + 50 + 92 + 86 + 9 - 35 - 12 + 86 + 9 - 16777215 - 12 + 86 + 9 + + Qt::LeftToRight + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 16 - 40 - 42 + 21 + 7 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -3078,12 +3606,24 @@ p, li { white-space: pre-wrap; } - 86 - 26 - 48 - 76 + 68 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -3091,12 +3631,24 @@ p, li { white-space: pre-wrap; } - 110 - 26 - 48 - 76 + 90 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -3104,16 +3656,22 @@ p, li { white-space: pre-wrap; } - 67 - 43 - 111 + 52 + 35 + 100 40 - 0 - 20 + 100 + 40 + + + + + 100 + 40 @@ -3127,11 +3685,23 @@ p, li { white-space: pre-wrap; } 12 - 64 - 52 - 10 + 37 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -3139,12 +3709,24 @@ p, li { white-space: pre-wrap; } - 72 - 72 - 100 + 61 + 42 + 80 25 + + + 80 + 25 + + + + + 80 + 25 + + Show! @@ -3152,8 +3734,8 @@ p, li { white-space: pre-wrap; } - 70 - 79 + 12 + 46 16 17 @@ -3170,65 +3752,65 @@ p, li { white-space: pre-wrap; } 33 - 67 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 67 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 67 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 67 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 67 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> @@ -3237,14 +3819,14 @@ p, li { white-space: pre-wrap; } - 190 - 142 + 150 + 120 - 190 - 142 + 150 + 120 @@ -3253,8 +3835,8 @@ p, li { white-space: pre-wrap; } - 13 - 79 + 12 + 46 50 50 @@ -3278,22 +3860,22 @@ p, li { white-space: pre-wrap; } - 70 - 117 - 104 - 14 + 12 + 100 + 136 + 15 - 0 - 14 + 136 + 15 - 16777215 - 14 + 136 + 15 @@ -3306,69 +3888,72 @@ p, li { white-space: pre-wrap; } - 70 + 60 10 - 104 - 14 + 86 + 9 - 0 - 14 + 86 + 9 - 16777215 - 14 + 86 + 9 - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter - 70 - 104 - 104 - 12 + 50 + 92 + 86 + 9 - 35 - 12 + 86 + 9 - 16777215 - 12 + 86 + 9 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 18 - 16 - 40 - 42 + 21 + 7 + 28 + 28 - 40 - 42 + 28 + 28 - 40 - 42 + 28 + 28 @@ -3381,12 +3966,24 @@ p, li { white-space: pre-wrap; } - 86 - 26 - 48 - 76 + 68 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -3394,12 +3991,24 @@ p, li { white-space: pre-wrap; } - 110 - 26 - 48 - 76 + 90 + 19 + 46 + 72 + + + 46 + 72 + + + + + 46 + 72 + + true @@ -3407,16 +4016,22 @@ p, li { white-space: pre-wrap; } - 67 - 43 - 111 + 52 + 35 + 100 40 - 0 - 20 + 1 + 40 + + + + + 100 + 40 @@ -3430,11 +4045,23 @@ p, li { white-space: pre-wrap; } 12 - 57 - 52 - 10 + 37 + 50 + 7 + + + 50 + 7 + + + + + 50 + 7 + + @@ -3442,8 +4069,8 @@ p, li { white-space: pre-wrap; } - 70 - 79 + 12 + 46 16 17 @@ -3460,381 +4087,76 @@ p, li { white-space: pre-wrap; } 33 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 23 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 53 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 43 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> 13 - 65 + 36 12 12 - <a>&#9734;</a> + <a>&#9734;</a> - + - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 260 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 0 - - - - - - - - - 260 - 188 - - - - - 260 - 188 - - - - - 4 - - - - - Qt::NoFocus - - - 3 - - - - Hands - - - - 0 - - - 0 - - - - - Qt::AlignCenter - - - - - - - - Chat - - - - 0 - - - 0 - - - - - Qt::NoFocus - - - true - - - Qt::ScrollBarAlwaysOff - - - - - - - - - - - Kick - - - - 0 - - - 6 - - - 5 - - - - - 0 - - - - - 5 - - - - - Vote started by: - - - - - - - - 0 - 0 - - - - - - - - - - - - - 5 - - - - - Vote Timeout: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - 80 - 20 - - - - Yes - - - - - - - - 80 - 20 - - - - No - - - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 27 - - - - - - - - - Player info - - - - 3 - - - 6 - - - - - Qt::ClickFocus - - - - - - - Qt::NoFocus - - - Save - - - - - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 155 - 0 - - - - + + 0 + @@ -3848,14 +4170,14 @@ p, li { white-space: pre-wrap; } - 168 - 188 + 800 + 60 - 168 - 188 + 800 + 60 @@ -3864,84 +4186,171 @@ p, li { white-space: pre-wrap; } - - - 0 - - - 1 - + 0 - - + + 0 + + + + + Qt::Horizontal + + + + 22 + 57 + + + + + + 0 - - - - - 73 - 0 - + + + + 0 - - QAbstractSpinBox::NoButtons - - - true - - - QAbstractSpinBox::CorrectToNearestValue - - - 99999999 - - - 5 - - + + + + + 80 + 25 + + + + + 80 + 25 + + + + Qt::NoFocus + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + true + + + QAbstractSpinBox::CorrectToNearestValue + + + 99999999 + + + 5 + + + + - - + + - 95 - 25 + 220 + 0 - 95 - 25 + 220 + 16777215 Qt::NoFocus + + 9999999 + + + 10 + + + Qt::Horizontal + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - - Qt::NoFocus - - - 9999999 - - - 10 - - - Qt::Horizontal - - - - + @@ -3951,13 +4360,13 @@ p, li { white-space: pre-wrap; } - 168 + 120 43 - 168 + 120 43 @@ -3966,7 +4375,7 @@ p, li { white-space: pre-wrap; } - + @@ -3976,13 +4385,13 @@ p, li { white-space: pre-wrap; } - 168 + 120 43 - 168 + 120 43 @@ -3991,7 +4400,7 @@ p, li { white-space: pre-wrap; } - + @@ -4001,13 +4410,13 @@ p, li { white-space: pre-wrap; } - 168 + 120 43 - 168 + 120 43 @@ -4016,28 +4425,168 @@ p, li { white-space: pre-wrap; } + + + + 0 + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 50 + 50 + + + + + 50 + 50 + + + + Fullscreen + + + + + + + :/gfx/view-fullscreen_50x50.png:/gfx/view-fullscreen_50x50.png + + + + 50 + 50 + + + + + + - + + + 0 + + + + + Qt::Vertical + + + + 47 + 13 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 50 + 50 + + + + + 50 + 50 + + + + + + + + :/gfx/preferences-desktop_50x50.png:/gfx/preferences-desktop_50x50.png + + + + 50 + 50 + + + + + + + + - Qt::Vertical + Qt::Horizontal - 20 - 0 + 40 + 20 - - + + - Qt::Vertical + Qt::Horizontal - 20 - 0 + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 @@ -4045,413 +4594,21 @@ p, li { white-space: pre-wrap; } - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 155 - 0 - - - - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 260 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 0 - - - - - - - - - 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 - - - - - - - - - Chance - - - - 1 - - - 0 - - - 1 - - - 1 - - - 0 - - - - - - - - - - - - - - - - 6 - - - 0 - - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 128 - 128 - 128 - - - - - - - 199 - 199 - 199 - - - - - - - - Speed: - - - - - - - - 18 - 0 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 128 - 128 - 128 - - - - - - - 199 - 199 - 199 - - - - - - - - - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - 1 - - - 11 - - - 1 - - - Qt::Horizontal - - - - - - - true - - - - 40 - 20 - - - - Qt::NoFocus - - - Shortcut: <Shift> - - - - - - - - - - + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -4459,29 +4616,28 @@ p, li { white-space: pre-wrap; } 0 0 - 1024 - 26 + 800 + 20 - - - &View - - - - - - - - - + + + 0 + 0 + + + + + 16777215 + 16777215 + + &Settings - @@ -4528,7 +4684,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/view-fullscreen.png:/gfx/view-fullscreen.png @@ -4586,7 +4742,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/systemsettings.png:/gfx/systemsettings.png @@ -4595,7 +4751,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/application_exit.png:/gfx/application_exit.png @@ -4615,23 +4771,16 @@ p, li { white-space: pre-wrap; } + + Slider + QSlider +
myslider.h
+ MySetLabel QLabel
mysetlabel.h
 - - MyLeftTabWidget - QTabWidget -
mylefttabwidget.h
- 1 - - - MyRightTabWidget - QTabWidget -
myrighttabwidget.h
- 1 - MyStatusLabel QLabel @@ -4647,11 +4796,6 @@ p, li { white-space: pre-wrap; } QLabel
myavatarlabel.h
 - - MyChanceLabel - QLabel -
mychancelabel.h
- MyActionButton QPushButton @@ -4672,11 +4816,6 @@ p, li { white-space: pre-wrap; } QLabel
mynamelabel.h
 - - Slider - QSlider -
myslider.h
- MyCashLabel QLabel @@ -4684,24 +4823,7 @@ p, li { white-space: pre-wrap; } - + - - - horizontalSlider_speed - valueChanged(int) - label_speedValue - setNum(int) - - - 886 - 624 - - - 800 - 638 - - - - + diff --git a/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui b/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui index 0c93b085..0f297913 100644 --- a/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui +++ b/src/gui/qt/gui_800x480/internetgamelogindialog_800x480.ui @@ -6,16 +6,31 @@ 0 0 - 292 - 230 + 800 + 300 + + + 800 + 300 + + + + + 800 + 300 + + Internet Game Login - + + + QObject{font: 20px} + Registered user @@ -49,6 +64,9 @@ + + QObject{font: 18px} + Remember password (not recommended) @@ -57,15 +75,38 @@ - + + + QObject{font: 20px} + Login as guest - + + + + + QObject {font: 20px} + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body> +<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://create-gaming-account.pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">Create new user account</span></a></p></td></tr></table></body></html> + + + true + + + @@ -81,36 +122,80 @@ + + QObject {font: bold 20px} + Login - - - - Cancel - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://create-gaming-account.pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">Create new user account</span></a></p></td></tr></table></body></html> + + + + Qt::Horizontal - - true + + + 40 + 20 + - + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + @@ -121,7 +206,6 @@ p, li { white-space: pre-wrap; } checkBox_rememberPassword checkBox_guest pushButton_login - pushButton_cancel @@ -141,21 +225,5 @@ p, li { white-space: pre-wrap; } - - pushButton_cancel - clicked() - internetGameLoginDialog - reject() - - - 244 - 194 - - - 290 - 150 - - - diff --git a/src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui b/src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui index a0739093..a934ea9d 100644 --- a/src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/joinnetworkgamedialog_800x480.ui @@ -6,19 +6,31 @@ 0 0 - 614 - 458 + 800 + 424 + + + 800 + 424 + + + + + 800 + 424 + + Join Network Game - 9 + 1 - 6 + 1 @@ -49,30 +61,29 @@ 0 + + QObject {font: bold 20px} + Connect - - - - Close - - - - Connect to Network Game + + + QObject {font: 20px} + Profile Name: @@ -83,6 +94,9 @@ + + QObject {font: 20px} + myServerProfile1 @@ -94,6 +108,9 @@ + + QObject {font: 20px} + IP Address / Domain Name: @@ -103,10 +120,17 @@ - + + + QObject {font: 20px} + + + + QObject {font: 20px} + Port: @@ -117,6 +141,9 @@ + + QObject {font: 20px} + 80 @@ -140,6 +167,9 @@ + + QObject {font: 20px} + Use IPv6 @@ -147,6 +177,9 @@ + + QObject {font: 20px} + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -183,6 +216,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 20px} + Use SCTP @@ -190,6 +226,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 20px} + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -216,8 +255,11 @@ p, li { white-space: pre-wrap; } - + + + QObject {font: 20px} + Server Profiles @@ -302,6 +344,19 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -317,7 +372,6 @@ p, li { white-space: pre-wrap; } pushButton_save pushButton_delete pushButton_connect - pushButton_close @@ -337,22 +391,6 @@ p, li { white-space: pre-wrap; } - - pushButton_close - clicked() - joinNetworkGameDialog - reject() - - - 548 - 429 - - - 483 - 428 - - - treeWidget itemDoubleClicked(QTreeWidgetItem*,int) diff --git a/src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui b/src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui index 59ea769a..28d9aecf 100644 --- a/src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/manualblindsorderdialog_800x480.ui @@ -6,68 +6,43 @@ 0 0 - 248 - 362 + 800 + 424 + + + 800 + 424 + + + + + 800 + 424 + + Manual Blinds Order + + QObject {font: 20px} + - - - - 4 - - - - - - - - Delete - - - - - - - Qt::Vertical - - - - 20 - 121 - - - - - - - - $ - - - 1 - - - 20000 - - - 5 - - - - - - - Add - - - - - + + + Qt::Vertical + + + + 20 + 40 + + + + + Afterwards: @@ -126,23 +101,76 @@ - + + + QObject {font: bold 20px} + Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Ok + + + + 4 + + + + + + + + Delete + + + + + + + Qt::Vertical + + + + 20 + 121 + + + + + + + + $ + + + 1 + + + 20000 + + + 5 + + + + + + + Add + + + + + listWidget_blinds - pushButton_delete - spinBox_input - pushButton_add radioButton_alwaysDoubleBlinds radioButton_alwaysRaiseAbout spinBox_alwaysRaiseValue diff --git a/src/gui/qt/gui_800x480/mymessagedialog_800x480.ui b/src/gui/qt/gui_800x480/mymessagedialog_800x480.ui index 264cfd40..d56e992e 100644 --- a/src/gui/qt/gui_800x480/mymessagedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/mymessagedialog_800x480.ui @@ -6,19 +6,28 @@ 0 0 - 275 - 118 + 800 + 250 + + + 800 + 250 + + 800 - 600 + 250 Dialog + + QObject {font: 20px} + 9 @@ -67,6 +76,9 @@ + + QObject {font: bold 20px} + Qt::Horizontal diff --git a/src/gui/qt/gui_800x480/newgamedialog_800x480.ui b/src/gui/qt/gui_800x480/newgamedialog_800x480.ui index 2e547bb8..8ef25ff7 100755 --- a/src/gui/qt/gui_800x480/newgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/newgamedialog_800x480.ui @@ -6,18 +6,33 @@ 0 0 - 225 - 271 + 800 + 350 + + + 800 + 350 + + + + + 800 + 350 + + Start Local Game + + QObject {font: 20px} + - + - Local Game Settings + @@ -43,7 +58,7 @@ - + Start Cash: @@ -53,7 +68,7 @@ - + $ @@ -72,7 +87,7 @@ - + Blinds @@ -101,7 +116,7 @@ - + Game Speed: @@ -111,7 +126,7 @@ - + 1 @@ -124,19 +139,100 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - + + + QObject {font: bold 20px} + Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Ok + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui b/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui index dae19753..67ccc6ae 100644 --- a/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui +++ b/src/gui/qt/gui_800x480/selectavatardialog_800x480.ui @@ -1,107 +1,99 @@ - + + selectAvatarDialog - - + + 0 0 - 548 - 500 + 800 + 424 - - + + 0 0 - + - 548 - 500 + 800 + 424 - + - 548 - 500 + 800 + 424 - + Please select an avatar - - - - + + QObject {font: 18px} + + + + + Select an avatar - + true - + true - - - + + + - + People - + Miscellaneous - - + + - - - + + + Load avatar from external file - + true - + false - - + + 9 - - 9 - - - 9 - - - 9 - - + 2 - - 2 - - - - + + + 27 26 - + 27 26 @@ -109,19 +101,22 @@ - - + + - - - + + + + QObject {font: bold 20px} + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Ok @@ -144,11 +139,11 @@ selectAvatarDialog reject() - + 316 488 - + 286 274 @@ -160,11 +155,11 @@ listWidget setEnabled(bool) - + 47 15 - + 273 159 @@ -176,11 +171,11 @@ lineEdit setEnabled(bool) - + 42 395 - + 268 439 @@ -192,11 +187,11 @@ pushButton_OpenAvatarFile setEnabled(bool) - + 273 418 - + 527 440 @@ -208,11 +203,11 @@ comboBox_avatarViewCategorie setEnabled(bool) - + 80 16 - + 87 38 diff --git a/src/gui/qt/gui_800x480/serverlistdialog_800x480.ui b/src/gui/qt/gui_800x480/serverlistdialog_800x480.ui index 47af2ce3..eefb7173 100644 --- a/src/gui/qt/gui_800x480/serverlistdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/serverlistdialog_800x480.ui @@ -6,14 +6,45 @@ 0 0 - 289 - 241 + 800 + 300 + + + 800 + 300 + + + + + 800 + 300 + + Server List + + QObject {font: 20px} + + + + + QObject {font: bold 20px} + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + false + + + @@ -34,19 +65,6 @@ - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - true - - - diff --git a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui index 9dc38be0..25d13554 100644 --- a/src/gui/qt/gui_800x480/settingsdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/settingsdialog_800x480.ui @@ -6,36 +6,51 @@ 0 0 - 785 - 530 + 800 + 424 - 785 - 530 + 800 + 424 + + + + + 800 + 424 Settings + + 0 + + + 0 + - 190 + 200 0 - 190 + 200 16777215 + + QObject { font: 16px } + 32 @@ -53,7 +68,7 @@ Interface - + :/gfx/preferences-desktop.png:/gfx/preferences-desktop.png @@ -62,7 +77,7 @@ Style - + :/gfx/fill-color.png:/gfx/fill-color.png @@ -71,7 +86,7 @@ Sound - + :/gfx/speaker.png:/gfx/speaker.png @@ -80,7 +95,7 @@ Local Game - + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png @@ -89,7 +104,7 @@ Network Game - + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png @@ -98,7 +113,7 @@ Internet Game - + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png @@ -107,7 +122,7 @@ Nicks/Avatars - + :/gfx/system_users.png:/gfx/system_users.png @@ -116,7 +131,7 @@ Log Messages - + :/gfx/utilities-log-viewer.png:/gfx/utilities-log-viewer.png @@ -125,7 +140,7 @@ Factory Settings - + :/gfx/document-revert.png:/gfx/document-revert.png @@ -134,31 +149,45 @@ - 0 + 1 + + QObject {font: 16px} + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + - QLabel { font-weight: bold; } + QObject { font: bold 20px } Interface - - - - Qt::Horizontal - - - + + + Language: @@ -168,7 +197,11 @@ - + + + + + @@ -188,74 +221,66 @@ - - - Show right toolbox - - - - Show fade-out animation for non-winning cards - - - - Reverse order of F-Keys (F1 - F4) - - - - + Show buttons for small blind and big blind - + Don't translate poker strings like check, call, raise from game table style - + Show cards chance monitor - + Show own cards only on mouse click - + + + + Disable splashscreen on startup + + + + Show flip-card animation - - - - Show left toolbox + + + + Qt::Vertical - - - - - - Disable splashscreen on startup + + + 20 + 40 + - + @@ -264,23 +289,50 @@ Network / Internet Game + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + - + + 20 + + + 0 + + + 0 + + + 0 + + + 0 + + + + QObject {font: 14px} + Switch keyboard focus to bet-input-field if it's your turn - + + + QObject {font: 14px} + Show country flag in the corner of avatar - + + + QObject {font: 14px} + Activate the "accidentally call after big raise" blocker @@ -289,15 +341,15 @@ - - + + Qt::Vertical - 400 - 111 + 20 + 40 @@ -305,11 +357,20 @@ + + QObject {font: 14px} + + + 0 + + + 0 + - QLabel { font-weight: bold; } + QObject {font: bold 20px} Style @@ -317,16 +378,12 @@ - - - Qt::Horizontal - - - - + + + - 0 + 1 @@ -357,7 +414,7 @@ 20 - 17 + 10 @@ -366,6 +423,18 @@ + + + 0 + 170 + + + + + 16777215 + 170 + + Preview - Information: @@ -391,6 +460,21 @@ + + + 0 + 150 + + + + + 16777215 + 150 + + + + QObject {font: 14px} + @@ -405,7 +489,7 @@ - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -421,6 +505,18 @@ p, li { white-space: pre-wrap; } + + + 0 + 0 + + + + + 16777215 + 16777215 + + 5 @@ -462,6 +558,19 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -502,6 +611,18 @@ p, li { white-space: pre-wrap; } + + + 0 + 170 + + + + + 16777215 + 170 + + Preview - Information: @@ -527,6 +648,21 @@ p, li { white-space: pre-wrap; } + + + 0 + 160 + + + + + 16777215 + 160 + + + + QObject {font: 14px} + @@ -541,7 +677,7 @@ p, li { white-space: pre-wrap; } - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -587,14 +723,30 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 40 + + + + + + QObject {font: 16px} + Card Back - + Use card back from card style @@ -604,7 +756,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -652,7 +804,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/document-open-folder.png:/gfx/document-open-folder.png @@ -661,15 +813,18 @@ p, li { white-space: pre-wrap; } + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:400; font-style:normal;"> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +</style></head><body style=" font-family:'Sans Serif'; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: Best quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=48, height=76.</span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:10pt; font-style:italic;">Note: Best quality with image ratio like </span><span style=" font-family:'Nimbus Sans L'; font-size:10pt; font-weight:600; font-style:italic;">width=48, height=76.</span></p></td></tr></table></body></html> true @@ -678,7 +833,20 @@ p, li { white-space: pre-wrap; } - + + + + Qt::Vertical + + + + 20 + 40 + + + + + Qt::Vertical @@ -686,7 +854,7 @@ p, li { white-space: pre-wrap; } 20 - 276 + 40 @@ -698,24 +866,35 @@ p, li { white-space: pre-wrap; } + + QObject {font: 16px} + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + - QLabel { font-weight: bold; } + QObject {font: bold 20px} Sound - - - - Qt::Horizontal - - - @@ -758,6 +937,100 @@ p, li { white-space: pre-wrap; } + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + background-color: rgb(255, 255, 255); + 1 @@ -810,18 +1083,44 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - + + Qt::Vertical - 400 - 321 + 20 + 40 @@ -829,11 +1128,29 @@ p, li { white-space: pre-wrap; } + + QObject {font: 16px} + + + 0 + + + 2 + + + 0 + + + 0 + + + 0 + - QLabel { font-weight: bold; } + QObject {font: bold 20px} Local Game Settings @@ -841,11 +1158,17 @@ p, li { white-space: pre-wrap; } - + - Qt::Horizontal + Qt::Vertical - + + + 20 + 40 + + + @@ -950,6 +1273,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Every: @@ -960,6 +1286,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + 1 @@ -973,6 +1302,9 @@ p, li { white-space: pre-wrap; } 0 + + QObject {font: 14px} + hands @@ -980,6 +1312,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Every: @@ -987,6 +1322,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + 1 @@ -1000,6 +1338,9 @@ p, li { white-space: pre-wrap; } 0 + + QObject {font: 14px} + minutes @@ -1038,6 +1379,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Always double blinds @@ -1048,6 +1392,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Manual blinds order: @@ -1058,6 +1405,9 @@ p, li { white-space: pre-wrap; } false + + QObject {font: 14px} + Edit ... @@ -1110,14 +1460,14 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical - 437 - 285 + 20 + 40 @@ -1125,11 +1475,29 @@ p, li { white-space: pre-wrap; } + + QObject {font: 15px} + + + 0 + + + 2 + + + 0 + + + 0 + + + 0 + - QLabel { font-weight: bold; } + QObject {font: bold 20px} Network Game Settings @@ -1137,11 +1505,17 @@ p, li { white-space: pre-wrap; } - + - Qt::Horizontal + Qt::Vertical - + + + 20 + 40 + + + @@ -1237,6 +1611,9 @@ p, li { white-space: pre-wrap; } 105 + + + Raise blinds: @@ -1258,6 +1635,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Every: @@ -1268,6 +1648,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + 1 @@ -1281,6 +1664,9 @@ p, li { white-space: pre-wrap; } 0 + + QObject {font: 14px} + hands @@ -1288,6 +1674,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Every: @@ -1295,6 +1684,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + 1 @@ -1308,24 +1700,14 @@ p, li { white-space: pre-wrap; } 0 + + QObject {font: 14px} + minutes - - - - Qt::Vertical - - - - 20 - 10 - - - - @@ -1343,6 +1725,9 @@ p, li { white-space: pre-wrap; } 105 + + + Raise mode: @@ -1364,6 +1749,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Always double blinds @@ -1374,6 +1762,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Manual blinds order: @@ -1384,6 +1775,9 @@ p, li { white-space: pre-wrap; } false + + QObject {font: 14px} + Edit ... @@ -1459,6 +1853,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Network Server Settings @@ -1467,6 +1864,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Server Port: @@ -1483,6 +1883,9 @@ p, li { white-space: pre-wrap; } 0 + + QObject {font: 14px} + 80 @@ -1498,6 +1901,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Use IPv6 @@ -1505,6 +1911,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> @@ -1515,6 +1924,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + Use SCTP @@ -1522,6 +1934,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> @@ -1533,40 +1948,38 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 20 - 40 - - - - + + QObject {font: 16px} + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + - QLabel { font-weight: bold; } + QObject {font: bold 20px} Internet Game Settings - - - - Qt::Horizontal - - - @@ -1734,6 +2147,19 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -1743,11 +2169,15 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style="font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: Default </span><span style=" font-weight:600; font-style:italic;">Game Settings</span><span style=" font-style:italic;"> like "Maximum number of players", "Start Cash" and "Small Blind" will be used </span><span style=" font-weight:600; font-style:italic;">from Network Game Settings.</span></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-style:italic;">Note: Default </span><span style=" font-size:12pt; font-weight:600; font-style:italic;">Game Settings</span><span style=" font-size:12pt; font-style:italic;"> like &quot;Maximum number of players&quot;, &quot;Start Cash&quot; and &quot;Small Blind&quot; will be used </span><span style=" font-size:12pt; font-weight:600; font-style:italic;">from Network Game Settings.</span></p></body></html> true @@ -1790,7 +2220,7 @@ p, li { white-space: pre-wrap; } Standard - + :/gfx/player_play.png:/gfx/player_play.png @@ -1799,7 +2229,7 @@ p, li { white-space: pre-wrap; } Registered players only - + :/gfx/registered.png:/gfx/registered.png @@ -1808,7 +2238,7 @@ p, li { white-space: pre-wrap; } Invited players only - + :/gfx/list_add_user.png:/gfx/list_add_user.png @@ -1817,7 +2247,7 @@ p, li { white-space: pre-wrap; } Ranking game - + :/gfx/cup.png:/gfx/cup.png @@ -1836,7 +2266,7 @@ p, li { white-space: pre-wrap; } Use password for private game: - + :/gfx/lock.png:/gfx/lock.png @@ -1860,19 +2290,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 437 - 72 - - - - @@ -1914,7 +2331,7 @@ p, li { white-space: pre-wrap; } Remove Player - + :/gfx/list-remove.png:/gfx/list-remove.png @@ -1923,7 +2340,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -1931,7 +2348,7 @@ p, li { white-space: pre-wrap; } 20 - 121 + 40 @@ -1939,144 +2356,58 @@ p, li { white-space: pre-wrap; } + + true + + + QObject {font: 16px} + - - 1 + + 2 - - 8 + + 0 + + + 0 + + + 0 + + + 0 - QLabel { font-weight: bold; } + QObject {font: bold 20px} Player Nicks/Avatars - - - - Qt::Horizontal - - - 0 - - - - Qt::Horizontal - - - - 0 - 0 - - - - - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Human Player:<br /><span style=" font-style:italic;">(This nick will also be used for the online game login)</span></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Human Player:<br /><span style=" font-size:11pt; font-style:italic;">(This nick will also be used for the online game login)</span></p></body></html> Qt::AlignCenter - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 60 - 60 - - - - - 60 - 60 - - - - - - - - 50 - 50 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Horizontal - - - - 78 - 20 - - - - - + @@ -2086,13 +2417,13 @@ p, li { white-space: pre-wrap; } - 100 + 150 25 - 100 + 150 25 @@ -2101,19 +2432,44 @@ p, li { white-space: pre-wrap; } - - + + Qt::Horizontal - 88 + 40 20 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + + + + 50 + 50 + + + + @@ -2122,11 +2478,11 @@ p, li { white-space: pre-wrap; } Computer Engine - + 0 - - 4 + + 0 @@ -2148,13 +2504,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -2281,13 +2637,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -2442,13 +2798,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -2547,13 +2903,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -2778,13 +3134,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -2887,13 +3243,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -3020,13 +3376,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -3153,13 +3509,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -3286,13 +3642,13 @@ p, li { white-space: pre-wrap; } - 100 + 110 25 - 100 + 110 25 @@ -3338,6 +3694,9 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -3349,8 +3708,8 @@ p, li { white-space: pre-wrap; } - - + + Qt::Vertical @@ -3365,11 +3724,29 @@ p, li { white-space: pre-wrap; } + + QObject {font: 14px} + + + 2 + + + 0 + + + 0 + + + 4 + + + 0 + - QLabel { font-weight: bold; } + QObject {font: bold 20px} Log Messages @@ -3377,13 +3754,6 @@ p, li { white-space: pre-wrap; } - - - Qt::Horizontal - - - - Enable/Disable Logging @@ -3395,6 +3765,21 @@ p, li { white-space: pre-wrap; } true + + 0 + + + 4 + + + 0 + + + 0 + + + 0 + @@ -3496,7 +3881,7 @@ p, li { white-space: pre-wrap; } - 2 + 0 @@ -3516,7 +3901,7 @@ p, li { white-space: pre-wrap; } - + :/gfx/document-open-folder.png:/gfx/document-open-folder.png @@ -3526,8 +3911,11 @@ p, li { white-space: pre-wrap; } - + + + 0 + @@ -3557,6 +3945,9 @@ p, li { white-space: pre-wrap; } + + 0 + @@ -3572,21 +3963,27 @@ p, li { white-space: pre-wrap; } 0 + + QObject {color: rgb(255, 255, 255);} + - + + + 0 + Export as HTML - + :/gfx/text-html.png:/gfx/text-html.png @@ -3597,7 +3994,7 @@ p, li { white-space: pre-wrap; } Export as txt - + :/gfx/text-plain.png:/gfx/text-plain.png @@ -3608,7 +4005,7 @@ p, li { white-space: pre-wrap; } Save as ... - + :/gfx/filesave.png:/gfx/filesave.png @@ -3619,7 +4016,7 @@ p, li { white-space: pre-wrap; } Delete - + :/gfx/editdelete.png:/gfx/editdelete.png @@ -3629,21 +4026,44 @@ p, li { white-space: pre-wrap; } + + QObject {font: 16px} + + + 2 + + + 0 + + + 0 + + + 0 + + + 0 + + -1 75 + false true + + QObject {font: bold 20px} + Factory Settings - + Qt::Vertical @@ -3659,7 +4079,7 @@ p, li { white-space: pre-wrap; } - + @@ -3684,8 +4104,10 @@ p, li { white-space: pre-wrap; } - 75 - true + -1 + 50 + false + false @@ -3708,7 +4130,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -3721,20 +4143,19 @@ p, li { white-space: pre-wrap; } - - - - Qt::Horizontal - - - - + - true + -1 + 50 + false + false + + QObject {font: 14px} + Note: You can not reset all settings to default during a running game! @@ -3755,11 +4176,14 @@ p, li { white-space: pre-wrap; } + + QObject {font: bold 20px} + Qt::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::Ok @@ -3780,11 +4204,8 @@ p, li { white-space: pre-wrap; } listWidget comboBox_switchLanguage - checkBox_showRightToolbox - checkBox_showLeftToolbox checkBox_showFadeOutCardsAnimation checkBox_showFlipCardsAnimation - checkBox_alternateFKeysUserActionMode checkBox_showBlindButtons checkBox_cardsChanceMonitor checkBox_antiPeekMode @@ -3852,8 +4273,6 @@ p, li { white-space: pre-wrap; } checkBox_UseLobbyChat treeWidget_internetGameIgnoredPlayers pushButton_internetGameRemoveIgnoredPlayer - pushButton_HumanPlayerAvatar - lineEdit_HumanPlayerName pushButton_Opponent1Avatar lineEdit_Opponent1Name pushButton_Opponent2Avatar @@ -3884,7 +4303,7 @@ p, li { white-space: pre-wrap; } buttonBox - + @@ -3999,5 +4418,21 @@ p, li { white-space: pre-wrap; } + + checkBox_useAvatarServer + toggled(bool) + lineEdit_avatarServerAddress + setEnabled(bool) + + + 283 + 283 + + + 566 + 283 + + + diff --git a/src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui b/src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui index 26f1330d..b5e52a65 100644 --- a/src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui +++ b/src/gui/qt/gui_800x480/startnetworkgamedialog_800x480.ui @@ -1,71 +1,90 @@ - + + startNetworkGameDialog - - + + 0 0 - 403 - 560 + 800 + 424 - + + + 800 + 424 + + + + + 800 + 424 + + + Start Network Game - - - + + QObject {font: 18px} + + + + + + + 390 + 0 + + + + + 390 + 16777215 + + - + Connected Players - - - + + + Fill up with computer opponents - - - + + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - + + Maximum number of players: - - + + 0 - + Qt::Horizontal - + 40 20 @@ -74,77 +93,28 @@ - - + + Kick Player - - - - Chat - - - - 7 - - - 7 - - - 7 - - - 7 - - - 0 - - - 0 - - - - - - - - - - - - - - Qt::Horizontal - - - - - - + + + 6 - - 0 - - - 0 - - - 0 - - + 0 - + Qt::Horizontal - + 181 20 @@ -153,21 +123,54 @@ - - + + + QObject {font: bold 20px} + + Start Game - - - - Cancel - - - + + + + + 400 + 0 + + + + + 400 + 16777215 + + + + Chat + + + + 7 + + + 0 + + + + + QObject {color: rgb(255, 255, 255);} + + + + + + + + + @@ -177,7 +180,6 @@ textBrowser_ChatDisplay lineEdit_ChatInput pushButton_startGame - pushButton_cancel @@ -187,31 +189,15 @@ startNetworkGameDialog accept() - + 140 213 - + 75 211 - - pushButton_cancel - clicked() - startNetworkGameDialog - reject() - - - 235 - 220 - - - 276 - 163 - - - diff --git a/src/gui/qt/gui_800x480/tabs_800x480.ui b/src/gui/qt/gui_800x480/tabs_800x480.ui new file mode 100644 index 00000000..382a71cc --- /dev/null +++ b/src/gui/qt/gui_800x480/tabs_800x480.ui @@ -0,0 +1,810 @@ + + + tabs + + + + 0 + 0 + 800 + 424 + + + + + 800 + 424 + + + + + 800 + 424 + + + + Start Local Game + + + QObject {font: 20px} + + + + 0 + + + 0 + + + + + 0 + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + 0 + + + + + + 390 + 350 + + + + + 390 + 350 + + + + + 4 + + + + + Qt::NoFocus + + + 3 + + + + Hands + + + + 0 + + + 0 + + + + + Qt::AlignCenter + + + + + + + + Chat + + + + 0 + + + 0 + + + + + Qt::NoFocus + + + true + + + Qt::ScrollBarAlwaysOff + + + + + + + + + + + Kick + + + + 0 + + + 6 + + + 5 + + + + + 0 + + + + + 5 + + + + + Vote started by: + + + + + + + + 0 + 0 + + + + + + + + + + + + + 5 + + + + + Vote Timeout: + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + + + 80 + 20 + + + + Yes + + + + + + + + 80 + 20 + + + + No + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 27 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Player info + + + + 3 + + + 6 + + + + + Qt::ClickFocus + + + + + + + Qt::NoFocus + + + Save + + + + + + + + + + + + + + + 390 + 350 + + + + + 390 + 350 + + + + + 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 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Chance + + + + 1 + + + 0 + + + 1 + + + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + 6 + + + 0 + + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 128 + 128 + 128 + + + + + + + 199 + 199 + 199 + + + + + + + + Speed: + + + + + + + + 18 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + + + -1 + 50 + false + false + + + + + + + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + 1 + + + 11 + + + 1 + + + Qt::Horizontal + + + + + + + true + + + + 40 + 20 + + + + Qt::NoFocus + + + Shortcut: <Shift> + + + + + + + + + + + + Slider + QSlider +
myslider.h
+ + + MyLeftTabWidget + QTabWidget +
mylefttabwidget.h
+ 1 + + + MyRightTabWidget + QTabWidget +
myrighttabwidget.h
+ 1 + + + MyChanceLabel + QLabel +
mychancelabel.h
+ + + + + + horizontalSlider_speed + valueChanged(int) + label_speedValue + setNum(int) + + + 403 + 409 + + + 79 + 409 + + + + + diff --git a/src/gui/qt/resources/pokerth.qrc b/src/gui/qt/resources/pokerth.qrc index 63401fcb..52e97eb8 100644 --- a/src/gui/qt/resources/pokerth.qrc +++ b/src/gui/qt/resources/pokerth.qrc @@ -54,6 +54,8 @@ dialog-information.png view-statistics.png document-revert.png + view-fullscreen_50x50.png + preferences-desktop_50x50.png cflags/ad.png diff --git a/src/gui/qt/resources/preferences-desktop_50x50.png b/src/gui/qt/resources/preferences-desktop_50x50.png new file mode 100644 index 00000000..26987ba4 Binary files /dev/null and b/src/gui/qt/resources/preferences-desktop_50x50.png differ diff --git a/src/gui/qt/resources/view-fullscreen_50x50.png b/src/gui/qt/resources/view-fullscreen_50x50.png new file mode 100644 index 00000000..58832b2c Binary files /dev/null and b/src/gui/qt/resources/view-fullscreen_50x50.png differ diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index f742637b..309c725c 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -254,14 +254,16 @@ void settingsDialogImpl::prepareDialog() //Interface comboBox_switchLanguage->setCurrentIndex(comboBox_switchLanguage->findData(QString::fromUtf8(myConfig->readConfigString("Language").c_str()).section('_', 0, 0))); +#ifndef GUI_800x480 checkBox_showLeftToolbox->setChecked(myConfig->readConfigInt("ShowLeftToolBox")); checkBox_showRightToolbox->setChecked(myConfig->readConfigInt("ShowRightToolBox")); + checkBox_alternateFKeysUserActionMode->setChecked(myConfig->readConfigInt("AlternateFKeysUserActionMode")); +#endif checkBox_showFadeOutCardsAnimation->setChecked(myConfig->readConfigInt("ShowFadeOutCardsAnimation")); checkBox_showFlipCardsAnimation->setChecked(myConfig->readConfigInt("ShowFlipCardsAnimation")); checkBox_showBlindButtons->setChecked(myConfig->readConfigInt("ShowBlindButtons")); checkBox_showCountryFlagInAvatar->setChecked(myConfig->readConfigInt("ShowCountryFlagInAvatar")); checkBox_antiPeekMode->setChecked(myConfig->readConfigInt("AntiPeekMode")); - checkBox_alternateFKeysUserActionMode->setChecked(myConfig->readConfigInt("AlternateFKeysUserActionMode")); checkBox_enableBetInputFocusSwitch->setChecked(myConfig->readConfigInt("EnableBetInputFocusSwitch")); checkBox_cardsChanceMonitor->setChecked(myConfig->readConfigInt("ShowCardsChanceMonitor")); checkBox_dontTranslatePokerStrings->setChecked(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle")); @@ -270,6 +272,25 @@ void settingsDialogImpl::prepareDialog() //S t y l e //TABLE + +#ifdef GUI_800x480 + // define PokerTH default GameTableStyle for Maemo + treeWidget_gameTableStyles->clear(); + + GameTableStyleReader defaultTableStyle(myConfig, this); + defaultTableStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml"); + if(defaultTableStyle.getLoadedSuccessfull()) { + QStringList tempStringList1; + tempStringList1 << defaultTableStyle.getStyleDescription() << defaultTableStyle.getStyleMaintainerName(); + MyStyleListItem *defaultTableItem = new MyStyleListItem(tempStringList1, treeWidget_gameTableStyles); + defaultTableItem->setData(0, 15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml"); + defaultTableItem->setData(0, 16, POKERTH_DISTRIBUTED_STYLE); + defaultTableItem->setData(0, Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default_800x480/defaulttablestyle_800x480.xml"); + defaultTableItem->setData(2, Qt::ToolTipRole, defaultTableStyle.getMyStateToolTipInfo()); + if(defaultTableStyle.getState()) defaultTableItem->setIcon(2, QIcon(":/gfx/emblem-important.png")); + else defaultTableItem->setIcon(2, QIcon(":/gfx/dialog_ok_apply.png")); + } +#else // define PokerTH default GameTableStyle treeWidget_gameTableStyles->clear(); @@ -300,6 +321,7 @@ void settingsDialogImpl::prepareDialog() if(danuxi1TableStyle.getState()) danuxi1TableItem->setIcon(2, QIcon(":/gfx/emblem-important.png")); else danuxi1TableItem->setIcon(2, QIcon(":/gfx/dialog_ok_apply.png")); } +#endif //load secondary styles into list (if fallback no entry) myGameTableStylesList = myConfig->readConfigStringList("GameTableStylesList"); @@ -650,15 +672,17 @@ void settingsDialogImpl::isAccepted() // Interface myConfig->writeConfigString("Language", comboBox_switchLanguage->itemData(comboBox_switchLanguage->currentIndex()).toString().toUtf8().constData()); +#ifndef GUI_800x480 myConfig->writeConfigInt("ShowLeftToolBox", checkBox_showLeftToolbox->isChecked()); myConfig->writeConfigInt("ShowRightToolBox", checkBox_showRightToolbox->isChecked()); + myConfig->writeConfigInt("AlternateFKeysUserActionMode", checkBox_alternateFKeysUserActionMode->isChecked()); +#endif myConfig->writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked()); myConfig->writeConfigInt("ShowFlipCardsAnimation", checkBox_showFlipCardsAnimation->isChecked()); myConfig->writeConfigInt("ShowBlindButtons", checkBox_showBlindButtons->isChecked()); myConfig->writeConfigInt("ShowCardsChanceMonitor", checkBox_cardsChanceMonitor->isChecked()); myConfig->writeConfigInt("AntiPeekMode", checkBox_antiPeekMode->isChecked()); myConfig->writeConfigInt("ShowCountryFlagInAvatar", checkBox_showCountryFlagInAvatar->isChecked()); - myConfig->writeConfigInt("AlternateFKeysUserActionMode", checkBox_alternateFKeysUserActionMode->isChecked()); myConfig->writeConfigInt("DontTranslateInternationalPokerStringsFromStyle", checkBox_dontTranslatePokerStrings->isChecked()); myConfig->writeConfigInt("DisableSplashScreenOnStartup", checkBox_disableSplashscreen->isChecked()); myConfig->writeConfigInt("EnableBetInputFocusSwitch", checkBox_enableBetInputFocusSwitch->isChecked()); @@ -1209,6 +1233,9 @@ void settingsDialogImpl::showCurrentCardDeckStylePreview() maintainerEMailString = ""+MaintainerEMail+": "+style.getStyleMaintainerEMail()+"
"; } +#ifdef GUI_800x480 + label_cardDeckStyleInfo->setWordWrap(TRUE); +#endif label_cardDeckStyleInfo->setText(""+MaintainerName+": "+style.getStyleMaintainerName()+"
"+maintainerEMailString+""+CreateDate+": "+style.getStyleCreateDate()+""); //active the current selected item directly setSelectedCardDeckStyleActivated(); diff --git a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp index 6bbb779f..ab260125 100644 --- a/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp +++ b/src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp @@ -35,7 +35,9 @@ startNetworkGameDialogImpl::startNetworkGameDialogImpl(startWindowImpl *parent, lineEdit_ChatInput->installEventFilter(this); +#ifndef GUI_800x480 connect( pushButton_cancel, SIGNAL( clicked() ), this, SLOT( cancel() ) ); +#endif connect( pushButton_startGame, SIGNAL( clicked() ), this, SLOT( startGame() ) ); connect( pushButton_Kick, SIGNAL( clicked() ), this, SLOT( kickPlayer() ) ); connect( treeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( playerSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) ); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index a9dce82f..a4f2575d 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -1358,19 +1358,30 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state) switch(state) { // default case 0: +#ifdef GUI_800x480 + bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+"; font-size: 20px} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900; font-size: 20px}"); +#else bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+";} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900;}"); +#endif break; // blink case 1: +#ifdef GUI_800x480 + bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+"; font-size: 20px}"); +#else bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+";}"); - +#endif break; } } void GameTableStyleReader::setSpeedStringStyle(QLabel *l) { +#ifdef GUI_800x480 + l->setStyleSheet("QLabel { color: #"+SpeedTextColor+"; font-size: 20px}"); +#else l->setStyleSheet("QLabel { color: #"+SpeedTextColor+";}"); +#endif } void GameTableStyleReader::setVoteButtonStyle(QPushButton *b) @@ -1542,7 +1553,9 @@ void GameTableStyleReader::setTabWidgetStyle(QTabWidget *tw, QTabBar *tb) bottomPadding = " padding-bottom: 3px;"; #endif +#ifndef GUI_800x480 tb->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #"+TabWidgetTextColor+"; background-color: #"+TabWidgetBgColor+"; border: 2px solid #"+TabWidgetBorderColor+"; border-bottom-color: #"+TabWidgetBorderColor+"; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+tabBarPaddingTop+"px;"+bottomPadding+" padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #"+TabWidgetBgColor+"; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:selected { border-color: #"+TabWidgetBorderColor+"; border-bottom-color: #"+TabWidgetBgColor+"; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:only-one { margin: 0; } "); +#endif } @@ -1556,6 +1569,7 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt) QDesktopWidget dw; int availableWidth = dw.screenGeometry().width(); int availableHeight = dw.screenGeometry().height(); +#ifndef GUI_800x480 if(availableWidth == FixedWindowWidth.toInt() && availableHeight == FixedWindowHeight.toInt()) { gt->actionFullScreen->setEnabled(TRUE); } else { @@ -1565,6 +1579,7 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt) gt->move(50,50); } } +#endif } else { gt->setMinimumSize(MinimumWindowWidth.toInt(), MinimumWindowHeight.toInt()); gt->setMaximumSize(MaximumWindowWidth.toInt(), MaximumWindowHeight.toInt()); @@ -1573,6 +1588,7 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt) QDesktopWidget dw; int availableWidth = dw.screenGeometry().width(); int availableHeight = dw.screenGeometry().height(); +#ifndef GUI_800x480 if(availableWidth <= MaximumWindowWidth.toInt() && availableHeight <= MaximumWindowHeight.toInt()) { gt->actionFullScreen->setEnabled(TRUE); } else { @@ -1582,16 +1598,26 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt) gt->move(50,50); } } +#endif } } void GameTableStyleReader::setSliderStyle(QSlider *s) { -#if QT_VERSION >= 0x040700 - s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+"; height: 3px; background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 12px; margin: -7px 0; border-radius: 4px;}"); + + QString height(""); + +#ifdef GUI_800x480 + height = " height: 8px;"; #else - s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+"; height: 3px; background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 12px; margin: -2px 0; border-radius: 4px;}"); + height = " height: 3px;"; +#endif + +#if QT_VERSION >= 0x040700 + s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+";"+height+" background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 12px; margin: -7px 0; border-radius: 4px;}"); +#else + s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+";"+height+" background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 0; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 12px; margin: -2px 0; border-radius: 4px;}"); #endif }