Merge lp:~stolowski/libunity/libunity.debug-tool-previews into lp:libunity

[Paweł Stołowski]

Preview support for libunity-tool and build fixes.

Preview support for libunity-tool.

[Michal Hruby (mhr3)]

Works well, let's get it in...

review: Approve

=== modified file 'protocol/Makefile.am'
--- protocol/Makefile.am	2012-07-27 09:32:20 +0000
+++ protocol/Makefile.am	2012-08-14 14:17:21 +0000
@@ -12,12 +12,10 @@
 # Headers, vapi, and gir
 ##
 unityincludedir = $(includedir)/unity/unity
-unityinclude_HEADERS = \
-  unity-protocol.h \
-  $(NULL)
+nodist_unityinclude_HEADERS = unity-protocol.h
 
 unityvapidir = $(datadir)/vala/vapi
-unityvapi_DATA = \
+nodist_unityvapi_DATA = \
   unity-protocol.vapi \
   $(NULL)
 
@@ -55,7 +53,7 @@
   $(LIBUNITY_PACKAGES) \
   $(MAINTAINER_VALAFLAGS)
 
-libunity_protocol_private_la_SOURCES = \
+nodist_libunity_protocol_private_la_SOURCES = \
   $(libunity_protocol_private_la_VALASOURCES:.vala=.c) \
   $(NULL)
 
@@ -88,6 +86,3 @@
   $(libunity_protocol_private_la_VALASOURCES:.vala=.c) \
   $(NULL)
 
-dist-hook:
-	rm -f $(addprefix $(distdir)/,$(libunity_protocol_private_la_VALASOURCES:.vala=.c))
-

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-07-27 09:32:20 +0000
+++ src/Makefile.am	2012-08-14 14:17:21 +0000
@@ -12,15 +12,15 @@
 # Headers, vapi, and gir
 ##
 unityincludedir = $(includedir)/unity/unity
-unityinclude_HEADERS = \
-  unity.h \
-  unity-trace.h \
-  $(NULL)
+nodist_unityinclude_HEADERS = unity.h
+dist_unityinclude_HEADERS = unity-trace.h
 
 unityvapidir = $(datadir)/vala/vapi
-unityvapi_DATA = \
+nodist_unityvapi_DATA = \
   unity.vapi \
   unity.deps \
+  $(NULL)
+dist_unityvapi_DATA = \
   unity-trace.vapi \
   unity-trace.deps \
   $(NULL)
@@ -80,8 +80,8 @@
   $(LIBUNITY_PACKAGES) \
   $(MAINTAINER_VALAFLAGS)
 
-libunity_la_SOURCES = \
-  $(libunity_la_VALASOURCES:.vala=.c) \
+nodist_libunity_la_SOURCES = $(libunity_la_VALASOURCES:.vala=.c)
+dist_libunity_la_SOURCES = \
   unity-trace.c \
   unity-trace.h
 
@@ -142,9 +142,6 @@
   $(libunity_la_VALASOURCES:.vala=.c) \
   unity.deps
 
-dist-hook:
-	rm -f $(addprefix $(distdir)/,$(libunity_la_VALASOURCES:.vala=.c))
-
 ##
 # Compile .typelib from .gir
 ##

=== modified file 'test/vala/Makefile.am'
--- test/vala/Makefile.am	2012-07-27 09:32:20 +0000
+++ test/vala/Makefile.am	2012-08-14 14:17:21 +0000
@@ -51,15 +51,15 @@
   test-scope-signals.vala \
   test-vala.vala \
   $(NULL)
-test_vala_SOURCES = $(test_vala_VALASOURCES:.vala=.c)
+nodist_test_vala_SOURCES = $(test_vala_VALASOURCES:.vala=.c)
 
 test_lens_LDADD = $(test_libs)
 test_lens_VALASOURCES = test-lens.vala
-test_lens_SOURCES = $(test_lens_VALASOURCES:.vala=.c)
+nodist_test_lens_SOURCES = $(test_lens_VALASOURCES:.vala=.c)
 
 test_remote_scope_LDADD = $(test_libs)
 test_remote_scope_VALASOURCES = test-remote-scope.vala
-test_remote_scope_SOURCES = $(test_remote_scope_VALASOURCES:.vala=.c)
+nodist_test_remote_scope_SOURCES = $(test_remote_scope_VALASOURCES:.vala=.c)
 
 BUILT_SOURCES = \
   test-vala.vala.stamp \

=== modified file 'test/vala/Makefile.integration_tests'
--- test/vala/Makefile.integration_tests	2012-07-27 09:32:20 +0000
+++ test/vala/Makefile.integration_tests	2012-08-14 14:17:21 +0000
@@ -1,3 +1,5 @@
+if ENABLE_INTEGRATION_TESTS
+
 check_PROGRAMS += \
   test-launcher-integration \
   test-sound-menu \
@@ -6,11 +8,6 @@
   test-mpris-backend-prop-updates-client \
   test-mpris-backend-prop-updates-server
 
-# We must still build all the .c and .stamp files to distribute,
-# so we only disable the actual test runs when integration tests
-# are switched off
-if ENABLE_INTEGRATION_TESTS
-
 TEST_PROGS += \
   test-lens-scope-interactions \
   test-launcher-integration \
@@ -43,7 +40,7 @@
 #########################################
 test_launcher_integration_VALASOURCES = \
   test-launcher-integration.vala
-test_launcher_integration_SOURCES = \
+nodist_test_launcher_integration_SOURCES = \
   $(test_launcher_integration_VALASOURCES:.vala=.c)
 
 test_launcher_integration_LDADD = $(test_libs)
@@ -53,7 +50,7 @@
 #########################################
 test_sound_menu_VALASOURCES = \
   test-sound-menu.vala
-test_sound_menu_SOURCES = \
+nodist_test_sound_menu_SOURCES = \
   $(test_sound_menu_VALASOURCES:.vala=.c)
 
 test_sound_menu_LDADD = $(test_libs)
@@ -63,7 +60,7 @@
 #########################################
 test_mpris_backend_client_VALASOURCES = \
   test-mpris-backend-client.vala
-test_mpris_backend_client_SOURCES = \
+nodist_test_mpris_backend_client_SOURCES = \
   $(test_mpris_backend_client_VALASOURCES:.vala=.c)
 
 test_mpris_backend_client_LDADD = $(test_libs)
@@ -73,7 +70,7 @@
 ########################################
 test_mpris_backend_server_VALASOURCES = \
   test-mpris-backend-server.vala
-test_mpris_backend_server_SOURCES = \
+nodist_test_mpris_backend_server_SOURCES = \
   $(test_mpris_backend_server_VALASOURCES:.vala=.c)
 
 test_mpris_backend_server_LDADD = $(test_libs)
@@ -88,7 +85,7 @@
 #########################################
 test_mpris_backend_prop_updates_client_VALASOURCES = \
   test-mpris-backend-prop-updates-client.vala
-test_mpris_backend_prop_updates_client_SOURCES = \
+nodist_test_mpris_backend_prop_updates_client_SOURCES = \
   $(test_mpris_backend_prop_updates_client_VALASOURCES:.vala=.c)
 
 test_mpris_backend_prop_updates_client_LDADD = $(test_libs)
@@ -98,7 +95,7 @@
 ########################################
 test_mpris_backend_prop_updates_server_VALASOURCES = \
   test-mpris-backend-prop-updates-server.vala
-test_mpris_backend_prop_updates_server_SOURCES = \
+nodist_test_mpris_backend_prop_updates_server_SOURCES = \
   $(test_mpris_backend_prop_updates_server_VALASOURCES:.vala=.c)
 
 test_mpris_backend_prop_updates_server_LDADD = $(test_libs)

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2012-07-27 10:03:20 +0000
+++ tools/Makefile.am	2012-08-14 14:17:21 +0000
@@ -9,6 +9,8 @@
 libunity_tool_CPPFLAGS = \
   -DG_LOG_DOMAIN=\"libunity-tool\" \
   -I$(srcdir) \
+  -I$(top_builddir)/src \
+  -I$(top_builddir)/protocol \
   $(LIBUNITY_CFLAGS) \
   $(UNITYTOOL_CFLAGS)
 
@@ -21,36 +23,44 @@
 endif
 
 libunity_tool_LDADD = \
+  $(top_builddir)/src/libunity.la \
+  $(top_builddir)/protocol/libunity-protocol-private.la \
   $(LIBUNITY_LIBS) \
   $(UNITYTOOL_LIBS)
 
 libunity_tool_VALAFLAGS = \
   -C \
   --vapidir $(top_srcdir)/vapi \
