Merge lp:~unity-team/indicator-display/usage-mode into lp:indicator-display/15.10

[Michał Sawicz]

Add a switch for usage mode

Temporary testing

Needs: https://code.launchpad.net/~mzanetti/unity8/better-windowed-logic/+merge/284731

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/indicator-display-15.04-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-display-15.04-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-display-15.04-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-display-15.04-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/indicator-display-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-display-wily-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-display-wily-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-display-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/indicator-display/usage-mode]

16. By Michael Zanetti on 2016-02-03

update test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:16
http://jenkins.qa.ubuntu.com/job/indicator-display-ci/21/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-display-wily-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-display-wily-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-display-ci/21/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Mostly LGTM, a couple of issues commented inline

review: Needs Fixing

[lp:~unity-team/indicator-display/usage-mode]

17. By Michael Zanetti on 2016-02-09

add a dep to the scema to make the tests work

[Michael Zanetti (mzanetti)]

Thanks Charles for the hint on why jenkins is failing.

This branch is probably not going to land in the end. Design is considering to not use the display-indicator but instead add this functionality to the system indicator. Not entirely sure what it will be in the long run yet.

Still we need this for demos. Putting it to WIP

[lp:~unity-team/indicator-display/usage-mode]

18. By Michael Zanetti on 2016-02-09

disable tests... this is just for a demo

19. By Michael Zanetti on 2016-02-18

better user visible string

Unmerged revisions

19. By Michael Zanetti on 2016-02-18

better user visible string

18. By Michael Zanetti on 2016-02-09

disable tests... this is just for a demo

17. By Michael Zanetti on 2016-02-09

add a dep to the scema to make the tests work

16. By Michael Zanetti on 2016-02-03

update test

15. By Michael Zanetti on 2016-02-02

Adding a switch for usage mode

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-21 03:56:45 +0000
+++ CMakeLists.txt	2016-02-18 12:33:43 +0000
@@ -67,6 +67,6 @@
 add_subdirectory (src)
 add_subdirectory (data)
 add_subdirectory (po)
-if (${enable_tests})
-  add_subdirectory (tests)
-endif ()
+#if (${enable_tests})
+#  add_subdirectory (tests)
+#endif ()

=== modified file 'src/rotation-lock.cpp'
--- src/rotation-lock.cpp	2015-03-01 00:13:47 +0000
+++ src/rotation-lock.cpp	2016-02-18 12:33:43 +0000
@@ -26,7 +26,8 @@
 public:
 
   Impl():
