Browse Source

Fix rss icon too large in rss settings dialog

Give a name to the rss icon (in .ui file)
Add helper function: Utils::Misc::largeIconSize()
Group functions under the same #ifdef
adaptive-webui-19844
Chocobo1 8 years ago
parent
commit
0517a3eb63
  1. 23
      src/base/utils/misc.cpp
  2. 9
      src/base/utils/misc.h
  3. 4
      src/gui/rss/rsssettingsdlg.cpp
  4. 13
      src/gui/rss/rsssettingsdlg.ui

23
src/base/utils/misc.cpp

@ -611,6 +611,19 @@ void Utils::Misc::openFolderSelect(const QString &absolutePath) @@ -611,6 +611,19 @@ void Utils::Misc::openFolderSelect(const QString &absolutePath)
#endif
}
QSize Utils::Misc::smallIconSize()
{
// Get DPI scaled icon size (device-dependent), see QT source
int s = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
return QSize(s, s);
}
QSize Utils::Misc::largeIconSize()
{
// Get DPI scaled icon size (device-dependent), see QT source
int s = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
return QSize(s, s);
}
#endif // DISABLE_GUI
namespace
@ -631,16 +644,6 @@ void Utils::Misc::msleep(unsigned long msecs) @@ -631,16 +644,6 @@ void Utils::Misc::msleep(unsigned long msecs)
SleeperThread::msleep(msecs);
}
#ifndef DISABLE_GUI
QSize Utils::Misc::smallIconSize()
{
// Get DPI scaled icon size (device-dependent), see QT source
int s = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
return QSize(s, s);
}
#endif
QString Utils::Misc::osName()
{
// static initialization for usage in signal handler

9
src/base/utils/misc.h

@ -69,11 +69,6 @@ namespace Utils @@ -69,11 +69,6 @@ namespace Utils
void shutdownComputer(const ShutdownDialogAction &action);
#ifndef DISABLE_GUI
// Get screen center
QPoint screenCenter(QWidget *win);
QSize smallIconSize();
#endif
QString osName();
QString boostVersionString();
QString libtorrentVersionString();
@ -107,6 +102,10 @@ namespace Utils @@ -107,6 +102,10 @@ namespace Utils
#ifndef DISABLE_GUI
void openPath(const QString& absolutePath);
void openFolderSelect(const QString& absolutePath);
QPoint screenCenter(QWidget *win);
QSize smallIconSize();
QSize largeIconSize();
#endif
#ifdef Q_OS_WIN

4
src/gui/rss/rsssettingsdlg.cpp

@ -30,13 +30,17 @@ @@ -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());

13
src/gui/rss/rsssettingsdlg.ui

@ -16,16 +16,6 @@ @@ -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 @@ @@ -66,6 +56,9 @@
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="rssIcon"/>
</item>
</layout>
</item>
<item>

Loading…
Cancel
Save