Merge lp:~unity-team/qtmir/liveCaption into lp:qtmir

[Michał Sawicz]

React to surface modifications (window caption)

React to surface modifications (window caption)

Cf. https://bugs.launchpad.net/ubuntu/+source/unity-api/+bug/1497092

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, build depends on this unity-api MP: https://code.launchpad.net/~lukas-kde/unity-api/liveCaption/+merge/272769
Functionality-wise, also depends on qtubuntu MP: https://code.launchpad.net/~lukas-kde/qtubuntu/liveCaption/+merge/272756

To actually see the results you also need: https://code.launchpad.net/~lukas-kde/unity8/liveCaption/+merge/272760

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

N/A

[Daniel d'Andrada (dandrader)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:391
http://jenkins.qa.ubuntu.com/job/qtmir-ci/470/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/48/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/470/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-01 14:03:32 +0000
+++ CMakeLists.txt	2015-10-01 14:03:32 +0000
@@ -75,7 +75,7 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
 pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=8)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=9)
 
 include_directories(${APPLICATION_API_INCLUDE_DIRS})
 

=== modified file 'debian/control'
--- debian/control	2015-09-25 12:11:08 +0000
+++ debian/control	2015-10-01 14:03:32 +0000
@@ -93,7 +93,7 @@
 Conflicts: libqtmir,
            libunity-mir1,
 Provides: unity-application-impl,
-          unity-application-impl-8,
+          unity-application-impl-9,
 Description: Qt plugin for Unity specific Mir APIs
  QtMir provides Qt/QML bindings for Mir features that are exposed through the
  qtmir-desktop or qtmir-android QPA plugin such as Application management

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2015-09-18 16:33:06 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2015-10-01 14:03:32 +0000
@@ -158,6 +158,7 @@
     if (observer) {
         connect(observer.get(), &SurfaceObserver::framesPosted, this, &MirSurface::onFramesPostedObserved);
         connect(observer.get(), &SurfaceObserver::attributeChanged, this, &MirSurface::onAttributeChanged);
+        connect(observer.get(), &SurfaceObserver::nameChanged, this, &MirSurface::nameChanged);
         observer->setListener(this);
     }
 
@@ -468,7 +469,6 @@
 
 QString MirSurface::name() const
 {
-    //FIXME - how to listen to change in this property?
     return QString::fromStdString(m_surface->name());
 }
 

=== modified file 'src/platforms/mirserver/mirwindowmanager.cpp'
--- src/platforms/mirserver/mirwindowmanager.cpp	2015-10-01 14:03:32 +0000
+++ src/platforms/mirserver/mirwindowmanager.cpp	2015-10-01 14:03:32 +0000
@@ -26,7 +26,7 @@
 
 namespace ms = mir::scene;
 
-namespace 
+namespace
 {
 class MirWindowManagerImpl : public MirWindowManager
 {
@@ -63,7 +63,10 @@
         MirSurfaceAttrib attrib,
         int value) override;
 
-    void modify_surface(const std::shared_ptr<mir::scene::Session>&, const std::shared_ptr<mir::scene::Surface>&, const mir::shell::SurfaceSpecification&);
+    void modify_surface(
+        const std::shared_ptr<mir::scene::Session>&,
+        const std::shared_ptr<mir::scene::Surface>& surface,
+        const mir::shell::SurfaceSpecification& modifications) override;
 
 private:
     std::shared_ptr<mir::shell::DisplayLayout> const m_displayLayout;
@@ -150,13 +153,17 @@
     return surface->configure(attrib, value);
 }
 
-void MirWindowManagerImpl::modify_surface(const std::shared_ptr<mir::scene::Session>&, const std::shared_ptr<mir::scene::Surface>&, const mir::shell::SurfaceSpecification&)
+void MirWindowManagerImpl::modify_surface(const std::shared_ptr<mir::scene::Session>&,
+                                          const std::shared_ptr<mir::scene::Surface>& surface,
+                                          const mir::shell::SurfaceSpecification& modifications)
 {
-    // TODO support surface modifications
+    if (modifications.name.is_set()) {
+        surface->rename(modifications.name.value());
+    }
 }
 
 std::unique_ptr<MirWindowManager> MirWindowManager::create(
-    mir::shell::FocusController* /*focus_controller*/, 
+    mir::shell::FocusController* /*focus_controller*/,
     const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout)
 {
     return std::make_unique<MirWindowManagerImpl>(displayLayout);

=== modified file 'src/platforms/mirserver/surfaceobserver.cpp'
--- src/platforms/mirserver/surfaceobserver.cpp	2015-08-31 09:51:28 +0000
+++ src/platforms/mirserver/surfaceobserver.cpp	2015-10-01 14:03:32 +0000
@@ -42,6 +42,11 @@
     }
 }
 
+void SurfaceObserver::renamed(char const * name)
+{
+    Q_EMIT nameChanged(QString::fromUtf8(name));
+}
+
 void SurfaceObserver::attrib_changed(MirSurfaceAttrib attribute, int value)
 {
     if (m_listener) {

=== modified file 'src/platforms/mirserver/surfaceobserver.h'
--- src/platforms/mirserver/surfaceobserver.h	2015-08-31 09:51:28 +0000
+++ src/platforms/mirserver/surfaceobserver.h	2015-10-01 14:03:32 +0000
@@ -45,12 +45,13 @@
     void orientation_set_to(MirOrientation) override {}
     void client_surface_close_requested() override {}
     void keymap_changed(xkb_rule_names const &) override {}
-    void renamed(char const *) override {}
+    void renamed(char const * name) override;
 
 Q_SIGNALS:
     void attributeChanged(const MirSurfaceAttrib attribute, const int value);
     void framesPosted();
-    void resized(QSize size);
+    void resized(const QSize &size);
+    void nameChanged(const QString &name);
 
 private:
     QObject *m_listener;