Changes: Separate volume user interface into an application extension

RevBy: TrustMe

debian/.gitignore

@@ -4,6 +4,7 @@ system-ui-dev
 system-ui-doc
 system-ui-tests
 system-ui-screenlock-padlock
+system-ui-volume-fullscreen
 systemui-l10n-engineering-english
 libnotificationsystem0
 libnotificationsystem-dev

debian/control

@@ -86,6 +86,14 @@ Provides: system-ui-screenlock
 Conflicts: system-ui-screenlock
 Description: Screen lock extension for system-ui with a padlock
 
+Package: system-ui-volume-fullscreen
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Provides: system-ui-volume
+Conflicts: system-ui-volume
+Description: Volume extension for system-ui with a full screen view
+
 Package: duicontrolpanel-privatemodeapplet
 Architecture: any
 Section: libs

debian/system-ui-volume-fullscreen.install

@@ -0,0 +1,2 @@
+usr/lib/meegotouch/applicationextensions/libsysuid-volume.so
+usr/share/meegotouch/applicationextensions/sysuid-volume.desktop

src/extensions/extensions.pro

@@ -2,3 +2,4 @@ TEMPLATE = subdirs
 include(../../shared.pri)
 addSubDirs(screenlock)
 addSubDirs(screenlock/themes)
+addSubDirs(volume)

src/extensions/volume/sysuid-volume.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=X-MeeGoApplicationExtension
+Name=Volume Extension
+
+[X-MeeGoApplicationExtension]
+Interface=com.meego.core.VolumeExtensionInterface/0.20
+Extension=libsysuid-volume.so

src/extensions/volume/volume.pro

@@ -0,0 +1,58 @@
+MOC_DIR = .moc
+M_MGEN_OUTDIR = .gen
+OBJECTS_DIR = .obj
+LOCALLIBSDIR = ../../../lib
+
+include(../../../mconfig.pri)
+include(../../../localconfig.pri)
+
+TEMPLATE      = lib
+CONFIG       += plugin gui meegotouch system-ui link_pkgconfig
+QT           += dbus
+INCLUDEPATH  += \
+    ../../libnotificationsystem \
+    ../../systemui \
+    /usr/include/resource/qt4
+
+QMAKE_LIBDIR += $$LOCALLIBSDIR
+
+STYLE_HEADERS += volumebarstyle.h
+
+HEADERS += \
+    volumeextension.h \
+    volumebarlogic.h \
+    volumebar.h \
+    volumebarwindow.h \
+    volumebarstyle.h \
+    ../../systemui/closeeventeater.h
+
+SOURCES += \
+    volumeextension.cpp \
+    volumebarlogic.cpp \
+    volumebar.cpp \
+    volumebarwindow.cpp \
+    ../../systemui/closeeventeater.cpp
+
+TARGET        = $$qtLibraryTarget(sysuid-volume)
+DESTDIR       = $$LOCALLIBSDIR
+
+contains(DEFINES, HAVE_QMSYSTEM) {
+    PKGCONFIG += qmsystem2
+}
+
+contains(DEFINES, HAVE_LIBRESOURCEQT) {
+    PKGCONFIG += libresourceqt1
+}
+
+PKGCONFIG += \
+    dbus-1 \
+    dbus-glib-1
+
+target.path += $$M_APPLICATION_EXTENSION_DIR
+
+desktop_entry.path = $$M_APPLICATION_EXTENSION_DATA_DIR
+desktop_entry.files = *.desktop
+
+INSTALLS += \
+    target \
+    desktop_entry

src/extensions/volume/volumeextension.cpp

@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+**
+** This file is part of systemui.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation
+** and appearing in the file LICENSE.LGPL included in the packaging
+** of this file.
+**
+****************************************************************************/
+#include <QDebug>
+#include <MLibrary>
+#include "volumeextension.h"
+#include "volumebarlogic.h"
+
+Q_EXPORT_PLUGIN2(sysuid-volume, VolumeExtension)
+
+VolumeExtension::VolumeExtension() :
+    volumeBarLogic(NULL)
+{
+    qDebug() << "XX VOLUME EXTENSION INSTANTIATION";
+}
+
+VolumeExtension::~VolumeExtension()
+{
+    delete volumeBarLogic;
+}
+
+bool VolumeExtension::initialize(const QString &)
+{
+    qDebug() << "XX VOLUME EXTENSION INITIALIZATION";
+    volumeBarLogic = new VolumeBarLogic(this);
+    return true;
+}
+
+QGraphicsWidget *VolumeExtension::widget()
+{
+    return NULL;
+}
+
+M_LIBRARY

