Merge pull request #6269 from Chocobo1/icons

Fix new icons too large
This commit is contained in:
sledgehammer999
2017-01-20 18:33:35 +02:00
committed by GitHub
6 changed files with 61 additions and 62 deletions

View File

@@ -30,13 +30,17 @@
#include "rsssettingsdlg.h"
#include "ui_rsssettingsdlg.h"
#include "base/preferences.h"
#include "base/utils/misc.h"
#include "guiiconprovider.h"
RssSettingsDlg::RssSettingsDlg(QWidget *parent) :
QDialog(parent),
ui(new Ui::RssSettingsDlg)
{
ui->setupUi(this);
ui->rssIcon->setPixmap(GuiIconProvider::instance()->getIcon("application-rss+xml").pixmap(Utils::Misc::largeIconSize()));
// Load settings
const Preferences* const pref = Preferences::instance();
ui->spinRSSRefresh->setValue(pref->getRSSRefreshInterval());

View File

@@ -16,16 +16,6 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../icons.qrc">:/icons/qbt-theme/application-rss+xml.png</pixmap>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label">
<property name="text">
@@ -66,6 +56,9 @@
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="rssIcon"/>
</item>
</layout>
</item>
<item>