cairo-dock-team team mailing list archive

[Eduardo Mucelli Rezende Oliveira <edumucelli@xxxxxxxxx>]

Eduardo Mucelli Rezende Oliveira has proposed merging lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/WebSearch into lp:cairo-dock-plug-ins-extras.

Requested reviews:
  Cairo-Dock Third-Party (cairo-dock-third-party)

For more details, see:
https://code.launchpad.net/~eduardo-mucelli/cairo-dock-plug-ins-extras/WebSearch/+merge/179545

WebSearch: List of results now shows the search engine's logo if is not a "thumbnailable" link icon. As requested on the CD Forum.
-- 
https://code.launchpad.net/~eduardo-mucelli/cairo-dock-plug-ins-extras/WebSearch/+merge/179545
Your team Cairo-Dock Third-Party is requested to review the proposed merge of lp:~eduardo-mucelli/cairo-dock-plug-ins-extras/WebSearch into lp:cairo-dock-plug-ins-extras.

=== modified file 'WebSearch/Changelog.txt'
--- WebSearch/Changelog.txt	2013-06-16 00:59:02 +0000
+++ WebSearch/Changelog.txt	2013-08-09 21:39:04 +0000
@@ -1,3 +1,4 @@
+1.4.8: (August/9/2013): List of results now shows the search engine's logo if is not a "thumbnailable" link icon.
 1.4.7: (June/15/2013): Fixed Flickr.
 1.4.6: (June/14/2013): Fixing Google and Bing search. Removed Webshots and Twitter. Webshots closed :( its doors and Twitter changed its search to something really hard to fetch.
 1.4.3: (January/31/2012): Fixing Youtube search. Fixing a problem when opening URLs.

=== modified file 'WebSearch/WebSearch'
--- WebSearch/WebSearch	2012-02-01 01:57:11 +0000
+++ WebSearch/WebSearch	2013-08-09 21:39:04 +0000
@@ -16,7 +16,7 @@
 #    GNU General Public License for more details.
 
 # This applet provides an interface to some search engines such as
-# Google, Bing, Teoma, Yahoo!, Youtube, Webshots, Flickr, Wikipedia, ImageShack, and Twitter.
+# Google, Bing, Teoma, Yahoo!, Youtube, Flickr, Wikipedia, and ImageShack.
 #  To choose the search engine you can
 #     (1) Right-click on the main icon -> WebSearch -> (Choose the engine)
 #     (2) Right-click -> Configure this applet -> Configuration -> Search engine
@@ -80,7 +80,7 @@
     attr_accessor :engine, :engines, :query, :history,
                   :number_of_fetched_links, :number_of_displayed_links, :page_of_displayed_links,
                   :show_current_page, :show_description_instead_url, :show_thumbnail_preview,
-                  :scroll_engine_index
+                  :scroll_engine_index, :show_logo_result
 
     DialogActiveTime = 5                                                          # time in seconds that the dialog window will be active
 
@@ -106,6 +106,7 @@
       self.show_current_page = conf.params['Configuration']['show current page'].to_b
       self.show_description_instead_url = conf.params['Configuration']['show description instead url'].to_b
       self.show_thumbnail_preview = conf.params['Configuration']['show thumbnail preview'].to_b
+      self.show_logo_result = conf.params['Configuration']['show logo result'].to_b
     end
   
     def start
@@ -162,7 +163,7 @@
         item['label'] = engine
         item['menu'] = 1
         item['id'] = i
-        item['icon'] = File.expand_path("./images/data/#{engine}.png")
+        item['icon'] = engine.icon
         items.push item
       end
       items
@@ -345,6 +346,9 @@
         else
           sub_icon_list << link.shortened_url                                     # user prefer see shortened url with the sub-icon
         end
+        if not link.instance_of?(ThumbnailedLink) and self.show_logo_result
+          link.icon = File.expand_path("./images/data/#{self.engine.name}.png")
+        end
         sub_icon_list << link.icon                                                # the icon
         sub_icon_list << link.id.to_s                                             # the sequential id
       end

=== modified file 'WebSearch/WebSearch.conf'
--- WebSearch/WebSearch.conf	2013-06-16 00:59:02 +0000
+++ WebSearch/WebSearch.conf	2013-08-09 21:39:04 +0000
@@ -1,4 +1,4 @@
-#1.4.7
+#1.4.8
 
 #[gtk-about]
 [Icon]
@@ -109,3 +109,5 @@
 #b Enable thumbnail preview for Youtube, Flickr, ImageShack, and Digg searches ?
 #{for slow connections, disable will result in significantly faster fetching.}
 show thumbnail preview = true
+#b Show search engine's logo as the icon on the results?
+show logo result = true

=== modified file 'WebSearch/auto-load.conf'
--- WebSearch/auto-load.conf	2013-06-16 00:59:02 +0000
+++ WebSearch/auto-load.conf	2013-08-09 21:39:04 +0000
@@ -10,4 +10,4 @@
 category = 3
 
 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
-version = 1.4.7
+version = 1.4.8

=== modified file 'WebSearch/images/data/Bing.png'
Binary files WebSearch/images/data/Bing.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Bing.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/Digg.png'
Binary files WebSearch/images/data/Digg.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Digg.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/Flickr.png'
Binary files WebSearch/images/data/Flickr.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Flickr.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/Google.png'
Binary files WebSearch/images/data/Google.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Google.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/ImageShack.png'
Binary files WebSearch/images/data/ImageShack.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/ImageShack.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/Twitter.png'
Binary files WebSearch/images/data/Twitter.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Twitter.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/Webshots.png'
Binary files WebSearch/images/data/Webshots.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Webshots.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/Wikipedia.png'
Binary files WebSearch/images/data/Wikipedia.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Wikipedia.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/Yahoo.png'
Binary files WebSearch/images/data/Yahoo.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Yahoo.png	2013-08-09 21:39:04 +0000 differ
=== modified file 'WebSearch/images/data/Youtube.png'
Binary files WebSearch/images/data/Youtube.png	2010-05-29 23:12:40 +0000 and WebSearch/images/data/Youtube.png	2013-08-09 21:39:04 +0000 differ