New upstream version 18.1.0~ds0

6 files changed, 38 insertions, 48 deletions

diff --git a/src/mpris2/mediaplayer2.cpp b/src/mpris2/mediaplayer2.cpp
index d1dacc0..46522a2 100644
--- a/src/mpris2/mediaplayer2.cpp
+++ b/src/mpris2/mediaplayer2.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2018 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -47,80 +47,70 @@ MediaPlayer2::MediaPlayer2(BaseGui* gui, QObject* parent)
     : QDBusAbstractAdaptor(parent),
       m_gui(gui)
 {
-//     connect(m_gui, SIGNAL(fullScreen(bool)), this, SLOT(emitFullscreenChange(bool)));
+//	connect(m_gui, SIGNAL(fullScreen(bool)), this, SLOT(emitFullscreenChange(bool)));
 }
 
-MediaPlayer2::~MediaPlayer2()
-{
+MediaPlayer2::~MediaPlayer2() {
 }
 
-bool MediaPlayer2::CanQuit() const
-{
+bool MediaPlayer2::CanQuit() const {
     return true;
 }
 
-void MediaPlayer2::Quit() const
-{
+void MediaPlayer2::Quit() const {
+	qDebug("MediaPlayer2::Quit");
 	m_gui->runActions("close");
 }
 
-bool MediaPlayer2::CanRaise() const
-{
+bool MediaPlayer2::CanRaise() const {
     return true;
 }
 
-void MediaPlayer2::Raise() const
-{
-    m_gui->raise();
+void MediaPlayer2::Raise() const {
+	qDebug("MediaPlayer2::Raise");
+	m_gui->raise();
+	m_gui->activateWindow();
 }
 
-bool MediaPlayer2::Fullscreen() const
-{
+bool MediaPlayer2::Fullscreen() const {
     return m_gui->isFullScreen();
 }
 
-void MediaPlayer2::setFullscreen(bool fullscreen) const
-{
-    m_gui->toggleFullscreen(fullscreen);
+void MediaPlayer2::setFullscreen(bool fullscreen) const {
+	qDebug() << "MediaPlayer2::setFullscreen:" << fullscreen;
+	m_gui->toggleFullscreen(fullscreen);
 }
 
-void MediaPlayer2::emitFullscreenChange(bool fullscreen) const
-{
-    QVariantMap properties;
-    properties["Fullscreen"] = fullscreen;
-    Mpris2::signalPropertiesChange(this, properties);
+void MediaPlayer2::emitFullscreenChange(bool fullscreen) const {
+	QVariantMap properties;
+	properties["Fullscreen"] = fullscreen;
+	Mpris2::signalPropertiesChange(this, properties);
 }
 
-bool MediaPlayer2::CanSetFullscreen() const
-{
-    return true;
+bool MediaPlayer2::CanSetFullscreen() const {
+	return true;
 }
 
-bool MediaPlayer2::HasTrackList() const
-{
-    return false;
+bool MediaPlayer2::HasTrackList() const {
+	return false;
 }
 
-QString MediaPlayer2::Identity() const
-{
-    return QString("SMPlayer");
+QString MediaPlayer2::Identity() const {
+	return QString("SMPlayer");
 }
 
-QString MediaPlayer2::DesktopEntry() const
-{
-    return QString("smplayer");
+QString MediaPlayer2::DesktopEntry() const {
+	return QString("smplayer");
 }
 
-QStringList MediaPlayer2::SupportedUriSchemes() const
-{
-    //TODO: Implement me
-    return QStringList();
+QStringList MediaPlayer2::SupportedUriSchemes() const {
+	//TODO: Implement me
+	return QStringList();
 }
 
-QStringList MediaPlayer2::SupportedMimeTypes() const
-{
-    //TODO: Implement me
-    return QStringList();
+QStringList MediaPlayer2::SupportedMimeTypes() const {
+	//TODO: Implement me
+	return QStringList();
 }
 
 #include "moc_mediaplayer2.cpp"
diff --git a/src/mpris2/mediaplayer2.h b/src/mpris2/mediaplayer2.h
index c21e3c3..10b4a4e 100644
--- a/src/mpris2/mediaplayer2.h
+++ b/src/mpris2/mediaplayer2.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2018 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/mpris2/mediaplayer2player.cpp b/src/mpris2/mediaplayer2player.cpp
index e11d076..9a87982 100644
--- a/src/mpris2/mediaplayer2player.cpp
+++ b/src/mpris2/mediaplayer2player.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2018 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/mpris2/mediaplayer2player.h b/src/mpris2/mediaplayer2player.h
index 65e4673..2374a90 100644
--- a/src/mpris2/mediaplayer2player.h
+++ b/src/mpris2/mediaplayer2player.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2018 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/mpris2/mpris2.cpp b/src/mpris2/mpris2.cpp
index db12f3f..d91ecf9 100644
--- a/src/mpris2/mpris2.cpp
+++ b/src/mpris2/mpris2.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2018 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/mpris2/mpris2.h b/src/mpris2/mpris2.h
index 04d6201..0030dfa 100644
--- a/src/mpris2/mpris2.h
+++ b/src/mpris2/mpris2.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2018 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by