diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 39a759379..cc7432b9f 100644 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -6,9 +6,6 @@ FormMain::FormMain(QWidget *parent) : QMainWindow(parent), m_ui(new Ui::FormMain) { m_ui->setupUi(this); - // for testing purposes - m_ui->toolButton->setIcon(QIcon::fromTheme("application-exit")); - createConnections(); } diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui index 84d684627..6838ddbf1 100644 --- a/src/gui/formmain.ui +++ b/src/gui/formmain.ui @@ -17,8 +17,8 @@ - 230 - 150 + 40 + 20 61 51 @@ -26,6 +26,177 @@ ... + + + + + + 32 + 32 + + + + + + + 140 + 120 + 61 + 51 + + + + ... + + + + + + + + + 20 + 20 + + + + + + + 240 + 30 + 61 + 51 + + + + ... + + + + + + + + + 16 + 16 + + + + + + + 40 + 200 + 171 + 141 + + + + ... + + + + + + + + + 48 + 48 + + + + + + + 400 + 10 + 61 + 51 + + + + ... + + + + + + + + + 64 + 64 + + + + + + + 250 + 190 + 231 + 161 + + + + ... + + + + + + + + + 96 + 96 + + + + + + + 520 + 160 + 161 + 151 + + + + ... + + + + + + + + + 128 + 128 + + + + + + + 540 + 60 + 61 + 51 + + + + ... + + + + + + 32 @@ -40,7 +211,7 @@ 0 0 800 - 19 + 21 diff --git a/src/gui/themefactory.cpp b/src/gui/themefactory.cpp index 7fbefb761..e2a375be0 100644 --- a/src/gui/themefactory.cpp +++ b/src/gui/themefactory.cpp @@ -18,14 +18,16 @@ void ThemeFactory::setupSearchPaths() { } // TODO: Load currently selected "real" icon theme name instead of -// Qt default "", which stands for currently active system icon theme name. +// Qt default "", which stands for currently active system icon theme name on +// linux. On Windows, tiny "oxygen" version will be added. QString ThemeFactory::getSystemIconTheme() { #if defined(Q_OS_LINUX) + // Empty string forces Qt to use icon theme from operating system. return QString(); #else - // It is expected that oxygen is provided as fall-back theme for + // It is expected that mini-oxygen is provided as fall-back theme for // windows edition of RSS Guard. - return "oxygen"; + return "mini-oxygen"; #endif }