From b0c62959130d3edf81a2510df3103945a6ba6ac1 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Fri, 23 Jul 2010 10:19:27 +0300 Subject: Added accessor for classInstance for the camera guys. --- libdbus-qeventloop/dbusconnectioneventloop.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libdbus-qeventloop/dbusconnectioneventloop.h b/libdbus-qeventloop/dbusconnectioneventloop.h index d44f667..13259c3 100644 --- a/libdbus-qeventloop/dbusconnectioneventloop.h +++ b/libdbus-qeventloop/dbusconnectioneventloop.h @@ -63,6 +63,10 @@ public: static bool addConnection(DBusConnection* conn); static void removeConnection(DBusConnection* conn); + static DBUSConnectionEventLoop &getInstance(void) { + return classInstance; + } + private: bool internalAddConnection(DBusConnection* conn); void internalRemoveConnection(DBusConnection* conn); -- cgit v1.2.3 From 4689a740a3b9777aaeb644472d722a42240b6fa6 Mon Sep 17 00:00:00 2001 From: Nippan Singam Date: Tue, 27 Jul 2010 13:19:19 +0300 Subject: Added header file for bug 181631 --- resourceqt-client/client.h | 1 + tests/test-dbus-qeventloop/test-dbus-qeventloop.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/resourceqt-client/client.h b/resourceqt-client/client.h index 3100160..200e4b6 100644 --- a/resourceqt-client/client.h +++ b/resourceqt-client/client.h @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/tests/test-dbus-qeventloop/test-dbus-qeventloop.cpp b/tests/test-dbus-qeventloop/test-dbus-qeventloop.cpp index 032156a..db31150 100644 --- a/tests/test-dbus-qeventloop/test-dbus-qeventloop.cpp +++ b/tests/test-dbus-qeventloop/test-dbus-qeventloop.cpp @@ -1,4 +1,5 @@ #include "dbusconnectioneventloop.h" +#include #include class TestDbusQEventLoop: public QObject -- cgit v1.2.3 From 223a40ec162252785591c2164f3ca1326d7878ea Mon Sep 17 00:00:00 2001 From: Wolf Bergenheim Date: Tue, 3 Aug 2010 15:55:54 +0300 Subject: Fixed bug NB#181713 --- libresourceqt/src/resource-engine.cpp | 19 +++++++++------- libresourceqt/src/resource-set.cpp | 42 ++++++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp index e4068d2..dae826b 100644 --- a/libresourceqt/src/resource-engine.cpp +++ b/libresourceqt/src/resource-engine.cpp @@ -3,6 +3,8 @@ using namespace ResourcePolicy; +static QMultiMap engineMap; + resconn_t *ResourceEngine::libresourceConnection = NULL; quint32 ResourceEngine::libresourceUsers = 0; @@ -88,9 +90,11 @@ bool ResourceEngine::initialize() resproto_set_handler(ResourceEngine::libresourceConnection, RESMSG_UNREGISTER, handleUnregisterMessage); resproto_set_handler(ResourceEngine::libresourceConnection, RESMSG_GRANT, handleGrantMessage); resproto_set_handler(ResourceEngine::libresourceConnection, RESMSG_ADVICE, handleAdviceMessage); + engineMap.insert(ResourceEngine::libresourceConnection, this); } else { ResourceEngine::libresourceUsers += 1; + engineMap.insert(ResourceEngine::libresourceConnection, this); } qDebug("ResourceEngine (%u, %p) is now initialized. %d users", @@ -277,7 +281,7 @@ bool ResourceEngine::disconnectFromManager() bool ret = true; if (libresourceSet != NULL) { - ret = resconn_disconnect(libresourceSet, &resourceMessage, statusCallbackHandler) != 0; + ret = resconn_disconnect(libresourceSet, &resourceMessage, statusCallbackHandler)?true:false; } return ret; } @@ -561,15 +565,14 @@ static void connectionIsUp(resconn_t *connection) { qDebug("**************** %s() - locking....", __FUNCTION__); QMutexLocker locker(&mutex); - if (NULL == connection->dbus.rsets->userdata) { - qDebug("IGNORING connectionIsUp"); - return; - } - ResourceEngine *resourceEngine; - resourceEngine = reinterpret_cast(connection->dbus.rsets->userdata); qDebug("connection is up"); - resourceEngine->handleConnectionIsUp(connection); + + QList engines = engineMap.values(connection); + for (int i = 0; i < engines.size(); ++i) { + ResourceEngine *resourceEngine = engines.at(i); + resourceEngine->handleConnectionIsUp(connection); + } } void ResourceEngine::handleConnectionIsUp(resconn_t *connection) diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp index 8ddb54b..babddfe 100644 --- a/libresourceqt/src/resource-set.cpp +++ b/libresourceqt/src/resource-set.cpp @@ -272,18 +272,40 @@ bool ResourceSet::alwaysGetReply() void ResourceSet::connectedHandler() { qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); - qDebug("Connected to manager!"); + if (resourceEngine->isConnectedToManager()) { + qDebug("ResourceSet::%s() Connected to manager!", __FUNCTION__); - if (pendingAudioProperties) { - registerAudioProperties(); - } - if (pendingUpdate) { - resourceEngine->updateResources(); - pendingUpdate = false; + if (pendingAudioProperties) { + registerAudioProperties(); + } + if (pendingUpdate) { + resourceEngine->updateResources(); + pendingUpdate = false; + } + if (pendingAcquire) { + resourceEngine->acquireResources(); + pendingAcquire = false; + } } - if (pendingAcquire) { - resourceEngine->acquireResources(); - pendingAcquire = false; + else { // assuming reconnecting + qDebug("ResourceSet::%s() Reconnecting to manager...", __FUNCTION__); + + // first check if we have any acquired resources + for (int i = 0; i < NumberOfTypes; i++) { + if (resourceSet[i] != NULL) { + if (resourceSet[i]->isGranted()) { + if (i == AudioPlaybackType) { + pendingAudioProperties = true; + qDebug("ResourceSet::%s() We have audio", __FUNCTION__); + } + qDebug("ResourceSet::%s() We have acquired resources. Re-acquire", __FUNCTION__); + pendingAcquire = true; + resourceSet[i]->unsetGranted(); + } + } + } + // now reconnect + resourceEngine->connectToManager(); } } -- cgit v1.2.3 From 186e21da5f83fc26cd33f13e800cd59316250d04 Mon Sep 17 00:00:00 2001 From: Wolf Bergenheim Date: Thu, 5 Aug 2010 13:32:04 +0300 Subject: Renamed libresource-overridesqt => libmediaoverridesqt Renamed resourceoverrider => mediaoverrider --- common.pri | 2 +- libmediaoverridesqt/libmediaoverridesqt.pro | 36 ++++++++++ libmediaoverridesqt/libmediaoverridesqt1.pc | 12 ++++ libmediaoverridesqt/override.cpp | 63 ++++++++++++++++ libmediaoverridesqt/override.h | 32 +++++++++ .../libresource-overridesqt.pro | 36 ---------- .../libresource-overridesqt1.pc | 12 ---- libresource-overridesqt/override.cpp | 63 ---------------- libresource-overridesqt/override.h | 32 --------- libresourceqt.pro | 10 +-- mediaoverrider/main.cpp | 10 +++ mediaoverrider/mediaoverrider.cpp | 83 ++++++++++++++++++++++ mediaoverrider/mediaoverrider.desktop | 7 ++ mediaoverrider/mediaoverrider.h | 38 ++++++++++ mediaoverrider/mediaoverrider.pro | 28 ++++++++ resourceoverrider/main.cpp | 10 --- resourceoverrider/resourceoverrider.cpp | 83 ---------------------- resourceoverrider/resourceoverrider.desktop | 7 -- resourceoverrider/resourceoverrider.h | 38 ---------- resourceoverrider/resourceoverrider.pro | 28 -------- 20 files changed, 315 insertions(+), 315 deletions(-) create mode 100644 libmediaoverridesqt/libmediaoverridesqt.pro create mode 100644 libmediaoverridesqt/libmediaoverridesqt1.pc create mode 100644 libmediaoverridesqt/override.cpp create mode 100644 libmediaoverridesqt/override.h delete mode 100644 libresource-overridesqt/libresource-overridesqt.pro delete mode 100644 libresource-overridesqt/libresource-overridesqt1.pc delete mode 100644 libresource-overridesqt/override.cpp delete mode 100644 libresource-overridesqt/override.h create mode 100644 mediaoverrider/main.cpp create mode 100644 mediaoverrider/mediaoverrider.cpp create mode 100644 mediaoverrider/mediaoverrider.desktop create mode 100644 mediaoverrider/mediaoverrider.h create mode 100644 mediaoverrider/mediaoverrider.pro delete mode 100644 resourceoverrider/main.cpp delete mode 100644 resourceoverrider/resourceoverrider.cpp delete mode 100644 resourceoverrider/resourceoverrider.desktop delete mode 100644 resourceoverrider/resourceoverrider.h delete mode 100644 resourceoverrider/resourceoverrider.pro diff --git a/common.pri b/common.pri index fadd3bb..eefcd81 100644 --- a/common.pri +++ b/common.pri @@ -1,6 +1,6 @@ LIBDBUSQEVENTLOOP = $${PWD}/libdbus-qeventloop LIBRESOURCEQT = $${PWD}/libresourceqt -LIBRESOURCEOVERRIDESQT = $${PWD}/libresource-overridesqt +LIBMEDIAOVERRIDESQT = $${PWD}/libmediaoverridesqt LIBRESOURCEINC = $${LIBRESOURCEQT}/include/qt4 POLICY = $${LIBRESOURCEINC}/policy diff --git a/libmediaoverridesqt/libmediaoverridesqt.pro b/libmediaoverridesqt/libmediaoverridesqt.pro new file mode 100644 index 0000000..20296c4 --- /dev/null +++ b/libmediaoverridesqt/libmediaoverridesqt.pro @@ -0,0 +1,36 @@ +include(../common.pri) +TEMPLATE = lib +TARGET = mediaoverridesqt +DESTDIR = build +DEPENDPATH += . +INCLUDEPATH += . + +# Input +PUBLIC_HEADERS = override.h + +HEADERS += $${PUBLIC_HEADERS} + +SOURCES += override.cpp + +QMAKE_CXXFLAGS += -Wall +LIBS += -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop + +OBJECTS_DIR = build +MOC_DIR = moc + +CONFIG += qt dll +QT += dbus +PKGCONFIG += dbus-1 libresource0 + +QMAKE_DISTCLEAN += -r moc build + +# Install directives +headers.files = $${PUBLIC_HEADERS} +INSTALLBASE = /usr +target.path = $${INSTALLBASE}/lib +headers.path = $${INSTALLBASE}/include/resource/qt4/policy +pc.files = libmediaoverridesqt1.pc +pc.path = $${INSTALLBASE}/lib/pkgconfig + +INSTALLS = target headers pc + diff --git a/libmediaoverridesqt/libmediaoverridesqt1.pc b/libmediaoverridesqt/libmediaoverridesqt1.pc new file mode 100644 index 0000000..7666624 --- /dev/null +++ b/libmediaoverridesqt/libmediaoverridesqt1.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include/resource/qt4 + +Name: libmediaoverridesqt1 +Description: Maemo overrides Qt API +Version: 1.11 +Libs: -L${libdir} +Cflags: -I${includedir} +Requires: QtDbus + diff --git a/libmediaoverridesqt/override.cpp b/libmediaoverridesqt/override.cpp new file mode 100644 index 0000000..71102df --- /dev/null +++ b/libmediaoverridesqt/override.cpp @@ -0,0 +1,63 @@ +#include "override.h" + +#define MANAGER_PATH "/org/maemo/Playback/Manager" +#define MANAGER_SERVICE "org.maemo.Playback.Manager" +#define MANAGER_INTERFACE "org.maemo.Playback.Manager" + +using namespace ResourcePolicy; + +Override * ResourcePolicy::createMute(QObject *parent) +{ + return new Override("Mute", parent); +} + +Override * ResourcePolicy::createPrivacyOverride(QObject *parent) +{ + return new Override("PrivacyOverride", parent); +} + +Override * ResourcePolicy::createBluetoothOVerride(QObject *parent) +{ + return new Override("BluetoothOverride", parent); +} + +Override::Override(QString overrideType, QObject *parent): + QObject(parent), dBusConnection(QDBusConnection::sessionBus()), type(overrideType) +{ + dBusConnection.connect(MANAGER_SERVICE, MANAGER_PATH, MANAGER_INTERFACE, + type, this, SLOT(handleChange(bool))); +} + +Override::~Override() +{ +} + +void Override::fetchState() +{ + QDBusMessage msg; + QString method = "Get" + type; + + msg = QDBusMessage::createMethodCall(MANAGER_SERVICE, MANAGER_PATH, + MANAGER_INTERFACE, method); + dBusConnection.send(msg); +} + +void Override::request(bool newState) +{ + QDBusMessage msg; + QString method = "Request" + type; + + msg = QDBusMessage::createMethodCall(MANAGER_SERVICE, MANAGER_PATH, + MANAGER_INTERFACE, method); + + QVariantList args; + args.append(newState); + msg.setArguments(args); + dBusConnection.send(msg); +} + +void Override::handleChange(bool newState) +{ + emit changed(newState); +} + diff --git a/libmediaoverridesqt/override.h b/libmediaoverridesqt/override.h new file mode 100644 index 0000000..c906a55 --- /dev/null +++ b/libmediaoverridesqt/override.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include +#include + +namespace ResourcePolicy +{ + class Override : public QObject + { + Q_OBJECT +public: + Override(QString overrideType, QObject *parent=NULL); + virtual ~Override(); + void fetchState(); + +signals: + void changed(bool newState); + +private slots: + void handleChange(bool newState); + void request(bool newState); + +private: + QDBusConnection dBusConnection; + QString type; + }; + Override * createMute(QObject *parent=NULL); + Override * createPrivacyOverride(QObject *parent=NULL); + Override * createBluetoothOVerride(QObject *parent=NULL); +} + diff --git a/libresource-overridesqt/libresource-overridesqt.pro b/libresource-overridesqt/libresource-overridesqt.pro deleted file mode 100644 index c306266..0000000 --- a/libresource-overridesqt/libresource-overridesqt.pro +++ /dev/null @@ -1,36 +0,0 @@ -include(../common.pri) -TEMPLATE = lib -TARGET = resource-overridesqt -DESTDIR = build -DEPENDPATH += . -INCLUDEPATH += . - -# Input -PUBLIC_HEADERS = override.h - -HEADERS += $${PUBLIC_HEADERS} - -SOURCES += override.cpp - -QMAKE_CXXFLAGS += -Wall -LIBS += -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop - -OBJECTS_DIR = build -MOC_DIR = moc - -CONFIG += qt dll -QT += dbus -PKGCONFIG += dbus-1 libresource0 - -QMAKE_DISTCLEAN += -r moc build - -# Install directives -headers.files = $${PUBLIC_HEADERS} -INSTALLBASE = /usr -target.path = $${INSTALLBASE}/lib -headers.path = $${INSTALLBASE}/include/resource/qt4/policy -pc.files = libresource-overridesqt1.pc -pc.path = $${INSTALLBASE}/lib/pkgconfig - -INSTALLS = target headers pc - diff --git a/libresource-overridesqt/libresource-overridesqt1.pc b/libresource-overridesqt/libresource-overridesqt1.pc deleted file mode 100644 index a6cf64e..0000000 --- a/libresource-overridesqt/libresource-overridesqt1.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include/resource/qt4 - -Name: libresource-overridesqt1 -Description: Maemo resource management Qt API -Version: 1.11 -Libs: -L${libdir} -Cflags: -I${includedir} -Requires: QtDbus - diff --git a/libresource-overridesqt/override.cpp b/libresource-overridesqt/override.cpp deleted file mode 100644 index 71102df..0000000 --- a/libresource-overridesqt/override.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include "override.h" - -#define MANAGER_PATH "/org/maemo/Playback/Manager" -#define MANAGER_SERVICE "org.maemo.Playback.Manager" -#define MANAGER_INTERFACE "org.maemo.Playback.Manager" - -using namespace ResourcePolicy; - -Override * ResourcePolicy::createMute(QObject *parent) -{ - return new Override("Mute", parent); -} - -Override * ResourcePolicy::createPrivacyOverride(QObject *parent) -{ - return new Override("PrivacyOverride", parent); -} - -Override * ResourcePolicy::createBluetoothOVerride(QObject *parent) -{ - return new Override("BluetoothOverride", parent); -} - -Override::Override(QString overrideType, QObject *parent): - QObject(parent), dBusConnection(QDBusConnection::sessionBus()), type(overrideType) -{ - dBusConnection.connect(MANAGER_SERVICE, MANAGER_PATH, MANAGER_INTERFACE, - type, this, SLOT(handleChange(bool))); -} - -Override::~Override() -{ -} - -void Override::fetchState() -{ - QDBusMessage msg; - QString method = "Get" + type; - - msg = QDBusMessage::createMethodCall(MANAGER_SERVICE, MANAGER_PATH, - MANAGER_INTERFACE, method); - dBusConnection.send(msg); -} - -void Override::request(bool newState) -{ - QDBusMessage msg; - QString method = "Request" + type; - - msg = QDBusMessage::createMethodCall(MANAGER_SERVICE, MANAGER_PATH, - MANAGER_INTERFACE, method); - - QVariantList args; - args.append(newState); - msg.setArguments(args); - dBusConnection.send(msg); -} - -void Override::handleChange(bool newState) -{ - emit changed(newState); -} - diff --git a/libresource-overridesqt/override.h b/libresource-overridesqt/override.h deleted file mode 100644 index c906a55..0000000 --- a/libresource-overridesqt/override.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include -#include -#include - -namespace ResourcePolicy -{ - class Override : public QObject - { - Q_OBJECT -public: - Override(QString overrideType, QObject *parent=NULL); - virtual ~Override(); - void fetchState(); - -signals: - void changed(bool newState); - -private slots: - void handleChange(bool newState); - void request(bool newState); - -private: - QDBusConnection dBusConnection; - QString type; - }; - Override * createMute(QObject *parent=NULL); - Override * createPrivacyOverride(QObject *parent=NULL); - Override * createBluetoothOVerride(QObject *parent=NULL); -} - diff --git a/libresourceqt.pro b/libresourceqt.pro index ed89bee..cb5523a 100644 --- a/libresourceqt.pro +++ b/libresourceqt.pro @@ -5,10 +5,10 @@ CONFIG += ordered TEMPLATE = subdirs -SUBDIRS = libdbus-qeventloop \ - libresourceqt \ - libresource-overridesqt \ - resourceqt-client \ - resourceoverrider \ +SUBDIRS = libdbus-qeventloop \ + libresourceqt \ + libmediaoverridesqt \ + resourceqt-client \ + mediaoverrider \ tests diff --git a/mediaoverrider/main.cpp b/mediaoverrider/main.cpp new file mode 100644 index 0000000..db13d33 --- /dev/null +++ b/mediaoverrider/main.cpp @@ -0,0 +1,10 @@ +#include "mediaoverrider.h" + +int main(int argc, char **argv) +{ + MediaOverrider app(argc, argv); +// MApplication app(argc, argv); + + return app.run(); +} + diff --git a/mediaoverrider/mediaoverrider.cpp b/mediaoverrider/mediaoverrider.cpp new file mode 100644 index 0000000..24d9afc --- /dev/null +++ b/mediaoverrider/mediaoverrider.cpp @@ -0,0 +1,83 @@ +#include "mediaoverrider.h" + +MediaOverrider::MediaOverrider(int argc, char **argv, QObject *parent): + QObject(parent), app(argc, argv) +{ +// MTheme::loadCSS("MediaOverrider.css"); + window = new MApplicationWindow; + page = new MApplicationPage; + + layout = new MLayout; + policy = new MGridLayoutPolicy(layout); + policy->setSpacing(10); + + page->setTitle("Resource Overrider"); + MLabel * label = new MLabel("Press the toggle buttons to change overrides"); + policy->addItem(label, 0, 1); + label->setObjectName("label"); + label->setAlignment(Qt::AlignCenter); + + muteButton = new MButton(page->centralWidget()); + muteButton->setText("Mute"); + muteButton->setViewType(MButton::toggleType); + muteButton->setCheckable(true); + policy->addItem(muteButton, 1, 0); + muteButton->setObjectName("button"); + + privacyButton = new MButton(page->centralWidget()); + privacyButton->setText("Privacy"); + privacyButton->setViewType(MButton::toggleType); + privacyButton->setCheckable(true); + policy->addItem(privacyButton, 1, 1); + privacyButton->setObjectName("button"); + + btButton = new MButton(page->centralWidget()); + btButton->setText("BT"); + btButton->setViewType(MButton::toggleType); + btButton->setCheckable(true); + policy->addItem(btButton, 1, 2); + btButton->setObjectName("button"); + + page->centralWidget()->setLayout(layout); + + mute = ResourcePolicy::createMute(this); + privacyOverride = ResourcePolicy::createPrivacyOverride(this); + btOverride = ResourcePolicy::createBluetoothOVerride(this); + + QObject::connect(mute, SIGNAL(changed(bool)), this, SLOT(handleMuteChange(bool))); + QObject::connect(muteButton, SIGNAL(toggled(bool)), mute, SLOT(request(bool))); + + QObject::connect(privacyOverride, SIGNAL(changed(bool)), this, SLOT(handlePrivacyChange(bool))); + QObject::connect(privacyButton, SIGNAL(toggled(bool)), privacyOverride, SLOT(request(bool))); + + QObject::connect(btOverride, SIGNAL(changed(bool)), this, SLOT(handleBtChange(bool))); + QObject::connect(btButton, SIGNAL(toggled(bool)), btOverride, SLOT(request(bool))); + +} + +MediaOverrider::~MediaOverrider() +{} + +int MediaOverrider::run() +{ + page->appear(); + window->show(); + + return app.exec(); +} + +void MediaOverrider::handleMuteChange(bool newState) +{ + muteButton->setChecked(newState); +} + +void MediaOverrider::handlePrivacyChange(bool newState) +{ + privacyButton->setChecked(newState); +} + +void MediaOverrider::handleBtChange(bool newState) +{ + btButton->setChecked(newState); +} + diff --git a/mediaoverrider/mediaoverrider.desktop b/mediaoverrider/mediaoverrider.desktop new file mode 100644 index 0000000..b257a5e --- /dev/null +++ b/mediaoverrider/mediaoverrider.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Policy Media Overrider +Icon=icon-l-music +Exec=/usr/bin/mediaoverrider +OnlyShowIn=X-MeeGo; + diff --git a/mediaoverrider/mediaoverrider.h b/mediaoverrider/mediaoverrider.h new file mode 100644 index 0000000..052a7e0 --- /dev/null +++ b/mediaoverrider/mediaoverrider.h @@ -0,0 +1,38 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +class MediaOverrider: public QObject +{ + Q_OBJECT +public: + MediaOverrider(int argc, char **argv, QObject *parent=NULL); + ~MediaOverrider(); + int run(); +private slots: + void handleMuteChange(bool newState); + void handlePrivacyChange(bool newState); + void handleBtChange(bool newState); + +private: + MApplication app; + ResourcePolicy::Override *mute; + ResourcePolicy::Override *privacyOverride; + ResourcePolicy::Override *btOverride; + + MApplicationWindow *window; + MApplicationPage *page; + MLayout *layout; + MGridLayoutPolicy *policy; + MButton *muteButton; + MButton *privacyButton; + MButton *btButton; +}; + diff --git a/mediaoverrider/mediaoverrider.pro b/mediaoverrider/mediaoverrider.pro new file mode 100644 index 0000000..e74679a --- /dev/null +++ b/mediaoverrider/mediaoverrider.pro @@ -0,0 +1,28 @@ +include(../common.pri) + +TEMPLATE = app +TARGET = mediaoverrider +MOC_DIR = moc +OBJECTS_DIR = build +DEPENDPATH += . +INCLUDEPATH += $${LIBMEDIAOVERRIDESQT} +CONFIG += qt meegotouch +QT += dbus + +LIBS += -L$${LIBMEDIAOVERRIDESQT}/build -lmediaoverridesqt + +# Input +HEADERS += mediaoverrider.h +SOURCES += main.cpp mediaoverrider.cpp + +QMAKE_DISTCLEAN += -r moc build + +# Install options + +target.path = /usr/bin/ + +desktop.path = /usr/share/applications/ +desktop.files = mediaoverrider.desktop + +INSTALLS = target desktop + diff --git a/resourceoverrider/main.cpp b/resourceoverrider/main.cpp deleted file mode 100644 index 13634d5..0000000 --- a/resourceoverrider/main.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "resourceoverrider.h" - -int main(int argc, char **argv) -{ - ResourceOverrider app(argc, argv); -// MApplication app(argc, argv); - - return app.run(); -} - diff --git a/resourceoverrider/resourceoverrider.cpp b/resourceoverrider/resourceoverrider.cpp deleted file mode 100644 index 606d419..0000000 --- a/resourceoverrider/resourceoverrider.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include "resourceoverrider.h" - -ResourceOverrider::ResourceOverrider(int argc, char **argv, QObject *parent): - QObject(parent), app(argc, argv) -{ -// MTheme::loadCSS("resourceoverrider.css"); - window = new MApplicationWindow; - page = new MApplicationPage; - - layout = new MLayout; - policy = new MGridLayoutPolicy(layout); - policy->setSpacing(10); - - page->setTitle("Resource Overrider"); - MLabel * label = new MLabel("Press the toggle buttons to change overrides"); - policy->addItem(label, 0, 1); - label->setObjectName("label"); - label->setAlignment(Qt::AlignCenter); - - muteButton = new MButton(page->centralWidget()); - muteButton->setText("Mute"); - muteButton->setViewType(MButton::toggleType); - muteButton->setCheckable(true); - policy->addItem(muteButton, 1,0); - muteButton->setObjectName("button"); - - privacyButton = new MButton(page->centralWidget()); - privacyButton->setText("Privacy"); - privacyButton->setViewType(MButton::toggleType); - privacyButton->setCheckable(true); - policy->addItem(privacyButton, 1, 1); - privacyButton->setObjectName("button"); - - btButton = new MButton(page->centralWidget()); - btButton->setText("BT"); - btButton->setViewType(MButton::toggleType); - btButton->setCheckable(true); - policy->addItem(btButton, 1, 2); - btButton->setObjectName("button"); - - page->centralWidget()->setLayout(layout); - - mute = ResourcePolicy::createMute(this); - privacyOverride = ResourcePolicy::createPrivacyOverride(this); - btOverride = ResourcePolicy::createBluetoothOVerride(this); - - QObject::connect(mute, SIGNAL(changed(bool)), this, SLOT(handleMuteChange(bool))); - QObject::connect(muteButton, SIGNAL(toggled(bool)), mute, SLOT(request(bool))); - - QObject::connect(privacyOverride, SIGNAL(changed(bool)), this, SLOT(handlePrivacyChange(bool))); - QObject::connect(privacyButton, SIGNAL(toggled(bool)), privacyOverride, SLOT(request(bool))); - - QObject::connect(btOverride, SIGNAL(changed(bool)), this, SLOT(handleBtChange(bool))); - QObject::connect(btButton, SIGNAL(toggled(bool)), btOverride, SLOT(request(bool))); - -} - -ResourceOverrider::~ResourceOverrider() -{} - -int ResourceOverrider::run() -{ - page->appear(); - window->show(); - - return app.exec(); -} - -void ResourceOverrider::handleMuteChange(bool newState) -{ - muteButton->setChecked(newState); -} - -void ResourceOverrider::handlePrivacyChange(bool newState) -{ - privacyButton->setChecked(newState); -} - -void ResourceOverrider::handleBtChange(bool newState) -{ - btButton->setChecked(newState); -} - diff --git a/resourceoverrider/resourceoverrider.desktop b/resourceoverrider/resourceoverrider.desktop deleted file mode 100644 index 4200658..0000000 --- a/resourceoverrider/resourceoverrider.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Policy Resource Overrider -Icon=icon-l-music -Exec=/usr/bin/resourceoverrider -OnlyShowIn=X-MeeGo; - diff --git a/resourceoverrider/resourceoverrider.h b/resourceoverrider/resourceoverrider.h deleted file mode 100644 index 755d426..0000000 --- a/resourceoverrider/resourceoverrider.h +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -class ResourceOverrider: public QObject -{ - Q_OBJECT -public: - ResourceOverrider(int argc, char **argv, QObject *parent=NULL); - ~ResourceOverrider(); - int run(); -private slots: - void handleMuteChange(bool newState); - void handlePrivacyChange(bool newState); - void handleBtChange(bool newState); - -private: - MApplication app; - ResourcePolicy::Override *mute; - ResourcePolicy::Override *privacyOverride; - ResourcePolicy::Override *btOverride; - - MApplicationWindow *window; - MApplicationPage *page; - MLayout *layout; - MGridLayoutPolicy *policy; - MButton *muteButton; - MButton *privacyButton; - MButton *btButton; -}; - diff --git a/resourceoverrider/resourceoverrider.pro b/resourceoverrider/resourceoverrider.pro deleted file mode 100644 index 6bbbdcb..0000000 --- a/resourceoverrider/resourceoverrider.pro +++ /dev/null @@ -1,28 +0,0 @@ -include(../common.pri) - -TEMPLATE = app -TARGET = resourceoverrider -MOC_DIR = moc -OBJECTS_DIR = build -DEPENDPATH += . -INCLUDEPATH += $${LIBRESOURCEOVERRIDESQT} -CONFIG += qt meegotouch -QT += dbus - -LIBS += -L$${LIBRESOURCEOVERRIDESQT}/build -lresource-overridesqt - -# Input -HEADERS += resourceoverrider.h -SOURCES += main.cpp resourceoverrider.cpp - -QMAKE_DISTCLEAN += -r moc build - -# Install options - -target.path = /usr/bin/ - -desktop.path = /usr/share/applications/ -desktop.files = resourceoverrider.desktop - -INSTALLS = target desktop - -- cgit v1.2.3 From 68260cf98b7878d8db912450081e8cf5e5b4d5ef Mon Sep 17 00:00:00 2001 From: Wolf Bergenheim Date: Fri, 6 Aug 2010 10:49:19 +0300 Subject: removed commented out stuff --- libresourceqt/libresourceqt.pro | 3 --- 1 file changed, 3 deletions(-) diff --git a/libresourceqt/libresourceqt.pro b/libresourceqt/libresourceqt.pro index d78339a..355a594 100644 --- a/libresourceqt/libresourceqt.pro +++ b/libresourceqt/libresourceqt.pro @@ -28,9 +28,6 @@ MOC_DIR = moc CONFIG += qt link_pkgconfig dll QT = core PKGCONFIG += dbus-1 libresource0 -#CONFIG(release, release|debug) { -# DEFINES += QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT QT_NO_DEBUG_STREAM -#} # Install directives headers.files = $${PUBLIC_HEADERS} -- cgit v1.2.3