-  --pkg config --pkg gtk+-3.0 --pkg gmodule-2.0 \
-  $(LIBUNITY_PACKAGES)
+  --vapidir=$(top_builddir)/protocol \
+  --vapidir=$(top_builddir)/src \
+  --pkg config \
+  --pkg gtk+-3.0 \
+  --pkg gmodule-2.0 \
+  --pkg unity-internal \
+  --pkg unity-protocol \
+  $(LIBUNITY_PACKAGES) \
   $(MAINTAINER_VALAFLAGS)
 
 libunity_tool_VALASOURCES = \
   unity-tool.vala \
   unity-tool-dbus-util.vala \
   unity-tool-ui.vala \
+  preview-renderer.vala \
+  music-track-model-renderer.vala \
   $(NULL)
 
-
 libunity_tool_UISOURCES = unity-tool-res.gresource.xml unity-tool.ui dbus-lens-connect.ui
 
 unity-tool-res.c: $(libunity_tool_UISOURCES)
-	$(AM_V_GEN)$(GLIB_RESCOMPILE) --sourcedir $(srcdir) --generate-source $<
+	$(AM_V_GEN)$(GLIB_RESCOMPILE) --sourcedir $(srcdir) --target=$@ --generate-source $(filter %.xml,$^)
 
-libunity_tool_SOURCES = \
+nodist_libunity_tool_SOURCES = \
   $(libunity_tool_VALASOURCES:.vala=.c) \
   unity-tool-res.c \
   $(NULL)
 
-BUILT_SOURCES += unity_tool_vala.stamp
+BUILT_SOURCES += unity-tool-res.c unity_tool_vala.stamp
 EXTRA_DIST += \
-  $(BUILT_SOURCES) \
   $(libunity_tool_VALASOURCES) \
   $(libunity_tool_UISOURCES) \
   $(NULL)
@@ -60,7 +70,8 @@
 	@touch $@
 
 CLEANFILES += \
-  *.stamp \
+  unity_tool_vala.stamp \
+  unity-tool-res.c \
   $(libunity_tool_VALASOURCES:.vala=.c) \
   $(NULL)
 

=== added file 'tools/music-track-model-renderer.vala'
--- tools/music-track-model-renderer.vala	1970-01-01 00:00:00 +0000
+++ tools/music-track-model-renderer.vala	2012-08-14 14:17:21 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Pawel Stolowski <[e-mail]>
+ *
+ */
+
+using Gtk;
+
+namespace Unity.Tester {
+
+public class MusicTrackModelRenderer: Object
+{
+    public string dbus_model { get; construct; }
+    private Dee.SharedModel? track_model;
+    private Dee.ModelTag<int> track_model_tag;
+    private int row_counter = 0;
+    private ulong model_sync_sig_id = 0;
+    public ListStore track_view_model { get; construct; }
+
+    public signal void track_list_synchronized();
+
+    construct
+    {
+        track_view_model = new ListStore(6, typeof(string), typeof(int), typeof(string), typeof(uint), typeof(uint), typeof(double));
+    }
+
+    public MusicTrackModelRenderer(string dbus_model)
+    {
+        Object(dbus_model: dbus_model);
+    }
+
+    public void sync()
+    {
+        track_model = new Dee.SharedModel(dbus_model);
+        track_model_tag = new Dee.ModelTag<int>(track_model);
+
+        track_model.row_added.connect(track_added_cb);
+        track_model.row_changed.connect(track_changed_cb);
+
+        model_sync_sig_id = track_model.notify["synchronized"].connect(track_model_synchronized_cb);
+    }
+
+    private void track_added_cb(Dee.Model model, Dee.ModelIter iter)
+    {
+        var row = model.get_row(iter);
+
+        track_model_tag.set(track_model, iter, row_counter++);
+        
+        TreeIter tm_iter;
+        track_view_model.append(out tm_iter);
+        track_view_model.set(tm_iter, 0, row[0].get_string(), 1, row[1].get_int32(), 2, row[2].get_string(), 3, row[3].get_uint32(), 4, row[4].get_uint32(), 5, row[5].get_double(), -1);
+    }
+
+    private void track_changed_cb(Dee.Model model, Dee.ModelIter iter)
+    {
+        int index = track_model_tag.get(track_model, iter);
+        TreeIter tm_iter;
+        if (track_view_model.get_iter_first(out tm_iter)) {
+            while (index > 0)
+            {
+                if (!track_view_model.iter_next(ref tm_iter)) {
+                    break;
+                }
+                --index;
+            }
+            if (index == 0) {
+                var row = model.get_row(iter);
+                track_view_model.set(tm_iter, 0, row[0].get_string(), 1, row[1].get_int32(), 2, row[2].get_string(), 3, row[3].get_uint32(), 4, row[4].get_uint32(), 5, row[5].get_double(), -1);
+            } else {
+                stderr.printf("can't update row");
+            }
+        }
+    }
+
+    private void track_model_synchronized_cb()
+    {
+        SignalHandler.disconnect (track_model, model_sync_sig_id);
+        track_list_synchronized();
+    }
+}
+
+}
\ No newline at end of file

