FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New osx files.

Browse Source
This commit is contained in:
Martin Rotter 2017-10-09 11:11:17 +02:00
parent cc66e17c5f
commit cc68367cd6
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/scripts/.travis-install-osx.sh
View File

@ -4,6 +4,9 @@ mkdir rssguard-build && cd rssguard-build
qmake .. qmake ..
make make
make install make install
rm -rf "RSS Guard.app/Contents/Frameworks"
make dmg make dmg
make zip make zip

6
src/gui/dialogs/oauthlogin.cpp
View File

@ -18,6 +18,10 @@
#include "gui/dialogs/oauthlogin.h" #include "gui/dialogs/oauthlogin.h"
#include "gui/guiutilities.h"
#include "miscellaneous/application.h"
#include "miscellaneous/iconfactory.h"
#include <QUrlQuery> #include <QUrlQuery>
#include <QWebEngineCookieStore> #include <QWebEngineCookieStore>
#include <QWebEngineProfile> #include <QWebEngineProfile>
@ -25,6 +29,8 @@
OAuthLogin::OAuthLogin(QWidget* parent) : QDialog(parent) { OAuthLogin::OAuthLogin(QWidget* parent) : QDialog(parent) {
m_ui.setupUi(this); m_ui.setupUi(this);
GuiUtilities::applyDialogProperties(*this);
connect(this, &OAuthLogin::rejected, this, &OAuthLogin::authRejected); connect(this, &OAuthLogin::rejected, this, &OAuthLogin::authRejected);
connect(m_ui.m_loginPage, &WebViewer::urlChanged, this, &OAuthLogin::urlChanged); connect(m_ui.m_loginPage, &WebViewer::urlChanged, this, &OAuthLogin::urlChanged);
} }

2
src/gui/guiutilities.cpp
View File

@ -38,7 +38,7 @@ void GuiUtilities::setLabelAsNotice(QLabel& label, bool is_warning) {
} }
void GuiUtilities::applyDialogProperties(QWidget& widget, const QIcon& icon, const QString& title) { void GuiUtilities::applyDialogProperties(QWidget& widget, const QIcon& icon, const QString& title) {
widget.setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint); widget.setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint);
widget.setWindowIcon(icon); widget.setWindowIcon(icon);
if (!title.isEmpty()) { if (!title.isEmpty()) {

3
src/gui/guiutilities.h
View File

@ -19,13 +19,14 @@
#ifndef GUIUTILITIES_H #ifndef GUIUTILITIES_H
#define GUIUTILITIES_H #define GUIUTILITIES_H
#include <QIcon>
#include <QLabel> #include <QLabel>
#include <QWidget> #include <QWidget>
class GuiUtilities { class GuiUtilities {
public: public:
static void setLabelAsNotice(QLabel& label, bool is_warning); static void setLabelAsNotice(QLabel& label, bool is_warning);
static void applyDialogProperties(QWidget& widget, const QIcon& icon, const QString& title = QString()); static void applyDialogProperties(QWidget& widget, const QIcon& icon = QIcon(), const QString& title = QString());
static void applyResponsiveDialogResize(QWidget& widget, double factor = 0.6); static void applyResponsiveDialogResize(QWidget& widget, double factor = 0.6);
private: private: