diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 94f9788..4910a68 100644 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -242,8 +242,8 @@ void PictureDialog::addPreviousNextButtons() QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this); uiToolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); uiToolbar->setObjectName("uiToolbar"); - uiToolbar->addAction(QIcon(":/img/back.svg"), "", this, SLOT(previousPictureRequestedSlot())); - uiToolbar->addAction(QIcon(":/img/next.svg"), "", this, SLOT(nextPictureRequestedSlot())); + uiToolbar->addAction(QIcon(":/img/back.svgz"), "", this, SLOT(previousPictureRequestedSlot())); + uiToolbar->addAction(QIcon(":/img/next.svgz"), "", this, SLOT(nextPictureRequestedSlot())); layout()->setMenuBar(uiToolbar); naviEnabled = true; diff --git a/PlayerListDialog.cpp b/PlayerListDialog.cpp index 9518068..dae5ea4 100644 --- a/PlayerListDialog.cpp +++ b/PlayerListDialog.cpp @@ -79,7 +79,9 @@ PlayerListDialog::PlayerListDialog(QStringList players, ProfileDatabase *profile } else { - drawSwitchButtons(); + ui->cmdMakeAv->setIcon(QIcon(":/img/back.svgz")); + ui->cmdMakeSe->setIcon(QIcon(":/img/next.svgz")); + ui->cmdMakeAd->setIcon(QIcon(":/img/add.svgz")); } buildInterface(); @@ -101,13 +103,6 @@ PlayerListDialog::~PlayerListDialog() delete ui; } -void PlayerListDialog::drawSwitchButtons() -{ - ui->cmdMakeAv->setText("<"); - ui->cmdMakeSe->setText(">"); - ui->cmdMakeAd->setText("+"); -} - void PlayerListDialog::on_cmdCancel_clicked() { close(); diff --git a/PlayerListDialog.h b/PlayerListDialog.h index 8c99fb0..c341a22 100644 --- a/PlayerListDialog.h +++ b/PlayerListDialog.h @@ -48,7 +48,6 @@ private: ProfileDatabase *profileDB; Ui::PlayerListDialog *ui; bool listUpdated; - void drawSwitchButtons(); void buildInterface(); signals: diff --git a/PlayerListDialog.ui b/PlayerListDialog.ui index 520dbb2..3bdda4c 100644 --- a/PlayerListDialog.ui +++ b/PlayerListDialog.ui @@ -50,32 +50,39 @@ </spacer> </item> <item> - <widget class="QToolButton" name="cmdMakeSe"/> - </item> - <item> - <widget class="QToolButton" name="cmdMakeAv"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QPushButton" name="cmdMakeSe"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> </property> - <property name="text"> - <string/> + <property name="autoDefault"> + <bool>false</bool> </property> </widget> </item> <item> - <widget class="QToolButton" name="cmdMakeAd"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QPushButton" name="cmdMakeAv"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> </property> <property name="text"> <string/> </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="cmdMakeAd"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="text"> + <string/> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> </widget> </item> <item> diff --git a/res/add.svgz b/res/add.svgz new file mode 100644 index 0000000..74451ae Binary files /dev/null and b/res/add.svgz differ diff --git a/res/app.qrc b/res/app.qrc index 4e74981..8f7b288 100644 --- a/res/app.qrc +++ b/res/app.qrc @@ -9,12 +9,13 @@ <file>5sync-96.png</file> <file>5sync-128.png</file> <file>5sync-256.png</file> + <file>add.svgz</file> <file>avatararea.png</file> <file>avatarareaimport.png</file> - <file>back.svg</file> + <file>back.svgz</file> <file>empty1x16.png</file> <file>mappreview.jpg</file> - <file>next.svg</file> + <file>next.svgz</file> <file>pointmaker-8.png</file> <file>pointmaker-16.png</file> <file>pointmaker-24.png</file> diff --git a/res/back.svg b/res/back.svg deleted file mode 100644 index ef41738..0000000 --- a/res/back.svg +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="512px" id="Layer_1" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" width="512px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><polygon points="352,115.4 331.3,96 160,256 331.3,416 352,396.7 201.5,256 "/></svg> \ No newline at end of file diff --git a/res/back.svgz b/res/back.svgz new file mode 100644 index 0000000..84a61ba Binary files /dev/null and b/res/back.svgz differ diff --git a/res/next.svg b/res/next.svg deleted file mode 100644 index 42db626..0000000 --- a/res/next.svg +++ /dev/null @@ -1 +0,0 @@ -<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="512px" id="Layer_1" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" width="512px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><polygon points="160,115.4 180.7,96 352,256 180.7,416 160,396.7 310.5,256 "/></svg> \ No newline at end of file diff --git a/res/next.svgz b/res/next.svgz new file mode 100644 index 0000000..0203d84 Binary files /dev/null and b/res/next.svgz differ