Merge lp:~unity-team/unity-lens-video/match-latest-design into lp:unity-lens-video

[Michal Hruby]

Update to match latest designs

Update to match latest designs. So far mostly visual changes, ordering changes might come later.

[Paweł Stołowski (stolowski)]

Looking good. +1

review: Approve

=== modified file 'po/unity-lens-video.pot'
--- po/unity-lens-video.pot	2012-02-22 14:05:03 +0000
+++ po/unity-lens-video.pot	2012-09-14 09:19:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-22 11:42+0100\n"
+"POT-Creation-Date: 2012-09-14 10:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,30 +17,54 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/unity-lens-video:78 ../src/unity-lens-video:84
+#: ../src/unity-lens-video:49 ../src/unity-lens-video:56
 msgid "My Videos"
 msgstr ""
 
-#: ../src/unity-lens-video:79
+#: ../src/unity-lens-video:50
 msgid "Online"
 msgstr ""
 
-#: ../src/unity-lens-video:80 ../video.lens.in.h:2
+#: ../src/unity-lens-video:51 ../video.lens.in.h:1
 msgid "Videos"
 msgstr ""
 
-#: ../src/unity-lens-video:81
+#: ../src/unity-lens-video:52
 msgid "Recently Viewed"
 msgstr ""
 
-#: ../src/unity-lens-video:82
+#: ../src/unity-lens-video:53
+msgid "More suggestions"
+msgstr ""
+
+#: ../src/unity-lens-video:54
 msgid "Search Videos"
 msgstr ""
 
-#: ../src/unity-lens-video:83
+#: ../src/unity-lens-video:55
 msgid "Sources"
 msgstr ""
 
-#: ../video.lens.in.h:1
+#: ../src/unity-lens-video:173
+msgid "Format"
+msgstr ""
+
+#: ../src/unity-lens-video:174
+msgid "Dimensions"
+msgstr ""
+
+#: ../src/unity-lens-video:175
+msgid "Size"
+msgstr ""
+
+#: ../src/unity-lens-video:178
+msgid "Show in Folder"
+msgstr ""
+
+#: ../src/unity-lens-video:181
+msgid "Play"
+msgstr ""
+
+#: ../video.lens.in.h:2
 msgid "Search local videos"
 msgstr ""

=== modified file 'src/unity-lens-video'
--- src/unity-lens-video	2012-09-14 07:31:36 +0000
+++ src/unity-lens-video	2012-09-14 09:19:18 +0000
@@ -50,10 +50,15 @@
 CAT_ONLINE = _("Online")
 CAT_GLOBAL = _("Videos")
 CAT_RECENT = _("Recently Viewed")
+CAT_MORE_SUGGESTIONS = _("More suggestions")
 HINT = _("Search Videos")
 SOURCES = _("Sources")
 LOCAL_VIDEOS = _("My Videos")
 
+CAT_INDEX_MY_VIDEOS = 0
+CAT_INDEX_ONLINE = 1
+CAT_INDEX_MORE = 2
+
 BUS_NAME = "net.launchpad.lens.video"
 FOLDER = GLib.get_user_special_dir(GLib.USER_DIRECTORY_VIDEOS)
 HOME_FOLDER = GLib.get_home_dir()
@@ -66,6 +71,7 @@
 except:
     raise SystemExit(1)
 
+REFRESH_TIMEOUT = 300
 PREVIEW_PLAYER_DBUS_NAME = "com.canonical.Unity.Lens.Music.PreviewPlayer"
 PREVIEW_PLAYER_DBUS_PATH = "/com/canonical/Unity/Lens/Music/PreviewPlayer"
 PREVIEW_PLAYER_DBUS_IFACE = PREVIEW_PLAYER_DBUS_NAME
@@ -85,18 +91,14 @@
 
         svg_dir = "/usr/share/icons/unity-icon-theme/places/svg/"
         cats = []
-        cats.append(Unity.Category.new(CAT_RECENT,
-            Gio.ThemedIcon.new(svg_dir + "group-recent.svg"),
-            Unity.CategoryRenderer.VERTICAL_TILE))
         cats.append(Unity.Category.new(CAT_ONCOMPUTER,
             Gio.ThemedIcon.new(svg_dir + "group-videos.svg"),
             Unity.CategoryRenderer.VERTICAL_TILE))
         cats.append(Unity.Category.new(CAT_ONLINE,
             Gio.ThemedIcon.new(svg_dir + "group-internet.svg"),
-            Unity.CategoryRenderer.HORIZONTAL_TILE))
-        # Specific Home Dash category
-        cats.append(Unity.Category.new(CAT_GLOBAL,
-            Gio.ThemedIcon.new("/usr/share/unity/6/lens-nav-video.svg"),
+            Unity.CategoryRenderer.VERTICAL_TILE))
+        cats.append(Unity.Category.new(CAT_MORE_SUGGESTIONS,
+            Gio.ThemedIcon.new(svg_dir + "group-treat-yourself.svg"),
             Unity.CategoryRenderer.VERTICAL_TILE))
         self._lens.props.categories = cats
 
@@ -110,7 +112,6 @@
         self._scope.search_in_global = True
         self._scope.props.sources.add_option('local', LOCAL_VIDEOS, None)
         self._scope.connect("search-changed", self.on_search_changed)
