Merge lp:~costales/folder-color/files_emblem into lp:folder-color

[costales]

File emblems

[lp:~costales/folder-color/files_emblem]

285. By costales on 2017-08-12

WIP

286. By costales on 2017-08-12

WIP

287. By costales on 2017-08-12

WIP

288. By costales on 2017-08-13

WIP

=== modified file 'debian/changelog'
--- debian/changelog	2017-08-01 13:58:16 +0000
+++ debian/changelog	2017-08-13 16:41:50 +0000
@@ -1,4 +1,4 @@
-folder-color (0.0.83) xenial; urgency=low
+folder-color (0.0.84) xenial; urgency=low
 
   * Fixed #1705546
   * Updated translations

=== modified file 'debian/control'
--- debian/control	2017-08-01 13:33:14 +0000
+++ debian/control	2017-08-13 16:41:50 +0000
@@ -1,7 +1,7 @@
 Source: folder-color
 Section: utils
 Priority: extra
-Standards-Version: 0.0.83
+Standards-Version: 0.0.84
 Maintainer: costales <[e-mail]>
 Build-Depends: python-distutils-extra, debhelper (>=7)
 Homepage: https://code.launchpad.net/folder-color

=== modified file 'install_scripts/caja.sh'
--- install_scripts/caja.sh	2017-07-02 15:39:18 +0000
+++ install_scripts/caja.sh	2017-08-13 16:41:50 +0000
@@ -16,7 +16,7 @@
 sed -i 's/nautilus/caja/g' ../caja-extension/folder-color.py
 sed -i 's/Nautilus/Caja/g' ../caja-extension/folder-color.py
 sed -i 's/is_uri=False/is_uri=True/' ../caja-extension/folder-color.py
-sed -i "s/self.foldercolor.set_icon(folder_name, self._get_skel_folder(folder_name, icon)\['name'\])/self.foldercolor.set_icon(folder_name, self._get_skel_folder(folder_name, icon)\['filename'\], True)/" ../caja-extension/folder-color.py
+sed -i "s/self.foldercolor.set_color(item_path, self._get_skel_folder(item_path, icon)\['name'\])/self.foldercolor.set_color(item_path, self._get_skel_folder(item_path, icon)\['filename'\], True)/" ../caja-extension/folder-color.py
 sed -i 's/Gtk.ColorChooserDialog()/Gtk.ColorSelectionDialog()/g' ../caja-extension/folder-color.py
 sed -i 's/dialog.set_use_alpha(False)//g' ../caja-extension/folder-color.py
 sed -i 's/color = dialog.get_rgba()/color = dialog.get_color_selection().get_current_color()/g' ../caja-extension/folder-color.py

=== modified file 'nautilus-extension/folder-color.py'
--- nautilus-extension/folder-color.py	2017-08-01 13:40:45 +0000
+++ nautilus-extension/folder-color.py	2017-08-13 16:41:50 +0000
@@ -1,4 +1,4 @@
-# Folder Color 0.0.83
+# Folder Color 0.0.84
 # Copyright (C) 2012-2017 Marcos Alvarez Costales https://launchpad.net/~costales
 #
 # Folder Color is free software; you can redistribute it and/or modify
@@ -26,55 +26,53 @@
 class FolderColor:
     """Folder Color Class"""
     def __init__(self):
