diff --git a/data/gfx/gui/misc/bigblindPuck.png b/data/gfx/gui/table/default/bigblindPuck.png similarity index 100% rename from data/gfx/gui/misc/bigblindPuck.png rename to data/gfx/gui/table/default/bigblindPuck.png diff --git a/data/gfx/gui/misc/smallblindPuck.png b/data/gfx/gui/table/default/smallblindPuck.png similarity index 100% rename from data/gfx/gui/misc/smallblindPuck.png rename to data/gfx/gui/table/default/smallblindPuck.png diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 63c3df99..88c89808 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -998,8 +998,8 @@ void mainWindowImpl::refreshSet() { void mainWindowImpl::refreshButton() { QPixmap dealerButton(myQtHelper->getDataPath() +"gfx/gui/table/default/dealerPuck.png"); - QPixmap smallblindButton(myQtHelper->getDataPath() +"gfx/gui/misc/smallblindPuck.png"); - QPixmap bigblindButton(myQtHelper->getDataPath() +"gfx/gui/misc/bigblindPuck.png"); + QPixmap smallblindButton(myQtHelper->getDataPath() +"gfx/gui/table/default/smallblindPuck.png"); + QPixmap bigblindButton(myQtHelper->getDataPath() +"gfx/gui/table/default/bigblindPuck.png"); QPixmap onePix(myQtHelper->getDataPath() +"gfx/gui/misc/1px.png"); int i; diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc deleted file mode 100755 index 03585ec0..00000000 --- a/src/gui/qt/resources.qrc +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/gui/qt/selectavatardialog.ui b/src/gui/qt/selectavatardialog.ui index f4073662..e23b41be 100644 --- a/src/gui/qt/selectavatardialog.ui +++ b/src/gui/qt/selectavatardialog.ui @@ -100,25 +100,22 @@ 9 - 6 + 2 27 - 23 + 26 27 - 23 + 26 - - :/graphics/resources/graphics/fileopen16.png - diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index d71ccf90..2fdcacac 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -77,7 +77,7 @@ 0 - 0 + 2 @@ -101,18 +101,15 @@ 27 - 23 + 26 27 - 23 + 26 - - :/graphics/resources/graphics/fileopen16.png - @@ -2235,7 +2232,7 @@ p, li { white-space: pre-wrap; } - :/graphics/resources/graphics/fileopen16.png + @@ -2459,9 +2456,7 @@ p, li { white-space: pre-wrap; } comboBox_logInterval buttonBox - - - + listWidget diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp index ccd761a3..2760a4e7 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp @@ -31,6 +31,8 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c) myQtHelper = new QtHelper; + pushButton_OpenAvatarFile->setIcon(QIcon(QPixmap(myQtHelper->getDataPath()+"gfx/gui/misc/fileopen16.png"))); + // listWidget->setViewMode(QListView::IconMode); // listWidget->setIconSize(QSize(50,50)); // listWidget->setLayoutDirection(Qt::LeftToRight); diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index a1998cc2..d3a5e6d8 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -30,6 +30,10 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva { setupUi(this); + + QtHelper *myQtHelper = new QtHelper; + + pushButton_openFlipsidePicture->setIcon(QIcon(QPixmap(myQtHelper->getDataPath()+"gfx/gui/misc/fileopen16.png"))); if (myConfig->readConfigInt("CLA_NoWriteAccess")) { groupBox_logOnOff->setDisabled(TRUE); } diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h index 1dd9643d..d63ba74d 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.h +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h @@ -23,6 +23,8 @@ #include "ui_settingsdialog.h" #include "selectavatardialogimpl.h" +#include "qthelper.h" + #include #include