=== added file 'tools/preview-renderer.vala'
--- tools/preview-renderer.vala	1970-01-01 00:00:00 +0000
+++ tools/preview-renderer.vala	2012-08-14 14:17:21 +0000
@@ -0,0 +1,457 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Pawel Stolowski <[e-mail]>
+ *
+ */
+using Gtk;
+
+namespace Unity.Tester {
+
+    public abstract class PreviewRenderer: Object
+    {
+        public signal void preview_action_clicked(string uri);
+
+        public abstract Gtk.Widget get_widget();
+        public abstract Gtk.Widget get_buttons();
+        public abstract Gtk.Widget get_extra_buttons();
+
+        internal abstract void render_buttons();
+        internal abstract void render_extra_buttons();
+        internal abstract void render();
+
+        public static PreviewRenderer? create(Unity.Protocol.Preview preview, string scope_uri)
+        {
+            if (preview is Unity.Protocol.GenericPreview) {
+                return new GenericPreviewRenderer(preview as Unity.Protocol.GenericPreview, scope_uri);
+            }
+            if (preview is Unity.Protocol.ApplicationPreview) {
+                return new ApplicationPreviewRenderer(preview as Unity.Protocol.ApplicationPreview, scope_uri);
+            }
+            if (preview is Unity.Protocol.MusicPreview) {
+                return new MusicPreviewRenderer(preview as Unity.Protocol.MusicPreview, scope_uri);
+            }
+            if (preview is Unity.Protocol.MoviePreview) {
+                return new MoviePreviewRenderer(preview as Unity.Protocol.MoviePreview, scope_uri);
+            }
+            if (preview is Unity.Protocol.SeriesPreview) {
+                return new SeriesPreviewRenderer(preview as Unity.Protocol.SeriesPreview, scope_uri);
+            }
+            return null;
+        }
+
+        public Unity.Protocol.Preview preview { get; construct; }
+        public string scope_uri { get; construct; }
+    }
+
+    /**
+     * Render preview in Gtk.Grid with 2 columns (name and value).
+     */
+    public abstract class GridRenderer: PreviewRenderer
+    {
+        public GridRenderer()
+        {
+            Object();
+        }
+
+        internal void add_standard_attributes(Unity.Protocol.Preview preview)
+        {
+            add_text_row("<b>Title</b>", preview.title);
+            add_text_row("<b>Subtitle</b>", preview.subtitle);
+            add_text_row("<b>Description</b>", preview.description);
+            add_text_row("<b>Image source</b>", preview.image_source_uri);
+            add_text_icon_row("<b>Image</b>", preview.image, preview.image.to_string(), 512);
+        }
+
+        internal void add_info_hints(Unity.Protocol.Preview preview)
+        {
+            Unity.Protocol.InfoHintRaw[] hints = preview.get_info_hints();
+            add_headline("<b><u>Info Hint</u></b>");
+            foreach (Unity.Protocol.InfoHintRaw hint in hints) {
+                add_text_row("<b>Id</b>", hint.id);
+                add_text_row("<b>Display Name</b>", hint.display_name);
+                add_text_row("<b>Icon hint</b>", hint.icon_hint);
+                add_text_row("<b>Value</b>", hint.value.print(true));
+            }
+        }
+
+        /**
+         * Renders name and value in two adjacent cells of grid row
+         */
+        public void add_text_row(string name, string? value)
+        {
+            var name_label = new Gtk.Label(null);
+            name_label.set_markup(name);
+            grid.attach(name_label, 0, row, 1, 1);
+            var value_label = new Gtk.Label(value);
+            value_label.selectable = true;
+            grid.attach(value_label, 1, row, 1, 1);
+
+            ++row;
+        }
+
+        /**
+         * Renders text in two joined cells of grid row
+         */
+        public void add_headline(string text)
+        {
+            var label = new Gtk.Label(null);
+            label.set_markup(text);
+            grid.attach(label, 0, row, 2, 1);
+
+            ++row;
+        }
+
+        /**
+         * Renders name and arbitrary widget in two adjacent cells of grid row
+         */
+        public void add_widget(string name, Gtk.Widget widget)
+        {
+            var name_label = new Gtk.Label(null);
+            name_label.set_markup(name);
+            grid.attach(name_label, 0, row, 1, 1);
+            grid.attach(widget, 1, row, 1, 1);
+            ++row;
+        }
+        
+        public void on_preview_action_clicked(Gtk.Button button)
+        {
+            string uri = preview_actions.get(button);
+            preview_action_clicked(uri);
+        }
+
+        /**
+         * Renders name and icon in two adjacent cells of grid row
+         */
+        public void add_text_icon_row(string name, GLib.Icon? icon, string? tooltip, int size=32)
+        {
+            var icon_label = new Gtk.Label(null);
+            icon_label.set_markup(name);
+            grid.attach(icon_label, 0, row, 1, 1);
+            var themed_icon = Gtk.IconTheme.get_default().lookup_by_gicon(icon, size, 0);
+            var pixbuf = themed_icon.load_icon();
+            Gtk.Image image = new Gtk.Image.from_pixbuf(pixbuf);
+            if (tooltip != null) {
+                image.set_tooltip_text(tooltip);
+            }
+            grid.attach(image, 1, row, 1, 1);
+
+            ++row;
+        }
+
+        public override Gtk.Widget get_widget()
+        {
+            render();
+            grid.foreach((obj) => { obj.set_halign(Gtk.Align.START); });
+            return grid;
+        }
+
+        public override Gtk.Widget get_buttons()
+        {
+            render_buttons();
+            return preview_actions_box;
+        }
+
+        public override Gtk.Widget get_extra_buttons()
+        {
+            render_extra_buttons();
+            return preview_extra_buttons_box;
+        }
+
+        public override void render_buttons()
+        {
+            preview_actions = new GLib.HashTable<Gtk.Button, string>(null, null);
+            Unity.Protocol.PreviewActionRaw[] actions = preview.get_actions();
+            for (int i=0; i<actions.length; i++) {
+                unowned Unity.Protocol.PreviewActionRaw action = actions[i];
+                Gtk.Button btn = new Gtk.Button.with_label(action.display_name);
+                btn.clicked.connect(on_preview_action_clicked);
+                preview_actions_box.pack_start(btn, false, false);
+                string action_uri = "%s:%s".printf(action.id, scope_uri);
+                btn.set_tooltip_text(action_uri);
+                preview_actions.insert(btn, action_uri);
+                btn.show_all();
+            }
+        }
+
+        internal override void render_extra_buttons()
+        {
+        }
+
+        construct {
+            grid = new Gtk.Grid();
+            grid.set_column_spacing(5);
+            grid.set_row_spacing(5);
+            grid.border_width = 5;
+            grid.set_halign(Gtk.Align.FILL);
+            grid.set_valign(Gtk.Align.FILL);
+            grid.hexpand = true;
+            grid.vexpand = true;
+
+            preview_actions_box = new Gtk.Box(Gtk.Orientation.VERTICAL, 5);
+            preview_actions_box.set_halign(Gtk.Align.FILL);
+            preview_actions_box.set_valign(Gtk.Align.FILL);
+            preview_actions_box.hexpand = false;
+            preview_actions_box.vexpand = false;
+
+            preview_extra_buttons_box = new Gtk.Box(Gtk.Orientation.VERTICAL, 5);
+            preview_extra_buttons_box.set_halign(Gtk.Align.FILL);
+            preview_extra_buttons_box.set_valign(Gtk.Align.FILL);
+            preview_extra_buttons_box.hexpand = false;
+            preview_extra_buttons_box.vexpand = false;
+        }
+
+        private int row = 0;
+        public Gtk.Grid grid { get; construct; }
+        public Gtk.Box preview_actions_box { get; construct; }
+        public Gtk.Box preview_extra_buttons_box { get; construct; }
+        private GLib.HashTable<Gtk.Button, string> preview_actions = null;
+    }
+
+    public class GenericPreviewRenderer: GridRenderer
+    {
+        public GenericPreviewRenderer(Unity.Protocol.GenericPreview preview, string scope_uri)
+        {
+            Object(preview: preview, scope_uri: scope_uri);
+        }
+
+        internal override void render()
+        {
+            assert(preview != null);
+
+            base.add_standard_attributes(preview as Unity.Protocol.GenericPreview);
+            base.add_info_hints(preview as Unity.Protocol.GenericPreview);
+        }
+    }
+
+    public class ApplicationPreviewRenderer: GridRenderer
+    {
+        public ApplicationPreviewRenderer(Unity.Protocol.ApplicationPreview preview, string scope_uri)
+        {
+            Object(preview: preview, scope_uri: scope_uri);
+        }
+
+        internal override void render()
+        {
+            assert(preview != null);
+
+            var app_preview = preview as Unity.Protocol.ApplicationPreview;
+
+            base.add_standard_attributes(preview);
+            base.add_text_row("<b>License</b>", app_preview.license);
+            base.add_text_row("<b>Copyright</b>", app_preview.copyright);
+            base.add_text_row("<b>Last update</b>", app_preview.last_update);
+            base.add_text_row("<b>Rating</b>", "%.2f".printf(app_preview.rating));
+            base.add_text_row("<b>Number of ratings</b>", "%u".printf(app_preview.num_ratings));
+            base.add_text_icon_row("<b>Application icon</b>", app_preview.app_icon, app_preview.app_icon.to_string());
+            base.add_info_hints(app_preview);
+        }
+    }
+
+    public class MusicPreviewRenderer: GridRenderer
+    {
+        private MusicTrackModelRenderer track_model_renderer;
+        private Gtk.TreeView track_view;
+        private Gtk.Menu track_view_popup_menu;
+
+        public signal void play_music_track_clicked(string uri);
+        public signal void pause_music_track_clicked(string uri);
+
+        public MusicPreviewRenderer(Unity.Protocol.MusicPreview preview, string scope_uri)
+        {
+            Object(preview: preview, scope_uri: scope_uri);
+        }
+
+        internal override void render()
+        {
+            assert(preview != null);
+            var music_preview = preview as Unity.Protocol.MusicPreview;
+
+            base.add_standard_attributes(preview);
+            base.add_text_row("<b>Track data swarm name</b>", music_preview.track_data_swarm_name);
+            base.add_text_row("<b>Track data address</b>", music_preview.track_data_address);
+            base.add_info_hints(music_preview);
+
+            if (music_preview.track_data_swarm_name != null && music_preview.track_data_swarm_name != "")
+            {
+                track_model_renderer = new MusicTrackModelRenderer(music_preview.track_data_swarm_name);
+                track_view = new TreeView();
+                var track_view_viewport = new Viewport(null, null);
+            
+                track_view.set_model(track_model_renderer.track_view_model);
+
+                track_view.insert_column_with_attributes(-1, "uri", new CellRendererText (), "text", 0);
+                track_view.insert_column_with_attributes(-1, "track no", new CellRendererText (), "text", 1);
+                track_view.insert_column_with_attributes(-1, "title", new CellRendererText (), "text", 2);
+                track_view.insert_column_with_attributes(-1, "length", new CellRendererText (), "text", 3);
+                track_view.insert_column_with_attributes(-1, "playing", new CellRendererText (), "text", 4);
+                track_view.insert_column_with_attributes(-1, "progress", new CellRendererText (), "text", 5);
+            
+                track_view_viewport.add_with_properties(track_view);
+                add_widget("Track model", track_view_viewport);
+                
+                track_view_popup_menu = new Gtk.Menu();
+                var play_item = new Gtk.MenuItem.with_label("Play");
+                play_item.activate.connect(on_play_item_clicked);
+                track_view_popup_menu.append(play_item);
+                play_item.show();
+                var pause_item = new Gtk.MenuItem.with_label("Pause");
+                pause_item.activate.connect(on_pause_item_clicked);
+                track_view_popup_menu.append(pause_item);
+                pause_item.show();
+
+                track_view.button_press_event.connect(on_track_view_right_click);
+                track_model_renderer.sync();
+            }
+        }
+
+        public bool on_track_view_right_click(Gtk.Widget widget, Gdk.EventButton event)
+        {
+            if (event.type == Gdk.EventType.BUTTON_PRESS && event.button == 3 /* right mouse button */) {
+                track_view_popup_menu.popup(null, null, null, event.button, event.time);
+            }
+            return false;
+        }
+       
+        internal string get_selected_track_uri()
+        {
+            TreeModel model;
+            TreeIter iter;
+            var selection = track_view.get_selection();
+            if (selection.get_selected(out model, out iter)) {
+                Value val;
+                // get uri column
+                model.get_value(iter, 0, out val);
+                return val.get_string();
+            }
+            return "";
+        }
+
+        internal void on_play_item_clicked(Gtk.MenuItem item)
+        {
+            string uri = get_selected_track_uri();
+            if (uri != "")
+            {
+                play_music_track_clicked(uri);
+            }
+        }
+
+        internal void on_pause_item_clicked(Gtk.MenuItem item)
+        {
+            string uri = get_selected_track_uri();
+            if (uri != "")
+            {
+                pause_music_track_clicked(uri);
+            }
+        }
+    }
+
+    public class MoviePreviewRenderer: GridRenderer
+    {
+        public MoviePreviewRenderer(Unity.Protocol.MoviePreview preview, string scope_uri)
+        {
+            Object(preview: preview, scope_uri: scope_uri);
+        }
+
+        internal override void render()
+        {
+            assert(preview != null);
+            var movie_preview= preview as Unity.Protocol.MoviePreview;
+
+            base.add_standard_attributes(preview);
+            base.add_text_row("<b>Rating</b>", "%.2f".printf(movie_preview.rating));
+            base.add_text_row("<b>Number of ratings</b>", "%u".printf(movie_preview.num_ratings));
+            base.add_info_hints(movie_preview);
+        }
+    }
+
+    public class SeriesPreviewRenderer: GridRenderer
+    {
+        public signal void change_selected_series_item_clicked(string uri, int index);
+
+        public SeriesPreviewRenderer(Unity.Protocol.SeriesPreview preview, string scope_uri)
+        {
+            Object(preview: preview, scope_uri: scope_uri);
+        }
+
+        public void update_child_preview(Unity.Protocol.Preview child_preview)
+        {
+            (preview as Unity.Protocol.SeriesPreview).child_preview = child_preview;
+        }
+
+        private void on_change_selected_item_clicked(Gtk.ComboBox combo)
+        {
+            int index = int.parse(combo.active_id);
+            var series_preview = preview as Unity.Protocol.SeriesPreview;
+            if (index != series_preview.selected_item) {
+                change_selected_series_item_clicked(scope_uri, index);
+            }
+        }
+
+        internal override void render_extra_buttons()
+        {
+            var series_preview = preview as Unity.Protocol.SeriesPreview;
+
+            Gtk.Box box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 5);
+
+            Gtk.ComboBoxText items_combo = new Gtk.ComboBoxText();
+            items_combo.changed.connect(on_change_selected_item_clicked);
+            Protocol.SeriesItemRaw[] items = series_preview.get_items();
+            for (int i=0; i<items.length; i++) {
+                items_combo.append("%u".printf(i), "Series item #%u".printf(i));
+            }
+            items_combo.set_active_id("%u".printf(series_preview.selected_item));
+
+            var label = new Gtk.Label("Set active:");
+            box.pack_start(label);
+            box.pack_start(items_combo, false, false);
+            box.show_all();
+
+            preview_extra_buttons_box.pack_start(box, false, false);
+        }
+
+        internal override void render()
+        {
+            assert(preview != null);
+            var series_preview = preview as Unity.Protocol.SeriesPreview;
+
+            base.add_standard_attributes(preview);
+            base.add_text_row("<b>Selected item</b>", "%d".printf(series_preview.selected_item));
+            Protocol.SeriesItemRaw[] items = series_preview.get_items();
+
+            PreviewRenderer? child_preview = PreviewRenderer.create(series_preview.child_preview, scope_uri);
+            if (child_preview != null) {
+                base.add_widget("<b>Child preview</b>", child_preview.get_widget());
+            }
+
+            for (int i=0; i<items.length; i++) {
+                base.add_headline("<u><b>Series item #%u</b></u>".printf(i));
+                base.add_text_row("<b>Title</b>", items[i].title);
+                base.add_text_row("<b>Uri</b>", items[i].uri);
+
+                if (items[i].icon_hint != null) {
+                    try {
+                        var icon = GLib.Icon.new_for_string(items[i].icon_hint);
+                        base.add_text_icon_row("<b>Icon</b>", icon, items[i].icon_hint.to_string());
+                    }
+                    catch (GLib.Error e) {
+                        stderr.printf("Series Item icon couldn't be loaded: %s\n", e.message);
+                    }
+                }
+            }
+            base.add_info_hints(series_preview);
+        }
+    }
+}

