Merge pull request #7429 from silverqx/preview-modal-ux

Improved ux in preview dialog
This commit is contained in:
Mike Tzou
2017-09-27 20:33:31 +08:00
committed by GitHub
9 changed files with 87 additions and 35 deletions

View File

@@ -57,7 +57,7 @@
#include "logger.h"
#include "preferences.h"
Preferences* Preferences::m_instance = 0;
Preferences *Preferences::m_instance = 0;
Preferences::Preferences() {}
@@ -753,7 +753,8 @@ void Preferences::disableRecursiveDownload(bool disable)
}
#ifdef Q_OS_WIN
namespace {
namespace
{
enum REG_SEARCH_TYPE
{
USER,
@@ -842,7 +843,7 @@ namespace {
versions.sort();
bool found = false;
while(!found && !versions.empty()) {
while (!found && !versions.empty()) {
const QString version = versions.takeLast() + "\\InstallPath";
LPWSTR lpSubkey = new WCHAR[version.size() + 1];
version.toWCharArray(lpSubkey);
@@ -872,7 +873,6 @@ namespace {
return path;
}
}
QString Preferences::getPythonPath()
@@ -1163,7 +1163,7 @@ void Preferences::setMainLastDir(const QString &path)
setValue("MainWindowLastDir", path);
}
QSize Preferences::getPrefSize(const QSize& defaultSize) const
QSize Preferences::getPrefSize(const QSize &defaultSize) const
{
return value("Preferences/State/size", defaultSize).toSize();
}
@@ -1393,7 +1393,7 @@ void Preferences::setTransHeaderState(const QByteArray &state)
setValue("TransferList/qt5/HeaderState", state);
}
//From old RssSettings class
// From old RssSettings class
bool Preferences::isRSSWidgetEnabled() const
{
return value("GUI/RSSWidget/Enabled", false).toBool();

View File

@@ -90,7 +90,7 @@ class Preferences: public QObject
const QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
void setValue(const QString &key, const QVariant &value);
static Preferences* m_instance;
static Preferences *m_instance;
signals:
void changed();
@@ -98,7 +98,7 @@ signals:
public:
static void initInstance();
static void freeInstance();
static Preferences* instance();
static Preferences *instance();
// General options
QString getLocale() const;
@@ -328,7 +328,7 @@ public:
int getToolbarTextPosition() const;
void setToolbarTextPosition(const int position);
//From old RssSettings class
// From old RssSettings class
bool isRSSWidgetEnabled() const;
void setRSSWidgetVisible(const bool enabled);