-        # Colors
+        # Folder colors
         self.COLORS = [
-                       'black',
-                       'blue',
-                       'brown',
-                       'cyan',
-                       'green',
-                       'grey',
-                       'magenta',
-                       'orange',
-                       'pink',
-                       'purple',
-                       'red',
-                       'violet',
-                       'yellow'
-                      ]
+            'black',
+            'blue',
+            'brown',
+            'cyan',
+            'green',
+            'grey',
+            'magenta',
+            'orange',
+            'pink',
+            'purple',
+            'red',
+            'violet',
+            'yellow'
+        ]
         self.I18N_COLORS = {
-                            'black'  : _("Black"),
-                            'blue'   : _("Blue"),
-                            'brown'  : _("Brown"),
-                            'cyan'   : _("Cyan"),
-                            'green'  : _("Green"),
-                            'grey'   : _("Grey"),
-                            'magenta': _("Magenta"),
-                            'orange' : _("Orange"),
-                            'pink'   : _("Pink"),
-                            'purple' : _("Purple"),
-                            'red'    : _("Red"),
-                            'violet' : _("Violet"),
-                            'yellow' : _("Yellow")
-                           }
-        
+            'black'  : _("Black"),
+            'blue'   : _("Blue"),
+            'brown'  : _("Brown"),
+            'cyan'   : _("Cyan"),
+            'green'  : _("Green"),
+            'grey'   : _("Grey"),
+            'magenta': _("Magenta"),
+            'orange' : _("Orange"),
+            'pink'   : _("Pink"),
+            'purple' : _("Purple"),
+            'red'    : _("Red"),
+            'violet' : _("Violet"),
+            'yellow' : _("Yellow")
+        }
         # Emblems
         self.EMBLEMS = [
-                        'emblem-important',
-                        'emblem-urgent',
-                        'emblem-favorite',
-                        'emblem-default',
-                        'emblem-new'
-                       ]
+            'emblem-important',
+            'emblem-urgent',
+            'emblem-favorite',
+            'emblem-default',
+            'emblem-new'
+        ]
         self.I18N_EMBLEMS = {
-                             'emblem-important': _("Important"),
-                             'emblem-urgent'   : _("In Progress"),
-                             'emblem-favorite' : _("Favorite"),
-                             'emblem-default'  : _("Finished"),
-                             'emblem-new'      : _("New")
-                            }
-        
-        # Custom color
+            'emblem-important': _("Important"),
+            'emblem-urgent'   : _("In Progress"),
+            'emblem-favorite' : _("Favorite"),
+            'emblem-default'  : _("Finished"),
+            'emblem-new'      : _("New")
+        }
+        # Custom folder color
         self.PATH_CUSTOM_COLOR = os.path.join(os.getenv('HOME'), '.local', 'share', 'folder-color', 'icons')
         self.GRADIENT_RANGE = 15
         self.VALUE_LIGHT  = 'value_light'
@@ -92,48 +90,65 @@
             return {'name': '',
                     'filename': ''}
     
-    def set_icon(self, folder_name, color, is_uri=False):
-        """Set color to a folder"""
-        folder, info = self._unset_icon(folder_name) # Restore because I don't know if I set previously with custom-icon or custom-icon-name
+    def set_color(self, item_path, color, is_uri=False):
+        """Set color to a file/directory"""
+         # Restore
+        self._unset_color(item_path)
+        # Set
+        item = Gio.File.new_for_path(item_path)
         if not is_uri:
+            info = item.query_info('metadata::custom-icon-name', 0, None)
             info.set_attribute_string("metadata::custom-icon-name", color)
         else:
+            info = item.query_info('metadata::custom-icon', 0, None)
             info.set_attribute_string('metadata::custom-icon', 'file://'+color)
-        folder.set_attributes_from_info(info, 0, None)
-        self._refresh_icon(folder_name)
-    
-    def restore_icon(self, folder_name):
-        """Restore by default"""
-        folder, info = self._unset_icon(folder_name)
-        folder.set_attributes_from_info(info, 0, None)
-        self.set_emblem(folder_name, '')
-    
-    def set_emblem(self, folder_name, emblem_name=''):
+        item.set_attributes_from_info(info, 0, None)
+        # Refresh
+        self._refresh(item_path)
+    
+    def set_emblem(self, item_path, emblem_name=''):
         """Set emblem"""
-        emblem = []
+        # Restore
+        self._unset_emblem(item_path)
+        # Set
         if emblem_name:
+            emblem = []
             emblem.append(emblem_name)