=== modified file 'tools/unity-tool-dbus-util.vala'
--- tools/unity-tool-dbus-util.vala	2012-06-13 15:17:44 +0000
+++ tools/unity-tool-dbus-util.vala	2012-08-14 14:17:21 +0000
@@ -17,12 +17,12 @@
 
         public DBusLensUtil()
         {
-			try {
-				lens_dbusname_regex = new Regex("^([a-zA-Z-]+(\\.[a-zA-Z-]+)+)\\.T[\\d]+.[a-zA-Z]+$");
-			}
-			catch (Error e) {
-				stderr.printf("Error parsing lens_dbusname_regex");
-			}
+            try {
+                lens_dbusname_regex = new Regex("^([a-zA-Z-]+(\\.[a-zA-Z-]+)+)\\.T[\\d]+.[a-zA-Z]+$");
+            }
+            catch (Error e) {
+                stderr.printf("Error parsing lens_dbusname_regex");
+            }
         }
 
         /**
@@ -32,22 +32,22 @@
         {
             List<string> services = new List<string>();
 
-			var vt = new VariantType ("(as)");
-			var bus = Bus.get_sync (BusType.SESSION);
-			Variant v = bus.call_sync("org.freedesktop.DBus",
-									  "/org/freedesktop/DBus",
-									  "org.freedesktop.DBus",
-									  "ListNames",
-									  null,
-									  vt,
-									  0,
-									  -1,
-									  null);
+            var vt = new VariantType ("(as)");
+            var bus = Bus.get_sync (BusType.SESSION);
+            Variant v = bus.call_sync("org.freedesktop.DBus",
+                                      "/org/freedesktop/DBus",
+                                      "org.freedesktop.DBus",
+                                      "ListNames",
+                                      null,
+                                      vt,
+                                      0,
+                                      -1,
+                                      null);
 
-			string *[]names = v.get_child_value(0).get_strv();
-			foreach (string *s in names) {
-				services.append(s);
-			}
+            string *[]names = v.get_child_value(0).get_strv();
+            foreach (string *s in names) {
+                services.append(s);
+            }
 
             return services;
         }
@@ -89,85 +89,85 @@
          */
         public async unowned List<DBusObjectAddress?> findLenses() throws GLib.Error
         {
-			if (lens_dbusname_regex == null) {
-				stderr.printf("Invalid lens_dbusname_regex");
-				return lenses;
-			}
-
-			var bus = Bus.get_sync (BusType.SESSION);
-			var vt = new VariantType ("(s)");
-
-			//
-			// Service filtering - potential lenses must match this regexp;
-			// e.g. com.canonical.Unity.Lens.applications.T1338793992370.Results
-			foreach (string srv in getServices()) {
-				if (lens_dbusname_regex.match(srv)) {
-					try {
-						var vb = new VariantBuilder(new VariantType("(s)"));
-						vb.add_value(srv);
-
-						Variant v = bus.call_sync(
-							"org.freedesktop.DBus",
-							"/",
-							"org.freedesktop.DBus",
-							"GetNameOwner",
-							vb.end(),
-							vt,
-							0,
-							10,
-							null);
-
-						if (v != null) {
-							string owner = v.get_child_value(0).get_string();
-							if (owner != null) {
-								DBusObjectAddress obj = DBusObjectAddress() {
-									dbus_name = owner,
-									dbus_path = "/"
-								};
-								nodes.push_tail(obj);
-							}
-						}
-					}
-					catch (Error e) {
-						// silently ignore
-					}
-
-				}
-			}
-
-			//
-			// introspect all dbus paths from nodes queue.
-			// queue may grow as new paths are discovered.
-			while (nodes.length > 0) {
-				DBusObjectAddress node = nodes.pop_head();
-
-				current_dbus_name = node.dbus_name;
-				current_dbus_path = node.dbus_path;
-
-				try {
-					Variant v = bus.call_sync(current_dbus_name,
-											  current_dbus_path,
-											  "org.freedesktop.DBus.Introspectable",
-											  "Introspect",
-											  null,
-											  vt,
-											  0,
-											  10,
-											  null);
-
-					if (v != null) {
-						string xmldata = v.get_child_value(0).get_string();
-						var context = new MarkupParseContext (parser, MarkupParseFlags.TREAT_CDATA_AS_TEXT, this, null);
-						context.parse (xmldata, xmldata.length);
-					}
-				}
-				catch (Error e) {
-					// silently ignore
-				}
-
-				Idle.add(findLenses.callback);
-				yield;
-			}
+            if (lens_dbusname_regex == null) {
+                stderr.printf("Invalid lens_dbusname_regex");
+                return lenses;
+            }
+
+            var bus = Bus.get_sync (BusType.SESSION);
+            var vt = new VariantType ("(s)");
+
+            //
+            // Service filtering - potential lenses must match this regexp;
+            // e.g. com.canonical.Unity.Lens.applications.T1338793992370.Results
+            foreach (string srv in getServices()) {
+                if (lens_dbusname_regex.match(srv)) {
+                    try {
+                        var vb = new VariantBuilder(new VariantType("(s)"));
+                        vb.add_value(srv);
+
+                        Variant v = bus.call_sync(
+                            "org.freedesktop.DBus",
+                            "/",
+                            "org.freedesktop.DBus",
+                            "GetNameOwner",
+                            vb.end(),
+                            vt,
+                            0,
+                            10,
+                            null);
+
+                        if (v != null) {
+                            string owner = v.get_child_value(0).get_string();
+                            if (owner != null) {
+                                DBusObjectAddress obj = DBusObjectAddress() {
+                                    dbus_name = owner,
+                                    dbus_path = "/"
+                                };
+                                nodes.push_tail(obj);
+                            }
+                        }
+                    }
+                    catch (Error e) {
+                        // silently ignore
+                    }
+
+                }
+            }
+
+            //
+            // introspect all dbus paths from nodes queue.
+            // queue may grow as new paths are discovered.
+            while (nodes.length > 0) {
+                DBusObjectAddress node = nodes.pop_head();
+
+                current_dbus_name = node.dbus_name;
+                current_dbus_path = node.dbus_path;
+
+                try {
+                    Variant v = bus.call_sync(current_dbus_name,
+                                              current_dbus_path,
+                                              "org.freedesktop.DBus.Introspectable",
+                                              "Introspect",
+                                              null,
+                                              vt,
+                                              0,
+                                              10,
+                                              null);
+
+                    if (v != null) {
+                        string xmldata = v.get_child_value(0).get_string();
+                        var context = new MarkupParseContext (parser, MarkupParseFlags.TREAT_CDATA_AS_TEXT, this, null);
+                        context.parse (xmldata, xmldata.length);
+                    }
+                }
+                catch (Error e) {
+                    // silently ignore
+                }
+
+                Idle.add(findLenses.callback);
+                yield;
+            }
 
             return lenses;
         }

