Michael Pujos 2021-04-15 12:54:10 +00:00 committed by Git OBS Bridge
parent cde961dc51
commit 3930ed7e4d
6 changed files with 19 additions and 81 deletions

View File

@ -1,62 +0,0 @@
--- upplay.orig/dirbrowser/cdbrowser.cpp 2020-11-19 17:28:50.000000000 +0100
+++ upplay/dirbrowser/cdbrowser.cpp 2020-11-30 11:54:15.313447480 +0100
@@ -105,6 +105,7 @@
#ifdef USING_WEBENGINE
connect(this, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool)));
+ QApplication::instance()->installEventFilter(this);
#else
connect(this, SIGNAL(linkClicked(const QUrl &)),
this, SLOT(onLinkClicked(const QUrl &)));
@@ -131,6 +132,9 @@
CDBrowser::~CDBrowser()
{
+#ifdef USING_WEBENGINE
+ QApplication::instance()->removeEventFilter(this);
+#endif
deleteReaders("~CDBrowser");
}
@@ -197,12 +201,16 @@
bool CDBrowser::eventFilter(QObject *object, QEvent *event)
{
- switch (event->type()) {
+ if (object->parent() != this) return false;
+ switch (event->type()) {
case QEvent::MouseButtonRelease:
{
const QMouseEvent *mouseEvent(static_cast<QMouseEvent*>(event));
if (mouseEvent) {
m_lastbutton = mouseEvent->button();
+ if (m_lastbutton == Qt::BackButton) {
+ back(0);
+ }
}
}
break;
@@ -262,6 +270,9 @@
{
//qDebug() << "CDBrowser::mouseReleaseEvent";
m_lastbutton = event->button();
+ if (m_lastbutton == Qt::BackButton) {
+ back(0);
+ }
QWEBVIEW::mouseReleaseEvent(event);
}
@@ -959,13 +970,6 @@
" m_initUDN [" << qs2utf8s(m_initUDN) <<
"] curpath size " << m_curpath.size() << endl);
-#ifdef USING_WEBENGINE
- if (focusWidget()) {
- focusWidget()->removeEventFilter(this);
- focusWidget()->installEventFilter(this);
- }
-#endif
-
deleteReaders("initialPage");
emit sig_now_in(this, tr("Servers"));
m_searchcaps.clear();

View File

@ -1,11 +0,0 @@
--- upplay.orig/GUI/standard.qss 2017-08-01 08:49:30.000000000 +0200
+++ upplay/GUI/standard.qss 2020-11-26 16:46:39.713289208 +0100
@@ -1,8 +1,3 @@
-QListView, QTableView {
- background: #FFFFFF;
- alternate-background-color: #DADADA;
-}
-
QListView:focus, QTableView:focus {
border: 2px solid #424e72;
}

3
upplay-1.4.10.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e3a051aceb7ccf238ef875ea2ad74e19e756ba1a7e0461600fbfdec0769fcc6
size 834201

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:649d60fcc38aa3ec7ccd909999b4ef3e4d9fc5fdf5043e381c85f5cc0ed8b412
size 1023220

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Apr 15 12:46:31 UTC 2021 - Michael Pujos <pujos.michael@gmail.com>
- update to 1.4.10
* Make the renderer selection dialog dynamic: it will react to a
renderer appearing on the network
* When the connection with a renderer is lost, try to reconnect
instead of asking the user what to do
* Improve device restart detection and renew subscriptions when needed
* Small fixes in colors in system dark theme
* Small fixes in Webengine version
- removed dark-theme-fix.patch, now in upstream
-------------------------------------------------------------------
Mon Nov 30 10:59:38 UTC 2020 - Michael Pujos <pujos.michael@gmail.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package upplay
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,14 +17,12 @@
Name: upplay
Version: 1.4.7
Version: 1.4.10
Release: 0
Summary: UPnP and OpenHome audio Control Point
License: GPL-2.0-or-later
URL: https://www.lesbonscomptes.com/upplay/
Source: https://www.lesbonscomptes.com/upplay/downloads/upplay-%{version}.tar.gz
Patch0: dark-theme-fix.patch
Patch1: browser-back-mouse-button-support.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
@ -40,7 +38,7 @@ upplay is a Qt5-based audio Control Point for browsing and playing music
managed by your UPnP/DLNA media servers to your UPnP/DLNA/OpenHome players (renderers).
%prep
%autosetup -p1
%setup -q
%build
%qmake5 'WEBPLATFORM=webengine' QMAKE_POST_LINK='$(STRIP) $(TARGET)'