-        emblems = list(emblem)
-        emblems.append(None) # Needs
-        
-        folder = Gio.File.new_for_path(folder_name)
-        info = folder.query_info('metadata::emblems', 0, None)
-        info.set_attribute_stringv('metadata::emblems', emblems)
-        folder.set_attributes_from_info(info, 0, None)
-        
-        self._refresh_icon(folder_name)
-    
-    def _unset_icon(self, folder_name):
-        """Restore to default"""
-        folder = Gio.File.new_for_path(folder_name)
-        info = folder.query_info('metadata::custom-icon-name', 0, None)
+            emblems = list(emblem)
+            emblems.append(None) # Needs
+            item = Gio.File.new_for_path(item_path)
+            info = item.query_info('metadata::emblems', 0, None)
+            info.set_attribute_stringv('metadata::emblems', emblems)
+            item.set_attributes_from_info(info, 0, None)
+        # Refresh
+        self._refresh(item_path)
+    
+    def restore(self, item_path):
+        """Restore folder icon to default"""
+        # Restore
+        self._unset_color(item_path)
+        self._unset_emblem(item_path)
+        # Refresh
+        self._refresh(item_path)
+    
+    def _unset_emblem(self, item_path):
+        """Restore emblem to default"""
+        item = Gio.File.new_for_path(item_path)
+        info = item.query_info('metadata::emblems', 0, None)
+        info.set_attribute('metadata::emblems', Gio.FileAttributeType.INVALID, 0)
+        item.set_attributes_from_info(info, 0, None)
+    
+    def _unset_color(self, item_path):
+        """Restore folder color to default"""
+        item = Gio.File.new_for_path(item_path)
+        info = item.query_info('metadata::custom-icon-name', 0, None)
         info.set_attribute('metadata::custom-icon',      Gio.FileAttributeType.INVALID, 0)
         info.set_attribute('metadata::custom-icon-name', Gio.FileAttributeType.INVALID, 0)
-        return folder, info
+        item.set_attributes_from_info(info, 0, None)
     
-    def _refresh_icon(self, folder_name):
-        """Reload the current folder icon"""
-        os.utime(folder_name, None)
+    def _refresh(self, item_path):
+        """Reload the current file/directory icon"""
+        os.utime(item_path, None)
 
 
 
@@ -142,6 +157,8 @@
     def __init__(self):
         self.foldercolor = FolderColor()
         self.theme_dirname = ''
+        self.all_are_directories = True
+        self.all_are_files = True
     
     def get_file_items(self, window, items):
         """Nautilus invoke this function in its startup > Create menu entry"""
@@ -161,72 +178,112 @@
         if not len(items):
             return False
         
+        self.all_are_directories = True
+        self.all_are_files = True
         for item in items:
             # GNOME can only handle files
             if item.get_uri_scheme() != 'file':
                 return False
             
-            # Only folders
-            if not item.is_directory():
-                return False
+            if item.is_directory():
+                self.all_are_files = False
+            else:
+                self.all_are_directories = False
+        
+        if not self.all_are_directories and not self.all_are_files: # Only all folders or files
+            return False
         
         # All OK? > Generate menu
         return True
     
     def _generate_menu(self, items):