=== modified file 'tools/unity-tool-ui.vala'
--- tools/unity-tool-ui.vala	2012-06-13 15:32:55 +0000
+++ tools/unity-tool-ui.vala	2012-08-14 14:17:21 +0000
@@ -43,34 +43,48 @@
             uimodel = builder.get_object("results_model") as ListStore;
             ui_filter_model = builder.get_object("filters_model") as ListStore;
 
+            notebook = builder.get_object("notebook") as Notebook;
             search_entry = builder.get_object("search_entry") as Entry;
             search_type_global_rbutton = builder.get_object("search_type_global") as RadioButton;
             search_button = builder.get_object("search_button") as Button;
+            results_button = builder.get_object("results_button") as Button;
+            prev_preview_button = builder.get_object("prev_preview_btn") as Button;
+            next_preview_button = builder.get_object("next_preview_btn") as Button;
             statusbar = builder.get_object("statusbar") as Statusbar;
             log_buffer = builder.get_object("log_buffer") as TextBuffer;
+            preview_raw_data = builder.get_object("preview_raw_data") as TextBuffer;
+            preview_buttons_container = builder.get_object("preview_buttons_container") as Alignment;
+            preview_extra_buttons_container = builder.get_object("preview_extra_buttons_container") as Alignment;
+            preview_viewport = builder.get_object("preview_viewport") as Viewport;
+            assert(preview_viewport != null);
+
+            results_view = builder.get_object("results_view") as TreeView;
+            results_view_selection = builder.get_object("results_view_selection") as TreeSelection;
+            results_popup_menu = builder.get_object("results_popup_menu") as Gtk.Menu;
 
             statusbar_info_ctx = statusbar.get_context_id("Info");
             statusbar_error_ctx = statusbar.get_context_id("Error");
 
+            show_no_preview();
             show_connect_dialog();
         }
         catch (GLib.Error e) {
             ui_load_error(e.message);
-			return false;
+            return false;
         }
         return true;
     }
 
-	private void ui_load_error(string message)
-	{
-		Gtk.Dialog dlg = new Gtk.MessageDialog(null,
+    private void ui_load_error(string message)
+    {
+        Gtk.Dialog dlg = new Gtk.MessageDialog(null,
                     Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL,
                     Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,
                     "Error loading UI file:\n%s".printf(message));
-		dlg.title = "Error creating UI";
-		dlg.run();
-		dlg.destroy();
-	}
+        dlg.title = "Error creating UI";
+        dlg.run();
+        dlg.destroy();
+    }
 
     private void discover_lens()
     {
@@ -94,7 +108,7 @@
                     stderr.printf("DBus Lens auto-discovery failed %s\n", e.message);
                     lens_discovery_spinner.stop();
                 }
-        });
+            });
     }
 
     [CCode (instance_pos = -1)]
@@ -113,37 +127,50 @@
     }
 
     //
-    // 'New' menu action handler
+    // Handler for File > New menu item.
     [CCode (instance_pos = -1)]
     public void on_connect_clicked(Gtk.MenuItem item)
     {
         show_connect_dialog();
     }
 
+    /**
+     * Handler for Edit > Clear Log menu item.
+     */
+    [CCode (instance_pos = -1)]
+    public void on_clear_log_clicked(Gtk.MenuItem item)
+    {
+        Gtk.TextIter start;
+        Gtk.TextIter end;
+        log_buffer.get_start_iter(out start);
+        log_buffer.get_end_iter(out end);
+        log_buffer.delete(ref start, ref end);
+    }
+
     private void show_connect_dialog()
     {
         var builder = new Builder ();
-		try {
-			builder.add_from_resource("/com/canonical/Unity/unity-tool/dbus-lens-connect.ui");
-			builder.connect_signals(this);
-			lens_discovery_spinner = builder.get_object("lens_discovery_spinner") as Spinner;
-			lens_list_model = builder.get_object("lens_list_model") as ListStore;
-			lens_list_combobox = builder.get_object("lens_list_combobox") as ComboBox;
-			dbus_name_entry = builder.get_object("dbus_name_entry") as Entry;
-			dbus_path_entry = builder.get_object("dbus_path_entry") as Entry;
-			lens_connect_dlg = builder.get_object("lens_connect_dialog") as Dialog;
+        try {
+            builder.add_from_resource("/com/canonical/Unity/unity-tool/dbus-lens-connect.ui");
+            builder.connect_signals(this);
+            lens_discovery_spinner = builder.get_object("lens_discovery_spinner") as Spinner;
+            lens_list_model = builder.get_object("lens_list_model") as ListStore;
+            lens_list_combobox = builder.get_object("lens_list_combobox") as ComboBox;
+            dbus_name_entry = builder.get_object("dbus_name_entry") as Entry;
+            dbus_path_entry = builder.get_object("dbus_path_entry") as Entry;
+            lens_connect_dlg = builder.get_object("lens_connect_dialog") as Dialog;
 
-			discover_lens();
-			
-			if (Options.lens_dbus_path != null && Options.lens_dbus_path != "" && Options.lens_dbus_name != null && Options.lens_dbus_name != "") {
-				dbus_name_entry.text = Options.lens_dbus_name;
-				dbus_path_entry.text = Options.lens_dbus_path;
-			}
-			lens_connect_dlg.show_all();
-		} 
-		catch (GLib.Error e) {
-			ui_load_error(e.message);
-		}
+            discover_lens();
+            
+            if (Options.lens_dbus_path != null && Options.lens_dbus_path != "" && Options.lens_dbus_name != null && Options.lens_dbus_name != "") {
+                dbus_name_entry.text = Options.lens_dbus_name;
+                dbus_path_entry.text = Options.lens_dbus_path;
+            }
+            lens_connect_dlg.show_all();
+        } 
+        catch (GLib.Error e) {
+            ui_load_error(e.message);
+        }
     }
 
     private void results_row_added_cb(Dee.Model model, Dee.ModelIter iter)
@@ -153,7 +180,7 @@
         uimodel.append(out uiiter);
 
         uimodel.set(uiiter, 0, row[0].get_string(), 1, row[1].get_string(), 2, row[2].get_uint32(), 3, row[3].get_string(), 4, row[4].get_string(), 5,
-                row[5].get_string(), 6, row[6].get_string(), -1);
+                    row[5].get_string(), 6, row[6].get_string(), -1);
     }
 
     private void filters_row_added_cb(Dee.Model model, Dee.ModelIter iter)
