Added setting ambience directly from the menu

matrixx · Sep 6, 2014 · a80ff5a · a80ff5a
1 parent 2e01a9a
commit a80ff5a
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.pro.user
+build
diff --git a/harbour-trulyyours.pro b/harbour-trulyyours.pro
@@ -2,13 +2,19 @@ TEMPLATE = app
 TARGET = harbour-trulyyours
 CONFIG += sailfishapp
 
+QT += dbus
+
+system(qdbusxml2cpp -p src/ambienced.h:src/ambienced.cpp src/ambienced.xml)
+
 HEADERS += \
  src/ambiencemanager.h \
- src/tagmanager.h
+ src/tagmanager.h \
+ src/ambienced.h
 
 SOURCES += src/harbour-trulyyours.cpp \
  src/ambiencemanager.cpp \
- src/tagmanager.cpp
+ src/tagmanager.cpp \
+ src/ambienced.cpp
 
 OTHER_FILES += rpm/$${TARGET}.spec \
  rpm/$${TARGET}.yaml \

diff --git a/qml/pages/AmbienceDetailPage.qml b/qml/pages/AmbienceDetailPage.qml
@@ -50,6 +50,15 @@ Page {
  contentHeight: fullImage.height
 
  PullDownMenu {
+ MenuItem {
+ text: qsTr("Save and create ambience")
+ visible: fullImage.source != "" && !savingInProgress
+ onClicked: {
+ savingInProgress = true;
+ ambienceMgr.saveImageToGalleryAndApplyAmbience(name)
+ }
+ }
+
  MenuItem {
  text: qsTr("Save to gallery")
  visible: fullImage.source != "" && !savingInProgress

diff --git a/src/.gitignore b/src/.gitignore
@@ -0,0 +1,2 @@
+ambienced.h
+ambienced.cpp
diff --git a/src/ambienced.xml b/src/ambienced.xml
@@ -0,0 +1,60 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"https://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="com.jolla.ambienced">
+ <method name="indexFile">
+ <arg direction="in" type="s" name="url"/>
+ </method>
+ <method name="createAmbience">
+ <arg direction="in" type="s" name="url"/>
+ </method>
+ <method name="setAmbience">
+ <arg direction="in" type="s" name="url"/>
+ </method>
+ <method name="remove">
+ <arg direction="in" type="i" name="contentType"/>
+ <arg direction="in" type="x" name="contentId"/>
+ </method>
+ <method name="installPackage">
+ <arg direction="in" type="s" name="path"/>
+ </method>
+ <method name="saveAttributes">
+ <arg direction="in" type="i" name="contentType"/>
+ <arg direction="in" type="x" name="contentId"/>
+ <arg direction="in" type="a{sv}" name="args"/>
+ <annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In2"/>
+ </method>
+ <method name="refreshAmbiences"/>
+ <signal name="contentChanged">
+ <arg direction="out" type="i" name="type"/>
+ </signal>
+ </interface>
+ <interface name="org.freedesktop.DBus.Properties">
+ <method name="Get">
+ <arg name="interface_name" type="s" direction="in"/>
+ <arg name="property_name" type="s" direction="in"/>
+ <arg name="value" type="v" direction="out"/>
+ </method>
+ <method name="Set">
+ <arg name="interface_name" type="s" direction="in"/>
+ <arg name="property_name" type="s" direction="in"/>
+ <arg name="value" type="v" direction="in"/>
+ </method>
+ <method name="GetAll">
+ <arg name="interface_name" type="s" direction="in"/>
+ <arg name="values" type="a{sv}" direction="out"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+ </method>
+ </interface>
+ <interface name="org.freedesktop.DBus.Introspectable">
+ <method name="Introspect">
+ <arg name="xml_data" type="s" direction="out"/>
+ </method>
+ </interface>
+ <interface name="org.freedesktop.DBus.Peer">
+ <method name="Ping"/>
+ <method name="GetMachineId">
+ <arg name="machine_uuid" type="s" direction="out"/>
+ </method>
+ </interface>
+</node>
diff --git a/src/ambiencemanager.cpp b/src/ambiencemanager.cpp
@@ -4,14 +4,19 @@
 #include <QImage>
 #include <QFileInfo>
 #include <QDir>
+#include <QUrl>
 #include <QVariant>
 
+static const char *AMBIENCED_SERVICE = "com.jolla.ambienced";
+static const char *AMBIENCED_PATH = "/com/jolla/ambienced";
+
 AmbienceManager::AmbienceManager(QObject *parent) :
  QObject(parent),
  mThumbnailReply(0),
  mFullImageReply(0),
  mThumbnail(0),
- mFullImage(0)
+ mFullImage(0),
+ mInterface(0)
 {
  mPictureLocation = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
  mCacheLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
@@ -20,6 +25,8 @@ AmbienceManager::AmbienceManager(QObject *parent) :
  {
  qDebug() << "failed to create cachedir";
  }
+
+ mInterface = new ComJollaAmbiencedInterface(AMBIENCED_SERVICE, AMBIENCED_PATH, QDBusConnection::sessionBus(), this);
 }
 
 AmbienceManager::~AmbienceManager()
@@ -70,18 +77,35 @@ bool AmbienceManager::hasThumbnail(QString name)
  return (QFile::exists(filePath));
 }
 
-void AmbienceManager::saveImageToGallery(QString name)
+static inline QString createAmbienceImage(const QString &pictureLocation, const QString &name)
 {
- if (QFile::exists(mCacheLocation + "/ambience-" + name))
- {
- QFile::copy(mCacheLocation + "/ambience-" + name, mPictureLocation + "/ambience-" + name);
- mSavedFullImages.append(mCacheLocation + "/ambience-" + name);
- emit saveImageToGallerySucceeded();
- }
- else
+ return pictureLocation + "/ambience-" + name;
+}
+
+bool AmbienceManager::saveImageToGallery(QString name)
+{
+ if (!QFile::exists(mCacheLocation + "/ambience-" + name))
  {
  qDebug() << name << "does not exist, cannot copy to gallery";
+ return false;
  }
+
+ QFile::copy(mCacheLocation + "/ambience-" + name, createAmbienceImage(mPictureLocation, name));
+ mSavedFullImages.append(mCacheLocation + "/ambience-" + name);
+ emit saveImageToGallerySucceeded();
+ return true;
+}
+
+bool AmbienceManager::saveImageToGalleryAndApplyAmbience(const QString &name)
+{
+ if (!saveImageToGallery(name)) {
+ return false;
+ }
+
+ QString url = QUrl::fromLocalFile(createAmbienceImage(mPictureLocation, name)).toString();
+ mInterface->createAmbience(url);
+ mInterface->setAmbience(url);
+ return true;
 }
 
 void AmbienceManager::saveThumbnail(QUrl fileUrl, QString name)

diff --git a/src/ambiencemanager.h b/src/ambiencemanager.h
@@ -8,6 +8,7 @@
 #include <QFile>
 #include <QQueue>
 #include <QStringList>
+#include "ambienced.h"
 
 class AmbienceManager : public QObject
 {
@@ -17,7 +18,8 @@ class AmbienceManager : public QObject
  virtual ~AmbienceManager();
  Q_INVOKABLE QString thumbnail(QString name);
  Q_INVOKABLE bool hasThumbnail(QString name);
- Q_INVOKABLE void saveImageToGallery(QString name);
+ Q_INVOKABLE bool saveImageToGallery(QString name);
+ Q_INVOKABLE bool saveImageToGalleryAndApplyAmbience(const QString &name);
 
 signals:
  void saveImageToGallerySucceeded();
@@ -43,6 +45,7 @@ public slots:
  QString mCacheLocation;
  QQueue<QPair<QUrl, QString> > mThumbnailQueue;
  QStringList mSavedFullImages;
+ ComJollaAmbiencedInterface *mInterface;
 };
 
 #endif // AMBIENCEMANAGER_H