|
[-]
[+]
|
Added |
_service:tar_git:gestured.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:gestured.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/gesture-daemon.git</param>
<param name="branch">master</param>
- <param name="revision">950a38789ae23b765d8a9b46306d9ab3f1b8e62b</param>
+ <param name="revision">0bb543d262dc1c5fb63831c1bddc2bcbb1d1418a</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.13.tar.bz2/src/gesture-actions.cpp
^
|
| @@ -9,7 +9,6 @@
#include "gesture-actions.h"
#include <QFile>
#include <QTextStream>
-#include <mlite5/MGConfItem>
Gestures::Gestures(QObject *parent) :
QObject(parent)
@@ -21,13 +20,6 @@
_serviceWatcher = new QDBusServiceWatcher(this);
_serviceWatcher->setConnection(bus);
connect(_serviceWatcher, &QDBusServiceWatcher::serviceOwnerChanged, this, &Gestures::ownerChanged);
-
- cameraDevice = new MGConfItem("/apps/jolla-camera/cameraDevice");
-
- cameraNeedRestoreSettings = false;
- cameraDeviceValue = cameraDevice->value().toString();
-
- QObject::connect(cameraDevice, SIGNAL(valueChanged()), this, SLOT(cameraValueChanged()));
}
Gestures::~Gestures()
@@ -114,25 +106,14 @@
void Gestures::showCameraViewfinder()
{
- cameraDeviceValue = cameraDevice->value().toString();
-
- if (cameraDeviceValue != "secondary")
- cameraNeedRestoreSettings = true;
-
QDBusConnection bus = QDBusConnection::sessionBus();
- QDBusMessage call = QDBusMessage::createMethodCall("com.jolla.camera", "/", "com.jolla.camera", "showFrontViewfinder");
+ QDBusMessage call = QDBusMessage::createMethodCall("com.jolla.camera", "/", "com.jolla.camera.ui", "showViewfinder");
- bus.call(call, QDBus::NoBlock, 1);
-}
+ QVariantList args;
+ args << QString("hello");
+ call.setArguments(args);
-void Gestures::cameraValueChanged()
-{
- if (cameraNeedRestoreSettings)
- {
- QThread::msleep(100);
- cameraNeedRestoreSettings = false;
- cameraDevice->set(cameraDeviceValue);
- }
+ bus.call(call, QDBus::NoBlock, 1);
}
void Gestures::showVoicecallUi()
|
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.13.tar.bz2/src/gesture-actions.h
^
|
| @@ -12,7 +12,6 @@
#include <QtDBus/QtDBus>
#include <QTimer>
#include <QThread>
-#include <mlite5/MGConfItem>
class Gestures : public QObject
{
@@ -27,7 +26,6 @@
private slots:
void ownerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
- void cameraValueChanged();
private:
void toggleFlashlight();
@@ -36,14 +34,8 @@
void showVoicecallUi();
bool getMpris2Service();
- bool cameraNeedRestoreSettings;
-
QString _mpris2Service;
QDBusServiceWatcher *_serviceWatcher;
-
- MGConfItem *cameraDevice;
-
- QString cameraDeviceValue;
};
#endif // GESTURE_ACTIONS_H
|
