Hi Kaitlin What is this volume full screen extension? Which build do you want to add it?
Peter > -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Kaitlin Rupert > Sent: Friday, February 18, 2011 4:09 AM > To: [email protected] > Subject: [meego-commits] 13932: Changes to > Trunk:Testing/meegotouch-systemui > > Hi, > I have made the following changes to meegotouch-systemui in project > Trunk:Testing. Please review and accept ASAP. > > Thank You, > Kaitlin Rupert > > [This message was auto-generated] > > --- > > Request #13932: > > submit: devel:qt-mtf/meegotouch-systemui(r50) -> > Trunk:Testing/meegotouch-systemui > > > Message: > * Thu Feb 17 2011 Luis Araujo <[email protected]> - 0.20.5 > - Update to release tag 0.20.5-1 (BMC#13632) > - Add the volume-fullscreen extension subpackage. > > State: new 2011-02-17T07:08:12 krupert > Comment: None > > > > changes files: > -------------- > --- meegotouch-systemui.changes > +++ meegotouch-systemui.changes > @@ -0,0 +1,4 @@ > +* Thu Feb 17 2011 Luis Araujo <[email protected]> - 0.20.5 > +- Update to release tag 0.20.5-1 (BMC#13632) > +- Add the volume-fullscreen extension subpackage. > + > > old: > ---- > meegotouch-systemui-0.20.4.tar.bz2 > > new: > ---- > meegotouch-systemui-0.20.5.tar.bz2 > > spec files: > ----------- > --- meegotouch-systemui.spec > +++ meegotouch-systemui.spec > @@ -7,7 +7,7 @@ > > Name: meegotouch-systemui > Summary: System UI daemon > -Version: 0.20.4 > +Version: 0.20.5 > Release: 1 > Group: System/Desktop > License: LGPLv2.1 > @@ -64,6 +64,15 @@ > This package contains the screen lock extension for system-ui with a padlock. > > > +%package volume-fullscreen > +Summary: Volume fullscreen extension for system-ui > +Group: System/GUI/Other > +Requires: %{name} = %{version}-%{release} > + > +%description volume-fullscreen > +This package contains the volume fullscreen extension for system-ui. > + > + > %package -n meegocontrolpanel-privatemodeapplet > Summary: Private mode control panel applet > Group: System/GUI/Other > @@ -153,6 +162,9 @@ > > > > + > + > + > %post -n libnotificationsystem0 -p /sbin/ldconfig > > %postun -n libnotificationsystem0 -p /sbin/ldconfig > @@ -196,6 +208,13 @@ > # >> files screenlock-padlock > # << files screenlock-padlock > > +%files volume-fullscreen > +%defattr(-,root,root,-) > +%{_libdir}/meegotouch/applicationextensions/libsysuid-volume.so > +%{_datadir}/meegotouch/applicationextensions/sysuid-volume.desktop > +# >> files volume-fullscreen > +# << files volume-fullscreen > + > %files -n meegocontrolpanel-privatemodeapplet > %defattr(-,root,root,-) > %{_libdir}/duicontrolpanel/applets/libprivatemodeapplet.so > > other changes: > -------------- > > ++++++ meegotouch-systemui-0.20.4.tar.bz2 -> > meegotouch-systemui-0.20.5.tar.bz2 > --- debian/changelog > +++ debian/changelog > @@ -1,3 +1,15 @@ > +system-ui (0.20.6~1) unstable; urgency=low > + > + * [UNRELEASED] > + > + -- Vesa Halttunen <[email protected]> Mon, 14 Feb 2011 16:47:43 > +0200 > + > +system-ui (0.20.5-1) unstable; urgency=low > + > + * Separated the volume UI into an application extension > + > + -- Vesa Halttunen <[email protected]> Mon, 14 Feb 2011 15:07:26 > +0200 > + > system-ui (0.20.4-1) unstable; urgency=low > > * Fixes: NB#208077 - MNotification doesn't show specified image > --- debian/control > +++ debian/control > @@ -86,6 +86,14 @@ > 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 > +++ debian/system-ui-volume-fullscreen.install > +usr/lib/meegotouch/applicationextensions/libsysuid-volume.so > +usr/share/meegotouch/applicationextensions/sysuid-volume.desktop > --- src/extensions/extensions.pro > +++ src/extensions/extensions.pro > @@ -2,3 +2,4 @@ > include(../../shared.pri) > addSubDirs(screenlock) > addSubDirs(screenlock/themes) > +addSubDirs(volume) > --- src/extensions/volume > +++ src/extensions/volume > +(directory) > --- src/extensions/volume/sysuid-volume.desktop > +++ src/extensions/volume/sysuid-volume.desktop > +[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 > +++ src/extensions/volume/volume.pro > +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/volumebar.cpp > +++ src/extensions/volume/volumebar.cpp > (renamed from src/systemui/volumecontrol/volumebar.cpp) > --- src/extensions/volume/volumebar.h > +++ src/extensions/volume/volumebar.h > (renamed from src/systemui/volumecontrol/volumebar.h) > --- src/extensions/volume/volumebarlogic.cpp > +++ src/extensions/volume/volumebarlogic.cpp > (renamed from src/systemui/volumecontrol/volumebarlogic.cpp) > --- src/extensions/volume/volumebarlogic.h > +++ src/extensions/volume/volumebarlogic.h > (renamed from src/systemui/volumecontrol/volumebarlogic.h) > --- src/extensions/volume/volumebarstyle.h > +++ src/extensions/volume/volumebarstyle.h > (renamed from src/systemui/volumecontrol/volumebarstyle.h) > --- src/extensions/volume/volumebarwindow.cpp > +++ src/extensions/volume/volumebarwindow.cpp > (renamed from src/systemui/volumecontrol/volumebarwindow.cpp) > --- src/extensions/volume/volumebarwindow.h > +++ src/extensions/volume/volumebarwindow.h > (renamed from src/systemui/volumecontrol/volumebarwindow.h) > --- src/extensions/volume/volumeextension.cpp > +++ src/extensions/volume/volumeextension.cpp > +/************************************************************** > ************** > +** > +** 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 <MLibrary> > +#include "volumeextension.h" > +#include "volumebarlogic.h" > + > +Q_EXPORT_PLUGIN2(sysuid-volume, VolumeExtension) > + > +VolumeExtension::VolumeExtension() : > + volumeBarLogic(NULL) > +{ > +} > + > +VolumeExtension::~VolumeExtension() > +{ > + delete volumeBarLogic; > +} > + > +bool VolumeExtension::initialize(const QString &) > +{ > + volumeBarLogic = new VolumeBarLogic(this); > + return true; > +} > + > +QGraphicsWidget *VolumeExtension::widget() > +{ > + return NULL; > +} > + > +M_LIBRARY > --- src/extensions/volume/volumeextension.h > +++ src/extensions/volume/volumeextension.h > +/************************************************************** > ************** > +** > +** 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/VolumeExtensionInterface > +++ src/systemui/VolumeExtensionInterface > +#include "volumeextensioninterface.h" > --- src/systemui/systemui.pro > +++ src/systemui/systemui.pro > @@ -55,7 +55,6 @@ > 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 @@ > PKGCONFIG += aegis-crypto > } > > -contains(DEFINES, HAVE_LIBRESOURCEQT) { > - PKGCONFIG += libresourceqt1 > -} > - > contains(DEFINES, HAVE_LIBNGF) { > PKGCONFIG += libngf0 > } > @@ -87,5 +82,11 @@ > dbus_policy.files += systemui.conf > dbus_policy.path = $$(DEBIAN_DESTDIR)/etc/dbus-1/system.d > > +headers.path = /usr/include/system-ui > +headers.files += \ > + volumeextensioninterface.h \ > + VolumeExtensionInterface > + > INSTALLS += target \ > - dbus_policy > + dbus_policy \ > + headers > --- src/systemui/sysuid.cpp > +++ 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 @@ > #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 @@ > delete ngfNotificationSink; > delete mCompositorNotificationSink; > delete notificationManager; > + delete volumeExtensionArea; > instance_ = 0; > } > > --- src/systemui/sysuid.h > +++ src/systemui/sysuid.h > @@ -43,6 +43,7 @@ > class NotifierNotificationSink; > class SysUidRequest; > class VolumeBarLogic; > +class MApplicationExtensionArea; > > class Sysuid : public QObject > { > @@ -114,8 +115,8 @@ > //! 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/volumecontrol > +++ src/systemui/volumecontrol > -(directory) > --- src/systemui/volumecontrol/volumebar.cpp > +++ src/systemui/volumecontrol/volumebar.cpp > (renamed to src/extensions/volume/volumebar.cpp) > --- src/systemui/volumecontrol/volumebar.h > +++ src/systemui/volumecontrol/volumebar.h > (renamed to src/extensions/volume/volumebar.h) > --- src/systemui/volumecontrol/volumebarlogic.cpp > +++ src/systemui/volumecontrol/volumebarlogic.cpp > (renamed to src/extensions/volume/volumebarlogic.cpp) > --- src/systemui/volumecontrol/volumebarlogic.h > +++ src/systemui/volumecontrol/volumebarlogic.h > (renamed to src/extensions/volume/volumebarlogic.h) > --- src/systemui/volumecontrol/volumebarstyle.h > +++ src/systemui/volumecontrol/volumebarstyle.h > (renamed to src/extensions/volume/volumebarstyle.h) > --- src/systemui/volumecontrol/volumebarwindow.cpp > +++ src/systemui/volumecontrol/volumebarwindow.cpp > (renamed to src/extensions/volume/volumebarwindow.cpp) > --- src/systemui/volumecontrol/volumebarwindow.h > +++ src/systemui/volumecontrol/volumebarwindow.h > (renamed to src/extensions/volume/volumebarwindow.h) > --- src/systemui/volumecontrol/volumecontrol.pri > +++ src/systemui/volumecontrol/volumecontrol.pri > - > -INCLUDEPATH += \ > - volumecontrol/ \ > - /usr/include/resource/qt4 > - > -STYLE_HEADERS += \ > - volumecontrol/volumebarstyle.h > - > -HEADERS+= \ > - volumecontrol/volumebarlogic.h \ > - volumecontrol/volumebar.h \ > - volumecontrol/volumebarwindow.h \ > - $$STYLE_HEADERS > - > -SOURCES+= \ > - volumecontrol/volumebarlogic.cpp \ > - volumecontrol/volumebar.cpp \ > - volumecontrol/volumebarwindow.cpp > - > --- src/systemui/volumeextensioninterface.h > +++ src/systemui/volumeextensioninterface.h > +/************************************************************** > ************** > + ** > + ** 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 > +++ tests/stubs/sysuid_stub.h > @@ -87,7 +87,7 @@ > 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 > +++ 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 > +++ tests/ut_sysuid/ut_sysuid.pro > @@ -26,7 +26,6 @@ > # 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 > +++ tests/ut_volumebar/ut_volumebar.pro > @@ -3,22 +3,22 @@ > 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) > --- tests/ut_volumebarlogic/ut_volumebarlogic.pro > +++ tests/ut_volumebarlogic/ut_volumebarlogic.pro > @@ -2,20 +2,20 @@ > include(../common_top.pri) > TARGET = ut_volumebarlogic > > -INCLUDEPATH += $$SRCDIR/volumecontrol > +INCLUDEPATH += $$ROOTSRCDIR/extensions/volume > > CONFIG += link_pkgconfig > PKGCONFIG += dbus-1 dbus-glib-1 libresourceqt1 qmsystem2 > > HEADERS += \ > ut_volumebarlogic.h \ > - $$SRCDIR/volumecontrol/volumebarlogic.h \ > - $$SRCDIR/volumecontrol/volumebarwindow.h \ > + $$ROOTSRCDIR/extensions/volume/volumebarlogic.h \ > + $$ROOTSRCDIR/extensions/volume/volumebarwindow.h \ > $$SRCDIR/closeeventeater.h > > SOURCES += \ > ut_volumebarlogic.cpp \ > - $$SRCDIR/volumecontrol/volumebarlogic.cpp \ > + $$ROOTSRCDIR/extensions/volume/volumebarlogic.cpp \ > $$STUBSDIR/stubbase.cpp > > include(../common_bot.pri) > --- tests/ut_volumebarwindow/ut_volumebarwindow.pro > +++ tests/ut_volumebarwindow/ut_volumebarwindow.pro > @@ -4,23 +4,23 @@ > > INCLUDEPATH += \ > $$LIBNOTIFICATIONSRCDIR \ > - $$SRCDIR/volumecontrol > + $$ROOTSRCDIR/extensions/volume > > CONFIG += link_pkgconfig > PKGCONFIG += libresourceqt1 > > -STYLE_HEADERS += $$SRCDIR/volumecontrol/volumebarstyle.h > +STYLE_HEADERS += $$ROOTSRCDIR/extensions/volume/volumebarstyle.h > > HEADERS += \ > ut_volumebarwindow.h \ > - $$SRCDIR/volumecontrol/volumebarwindow.h \ > - $$SRCDIR/volumecontrol/volumebarlogic.h \ > - $$SRCDIR/volumecontrol/volumebar.h \ > + $$ROOTSRCDIR/extensions/volume/volumebarwindow.h \ > + $$ROOTSRCDIR/extensions/volume/volumebarlogic.h \ > + $$ROOTSRCDIR/extensions/volume/volumebar.h \ > $$STYLE_HEADERS > > SOURCES += \ > ut_volumebarwindow.cpp \ > - $$SRCDIR/volumecontrol/volumebarwindow.cpp \ > + $$ROOTSRCDIR/extensions/volume/volumebarwindow.cpp \ > $$STUBSDIR/stubbase.cpp > > include(../common_bot.pri) > > ++++++ meegotouch-systemui.yaml > --- meegotouch-systemui.yaml > +++ meegotouch-systemui.yaml > @@ -1,6 +1,6 @@ > Name: meegotouch-systemui > Summary: System UI daemon > -Version: 0.20.4 > +Version: 0.20.5 > Release: 1 > Group: System/Desktop > License: LGPLv2.1 > @@ -76,6 +76,15 @@ > - > "%{_datadir}/themes/base/meegotouch/libsysuid-screenlock/*.conf" > - > "%{_datadir}/themes/base/meegotouch/libsysuid-screenlock/style/*.css" > > + - Name: volume-fullscreen > + Summary: Volume fullscreen extension for system-ui > + Group: System/GUI/Other > + Description: | > + This package contains the volume fullscreen extension for > system-ui. > + Files: > + - > "%{_libdir}/meegotouch/applicationextensions/libsysuid-volume.so" > + - > "%{_datadir}/meegotouch/applicationextensions/sysuid-volume.desktop" > + > - Name: meegocontrolpanel-privatemodeapplet > AsWholeName: yes > Summary: Private mode control panel applet > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