src/extensions/volume/volumeextension.h

@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
+**
+** This file is part of systemui.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation
+** and appearing in the file LICENSE.LGPL included in the packaging
+** of this file.
+**
+****************************************************************************/
+
+#ifndef VOLUMEEXTENSION_H
+#define VOLUMEEXTENSION_H
+
+#include "volumeextensioninterface.h"
+#include <QObject>
+
+class VolumeBarLogic;
+
+class VolumeExtension : public QObject, public VolumeExtensionInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(VolumeExtensionInterface MApplicationExtensionInterface)
+
+public:
+    VolumeExtension();
+    virtual ~VolumeExtension();
+
+    //! Methods derived from MApplicationExtensionInterface
+    virtual bool initialize(const QString &interface);
+    virtual QGraphicsWidget *widget();
+
+private:
+    VolumeBarLogic *volumeBarLogic;
+};
+
+#endif // VOLUMEEXTENSION_H

src/systemui/systemui.pro

@@ -55,7 +55,6 @@ SOURCES +=                              \
 include(statusindicatormenu/statusindicatormenu.pri)
 include(statusarea/statusarea.pri)
 include(notifications/notifications.pri)
-include(volumecontrol/volumecontrol.pri)
 include(screenlock/screenlock.pri)
 include(../../localconfig.pri)
 
@@ -71,10 +70,6 @@ contains(DEFINES, HAVE_AEGIS_CRYPTO) {
     PKGCONFIG += aegis-crypto
 }
 
-contains(DEFINES, HAVE_LIBRESOURCEQT) {
-    PKGCONFIG += libresourceqt1
-}
-
 contains(DEFINES, HAVE_LIBNGF) {
     PKGCONFIG += libngf0
 }

src/systemui/sysuid.cpp

@@ -20,6 +20,7 @@
 #include <MLocale>
 #include <MTheme>
 #include <MLocale>
+#include <MApplicationExtensionArea>
 #include <QDBusConnection>
 
 #include "usbui.h"
@@ -37,7 +38,6 @@
 #include "ngfnotificationsink.h"
 #include "contextframeworkcontext.h"
 #include "notifiernotificationsink.h"
-#include "volumebarlogic.h"
 #include "closeeventeater.h"
 #include <QX11Info>
 
@@ -133,8 +133,11 @@ Sysuid::Sysuid(QObject* parent) :
 #endif
     updateCompositorNotificationSinkEnabledStatus();
 
-    // Instantiate the volume control logic
-    volumeBarLogic = new VolumeBarLogic(this);
+    // Create an extension area for the volume extension
+    volumeExtensionArea = new MApplicationExtensionArea("com.meego.core.VolumeExtensionInterface/0.20");
+    volumeExtensionArea->setInProcessFilter(QRegExp("/sysuid-volume.desktop$"));
+    volumeExtensionArea->setOutOfProcessFilter(QRegExp("$^"));
+    volumeExtensionArea->init();
 }
 
 Sysuid::~Sysuid()
@@ -144,6 +147,7 @@ Sysuid::~Sysuid()
     delete ngfNotificationSink;
     delete mCompositorNotificationSink;
     delete notificationManager;
+    delete volumeExtensionArea;
     instance_ = 0;
 }
 

src/systemui/sysuid.h

@@ -43,6 +43,7 @@ class UnlockNotificationSink;
 class NotifierNotificationSink;
 class SysUidRequest;
 class VolumeBarLogic;
