|
[-]
[+]
|
Deleted |
_service:tar_git:gestured.changes
|
| @@ -1,3 +0,0 @@
-* Tue Apr 18 2017 Kimmo Lindholm <kimmo.lindholm@eke.fi> - 0.0.13
-- [camera] use correct dbus method
-
|
|
[-]
[+]
|
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">0bb543d262dc1c5fb63831c1bddc2bcbb1d1418a</param>
+ <param name="revision">833e69df741d585451c67ec4fb38617a003f7de0</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.11.tar.bz2/src/gesture-actions.cpp
^
|
| @@ -9,6 +9,7 @@
#include "gesture-actions.h"
#include <QFile>
#include <QTextStream>
+#include <mlite5/MGConfItem>
Gestures::Gestures(QObject *parent) :
QObject(parent)
@@ -20,6 +21,13 @@
_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()
@@ -106,16 +114,27 @@
void Gestures::showCameraViewfinder()
{
- QDBusConnection bus = QDBusConnection::sessionBus();
- QDBusMessage call = QDBusMessage::createMethodCall("com.jolla.camera", "/", "com.jolla.camera.ui", "showViewfinder");
+ cameraDeviceValue = cameraDevice->value().toString();
+
+ if (cameraDeviceValue != "secondary")
+ cameraNeedRestoreSettings = true;
- QVariantList args;
- args << QString("hello");
- call.setArguments(args);
+ QDBusConnection bus = QDBusConnection::sessionBus();
+ QDBusMessage call = QDBusMessage::createMethodCall("com.jolla.camera", "/", "com.jolla.camera", "showFrontViewfinder");
bus.call(call, QDBus::NoBlock, 1);
}
+void Gestures::cameraValueChanged()
+{
+ if (cameraNeedRestoreSettings)
+ {
+ QThread::msleep(100);
+ cameraNeedRestoreSettings = false;
+ cameraDevice->set(cameraDeviceValue);
+ }
+}
+
void Gestures::showVoicecallUi()
{
QDBusConnection bus = QDBusConnection::sessionBus();
|
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.11.tar.bz2/src/gesture-actions.h
^
|
| @@ -12,6 +12,7 @@
#include <QtDBus/QtDBus>
#include <QTimer>
#include <QThread>
+#include <mlite5/MGConfItem>
class Gestures : public QObject
{
@@ -26,6 +27,7 @@
private slots:
void ownerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
+ void cameraValueChanged();
private:
void toggleFlashlight();
@@ -34,8 +36,14 @@
void showVoicecallUi();
bool getMpris2Service();
+ bool cameraNeedRestoreSettings;
+
QString _mpris2Service;
QDBusServiceWatcher *_serviceWatcher;
+
+ MGConfItem *cameraDevice;
+
+ QString cameraDeviceValue;
};
#endif // GESTURE_ACTIONS_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.11.tar.bz2/src/gesture-enabler.cpp
^
|
| @@ -5,7 +5,6 @@
*
*/
-#include <QDataStream>
#include "gesture-enabler.h"
GestureEnabler::GestureEnabler(QObject *parent) :
|