-        self._lens.connect("notify::active", self.on_lens_active)
         self._scope.connect("filters-changed",self.on_filtering_changed)
         self._scope.props.sources.connect("notify::filtering",
             self.on_filtering_changed)
@@ -118,6 +119,15 @@
         self._lens.add_local_scope(self._scope)
         self._lens.export()
 
+        GLib.timeout_add_seconds(REFRESH_TIMEOUT, self.refresh_results)
+        self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
+
+    def refresh_results(self, *_):
+        """Update the results on a timeout."""
+        print "Queuing new search because of timeout"
+        self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
+        return True
+
     def on_filtering_changed(self, *_):
         """Run another search when a filter change is notified."""
         self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
@@ -193,11 +203,6 @@
             return Unity.ActivationResponse(handled=Unity.HandledType.NOT_HANDLED)
         return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH)
 
-    def on_lens_active(self, *_):
-        """ Run a search when the lens is opened """
-        if self._lens.props.active:
-            self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
-
     def on_search_changed(self, scope, search, search_type, cancellable):
         """On a new search, differentiate between lens view 
         and global search before updating the model"""
@@ -216,13 +221,17 @@
                 else:
                     self.update_results_model(search_string, model, 'global', cancellable, search_status)
             else:
-                self.update_results_model(search_string, model, 'lens', cancellable, search_status)
+                if not search_string:
+                    # this will call update_results_model as well
+                    self.zg_call(cancellable, search_status)
+                else:
+                    self.update_results_model(search_string, model, 'lens', cancellable, search_status)
         else:
             model.clear()
             if search_status:
                 search_status.finished ()
 
-    def update_results_model(self, search, model, cat, cancellable, search_status):
+    def update_results_model(self, search, model, cat, cancellable, search_status, clear_model=True):
         """Check for the existence of the cache folder, create it if needed,
         and run the search method."""
         if not Gio.file_new_for_path(CACHE).query_exists(None):
@@ -273,22 +282,21 @@
                                 result_list.append(item)
                 result_list = self.sort_alpha(result_list)
         
-        GLib.idle_add(self.add_results, search_status, model, cat, cancellable, result_list, search)
+        GLib.idle_add(self.add_results, search_status, model, cat, cancellable, result_list, search, clear_model)
         
 
     def add_results (self, search_status=None, model=None, 
-                    cat=None, cancellable=None, result_list=[], search=None):
+                    cat=None, cancellable=None, result_list=[], search=None,
+                    clear_model=None):
         result_sets = []
         
         if cancellable and not cancellable.is_cancelled():
             if cat == 'global':
                 # Create only one result set for the Global search
-                result_sets.append({'category':3, 'results':result_list})
+                result_sets.append({'category':CAT_INDEX_MY_VIDEOS, 'results':result_list})
             else:
-                if not search:
-                    self.zg_call ()
-                result_sets.append({'category':1, 'results':result_list})
-            model.clear()
+                result_sets.append({'category':CAT_INDEX_MY_VIDEOS, 'results':result_list})
+            if clear_model: model.clear()
             for result_set in result_sets:
                 cat = result_set['category']
                 for i in result_set['results']:
@@ -424,7 +432,7 @@
             icon_path = 'video'
         return icon_path
 
-    def zg_call (self):
+    def zg_call (self, cancellable, search_status):
         active = self._scope.props.sources.get_option("local").props.active
         filtering = self._scope.props.sources.props.filtering
         if active and filtering:
@@ -437,16 +445,23 @@
         interpretation = datamodel.Interpretation.VIDEO
         event_template.append_subject(
             datamodel.Subject.new_for_values(uri=uri,interpretation=interpretation))
+        def wrap(callback):
+            def wrapped(events):
+                callback(events, cancellable, search_status)
+
+            return wrapped
+
         ZG.find_events_for_templates(
             [event_template, ],
-            self.zg_events ,
+            wrap(self.progress_zg_events),
             timerange = time_range,
             storage_state = datamodel.StorageState.Any,
             num_events = max_amount_results,
             result_type = datamodel.ResultType.MostRecentSubjects
         )
 
-    def zg_events(self, events):
+    def progress_zg_events(self, events, cancellable, search_status):
+        if cancellable.is_cancelled(): return
         blacklist = self.get_blacklist ()
         result_list = []
         for event in events:
@@ -462,6 +477,7 @@
                     item.append('')
                     item.append(uri)
                     item.append(self.get_icon(path))
+                    item.append(CAT_INDEX_MY_VIDEOS)
                     result_list.append(item)
             elif uri.startswith('http'):
                 # If the file is distant, we take 
@@ -472,6 +488,7 @@
                 #  these two *should* be ascii, but it can't hurt to be safe
                 item.append(event.get_subjects()[0].uri.encode("utf-8"))
                 item.append(event.get_subjects()[0].storage.encode("utf-8"))
+                item.append(CAT_INDEX_ONLINE)
                 result_list.append(item)
 
         for i in result_list:
@@ -480,8 +497,11 @@
             uri = str(i[2])
             dnd_uri = str(i[2])
             icon_hint = str(i[3])
-            self._scope.props.results_model.append(uri, icon_hint, 
-                0, "text/html", title, comment, dnd_uri)
+            category = i[4]
+            self._scope.props.results_model.append(uri, icon_hint,
+                category, "text/html", title, comment, dnd_uri)
+
+        self.update_results_model("", search_status.props.results_model, 'lens', cancellable, search_status, False)
         
 # pylint: enable=R0903