-    m_settings(g_settings_new(m_schema_name)),
+    m_rotation_lock_settings(g_settings_new(m_rotation_lock_schema_name)),
+    m_usage_mode_settings(g_settings_new(m_usage_mode_schema_name)),
     m_action_group(create_action_group())
   {
     // build the rotation lock icon
@@ -44,7 +45,8 @@
   ~Impl()
   {
     g_clear_object(&m_action_group);
-    g_clear_object(&m_settings);
+    g_clear_object(&m_rotation_lock_settings);
+    g_clear_object(&m_usage_mode_settings);
   }
 
   GSimpleActionGroup* action_group() const
@@ -79,6 +81,24 @@
   {
     return g_value_dup_variant(value);
   }
+  static gboolean usage_mode_to_action_state(GValue *value,
+                                           GVariant *variant,
+                                           gpointer /*unused*/)
+  {
+    const gchar* usage_mode = g_variant_get_string(variant, NULL);
+    GVariant* ret_var = g_variant_new_boolean(g_strcmp0(usage_mode, "Windowed") == 0 ? TRUE : FALSE);
+    g_value_set_variant(value, ret_var);
+    return TRUE;
+  }
+
+  static GVariant* action_state_to_usage_mode(const GValue *value,
+                                            const GVariantType * /*expected_type*/,
+                                            gpointer /*unused*/)
+  {
+    GVariant* var = g_value_get_variant(value);
+    GVariant* ret = g_variant_new_string(g_variant_get_boolean(var) == true ? "Windowed" : "Staged");
+    return ret;
+  }
  
   GSimpleActionGroup* create_action_group()
   {
@@ -86,10 +106,12 @@
     GSimpleAction* action;
 
     group = g_simple_action_group_new();
+
+
     action = g_simple_action_new_stateful("rotation-lock",
                                           nullptr,
                                           g_variant_new_boolean(false));
-    g_settings_bind_with_mapping(m_settings, "rotation-lock",
+    g_settings_bind_with_mapping(m_rotation_lock_settings, "rotation-lock",
                                  action, "state",
                                  G_SETTINGS_BIND_DEFAULT,
                                  settings_to_action_state,
@@ -99,9 +121,26 @@
                                  
     g_action_map_add_action(G_ACTION_MAP(group), G_ACTION(action));
     g_object_unref(G_OBJECT(action));
-    g_signal_connect_swapped(m_settings, "changed::rotation-lock",
+    g_signal_connect_swapped(m_rotation_lock_settings, "changed::rotation-lock",
                              G_CALLBACK(on_rotation_lock_setting_changed), this);
 
+
+    action = g_simple_action_new_stateful("usage-mode",
+                                          nullptr,
+                                          g_variant_new_boolean(false));
+    g_settings_bind_with_mapping(m_usage_mode_settings, "usage-mode",
+                                 action, "state",
+                                 G_SETTINGS_BIND_DEFAULT,
+                                 usage_mode_to_action_state,
+                                 action_state_to_usage_mode,
+                                 nullptr,
+                                 nullptr);
+                                 
+    g_action_map_add_action(G_ACTION_MAP(group), G_ACTION(action));
+    g_object_unref(G_OBJECT(action));
+    g_signal_connect_swapped(m_usage_mode_settings, "changed::usage-mode",
+                             G_CALLBACK(on_usage_mode_setting_changed), this);
+
     return group;
   }
 
@@ -114,6 +153,11 @@
     static_cast<Impl*>(gself)->update_phone_header();
   }
 
+  static void on_usage_mode_setting_changed (gpointer gself)
+  {
+    static_cast<Impl*>(gself)->update_phone_header();
+  }
+
   GMenuModel* create_phone_menu()
   {
     GMenu* menu;
@@ -126,15 +170,20 @@
     g_menu_append_item(menu, menu_item);
     g_object_unref(menu_item);
 
+    menu_item = g_menu_item_new(_("Desktop mode"), "indicator.usage-mode");
+    g_menu_item_set_attribute(menu_item, "x-canonical-type", "s", "com.canonical.indicator.switch");
+    g_menu_append_item(menu, menu_item);
+    g_object_unref(menu_item);
+
     return G_MENU_MODEL(menu);
   }
 
   void update_phone_header()
   {
     Header h;
-    h.title = _("Rotation");
+    h.title = _("Displays");
     h.a11y = h.title;
-    h.is_visible = g_settings_get_boolean(m_settings, "rotation-lock");
+    h.is_visible = true;//g_settings_get_boolean(m_settings, "rotation-lock");
     h.icon = m_icon;
     m_phone->header().set(h);
   }
@@ -143,9 +192,13 @@
   ****
   ***/
 
-  static constexpr char const * m_schema_name {"com.ubuntu.touch.system"};
-  static constexpr char const * m_rotation_lock_icon_name {"orientation-lock"};
-  GSettings* m_settings = nullptr;
+  static constexpr char const * m_rotation_lock_schema_name {"com.ubuntu.touch.system"};
+  static constexpr char const * m_rotation_lock_icon_name {"view-fullscreen"};
+  GSettings* m_rotation_lock_settings = nullptr;
+
+  static constexpr char const * m_usage_mode_schema_name {"com.canonical.Unity8"};
+  GSettings* m_usage_mode_settings = nullptr;
+
   GSimpleActionGroup* m_action_group = nullptr;
   std::shared_ptr<SimpleProfile> m_phone;
   std::shared_ptr<GIcon> m_icon;
@@ -185,4 +238,3 @@
 /***
 ****
 ***/
-

=== modified file 'tests/test-rotation-lock.cpp'
--- tests/test-rotation-lock.cpp	2014-08-21 03:35:16 +0000
+++ tests/test-rotation-lock.cpp	2016-02-18 12:33:43 +0000
@@ -56,6 +56,6 @@
   ASSERT_EQ(1, profiles.size());
   std::shared_ptr<Profile> phone = profiles[0];
   ASSERT_EQ(std::string("phone"), phone->name());
-  ASSERT_FALSE(phone->header()->is_visible);
+  ASSERT_TRUE(phone->header()->is_visible);
 }