-        """Menu: Color | Custom | Restore | Emblems"""
-        # Menu title
-        if len(items) > 1:
-            top_menuitem = Nautilus.MenuItem(name='ChangeFolderColorMenu::Top', label=_("Folders' Color"), icon='folder_color_picker')
+        """Menu for [directories|files]: [Color,Custom,Restore,Emblems|Emblems,Restore]"""
+        # Directories
+        if self.all_are_directories:
+            # Title menu
+            if len(items) > 1:
+                top_menuitem = Nautilus.MenuItem(name='ChangeFolderColorMenu::Top', label=_("Folders' Color"), icon='folder_color_picker')
+            else:
+                top_menuitem = Nautilus.MenuItem(name='ChangeFolderColorMenu::Top', label=_("Folder's Color"),  icon='folder_color_picker')
+            submenu = Nautilus.Menu()
+            top_menuitem.set_submenu(submenu)
+            
+            # Colors
+            for color in self.foldercolor.COLORS:
+                icon = self._legacy_filename(color)
+                if not icon['name']:
+                    continue
+                if not self._check_same_theme(icon['filename']):
+                    continue
+                
+                name = ''.join(['ChangeFolderColorMenu::Colors"', color, '"'])
+                item = Nautilus.MenuItem(name=name, label=self.foldercolor.I18N_COLORS[color], icon=icon['name'])
+                item.connect('activate', self._menu_activate_color, icon['name'], items)
+                submenu.append_item(item)
+            
+            # Custom color
+            custom_icon = self._legacy_filename('custom')
+            if custom_icon['name'] and self._check_same_theme(custom_icon['filename']) and custom_icon['filename'].lower().endswith('.svg'): # exists + same theme + SVG
+                name = ''.join(['ChangeFolderColorMenu::Colors"', 'custom', '"'])
+                item = Nautilus.MenuItem(name=name, label=_("Custom"), icon='gtk-edit')
+                item.connect('activate', self._menu_activate_custom_color, custom_icon['name'], items)
+                submenu.append_item(item)
+            
+            # Restore
+            if self._check_generate_restore(items):
+                item_sep = Nautilus.MenuItem(name='ChangeFolderEmblemMenu::Sep', label=_("Restore:"), sensitive=False)
+                submenu.append_item(item_sep)
+                
+                item_restore = Nautilus.MenuItem(name='ChangeFolderColorMenu::Restore', label=_("Default"), icon='undo')
+                item_restore.connect('activate', self._menu_activate_restore, items)
+                submenu.append_item(item_restore)
+            
+            # Separator if there are emblems
+            for emblem in self.foldercolor.EMBLEMS:
+                if self.foldercolor.get_icon(emblem)['name']:
+                    item_sep = Nautilus.MenuItem(name='ChangeFolderColorMenu::Sep1', label=_("Emblem:"), sensitive=False)
+                    submenu.append_item(item_sep)
+                    break
+            
+            # Emblems
+            for emblem in self.foldercolor.EMBLEMS:
+                if self.foldercolor.get_icon(emblem)['name']:
+                    name = ''.join(['ChangeFolderColorMenu::Colors"', emblem, '"'])
+                    item = Nautilus.MenuItem(name=name, label=self.foldercolor.I18N_EMBLEMS[emblem], icon=emblem)
+                    item.connect('activate', self._menu_activate_emblem, emblem, items)
+                    submenu.append_item(item)
+        
+        # Files
         else:
