windows fonts fix (first try) + new button gfx
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
@@ -39,7 +39,7 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
|
||||
waitStartGameMsgBoxTimer->setSingleShot(TRUE);
|
||||
|
||||
// treeWidget_GameList->setGameListBackgroundImage(myAppDataPath +"gfx/gui/misc/background_gamelist.png");
|
||||
treeWidget_GameList->setStyleSheet("QTreeWidget {background-color: white; background-image: url("+myAppDataPath +"gfx/gui/misc/background_gamelist.png); background-attachment: scroll; background-position: top center ; background-repeat: no-repeat;}");
|
||||
treeWidget_GameList->setStyleSheet("QTreeWidget {background-color: white; background-image: url("+myAppDataPath +"gfx/gui/misc/background_gamelist.png); background-attachment: fixed; background-position: top center ; background-repeat: no-repeat;}");
|
||||
treeWidget_GameList->setAutoFillBackground(TRUE);
|
||||
|
||||
|
||||
@@ -474,6 +474,50 @@ void gameLobbyDialogImpl::clearDialog()
|
||||
// item4->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item4->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item4->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item5 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item5->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item5->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item5->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item6 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item6->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item6->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item6->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item7 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item7->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item7->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item7->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item8 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item8->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item8->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item8->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item9 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item9->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item9->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item9->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item10 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item10->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item10->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item10->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item11 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item11->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item11->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item11->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item12 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item12->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item12->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item12->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item13 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item13->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item13->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item13->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item14 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item14->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item14->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item14->setData(2, Qt::DisplayRole, "33223");
|
||||
// QTreeWidgetItem *item15 = new QTreeWidgetItem(treeWidget_GameList, 0);
|
||||
// item15->setData(0, Qt::DisplayRole, "43324434");
|
||||
// item15->setData(1, Qt::DisplayRole, "sfdsfsdfsd");
|
||||
// item15->setData(2, Qt::DisplayRole, "33223");
|
||||
}
|
||||
|
||||
void gameLobbyDialogImpl::checkPlayerQuantity() {
|
||||
|
||||
@@ -375,7 +375,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
||||
label_speedString->setStyleSheet("QLabel { color: #99D500;}");
|
||||
label_speedValue->setStyleSheet("QLabel { color: #99D500;}");
|
||||
|
||||
statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #99D500; }");
|
||||
statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #B7FF00; }");
|
||||
|
||||
//Groupbox Background
|
||||
for (i=1; i<MAX_NUMBER_OF_PLAYERS; i++) {
|
||||
@@ -394,7 +394,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
||||
pushButton_AllIn->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
|
||||
|
||||
// away radiobuttons
|
||||
QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }");
|
||||
// QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }");
|
||||
QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px;} QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png);} QRadioButton::indicator::unchecked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_unchecked.png);} QRadioButton::indicator:unchecked:hover { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_unchecked_hover.png);} QRadioButton::indicator:unchecked:pressed { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_pressed.png);} QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png);} QRadioButton::indicator:checked:hover { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked_hover.png);} QRadioButton::indicator:checked:pressed { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_pressed.png);}");
|
||||
|
||||
radioButton_manualAction->setStyleSheet(radioButtonString);
|
||||
radioButton_autoCheckFold->setStyleSheet(radioButtonString);
|
||||
@@ -403,7 +404,6 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
||||
groupBox_RightToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }");
|
||||
groupBox_LeftToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }");
|
||||
|
||||
|
||||
//raise actionLable above just inserted mypixmaplabel
|
||||
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { actionLabelArray[i]->raise(); }
|
||||
|
||||
@@ -3600,9 +3600,9 @@ void mainWindowImpl::myButtonsCheckable(bool state) {
|
||||
pushButton_AllIn->setCheckable(TRUE);
|
||||
|
||||
//design
|
||||
pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #7DFF95;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6_checked.png); }");
|
||||
pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #7DCDFF;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6_checked.png); }");
|
||||
pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #FF7D7D;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6_checked.png); }");
|
||||
pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #87FF97;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6_checked.png); }");
|
||||
pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #87CDFF;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6_checked.png); }");
|
||||
pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #FF8787;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6_checked.png); }");
|
||||
|
||||
myButtonsAreCheckable = TRUE;
|
||||
}
|
||||
|
||||
@@ -57,10 +57,10 @@
|
||||
#define ENABLE_LEAK_CHECK()
|
||||
#endif
|
||||
|
||||
// //Uncomment this for RELEASE
|
||||
// #include <QtPlugin>
|
||||
// Q_IMPORT_PLUGIN(qjpeg)
|
||||
// Q_IMPORT_PLUGIN(qgif)
|
||||
//Uncomment this for RELEASE
|
||||
#include <QtPlugin>
|
||||
Q_IMPORT_PLUGIN(qjpeg)
|
||||
Q_IMPORT_PLUGIN(qgif)
|
||||
|
||||
|
||||
using namespace std;
|
||||
@@ -94,13 +94,13 @@ int main( int argc, char **argv )
|
||||
// #ifdef __APPLE__
|
||||
// QString font1String("font-family: \"Lucida Grande\";");
|
||||
// #else
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb");
|
||||
QString font1String("font-family: \"Nimbus Sans L\";");
|
||||
// #endif
|
||||
a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }");
|
||||
#endif
|
||||
//add OS-independent fonts
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb");
|
||||
|
||||
//Set translations
|
||||
|
||||