@@ -163,14 +190,14 @@
         ui_filter_model.append(out uiiter);
 
         ui_filter_model.set(uiiter, 0, row[0].get_string(), 1, row[1].get_string (), 2, row[2].get_string (), 3, row[3].get_string (), 4, row[4].print(true),
-             5, row[5].get_boolean (), 6, row[6].get_boolean (), 7, row[7].get_boolean(), -1);
+                            5, row[5].get_boolean (), 6, row[6].get_boolean (), 7, row[7].get_boolean(), -1);
     }
 
     private void update_status()
     {
         statusbar.pop(statusbar_info_ctx);
         statusbar.push(statusbar_info_ctx, "%u records".printf(dee_results_model.get_n_rows()) + ", DBus name: " + Options.lens_dbus_name + " path: " +
-                Options.lens_dbus_path);
+                       Options.lens_dbus_path);
     }
 
     private void model_synchronized_cb()
@@ -186,8 +213,35 @@
         dee_filters_model = null;
     }
 
+    private void on_lens_service_vanished(GLib.DBusConnection connection, string name)
+    {
+        handle_error("Disconnected from %s".printf(name));
+        GLib.Bus.unwatch_name(dbus_watcher_id);
+        dbus_watcher_id = 0;
+        lens_proxy = null;
+
+        clear_data();
+        remove_preview();
+        show_no_preview();
+
+        disable_ui_actions_on_error_condition();
+    }
+
+    private void disable_ui_actions_on_error_condition()
+    {
+        if (lens_proxy == null || Options.lens_dbus_path == null || Options.lens_dbus_path.length == 0 || Options.lens_dbus_name == null || Options.lens_dbus_name.length == 0) {
+            search_entry.sensitive = false;
+            results_button.sensitive = false;
+            search_button.sensitive = false;
+        } else {
+            search_entry.sensitive = true;
+            results_button.sensitive = true;
+            search_button.sensitive = true;
+        }
+    }
+
     /**
-     * Triggered clicking 'Ok' in the connection dialog.
+     * Triggered by clicking 'Ok' in the connection dialog.
      */
     [CCode (instance_pos = -1)]
     public void on_lens_connect(Gtk.Dialog dlg, int response)
@@ -195,16 +249,43 @@
         //
         // user clicked 'Ok' in the Lens Connect dialog
         if (response == 1) {
+            clear_data();
+            remove_preview();
+            show_no_preview();
+
             Options.lens_dbus_name = dbus_name_entry.text;
             Options.lens_dbus_path = dbus_path_entry.text;
-        }
-        if (Options.lens_dbus_path == null || Options.lens_dbus_path.length == 0 || Options.lens_dbus_name == null || Options.lens_dbus_name.length == 0) {
-            search_entry.sensitive = false;
-            search_button.sensitive = false;
-        } else {
-            search_entry.sensitive = true;
-            search_button.sensitive = true;
-        }
+
+            lens_proxy = null;
+            DBusConnection? bus = null;
+
+            try
+            {
+                bus = Bus.get_sync(BusType.SESSION);
+                lens_proxy = bus.get_proxy_sync<Protocol.LensService>(Options.lens_dbus_name, Options.lens_dbus_path);
+
+                if (dbus_watcher_id > 0) {
+                    GLib.Bus.unwatch_name(dbus_watcher_id);
+                }
+                dbus_watcher_id = GLib.Bus.watch_name(GLib.BusType.SESSION, Options.lens_dbus_name, GLib.BusNameWatcherFlags.AUTO_START, null, on_lens_service_vanished);
+
+                lens_proxy.changed.connect((info) =>  {
+                        string model_name = search_type_global_rbutton.get_active() ? info.global_results_model_name : info.results_model_name;
+                        dee_results_model = new Dee.SharedModel(model_name);
+                        model_sync_sig_id = dee_results_model.notify["synchronized"].connect(model_synchronized_cb);
+                        dee_results_model.row_added.connect(results_row_added_cb);
+                    
+                        dee_filters_model = new Dee.SharedModel(info.filters_model_name);
+                        filters_model_sync_sig_id = dee_filters_model.notify["synchronized"].connect(filter_model_synchronized_cb);
+                        dee_filters_model.row_added.connect(filters_row_added_cb);
+                    });
+                append_log_message("Connected to: %s, %s\n".printf(Options.lens_dbus_name, Options.lens_dbus_path));
+            }
+            catch (GLib.IOError e) {
+                handle_error(e.message);
+            }
+        }
+        disable_ui_actions_on_error_condition();
         dlg.destroy();
     }
 
@@ -222,20 +303,20 @@
         var file_chooser = new FileChooserDialog("Open Lens file", null, Gtk.FileChooserAction.OPEN, Gtk.Stock.CANCEL, 0, Gtk.Stock.OPEN, 1);
         file_chooser.set_filter(filter);
         if (file_chooser.run() == 1) {
-			try {
-				get_lens_params_from_file(file_chooser.get_filename());
-				dbus_name_entry.text = Options.lens_dbus_name;
-				dbus_path_entry.text = Options.lens_dbus_path;
-			}
-			catch (Error e) {
-				Gtk.Dialog dlg = new Gtk.MessageDialog(null,
-								   Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL,
-								   Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,
-								   "Error loading lens parameters from file:\n%s".printf(e.message));
-				dlg.title = "Error loading lens file";
-				dlg.run();
-				dlg.destroy();
-			}
+            try {
+                get_lens_params_from_file(file_chooser.get_filename());
+                dbus_name_entry.text = Options.lens_dbus_name;
+                dbus_path_entry.text = Options.lens_dbus_path;
+            }
+            catch (Error e) {
+                Gtk.Dialog dlg = new Gtk.MessageDialog(null,
+                                   Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL,
+                                   Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,
+                                   "Error loading lens parameters from file:\n%s".printf(e.message));
+                dlg.title = "Error loading lens file";
+                dlg.run();
+                dlg.destroy();
+            }
         }
         file_chooser.destroy();
     }
@@ -251,12 +332,19 @@
     }
 
     /**
-     * Request lens info via debus, creates dee models.
+     * Request lens info via dbus, creates dee models.
      */
     private void request_lens_info()
     {
         spinner.start();
-
+        lens_proxy.info_request();
+    }
+ 
+    /**
+     * Clears all models, removing all search results.
+     */
+    private void clear_data()
+    {
         if (dee_filters_model != null) {
             dee_filters_model = null;
         }
@@ -265,21 +353,13 @@
         }
         uimodel.clear();
         ui_filter_model.clear();
-
-        LensInfo info = get_lens_info((msg) => { handle_error(msg); });
-        string model_name = search_type_global_rbutton.get_active() ? info.global_results_model_name : info.results_model_name;
-        dee_results_model = new Dee.SharedModel(model_name);
-        model_sync_sig_id = dee_results_model.notify["synchronized"].connect(model_synchronized_cb);
-        dee_results_model.row_added.connect(results_row_added_cb);
-
-        dee_filters_model = new Dee.SharedModel(info.filters_model_name);
-        filters_model_sync_sig_id = dee_filters_model.notify["synchronized"].connect(filter_model_synchronized_cb);
-        dee_filters_model.row_added.connect(filters_row_added_cb);
     }
 
     [CCode (instance_pos = -1)]
     public void on_results_button_clicked(Gtk.Button btn)
     {
+        clear_data();
+        remove_preview();
         request_lens_info();
     }
 