-            top_menuitem = Nautilus.MenuItem(name='ChangeFolderColorMenu::Top', label=_("Folder's Color"),  icon='folder_color_picker')
-        submenu = Nautilus.Menu()
-        top_menuitem.set_submenu(submenu)
-        
-        # Colors
-        for color in self.foldercolor.COLORS:
-            icon = self._legacy_filename(color)
-            if not icon['name']:
-                continue
-            if not self._check_same_theme(icon['filename']):
-                continue
-            
-            name = ''.join(['ChangeFolderColorMenu::Colors"', color, '"'])
-            item = Nautilus.MenuItem(name=name, label=self.foldercolor.I18N_COLORS[color], icon=icon['name'])
-            item.connect('activate', self._menu_activate_color, icon['name'], items)
-            submenu.append_item(item)
-        
-        # Custom color
-        custom_icon = self._legacy_filename('custom')
-        if custom_icon['name'] and self._check_same_theme(custom_icon['filename']) and custom_icon['filename'].lower().endswith('.svg'): # exists + same theme + SVG
-            name = ''.join(['ChangeFolderColorMenu::Colors"', 'custom', '"'])
-            item = Nautilus.MenuItem(name=name, label=_("Custom"), icon='gtk-edit')
-            item.connect('activate', self._menu_activate_custom_color, custom_icon['name'], items)
-            submenu.append_item(item)
-        
-        # Restore
-        if self._check_generate_restore(items):
-            item_sep = Nautilus.MenuItem(name='ChangeFolderEmblemMenu::Sep', label=_("Restore:"), sensitive=False)
-            submenu.append_item(item_sep)
-            
-            item_restore = Nautilus.MenuItem(name='ChangeFolderColorMenu::Restore', label=_("Default"), icon='undo')
-            item_restore.connect('activate', self._menu_activate_restore, items)
-            submenu.append_item(item_restore)
-        
-        # Separator if there are emblems
-        for emblem in self.foldercolor.EMBLEMS:
-            if self.foldercolor.get_icon(emblem)['name']:
-                item_sep = Nautilus.MenuItem(name='ChangeFolderColorMenu::Sep1', label=_("Categorize:"), sensitive=False)
+            # Title menu
+            if self.all_are_files:
+                if len(items) > 1:
+                    top_menuitem = Nautilus.MenuItem(name='ChangeFolderColorMenu::Top', label=_("Files' Emblem"), icon='folder_color_picker')
+                else:
+                    top_menuitem = Nautilus.MenuItem(name='ChangeFolderColorMenu::Top', label=_("File's Emblem"),  icon='folder_color_picker')
+            else:
+                top_menuitem = Nautilus.MenuItem(name='ChangeFolderColorMenu::Top', label=_("Emblem"),  icon='folder_color_picker')
+            submenu = Nautilus.Menu()
+            top_menuitem.set_submenu(submenu)
+            
+            # Emblems
+            exist_emblems = False
+            for emblem in self.foldercolor.EMBLEMS:
+                if self.foldercolor.get_icon(emblem)['name']:
+                    exist_emblems = True
+                    name = ''.join(['ChangeFolderColorMenu::Colors"', emblem, '"'])
+                    item = Nautilus.MenuItem(name=name, label=self.foldercolor.I18N_EMBLEMS[emblem], icon=emblem)
+                    item.connect('activate', self._menu_activate_emblem, emblem, items)
+                    submenu.append_item(item)
+        
+            # Restore
+            if exist_emblems and self._check_generate_restore(items):
+                item_sep = Nautilus.MenuItem(name='ChangeFolderEmblemMenu::Sep', label=_("Restore:"), sensitive=False)
                 submenu.append_item(item_sep)
-                break
-        
-        # Emblems
-        for emblem in self.foldercolor.EMBLEMS:
-            if self.foldercolor.get_icon(emblem)['name']:
-                name = ''.join(['ChangeFolderColorMenu::Colors"', emblem, '"'])
-                item = Nautilus.MenuItem(name=name, label=self.foldercolor.I18N_EMBLEMS[emblem], icon=emblem)
-                item.connect('activate', self._menu_activate_emblem, emblem, items)
-                submenu.append_item(item)
+                
+                item_restore = Nautilus.MenuItem(name='ChangeFolderColorMenu::Restore', label=_("Default"), icon='undo')
+                item_restore.connect('activate', self._menu_activate_restore, items)
+                submenu.append_item(item_restore)
             
         return top_menuitem,
     
@@ -244,9 +301,11 @@
             if item.is_gone():
                 continue
             
-            folder_name = urllib.unquote(item.get_uri()[7:])
-            folder = Gio.File.new_for_path(folder_name)
-            info = folder.query_info('metadata', 0, None)
+            # Get metadata file/folder
+            item_path = urllib.unquote(item.get_uri()[7:])
+            item = Gio.File.new_for_path(item_path)
+            info = item.query_info('metadata', 0, None)
+            # If any metadata > restore menu
             if info.get_attribute_as_string('metadata::custom-icon-name'):
                 return True
             if info.get_attribute_as_string('metadata::custom-icon'):
@@ -256,51 +315,51 @@
         
         return False
     
-    def _menu_activate_color(self, menu, icon, folders):
+    def _menu_activate_color(self, menu, icon, items):
         """Menu: Clicked color"""
-        for each_folder in folders:
-            if each_folder.is_gone():
+        for each_item in items:
+            if each_item.is_gone():
                 continue
             
-            folder_name = urllib.unquote(each_folder.get_uri()[7:])
-            self.foldercolor.set_icon(folder_name, self._get_skel_folder(folder_name, icon)['name'])
+            item_path = urllib.unquote(each_item.get_uri()[7:])
+            self.foldercolor.set_color(item_path, self._get_skel_folder(item_path, icon)['name'])
     
