Rename the method to find the path to an icon

The previous name was *way* to broad and a bit confusing, if it wasn't
only used to find icons...

sonata/artwork.py

@@ -17,7 +17,7 @@
 
 class Artwork(object):
 
-    def __init__(self, config, find_path, is_lang_rtl,
+    def __init__(self, config, path_to_icon, is_lang_rtl,
                  info_imagebox_get_size_request, schedule_gc_collect,
                  target_image_filename, imagelist_append,
                  remotefilelist_append, notebook_get_allocation,
@@ -42,9 +42,9 @@ def __init__(self, config, find_path, is_lang_rtl,
         self.get_current_song_text = get_current_song_text
 
         # local pixbufs, image file names
-        self.sonatacd = find_path('sonatacd.png')
-        self.sonatacd_large = find_path('sonatacd_large.png')
-        path = find_path('sonata-case.png')
+        self.sonatacd = path_to_icon('sonatacd.png')
+        self.sonatacd_large = path_to_icon('sonatacd_large.png')
+        path = path_to_icon('sonata-case.png')
         self.casepb = gtk.gdk.pixbuf_new_from_file(path)
         self.albumpb = None
         self.currentpb = None

sonata/main.py

@@ -218,10 +218,10 @@ def __init__(self, args, window=None, _sugar=False):
 
         # Add some icons, assign pixbufs:
         self.iconfactory = gtk.IconFactory()
-        ui.icon(self.iconfactory, 'sonata', self.find_path('sonata.png'))
+        ui.icon(self.iconfactory, 'sonata', self.path_to_icon('sonata.png'))
         ui.icon(self.iconfactory, 'artist',
-                self.find_path('sonata-artist.png'))
-        ui.icon(self.iconfactory, 'album', self.find_path('sonata-album.png'))
+                self.path_to_icon('sonata-artist.png'))
+        ui.icon(self.iconfactory, 'album', self.path_to_icon('sonata-album.png'))
         icon_theme = gtk.icon_theme_get_default()
         if HAVE_SUGAR:
             activity_root = activity.get_bundle_path()
@@ -237,7 +237,7 @@ def __init__(self, args, window=None, _sugar=False):
             except:
                 # Fallback to Sonata-included icons:
                 ui.icon(self.iconfactory, iconname,
-                        self.find_path('sonata-%s.png' % iconname))
+                        self.path_to_icon('sonata-%s.png' % iconname))
 
         # Main window
         if window is None:
@@ -262,12 +262,12 @@ def __init__(self, args, window=None, _sugar=False):
 
         # Artwork
         self.artwork = artwork.Artwork(
-            self.config, self.find_path, misc.is_lang_rtl(self.window),
+            self.config, self.path_to_icon, misc.is_lang_rtl(self.window),
             lambda: self.info_imagebox.get_size_request(),
             self.schedule_gc_collect, self.target_image_filename,
             self.imagelist_append, self.remotefilelist_append,
             self.notebook.get_allocation, self.set_allow_art_search,
-            self.status_is_play_or_pause, self.find_path('sonata-album.png'),
+            self.status_is_play_or_pause, self.path_to_icon('sonata-album.png'),
             self.get_current_song_text)
 
 
@@ -530,7 +530,7 @@ def __init__(self, args, window=None, _sugar=False):
         # Library tab
         self.library = library.Library(
             self.config, self.mpd, self.artwork, self.TAB_LIBRARY,
-            self.find_path('sonata-album.png'), self.settings_save,
+            self.path_to_icon('sonata-album.png'), self.settings_save,
             self.current.filtering_entry_make_red,
             self.current.filtering_entry_revert_color,
             self.current.filter_key_pressed, self.on_add_item, self.connected,
@@ -1319,7 +1319,7 @@ def handle_change_conn(self):
             self.currentdata.clear()
             if self.current_treeview.get_model():
                 self.current_treeview.get_model().clear()
-            self.tray_icon.update_icon(self.find_path('sonata_disconnect.png'))
+            self.tray_icon.update_icon(self.path_to_icon('sonata_disconnect.png'))
             self.info_update(True)
             if self.current.filterbox_visible:
                 gobject.idle_add(self.current.searchfilter_toggle, None)
@@ -1629,7 +1629,7 @@ def handle_change_status(self):
                 child[1].set_text('')
                 self.UIManager.get_widget('/traymenu/playmenu').show()
                 self.UIManager.get_widget('/traymenu/pausemenu').hide()
-                self.tray_icon.update_icon(self.find_path('sonata.png'))
+                self.tray_icon.update_icon(self.path_to_icon('sonata.png'))
             elif self.status['state'] == 'pause':
                 self.ppbutton.set_image(ui.image(
                     stock=gtk.STOCK_MEDIA_PLAY,
@@ -1638,7 +1638,7 @@ def handle_change_status(self):
                 child[1].set_text('')
                 self.UIManager.get_widget('/traymenu/playmenu').show()
                 self.UIManager.get_widget('/traymenu/pausemenu').hide()
-                self.tray_icon.update_icon(self.find_path('sonata_pause.png'))
+                self.tray_icon.update_icon(self.path_to_icon('sonata_pause.png'))
             elif self.status['state'] == 'play':
                 self.ppbutton.set_image(ui.image(
                     stock=gtk.STOCK_MEDIA_PAUSE,
@@ -1651,7 +1651,7 @@ def handle_change_status(self):
                     if self.prevstatus['state'] == 'pause':
                         # Forces the notification to popup if specified
                         self.on_currsong_notify()
-                self.tray_icon.update_icon(self.find_path('sonata_play.png'))
+                self.tray_icon.update_icon(self.path_to_icon('sonata_play.png'))
 
             self.playing_song_change()
             if self.status_is_play_or_pause():
@@ -3448,7 +3448,7 @@ def update_menu_visibility(self, show_songinfo_only=False):
                          'pl', 'update', 'sort', 'tag']:
                 self.UIManager.get_widget('/mainmenu/' + menu + 'menu/').hide()
 
-    def find_path(self, icon_name):
+    def path_to_icon(self, icon_name):
         # TOOD: when Sugar support has been removed, simplify this function:
         # remove temporary variables, simplify the check on the file existence
         if HAVE_SUGAR:
@@ -3513,7 +3513,7 @@ def on_about(self, _action):
                                    self.config,
                                    version,
                                    __license__,
-                                   self.find_path('sonata_large.png'))
+                                   self.path_to_icon('sonata_large.png'))
 
         stats = None
         if self.conn:
@@ -3539,7 +3539,7 @@ def systemtray_initialize(self):
             self.tray_icon.show()
         else:
             self.tray_icon.hide()
-        self.tray_icon.update_icon(self.find_path('sonata.png'))
+        self.tray_icon.update_icon(self.path_to_icon('sonata.png'))
 
     def dbus_show(self):
         self.window.hide()