@@ -290,29 +370,71 @@
     public void on_search_button_clicked(Gtk.Button btn)
     {
         string text = search_entry.text;
-        if (text != "") {
-            spinner.start();
+        spinner.start();
        
-            if (DBus.is_name(Options.lens_dbus_name) && GLib.Variant.is_object_path(Options.lens_dbus_path)) {
-                append_log_message("Query: '%s' (%s), DBus name: %s, DBus path: %s\n".printf(
-                            text,
-                            search_type_global_rbutton.get_active() ? "global" : "local",
-                            Options.lens_dbus_name,
-                            Options.lens_dbus_path));
-                call_lens_search(text, search_type_global_rbutton.get_active() ? 1 : 0, (result) =>
-                        {
-                            append_log_message(result.print(true) + "\n");
-                            request_lens_info();
-                        }, (msg) => {
-                            handle_error(msg);
-                        }
-                    );
+        if (DBus.is_name(Options.lens_dbus_name) && GLib.Variant.is_object_path(Options.lens_dbus_path)) {
+            append_log_message("Query: '%s' (%s), DBus name: %s, DBus path: %s\n".printf(
+                                   text,
+                                   search_type_global_rbutton.get_active() ? "global" : "local",
+                                   Options.lens_dbus_name,
+                                   Options.lens_dbus_path));
+
+            remove_preview();
+            show_no_preview();
+            clear_data();
+
+            if (search_type_global_rbutton.get_active()) {
+                lens_proxy.global_search.begin(text, new HashTable<string, Variant>(null, null),
+                                               (obj, res) => {
+                                                   try {
+                                                       var result = lens_proxy.global_search.end(res);
+                                                       append_log_message("Search reply: " + dump_ht_reply(result) + "\n");
+                                                       request_lens_info();
+                                                   }
+                                                   catch (Error e) {
+                                                       handle_error(e.message);
+                                                   }
+                                               });
             } else {
-                handle_error("Invalid DBus name/path");
+                lens_proxy.search.begin(text, new HashTable<string, Variant>(null, null),
+                                        (obj, res) => {
+                                            try {
+                                                var result = lens_proxy.search.end(res);
+                                                append_log_message("Search reply: " + dump_ht_reply(result) + "\n");
+                                                request_lens_info();
+                                            }
+                                            catch (Error e)  {
+                                                handle_error(e.message);
+                                            }
+                                        });
             }
+        } else {
+            handle_error("Invalid DBus name/path");
         }
     }
 
+    private static string dump_ht_reply(HashTable<string, Variant> reply)
+    {
+        var bld = new StringBuilder("{\n");
+        reply.foreach((k, v) => {
+                bld.append_printf("\t%s = %s", k, v.print(true));
+            });
+        bld.append("\n}");
+        return bld.str;
+    }
+
+    private static string dump_activation_reply(Unity.Protocol.ActivationReplyRaw reply)
+    {
+        var bld = new StringBuilder();
+        string handled_str = ((EnumClass) typeof (Unity.HandledType).class_ref()).get_value((int)reply.handled).value_name;
+        bld.append_printf("ActivationReplyRaw: {\n\turi=%s,\n\thandled=%s,\n\thints={\n\t", reply.uri, handled_str);
+        reply.hints.foreach((k, v) => {
+                bld.append_printf("\t\t%s = %s", k, v.print(true));
+            });
+        bld.append("\n\t}\n}");
+        return bld.str;
+    }
+
     /**
      * Helper method that stops spinner and puts error message on statusbar.
      */
@@ -324,11 +446,321 @@
         append_log_message(message + "\n");
     }
 
+    /**
+     * Helper method to workaround vala-0.16 & vala-0.17 bug -
+     * fix is coming to vala - see http://git.gnome.org/browse/vala/commit/?id=79925e1174d62d740ca8f360f489dd1660ea5881
+     */
+    private async void send_activate (string uri, uint action_type, out Unity.Protocol.ActivationReplyRaw reply) throws GLib.IOError
+    {
+        reply = yield lens_proxy.activate (uri, action_type);
+    }
+
+    private async void send_update (string uri, HashTable<string, Variant> props, out HashTable<string, Variant> reply) throws GLib.IOError
+    {
+        reply = yield lens_proxy.update_preview_property (preview_scope_uri, props);
+    }
+     
+    private void activate_preview(string preview_uri)
+    {
+        // call lens activate over dbus
+        Unity.Protocol.ActivationReplyRaw? reply_struct = null;
+        send_activate.begin(preview_uri,
+                            Unity.Protocol.ActionType.PREVIEW_RESULT,
+                            (obj, res) => {
+                try {
+                    send_activate.end(res, out reply_struct);
+                    preview_scope_uri = reply_struct.uri;
+                    handle_activation_reply(reply_struct);
+                    notebook.set_current_page(2); //activate 'Preview' tab
+                }
+                catch (GLib.IOError e) {
+                    handle_error(e.message);
+                }
+            });
+    }
+
+    private void update_next_prev_buttons(TreeModel model, TreeIter cur_iter)
+    {
+        TreeIter iter;
+
+        iter = cur_iter;
+        prev_preview_button.sensitive = model.iter_previous(ref iter);
+        iter = cur_iter;
+        next_preview_button.sensitive = model.iter_next(ref iter);
+    }
+
+    /**
+     * Handler for 'Request preview' context menu item.
+     */
+    [CCode (instance_pos = -1)]
+    public void on_request_preview(Gtk.MenuItem item)
+    {
+        TreeModel model;
+        TreeIter iter;
+        if (results_view_selection.get_selected(out model, out iter)) {
+            Value val;
+            last_active_model = model;
+            last_active_iter = iter;
+            // get value from uri column
+            model.get_value(iter, 0, out val);
+            activate_preview(val.get_string());
+            update_next_prev_buttons(model, iter);
+        }
+    }
+
+    /**
+     * Handler for 'Request preview' context menu item.
+     */
+    [CCode (instance_pos = -1)]
+    public void on_prev_preview_clicked(Gtk.Button button)
+        requires (last_active_model != null)
+    {
+        TreeModel model = last_active_model;
+        TreeIter iter = last_active_iter;
+        if (last_active_model.iter_previous (ref iter)) {
+            Value val;
+            last_active_iter = iter;
+            // get value from uri column
+            model.get_value(iter, 0, out val);
+            activate_preview(val.get_string());
+            update_next_prev_buttons(model, iter);
+        }
+    }
+    /**
+     * Handler for 'Request preview' context menu item.
+     */
+    [CCode (instance_pos = -1)]
+    public void on_next_preview_clicked(Gtk.MenuItem item)
+        requires (last_active_model != null)
+    {
+        TreeModel model = last_active_model;
+        TreeIter iter = last_active_iter;
+        if (last_active_model.iter_next (ref iter)) {
+            Value val;
+            last_active_iter = iter;
+            // get value from uri column
+            model.get_value(iter, 0, out val);
+            activate_preview(val.get_string());
+            update_next_prev_buttons(model, iter);
+        }
+    }
+    /**
+     * Handler for 'Activate result' context menu item.
+     */
+    [CCode (instance_pos = -1)]
+    public void on_activate_result(Gtk.MenuItem item)
+    {
+        TreeModel model;
+        TreeIter iter;
+        if (results_view_selection.get_selected(out model, out iter)) {
+            Value val;
+            // get value from uri column
+            model.get_value(iter, 0, out val);
+
+            //
+            // call lens activate over dbus
+            //
+            Unity.Protocol.ActivationReplyRaw? reply_struct = null;
+            send_activate.begin(val.get_string(), Unity.Protocol.ActionType.ACTIVATE_RESULT, (obj, res) => {
+                    try {
+                        send_activate.end(res, out reply_struct);
+                        handle_activation_reply(reply_struct);
+                    }
+                    catch (GLib.IOError e) {
+                        handle_error(e.message);
+                    }
+                });
+        }
+    }
+
+    /**
+     * Render preview and action buttons depending on preview type (if applicable); log reply.
+     */
+    private void handle_activation_reply(Unity.Protocol.ActivationReplyRaw reply_struct)
+    {
+        append_log_message("Activate reply: " + dump_activation_reply(reply_struct) + "\n");
+
+        if (reply_struct.handled == Unity.HandledType.SHOW_PREVIEW) {
+            if (reply_struct.hints.contains("preview")) {
+                handle_preview(reply_struct.hints["preview"]);
+            } else {
+                handle_error("Reply hints don't contain preview element");
+            }
+        } else {
+            remove_preview();
+            show_no_preview();
+        }
+    }
+
+    private void handle_preview(Variant preview_var)
+    {
+        Unity.Protocol.Preview? reconstructed = Unity.Protocol.Preview.parse(preview_var);
+        preview_raw_data.set_text(preview_var.print(true));
+        preview_renderer = PreviewRenderer.create(reconstructed, preview_scope_uri);
+        update_preview();
+    }
+
+    private void update_preview()
+    {
+        remove_preview();
+
+        if (preview_renderer != null) {
+            preview_renderer.preview_action_clicked.connect(on_preview_action_clicked);
+            if (preview_renderer is SeriesPreviewRenderer) {
+                ((SeriesPreviewRenderer)preview_renderer).change_selected_series_item_clicked.connect(on_change_selected_series_item_clicked);
+            }
+            else if (preview_renderer is MusicPreviewRenderer) {
+                var renderer = preview_renderer as MusicPreviewRenderer;
+                renderer.play_music_track_clicked.connect(on_play_music_track_clicked);
+                renderer.pause_music_track_clicked.connect(on_pause_music_track_clicked);
+            }
+            preview_viewport.add_with_properties(preview_renderer.get_widget());
+            preview_viewport.show_all();
+            
+            preview_buttons_container.add_with_properties(preview_renderer.get_buttons());
+            preview_buttons_container.show_all();
+            
+            preview_extra_buttons_container.add_with_properties(preview_renderer.get_extra_buttons());
+            preview_extra_buttons_container.show_all();
+        } else {
+            handle_error("Unknown preview type");
+            show_no_preview();
+        }
+    }
+
+    private void show_no_preview()
+    {
+        preview_renderer = null;
+
+        preview_raw_data.set_text("");
+        var box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
+        var label = new Gtk.Label("No preview");
+        box.pack_start(label);
+        preview_viewport.add_with_properties(box);
+        box.show_all();
+    }
+
+    /**
+     * Destroys all preview objects in the 'Render' tab.
+     */
+    private void remove_preview()
+    {
+        preview_viewport.foreach((obj) => { obj.destroy(); });
+
+        // remove preview buttons
+        preview_buttons_container.foreach((btn) => { btn.destroy(); });
+        preview_extra_buttons_container.foreach((btn) => { btn.destroy(); });
+    }
+
+    private void on_preview_action_clicked(PreviewRenderer renderer, string uri)
+    {
+        Unity.Protocol.ActivationReplyRaw? reply_struct = null;
+        send_activate.begin(uri, Unity.Protocol.ActionType.PREVIEW_ACTION, (obj, res) => {
+                try {
+                    send_activate.end(res, out reply_struct);
+                    handle_activation_reply(reply_struct);
+                }
+                catch (GLib.IOError e) {
+                    handle_error(e.message);
+                }
+            });
+    }
+
+    private void on_play_music_track_clicked(MusicPreviewRenderer renderer, string uri)
+    {
+        renderer.preview.begin_updates();
+        (renderer.preview as Unity.Protocol.MusicPreview).play_uri(uri);
+        handle_music_track_signals(renderer.preview.end_updates_as_hashtable());
+    }
+
+    private void on_pause_music_track_clicked(MusicPreviewRenderer renderer, string uri)
+    {
+        renderer.preview.begin_updates();
+        (renderer.preview as Unity.Protocol.MusicPreview).pause_uri(uri);
+        handle_music_track_signals(renderer.preview.end_updates_as_hashtable());
+    }
+
+    private void handle_music_track_signals(HashTable<string, Variant> props)
+    {
+        HashTable<string, Variant>? ht = null;
+        send_update.begin(preview_scope_uri, props, (obj, res) => {
+                try {
+                    send_update.end(res, out ht);
+                    if (ht != null) {
+                        append_log_message("UpdatePreviewProperty reply: " + dump_ht_reply(ht) + "\n"); //TODO: do we expect any reply?
+                    }
+                }
+                catch (GLib.IOError e) {
+                    handle_error(e.message);
+                }
+            });
+    }
+
+    private void on_change_selected_series_item_clicked(SeriesPreviewRenderer renderer, string uri, int index)
+    {
+        var props = new HashTable<string, Variant>(str_hash, str_equal);
+        props["series-active-index"] = new Variant.int32(index);
+            
+        HashTable<string, Variant>? ht = null;
+        send_update.begin(uri, props, (obj, res) => {
+                try {
+                    send_update.end(res, out ht);
+                    if (ht != null) {
+                        append_log_message("UpdatePreviewProperty reply: " + dump_ht_reply(ht) + "\n");
+                        if (ht.contains("preview")) {
+                            if (preview_renderer is SeriesPreviewRenderer) {
+                                (preview_renderer as SeriesPreviewRenderer).update_child_preview(Unity.Protocol.Preview.parse(ht["preview"]));
+                                update_preview();
+                            }
+                        }
+                    }
+                }
+                catch (GLib.IOError e) {
+                    handle_error(e.message);
+                }
+            });
+    }
+
+    /**
+     * Handle 'Request preview' context menu action.
+     */
+    [CCode (instance_pos = -1)]
+    public void on_results_popup_request(Gtk.Widget widget)
+    {
+    }
+    
+    /**
+     * Handles right mouse button click event in 'Results' tab.
+     */
+    [CCode (instance_pos = -1)]
+    public bool on_results_right_click(Gtk.Widget widget, Gdk.EventButton event)
+    {
+        if (event.type == Gdk.EventType.BUTTON_PRESS && event.button == 3 /* right mouse button */) {
+            results_popup_menu.popup(null, null, null, event.button, event.time);
+        }
+        return false;
+    }
+
+    private PreviewRenderer preview_renderer = null;
+    private Protocol.LensService lens_proxy = null;
+    private uint dbus_watcher_id = 0;
+    private string preview_scope_uri;
+    private Gtk.Notebook notebook = null;
+    private Gtk.Viewport preview_viewport = null;
+    private Gtk.TreeSelection results_view_selection = null;
+    private Gtk.Alignment preview_buttons_container = null;
+    private Gtk.Alignment preview_extra_buttons_container = null;
+    private Gtk.TextBuffer preview_raw_data = null;
+    private Gtk.Menu results_popup_menu = null;
+    private Gtk.TreeView results_view = null;
     private Gtk.RadioButton search_type_global_rbutton = null;
     private Gtk.Dialog lens_connect_dlg = null;
     private Gtk.Spinner spinner = null;
     private Gtk.Spinner lens_discovery_spinner = null;
     private Gtk.Button search_button = null;
+    private Gtk.Button results_button = null;
+    private Gtk.Button prev_preview_button = null;
+    private Gtk.Button next_preview_button = null;
     private Gtk.Statusbar statusbar = null;
     private Gtk.TextBuffer log_buffer = null;
     private uint statusbar_info_ctx;
@@ -344,6 +776,8 @@
     private ulong filters_model_sync_sig_id;
     private Dee.SharedModel? dee_results_model = null;
     private Dee.SharedModel? dee_filters_model = null;
+    private TreeModel? last_active_model = null;
+    private TreeIter? last_active_iter = null;
 }
 
 }