+class MApplicationExtensionArea;
 
 class Sysuid : public QObject
 {
@@ -114,8 +115,8 @@ private slots:
     //! The system-bus adaptor class for unlock-screen interface
     SysUidRequest *sysUidRequest;
 
-    //! The volume control logic
-    VolumeBarLogic *volumeBarLogic;
+    //! The volume extension area
+    MApplicationExtensionArea *volumeExtensionArea;
 
     //! Context item for getting information about video recording status
     QSharedPointer<ContextItem> useMode;

src/systemui/volumeextensioninterface.h

@@ -0,0 +1,45 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ ** All rights reserved.
+ ** Contact: Nokia Corporation ([email protected])
+ **
+ ** This file is part of systemui.
+ **
+ ** If you have questions regarding the use of this file, please contact
+ ** Nokia at [email protected].
+ **
+ ** This library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public
+ ** License version 2.1 as published by the Free Software Foundation
+ ** and appearing in the file LICENSE.LGPL included in the packaging
+ ** of this file.
+ **
+ ****************************************************************************/
+
+#ifndef VOLUMEEXTENSIONINTERFACE_H
+#define VOLUMEEXTENSIONINTERFACE_H
+
+#include <QObject>
+#include <mapplicationextensioninterface.h>
+
+/**
+ * VolumeExtensionInterface is the base class for volume extension classes.
+ *
+ * Extension developers need to implement this interface in their extension binary
+ * and export their implementation from the binary. The host application will maintain
+ * an inventory of available extensions and instantiate them using this interface
+ * when needed.
+ */
+class VolumeExtensionInterface : public MApplicationExtensionInterface
+{
+public:
+    /*!
+     * Destructor.
+     */
+    virtual ~VolumeExtensionInterface() {}
+};
+
+Q_DECLARE_INTERFACE(VolumeExtensionInterface, "com.meego.core.VolumeExtensionInterface/0.20")
+
+#endif // VOLUMEEXTENSIONINTERFACE_H

tests/stubs/sysuid_stub.h

@@ -87,7 +87,7 @@ Sysuid::Sysuid(QObject* parent) :
     usbUi (0), statusAreaRenderer (0), statusIndicatorMenuBusinessLogic (0), notificationManager (0),
     mCompositorNotificationSink (0), ngfNotificationSink (0),
     notifierNotificationSink_(0), sysUidRequest (0),
-    volumeBarLogic (0)
+    volumeExtensionArea (0)
 {
   gSysuidStub->SysuidConstructor(parent);
 }

tests/ut_sysuid/ut_sysuid.cpp

@@ -46,7 +46,6 @@
 #include "unlocknotifications_stub.h"
 #include "unlockmissedevents_stub.h"
 #include "unlocknotificationsinkstub.h"
-#include "volumebarlogic_stub.h"
 #include "x11wrapper_stub.h"
 #include "closeeventeater_stub.h"
 #include "notifiernotificationsink_stub.h"

tests/ut_sysuid/ut_sysuid.pro

@@ -26,7 +26,6 @@ SOURCES += \
 # unit test and unit classes
 HEADERS += \
     ut_sysuid.h \
-    $$SRCDIR/volumecontrol/volumebarlogic.h \
     $$SRCDIR/shutdownui.h \
     $$SRCDIR/usbui.h \
     $$ROOTSRCDIR/extensions/screenlock/lockscreen.h \

tests/ut_volumebar/ut_volumebar.pro

@@ -3,22 +3,22 @@ include(../common_top.pri)
 TARGET = ut_volumebar
 
 INCLUDEPATH += \
-               $$SRCDIR/volumecontrol \
+               $$ROOTSRCDIR/extensions/volume \
                /usr/include/resource/qt4
 
 CONFIG += link_pkgconfig
 
 STYLE_HEADERS += \
-    $$SRCDIR/volumecontrol/volumebarstyle.h
+    $$ROOTSRCDIR/extensions/volume/volumebarstyle.h
 
 HEADERS += \
     ut_volumebar.h \
-    $$SRCDIR/volumecontrol/volumebar.h \
+    $$ROOTSRCDIR/extensions/volume/volumebar.h \
     $$STYLE_HEADERS
 
 
 SOURCES += \
     ut_volumebar.cpp \
-    $$SRCDIR/volumecontrol/volumebar.cpp
+    $$ROOTSRCDIR/extensions/volume/volumebar.cpp
 
 include(../common_bot.pri)