-    def _menu_activate_restore(self, menu, folders):
+    def _menu_activate_restore(self, menu, items):
         """Menu: Clicked restore"""
-        for each_folder in folders:
-            if each_folder.is_gone():
+        for each_item in items:
+            if each_item.is_gone():
                 continue
             
-            folder_name = urllib.unquote(each_folder.get_uri()[7:])
-            self.foldercolor.restore_icon(folder_name)
+            item_path = urllib.unquote(each_item.get_uri()[7:])
+            self.foldercolor.restore(item_path)
     
-    def _menu_activate_emblem(self, menu, emblem, folders):
+    def _menu_activate_emblem(self, menu, emblem, items):
         """Menu: Clicked emblem"""
-        for each_folder in folders:
-            if each_folder.is_gone():
+        for each_item in items:
+            if each_item.is_gone():
                 continue
             
-            folder_name = urllib.unquote(each_folder.get_uri()[7:])
-            self.foldercolor.set_emblem(folder_name, emblem)
+            item_path = urllib.unquote(each_item.get_uri()[7:])
+            self.foldercolor.set_emblem(item_path, emblem)
     
-    def _menu_activate_custom_color(self, menu, icon, folders):
+    def _menu_activate_custom_color(self, menu, icon, items):
         """Menu: Clicked custom"""
         custom_color = self.custom_color_dialog()
         if custom_color == None: # Cancel
             return
         
-        for each_folder in folders:
-            if each_folder.is_gone():
+        for each_item in items:
+            if each_item.is_gone():
                 continue
             
-            folder_name = urllib.unquote(each_folder.get_uri()[7:])
-            custom_icon = self._get_skel_folder(folder_name, icon)
+            item_path = urllib.unquote(each_item.get_uri()[7:])
+            custom_icon = self._get_skel_folder(item_path, icon)
             
             src_file = custom_icon['filename']
             dst_file = ''.join([self.foldercolor.PATH_CUSTOM_COLOR, '/', custom_icon['name'], '-', custom_color['middle'], '.svg'])
             self._cp_file(src_file, dst_file, custom_color)
             
-            self.foldercolor.set_icon(folder_name, dst_file, True)
+            self.foldercolor.set_color(item_path, dst_file, True)
     
     def custom_color_dialog(self):
         """Pick color dialog"""
@@ -405,14 +464,14 @@
             skel_color = color + '_templates'
         if folder == GLib.get_user_special_dir(GLib.USER_DIRECTORY_VIDEOS):
             skel_color = color + '_videos'
-        skel_icon = self.foldercolor.get_icon(skel_color)
-        if skel_icon['name'] and self._check_same_theme(skel_icon['filename']):
-            return skel_icon
+        skel_folder = self.foldercolor.get_icon(skel_color)
+        if skel_folder['name'] and self._check_same_theme(skel_folder['filename']):
+            return skel_folder
         
         # Search folder-blue-<desktop>
         skel_color = skel_color.replace('_', '-')
-        skel_icon = self.foldercolor.get_icon(skel_color)
-        if skel_icon['name'] and self._check_same_theme(skel_icon['filename']):
-            return skel_icon
+        skel_folder = self.foldercolor.get_icon(skel_color)
+        if skel_folder['name'] and self._check_same_theme(skel_folder['filename']):
+            return skel_folder
         
         return self.foldercolor.get_icon(color)

=== modified file 'setup.py'
--- setup.py	2017-08-01 13:33:14 +0000
+++ setup.py	2017-08-13 16:41:50 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Folder Color 0.0.83 - http://launchpad.net/folder-color
+# Folder Color 0.0.84 - http://launchpad.net/folder-color
 # Copyright (C) 2012-2017 Marcos Alvarez Costales https://launchpad.net/~costales
 #
 # folder-color is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 # Setup stage
 DistUtilsExtra.auto.setup(
     name         = "folder-color",
-    version      = "0.0.83",
+    version      = "0.0.84",
     description  = "Change your folder color with just a click",
     author       = "Marcos Alvarez Costales https://launchpad.net/~costales",
     author_email = "https://launchpad.net/~costales",