=== modified file 'tools/unity-tool.ui'
--- tools/unity-tool.ui	2012-06-05 10:02:21 +0000
+++ tools/unity-tool.ui	2012-08-14 14:17:21 +0000
@@ -22,6 +22,7 @@
     </columns>
   </object>
   <object class="GtkTextBuffer" id="log_buffer"/>
+  <object class="GtkTextBuffer" id="preview_raw_data"/>
   <object class="GtkListStore" id="results_model">
     <columns>
       <!-- column-name col1 -->
@@ -40,6 +41,30 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkMenu" id="results_popup_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="activate_result">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Activate result</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="unity_tester_unity_tool_ui_on_activate_result" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="request_preview">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Request preview</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="unity_tester_unity_tool_ui_on_request_preview" swapped="no"/>
+      </object>
+    </child>
+  </object>
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Libunity Tool</property>
@@ -99,6 +124,31 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem2">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem3">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Clear Log</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="unity_tester_unity_tool_ui_on_clear_log_clicked" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -110,6 +160,7 @@
           <object class="GtkBox" id="box2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="border_width">6</property>
             <child>
               <object class="GtkBox" id="box3">
                 <property name="visible">True</property>
@@ -281,16 +332,18 @@
           </packing>
         </child>
         <child>
-          <object class="GtkNotebook" id="notebook1">
+          <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="margin_left">6</property>
+            <property name="margin_right">6</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkTreeView" id="treeview3">
+                  <object class="GtkTreeView" id="results_view">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="model">results_model</property>
@@ -298,8 +351,10 @@
                     <property name="enable_search">False</property>
                     <property name="search_column">0</property>
                     <property name="show_expanders">False</property>
+                    <signal name="button-press-event" handler="unity_tester_unity_tool_ui_on_results_right_click" swapped="no"/>
+                    <signal name="popup-menu" handler="unity_tester_unity_tool_ui_on_results_popup_request" swapped="no"/>
                     <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+                      <object class="GtkTreeSelection" id="results_view_selection"/>
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="treeviewcolumn1">
@@ -539,6 +594,224 @@
               </packing>
             </child>
             <child>
+              <object class="GtkBox" id="box6">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkButton" id="prev_preview_btn">
+                    <property name="label" translatable="yes">&lt;&lt;</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <signal name="clicked" handler="unity_tester_unity_tool_ui_on_prev_preview_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="vexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">10</property>
+                    <child>
+                      <object class="GtkFrame" id="frame1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <object class="GtkAlignment" id="preview_buttons_container">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label6">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Preview actions&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator" id="separator1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <object class="GtkAlignment" id="preview_extra_buttons_container">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label9">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Preview signals&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkNotebook" id="notebook2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="tab_pos">bottom</property>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkViewport" id="preview_viewport">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Rendered</property>
+                      </object>
+                      <packing>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTextView" id="preview_raw_view">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="editable">False</property>
+                            <property name="wrap_mode">char</property>
+                            <property name="buffer">preview_raw_data</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Raw data</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child type="tab">
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="next_preview_btn">
+                    <property name="label" translatable="yes">&gt;&gt;</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <signal name="clicked" handler="unity_tester_unity_tool_ui_on_next_preview_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Preview</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkScrolledWindow" id="scrolledwindow3">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -554,7 +827,7 @@
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child type="tab">
@@ -564,7 +837,7 @@
                 <property name="label" translatable="yes">Log</property>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">3</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>