Hello community, here is the log from the commit of package orion for openSUSE:Factory checked in at 2017-12-29 18:52:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orion (Old) and /work/SRC/openSUSE:Factory/.orion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orion" Fri Dec 29 18:52:25 2017 rev:14 rq:560448 version:1.6.1+git~20171212 Changes: -------- --- /work/SRC/openSUSE:Factory/orion/orion.changes 2017-11-07 09:59:49.258334556 +0100 +++ /work/SRC/openSUSE:Factory/.orion.new/orion.changes 2017-12-29 18:52:39.006902601 +0100 @@ -1,0 +2,6 @@ +Thu Dec 21 20:53:46 UTC 2017 - [email protected] + +- Update to version 1.6.1+git~20171212: + * add keep on top option for desktop + +------------------------------------------------------------------- Old: ---- orion-1.6.1+git~20171029.tar.xz New: ---- orion-1.6.1+git~20171212.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orion.spec ++++++ --- /var/tmp/diff_new_pack.EybnXu/_old 2017-12-29 18:52:40.882363951 +0100 +++ /var/tmp/diff_new_pack.EybnXu/_new 2017-12-29 18:52:40.886362802 +0100 @@ -17,7 +17,7 @@ Name: orion -Version: 1.6.1+git~20171029 +Version: 1.6.1+git~20171212 Release: 0 Summary: Twitch stream client using Qt License: GPL-3.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.EybnXu/_old 2017-12-29 18:52:40.974337535 +0100 +++ /var/tmp/diff_new_pack.EybnXu/_new 2017-12-29 18:52:40.974337535 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/alamminsalo/orion.git</param> - <param name="changesrevision">7f604661b3e94b09d1b6d13860606bc6fbd59f0f</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">ed4c051a969b0e9857f1a2c2f060bcdb8f748d4a</param></service></servicedata> \ No newline at end of file ++++++ orion-1.6.1+git~20171029.tar.xz -> orion-1.6.1+git~20171212.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.6.1+git~20171029/src/model/settingsmanager.cpp new/orion-1.6.1+git~20171212/src/model/settingsmanager.cpp --- old/orion-1.6.1+git~20171029/src/model/settingsmanager.cpp 2017-10-29 20:07:42.000000000 +0100 +++ new/orion-1.6.1+git~20171212/src/model/settingsmanager.cpp 2017-12-12 20:13:26.000000000 +0100 @@ -22,6 +22,7 @@ mChatEdge = 1; mLightTheme = false; mFont = ""; + mKeepOnTop = false; //Connections connect(HttpServer::getInstance(), &HttpServer::codeReceived, this, &SettingsManager::setAccessToken); @@ -84,6 +85,10 @@ if (settings->contains("font")) { setFont(settings->value("font").toString()); } + + if (settings->contains("keepOnTop")) { + setKeepOnTop(settings->value("keepOnTop").toBool()); + } } bool SettingsManager::alert() const @@ -332,3 +337,17 @@ return false; #endif } + +bool SettingsManager::keepOnTop() const +{ + return mKeepOnTop; +} + +void SettingsManager::setKeepOnTop(bool keepOnTop) +{ + if (mKeepOnTop != keepOnTop) { + mKeepOnTop = keepOnTop; + settings->setValue("keepOnTop", keepOnTop); + } + emit keepOnTopChanged(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.6.1+git~20171029/src/model/settingsmanager.h new/orion-1.6.1+git~20171212/src/model/settingsmanager.h --- old/orion-1.6.1+git~20171029/src/model/settingsmanager.h 2017-10-29 20:07:42.000000000 +0100 +++ new/orion-1.6.1+git~20171212/src/model/settingsmanager.h 2017-12-12 20:13:26.000000000 +0100 @@ -24,6 +24,7 @@ Q_PROPERTY(bool lightTheme READ lightTheme WRITE setLightTheme NOTIFY lightThemeChanged) Q_PROPERTY(QString font READ font WRITE setFont NOTIFY fontChanged) Q_PROPERTY(bool versionCheckEnabled READ versionCheckEnabled) + Q_PROPERTY(bool keepOnTop READ keepOnTop WRITE setKeepOnTop NOTIFY keepOnTopChanged) bool mAlert; bool mCloseToTray; @@ -40,6 +41,7 @@ QString mFont; bool mHiDpi; + bool mKeepOnTop; explicit SettingsManager(QObject *parent = nullptr); static SettingsManager *instance; @@ -85,6 +87,9 @@ bool versionCheckEnabled(); + bool keepOnTop() const; + void setKeepOnTop(bool keepOnTop); + signals: void alertChanged(); void closeToTrayChanged(); @@ -98,6 +103,7 @@ void lightThemeChanged(); void accessTokenChanged(QString accessToken); void fontChanged(); + void keepOnTopChanged(); public slots: void setAccessToken(const QString accessToken); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.6.1+git~20171029/src/qml/OptionsView.qml new/orion-1.6.1+git~20171212/src/qml/OptionsView.qml --- old/orion-1.6.1+git~20171029/src/qml/OptionsView.qml 2017-10-29 20:07:42.000000000 +0100 +++ new/orion-1.6.1+git~20171212/src/qml/OptionsView.qml 2017-12-12 20:13:26.000000000 +0100 @@ -169,6 +169,14 @@ selection: Settings.chatEdge onActivated: Settings.chatEdge = index } + + Switch { + visible: !isMobile() + id: keepOnTopOption + text: "Keep on top" + checked: Settings.keepOnTop + onClicked: Settings.keepOnTop = checked + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/orion-1.6.1+git~20171029/src/qml/main.qml new/orion-1.6.1+git~20171212/src/qml/main.qml --- old/orion-1.6.1+git~20171029/src/qml/main.qml 2017-10-29 20:07:42.000000000 +0100 +++ new/orion-1.6.1+git~20171212/src/qml/main.qml 2017-12-12 20:13:26.000000000 +0100 @@ -129,6 +129,10 @@ } }); } + + if (Settings.keepOnTop){ + root.flags |= Qt.WindowStaysOnTopHint; + } } Dialog { @@ -167,5 +171,16 @@ active: !isMobile() sourceComponent: AppTray{} } + + Connections{ + target: Settings + onKeepOnTopChanged:{ + if (Settings.keepOnTop){ + root.flags |= Qt.WindowStaysOnTopHint; + }else{ + root.flags &= ~Qt.WindowStaysOnTopHint; + } + } + } }
