Merge lp:~philip.scott/granite/notifications-demo into lp:~elementary-pantheon/granite/granite

[Felipe Escoto]

Notification Demo Added

Adds a notifications demo to Granite Demo.

It also updates it's .desktop to use the correct name.

Note: The notifications sent from the Demo have no icon set manually, this is intended as the Gala branch that fixes this will land soon

[Adam Bieńkowski (donadigo)]

It looks & works great, but following recent changes we should have "X-GNOME-UsesNotifications=true" in the .desktop file to fully support the app settings. Also I'm not sure if we want to showcase non-granite feature in a granite-demo app, notice how all widgets & functions there are granite specific.

review: Needs Fixing (code / testing)

Unmerged revisions

951. By Felipe Escoto on 2016-06-19

Notifications Demo

=== modified file 'demo/CMakeLists.txt'
--- demo/CMakeLists.txt	2015-12-04 07:55:06 +0000
+++ demo/CMakeLists.txt	2016-06-19 22:42:07 +0000
@@ -22,4 +22,4 @@
 add_executable (${EXEC_NAME} ${VALA_C})
 target_link_libraries (${EXEC_NAME} ${PKG_NAME} ${DEPS_LIBRARIES})
 install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/granite-demo.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pantheon.granite.demo.desktop DESTINATION share/applications)

=== modified file 'demo/GraniteDemo.vala'
--- demo/GraniteDemo.vala	2016-06-12 01:46:50 +0000
+++ demo/GraniteDemo.vala	2016-06-19 22:42:07 +0000
@@ -81,6 +81,7 @@
         create_dynamictab ();
         create_alert ();
         create_storage ();
+        create_notification ();
 
         window.add (main_stack);
         window.set_default_size (800, 550);
@@ -126,6 +127,7 @@
         welcome.append ("document-open", "DynamicNotebook", "Tab bar widget designed for a variable number of tabs.");
         welcome.append ("dialog-warning", "AlertView", "A View showing that an action is required to function.");
         welcome.append ("drive-harddisk", "Storage", "Small bar indicating the remaining amount of space.");
+        welcome.append ("dialog-information", "Notifications", "A simple test of how notifications work.");
         welcome.activated.connect ((index) => {
             switch (index) {
                 case 0:
@@ -152,6 +154,10 @@
                     home_button.show ();
                     main_stack.set_visible_child_name ("storage");
                     break;
+                case 6:
+                    home_button.show ();
+                    main_stack.set_visible_child_name ("notifications");
+                    break;
             }
         });
         main_stack.add_named (welcome, "welcome");
@@ -289,6 +295,37 @@
         });
     }
 
+    private void create_notification () {
+        var grid = new Gtk.Grid ();
+        grid.row_spacing = 6;
+        grid.column_spacing = 12;
+        grid.valign = Gtk.Align.CENTER;
+        grid.halign = Gtk.Align.CENTER;
+        grid.orientation = Gtk.Orientation.VERTICAL;
+
+        var show_button = new Gtk.Button.with_label (_("Send Notification"));
+        var update_button = new Gtk.Button.with_label (("Update Notification"));
+
+        show_button.clicked.connect (() => {
+            var notification = new Notification (_("Testing notifications"));
+
+            notification.set_body (_("Hello world!"));
+            this.send_notification ("notification_key", notification);
+        });
+
+        update_button.clicked.connect (() => {
+            var notification = new Notification (_("Testing notifications"));
+
+            notification.set_body (_("Hello again!"));
+            this.send_notification ("notification_key", notification);
+        });
+
+        grid.add (show_button);
+        grid.add (update_button);
+
+        main_stack.add_named (grid, "notifications");
+    }
+
     private Granite.Widgets.Avatar create_avatar () {
         var username = GLib.Environment.get_user_name ();
         var avatar = new Granite.Widgets.Avatar ();

=== renamed file 'demo/granite-demo.desktop' => 'demo/org.pantheon.granite.demo.desktop'