diff -Nru folder-color-0.0.84/.bzr/branch/last-revision folder-color-0.0.85/.bzr/branch/last-revision --- folder-color-0.0.84/.bzr/branch/last-revision 2017-08-13 17:02:49.000000000 +0000 +++ folder-color-0.0.85/.bzr/branch/last-revision 2017-08-14 08:31:30.000000000 +0000 @@ -1 +1 @@ -277 costales.marcos@gmail.com-20170813170152-temxj2q1xl65ohwh +279 costales.marcos@gmail.com-20170814082942-1n1l09bgnchb35tl Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/checkout/dirstate and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/checkout/dirstate differ Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.cix and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.cix differ Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.iix and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.iix differ Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.rix and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.rix differ diff -Nru folder-color-0.0.84/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.six folder-color-0.0.85/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.six --- folder-color-0.0.84/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.six 2017-08-13 17:02:49.000000000 +0000 +++ folder-color-0.0.85/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.six 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -B+Tree Graph Index 2 -node_ref_lists=0 -key_elements=1 -len=0 -row_lengths= Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.tix and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/indices/8876e79cb8198bc6fa757d54343535e0.tix differ Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.cix and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.cix differ Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.iix and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.iix differ Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.rix and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.rix differ diff -Nru folder-color-0.0.84/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.six folder-color-0.0.85/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.six --- folder-color-0.0.84/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.six 1970-01-01 00:00:00.000000000 +0000 +++ folder-color-0.0.85/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.six 2017-08-14 08:31:30.000000000 +0000 @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.tix and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/indices/9d69ed7c7a276e1dc4870d7cb6c21ee3.tix differ diff -Nru folder-color-0.0.84/.bzr/repository/pack-names folder-color-0.0.85/.bzr/repository/pack-names --- folder-color-0.0.84/.bzr/repository/pack-names 2017-08-13 17:02:49.000000000 +0000 +++ folder-color-0.0.85/.bzr/repository/pack-names 2017-08-14 08:31:30.000000000 +0000 @@ -3,5 +3,4 @@ key_elements=1 len=1 row_lengths=1 -x @k`Aaa`"El{c 5eg@Vj -ԄDX~T \ No newline at end of file +x 1 @j^'S/P̾m4cZYthĖҴȲTD"4 \ No newline at end of file Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/packs/8876e79cb8198bc6fa757d54343535e0.pack and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/packs/8876e79cb8198bc6fa757d54343535e0.pack differ Binary files /tmp/tmpwXcRxW/7TYLNP3qsX/folder-color-0.0.84/.bzr/repository/packs/9d69ed7c7a276e1dc4870d7cb6c21ee3.pack and /tmp/tmpwXcRxW/n8DodB9rck/folder-color-0.0.85/.bzr/repository/packs/9d69ed7c7a276e1dc4870d7cb6c21ee3.pack differ diff -Nru folder-color-0.0.84/debian/changelog folder-color-0.0.85/debian/changelog --- folder-color-0.0.84/debian/changelog 2017-08-13 17:03:33.000000000 +0000 +++ folder-color-0.0.85/debian/changelog 2017-08-14 08:31:40.000000000 +0000 @@ -1,7 +1,7 @@ -folder-color (0.0.84) xenial; urgency=low +folder-color (0.0.85) xenial; urgency=low - * Fixed #1705546 + * File's emblem * Updated translations - -- costales Mon, 31 Jul 2017 19:16:31 +0000 + -- costales Mon, 14 Aug 2017 10:16:31 +0000 diff -Nru folder-color-0.0.84/debian/control folder-color-0.0.85/debian/control --- folder-color-0.0.84/debian/control 2017-08-13 17:03:33.000000000 +0000 +++ folder-color-0.0.85/debian/control 2017-08-14 08:31:40.000000000 +0000 @@ -1,7 +1,7 @@ Source: folder-color Section: utils Priority: extra -Standards-Version: 0.0.84 +Standards-Version: 0.0.85 Maintainer: costales Build-Depends: python-distutils-extra, debhelper (>=7) Homepage: https://code.launchpad.net/folder-color diff -Nru folder-color-0.0.84/nautilus-extension/folder-color.py folder-color-0.0.85/nautilus-extension/folder-color.py --- folder-color-0.0.84/nautilus-extension/folder-color.py 2017-08-13 17:02:51.000000000 +0000 +++ folder-color-0.0.85/nautilus-extension/folder-color.py 2017-08-14 08:31:30.000000000 +0000 @@ -1,4 +1,4 @@ -# Folder Color 0.0.84 +# Folder Color 0.0.85 # Copyright (C) 2012-2017 Marcos Alvarez Costales https://launchpad.net/~costales # # Folder Color is free software; you can redistribute it and/or modify @@ -93,7 +93,7 @@ def set_color(self, item_path, color, is_uri=False): """Set color to a file/directory""" # Restore - self._unset_color(item_path) + self.restore_color(item_path) # Set item = Gio.File.new_for_path(item_path) if not is_uri: @@ -109,7 +109,7 @@ def set_emblem(self, item_path, emblem_name=''): """Set emblem""" # Restore - self._unset_emblem(item_path) + self.restore_emblem(item_path) # Set if emblem_name: emblem = [] @@ -123,28 +123,22 @@ # 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): + def restore_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) + self._refresh(item_path) - def _unset_color(self, item_path): + def restore_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) item.set_attributes_from_info(info, 0, None) + self._refresh(item_path) def _refresh(self, item_path): """Reload the current file/directory icon""" @@ -190,9 +184,6 @@ 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 @@ -229,15 +220,6 @@ 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']: @@ -253,6 +235,15 @@ item.connect('activate', self._menu_activate_emblem, emblem, 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_all, items) + submenu.append_item(item_restore) + # Files else: # Title menu @@ -282,7 +273,7 @@ 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) + item_restore.connect('activate', self._menu_activate_restore_emblem, items) submenu.append_item(item_restore) return top_menuitem, @@ -324,14 +315,24 @@ 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, items): + def _menu_activate_restore_all(self, menu, items): + """Menu: Clicked restore""" + for each_item in items: + if each_item.is_gone(): + continue + + item_path = urllib.unquote(each_item.get_uri()[7:]) + self.foldercolor.restore_color(item_path) + self.foldercolor.restore_emblem(item_path) + + def _menu_activate_restore_emblem(self, menu, items): """Menu: Clicked restore""" for each_item in items: if each_item.is_gone(): continue item_path = urllib.unquote(each_item.get_uri()[7:]) - self.foldercolor.restore(item_path) + self.foldercolor.restore_emblem(item_path) def _menu_activate_emblem(self, menu, emblem, items): """Menu: Clicked emblem""" diff -Nru folder-color-0.0.84/setup.py folder-color-0.0.85/setup.py --- folder-color-0.0.84/setup.py 2017-08-13 17:03:33.000000000 +0000 +++ folder-color-0.0.85/setup.py 2017-08-14 08:31:40.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Folder Color 0.0.84 - http://launchpad.net/folder-color +# Folder Color 0.0.85 - 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 @@ -26,7 +26,7 @@ # Setup stage DistUtilsExtra.auto.setup( name = "folder-color", - version = "0.0.84", + version = "0.0.85", description = "Change your folder color in Nautilus", author = "Marcos Alvarez Costales https://launchpad.net/~costales", author_email = "https://launchpad.net/~costales",