From a4c2e9576d6cff6f2070726e510884105b09bf4b Mon Sep 17 00:00:00 2001 From: Nodir Temirkhodjaev Date: Tue, 26 Jan 2021 15:11:49 +0300 Subject: [PATCH] UI: Remove icons from OK/Apply/Cancel buttons. --- src/ui/form/opt/pages/mainpage.cpp | 6 +++--- src/ui/form/prog/programswindow.cpp | 4 ++-- src/ui/form/zone/zoneswindow.cpp | 4 ++-- src/ui/fort-images.qrc | 2 -- src/ui/images/accept.png | Bin 781 -> 0 bytes src/ui/images/tick.png | Bin 537 -> 0 bytes 6 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 src/ui/images/accept.png delete mode 100644 src/ui/images/tick.png diff --git a/src/ui/form/opt/pages/mainpage.cpp b/src/ui/form/opt/pages/mainpage.cpp index 908d7985..7b50e6cb 100644 --- a/src/ui/form/opt/pages/mainpage.cpp +++ b/src/ui/form/opt/pages/mainpage.cpp @@ -90,9 +90,9 @@ QLayout *MainPage::setupDialogButtons() buttonsLayout->addStretch(); - m_btOk = new QPushButton(QIcon(":/images/tick.png"), QString()); - m_btApply = new QPushButton(QIcon(":/images/accept.png"), QString()); - m_btCancel = new QPushButton(QIcon(":/images/cancel.png"), QString()); + m_btOk = new QPushButton(); + m_btApply = new QPushButton(); + m_btCancel = new QPushButton(); connect(m_btOk, &QAbstractButton::clicked, ctrl(), &OptionsController::saveChanges); connect(m_btApply, &QAbstractButton::clicked, ctrl(), &OptionsController::applyChanges); diff --git a/src/ui/form/prog/programswindow.cpp b/src/ui/form/prog/programswindow.cpp index 9d1ccaac..cab4bf12 100644 --- a/src/ui/form/prog/programswindow.cpp +++ b/src/ui/form/prog/programswindow.cpp @@ -238,10 +238,10 @@ void ProgramsWindow::setupAppEditForm() // OK/Cancel auto buttonsLayout = new QHBoxLayout(); - m_btEditOk = new QPushButton(QIcon(":/images/tick.png"), QString()); + m_btEditOk = new QPushButton(); m_btEditOk->setDefault(true); - m_btEditCancel = new QPushButton(QIcon(":/images/cancel.png"), QString()); + m_btEditCancel = new QPushButton(); buttonsLayout->addWidget(m_btEditOk, 1, Qt::AlignRight); buttonsLayout->addWidget(m_btEditCancel); diff --git a/src/ui/form/zone/zoneswindow.cpp b/src/ui/form/zone/zoneswindow.cpp index 5e597525..bd7f78b1 100644 --- a/src/ui/form/zone/zoneswindow.cpp +++ b/src/ui/form/zone/zoneswindow.cpp @@ -173,10 +173,10 @@ void ZonesWindow::setupZoneEditForm() // OK/Cancel auto buttonsLayout = new QHBoxLayout(); - m_btEditOk = new QPushButton(QIcon(":/images/tick.png"), QString()); + m_btEditOk = new QPushButton(); m_btEditOk->setDefault(true); - m_btEditCancel = new QPushButton(QIcon(":/images/cancel.png"), QString()); + m_btEditCancel = new QPushButton(); buttonsLayout->addWidget(m_btEditOk, 1, Qt::AlignRight); buttonsLayout->addWidget(m_btEditCancel); diff --git a/src/ui/fort-images.qrc b/src/ui/fort-images.qrc index 5b890407..a4cef889 100644 --- a/src/ui/fort-images.qrc +++ b/src/ui/fort-images.qrc @@ -1,6 +1,5 @@ - images/accept.png images/application.png images/application-window-96.png images/application_add.png @@ -50,7 +49,6 @@ images/shield.png images/sheild-96.png images/stop.png - images/tick.png images/windows-48.png images/world.png images/world_link.png diff --git a/src/ui/images/accept.png b/src/ui/images/accept.png deleted file mode 100644 index 89c8129a490b329f3165f32fa0781701aab417ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmV+o1M>WdP)4-QibtN)VXQDpczE`xXAkUjh%RI>;okxb7K@0kpyQ1k_Y(|Oe7$m(^ zNYX>mI||sUbmn+c3<&FnE=4u#()KBS^SH8e)Qs5i!#lY=$-1gbH6VluzU=m=EP78&5vQ z-?+fFP-G2l&l_QzYealK$;1Rl?FkzXR&Jv@fBPNjCr#AYRyJ7UJQ0v#?)7Ott=>3`#-pV!7>9}>Q1jL)H6h&gkP@3nI=+F3nA~M>u#(n* z8T!#8oEw&-mED4!h4s!N@Jo3S7N&Q6%6l3}nlcd~X@>;uelvPsSkXIgg~e+^T1zSf z3SNj(5%jK~i8@b;CHs{AQG2a)rMyf zFQK~pm1x3+7!nu%-M`k}``c>^00{o_1pjWJUTfl8mg=3qGEl8H@}^@w`VUx0_$uy4 z2FhRqKX}xI*?Tv1DJd8z#F#0c%*~rM30HE1@2o5m~}ZyoWhqv>ql{V z1ZGE0lgcoK^lx+eqc*rAX1Ky;Xx3U%u#zG!m-;eD1Qsn@kf3|F9qz~|95=&g3(7!X zB}JAT>RU;a%vaNOGnJ%e1=K6eAh43c(QN8RQ6~GP%O}Jju$~Ld*%`mO1p