Hello community, here is the log from the commit of package folder-color for openSUSE:Factory checked in at 2015-03-23 12:17:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/folder-color (Old) and /work/SRC/openSUSE:Factory/.folder-color.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "folder-color" Changes: -------- --- /work/SRC/openSUSE:Factory/folder-color/folder-color.changes 2015-03-18 13:08:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.folder-color.new/folder-color.changes 2015-03-23 12:17:51.000000000 +0100 @@ -3,0 +4,8 @@ +- Update to 0.0.62: + * Fix network and recent directories. + * Allow to hide donation. + * Fix layout in Global colour. + +------------------------------------------------------------------- +Wed Mar 18 06:15:23 UTC 2015 - [email protected] + Old: ---- folder-color-caja_0.0.61_all.tar.gz folder-color_0.0.61_all.tar.gz New: ---- folder-color-caja_0.0.62_all.tar.gz folder-color_0.0.62_all.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ folder-color.spec ++++++ --- /var/tmp/diff_new_pack.DWKpoM/_old 2015-03-23 12:17:52.000000000 +0100 +++ /var/tmp/diff_new_pack.DWKpoM/_new 2015-03-23 12:17:52.000000000 +0100 @@ -20,7 +20,7 @@ %define _version 0.0.6x %define _common_ver 0.0.60 Name: folder-color -Version: 0.0.61 +Version: 0.0.62 Release: 0 Summary: Change a directory colour in Caja and Nautilus License: GPL-3.0+ ++++++ folder-color-caja_0.0.61_all.tar.gz -> folder-color-caja_0.0.62_all.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color-caja/caja-extension/folder-color.py new/folder-color-caja/caja-extension/folder-color.py --- old/folder-color-caja/caja-extension/folder-color.py 2015-03-17 21:43:41.000000000 +0100 +++ new/folder-color-caja/caja-extension/folder-color.py 2015-03-18 19:42:06.000000000 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Folder Color 0.0.61 +# Folder Color 0.0.62 # Copyright (C) 2012-2015 Marcos Alvarez Costales https://launchpad.net/~costales # # Folder Color is free software; you can redistribute it and/or modify @@ -442,32 +442,36 @@ win.set_title(_("Folder Color Preferences")) win.set_resizable(False) - vbox = Gtk.VBox(spacing=6) # Change global color - label = Gtk.Label(_("Global Color:")) - label.set_justify(Gtk.Justification.LEFT) - vbox.pack_start(label, True, True, 0) + vbox = Gtk.VBox(spacing=6) # Add current theme colors hbox = Gtk.HBox(spacing=6) - # Load colors + # Colors name_colors = Gtk.ListStore(str, str) colors = self.foldercolor.get_available_icons()[1] for color in colors: name_colors.append([color[1], color[0]]) name_colors.append([_("Default"), 'default']) - self.cb_colors = Gtk.ComboBox.new_with_model(name_colors) - renderer_text = Gtk.CellRendererText() + self.cb_colors = Gtk.ComboBox.new_with_model(name_colors) self.cb_colors.pack_start(renderer_text, True) self.cb_colors.add_attribute(renderer_text, "text", 0) self.cb_colors.set_entry_text_column(1) self.cb_colors.set_active(0) - hbox.pack_start(self.cb_colors, False, False, 0) + label = Gtk.Label(_("Global Color:")) button = Gtk.Button(_("Apply")) button.connect('clicked', self._on_color_changed) - hbox.pack_start(button, True, True, 0) + exp1 = Gtk.AspectFrame() + exp1.set_shadow_type(0) + exp2 = Gtk.AspectFrame() + exp2.set_shadow_type(0) + hbox.pack_start(exp1, True, True, 0) + hbox.pack_start(label, False, False, 0) + hbox.pack_start(self.cb_colors, False, False, 0) + hbox.pack_start(button, False, False, 0) + hbox.pack_start(exp2, True, True, 0) vbox.pack_start(hbox, False, False, 0) label = Gtk.Label(_("(You may need to restart the file manager)")) @@ -476,15 +480,34 @@ # Donate if not os.path.exists(self.foldercolor.HIDE_DONATION): - vbox.pack_start(Gtk.HSeparator(), False, True, 6) # Separator - button = Gtk.LinkButton(self.foldercolor.URL_DONATE, _("Suppport this app with a donation")) - vbox.pack_start(button, True, True, 0) + self.vbox_donate = Gtk.VBox(spacing=6) + self.vbox_donate.pack_start(Gtk.HSeparator(), False, True, 6) + hbox = Gtk.HBox(spacing=6) + btn_donate = Gtk.LinkButton(self.foldercolor.URL_DONATE, _("Suppport this app with a donation")) + img_hide = Gtk.Image(stock=Gtk.STOCK_CLOSE) + btn_hide = Gtk.Button(image=img_hide) + btn_hide.connect("clicked", self._on_donate_hide) + btn_hide.set_tooltip_text(_("Hide donation forever")) + hbox.pack_start(btn_donate, False, False, 0) + hbox.pack_start(btn_hide, False, False, 0) + self.vbox_donate.pack_start(hbox, False, False, 0) + vbox.pack_start(self.vbox_donate, False, False, 0) win.add(vbox) win.connect('delete-event', self._close_win) win.show_all() Gtk.main() + def _on_donate_hide(self, null): + self.vbox_donate.hide() + # Hide donation after show it + try: + os.makedirs(self.foldercolor.HIDE_DONATION) + except OSError as exception: + pass + except: + pass + def _close_win(self, null1, null2): self.lock.remove() Gtk.main_quit() @@ -595,6 +618,12 @@ shutil.copy2(src_file, dst_file) dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 3)) # folder_home.svg shutil.copy2(src_file, dst_file) + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 4)) # network-workgroup.svg + shutil.copy2(src_file, dst_file) + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 5)) # folder-remote.svg + shutil.copy2(src_file, dst_file) + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 6)) # document-open-recent.svg + shutil.copy2(src_file, dst_file) # Generate index.theme index_file = '/'.join([os.path.join(self.foldercolor.USER_PATH_THEME, name), 'index.theme']) @@ -626,7 +655,13 @@ """Compose icon by default""" # Need hacks if folder == None: - if special == 3: + if special == 6: + iconname = 'document-open-recent.svg' + elif special == 5: + iconname = 'folder-remote.svg' + elif special == 4: + iconname = 'network-workgroup.svg' + elif special == 3: iconname = 'folder_home.svg' elif special == 2: iconname = 'user-home.svg' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color-caja/debian/changelog new/folder-color-caja/debian/changelog --- old/folder-color-caja/debian/changelog 2015-03-17 21:43:42.000000000 +0100 +++ new/folder-color-caja/debian/changelog 2015-03-18 19:42:07.000000000 +0100 @@ -1,8 +1,10 @@ -folder-color-caja (0.0.61) trusty; urgency=low +folder-color-caja (0.0.62) trusty; urgency=low - * Fixed global color with translations - * Allow local themes in user folder - * Updated strings + * Allow local themes + * Fixed folders network and recent + * Allow to hide donation + * Layout in Global color fixed + * Updated translations - -- costales <[email protected]> Mon, 16 Mar 2015 22:40:31 +0000 + -- costales <[email protected]> Web, 18 Mar 2015 19:02:31 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color-caja/debian/control new/folder-color-caja/debian/control --- old/folder-color-caja/debian/control 2015-03-17 21:43:42.000000000 +0100 +++ new/folder-color-caja/debian/control 2015-03-18 19:42:07.000000000 +0100 @@ -1,7 +1,7 @@ Source: folder-color-caja Section: utils Priority: extra -Standards-Version: 0.0.61 +Standards-Version: 0.0.62 Maintainer: costales <[email protected]> Build-Depends: python-distutils-extra, debhelper (>=7) Homepage: https://code.launchpad.net/folder-color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color-caja/setup.py new/folder-color-caja/setup.py --- old/folder-color-caja/setup.py 2015-03-17 21:43:41.000000000 +0100 +++ new/folder-color-caja/setup.py 2015-03-18 19:42:06.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Folder Color 0.0.61 - http://launchpad.net/folder-color +# Folder Color 0.0.62 - http://launchpad.net/folder-color # Copyright (C) 2012-2015 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-caja", - version = "0.0.61", + version = "0.0.62", description = "Change your folder color in Caja", author = "Marcos Alvarez Costales https://launchpad.net/~costales";, author_email = "https://launchpad.net/~costales";, ++++++ folder-color_0.0.61_all.tar.gz -> folder-color_0.0.62_all.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color/debian/changelog new/folder-color/debian/changelog --- old/folder-color/debian/changelog 2015-03-17 21:43:18.000000000 +0100 +++ new/folder-color/debian/changelog 2015-03-18 19:41:59.000000000 +0100 @@ -1,8 +1,10 @@ -folder-color (0.0.61) trusty; urgency=low +folder-color (0.0.62) trusty; urgency=low - * Fixed global color with translations - * Allow local themes in user folder - * Updated strings + * Allow local themes + * Fixed folders network and recent + * Allow to hide donation + * Layout in Global color fixed + * Updated translations - -- costales <[email protected]> Mon, 16 Mar 2015 22:40:31 +0000 + -- costales <[email protected]> Web, 18 Mar 2015 19:02:31 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color/debian/control new/folder-color/debian/control --- old/folder-color/debian/control 2015-03-17 21:43:18.000000000 +0100 +++ new/folder-color/debian/control 2015-03-18 19:41:59.000000000 +0100 @@ -1,7 +1,7 @@ Source: folder-color Section: utils Priority: extra -Standards-Version: 0.0.61 +Standards-Version: 0.0.62 Maintainer: costales <[email protected]> Build-Depends: python-distutils-extra, debhelper (>=7) Homepage: https://code.launchpad.net/folder-color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color/nautilus-extension/folder-color.py new/folder-color/nautilus-extension/folder-color.py --- old/folder-color/nautilus-extension/folder-color.py 2015-03-17 21:42:39.000000000 +0100 +++ new/folder-color/nautilus-extension/folder-color.py 2015-03-18 19:41:35.000000000 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Folder Color 0.0.61 +# Folder Color 0.0.62 # Copyright (C) 2012-2015 Marcos Alvarez Costales https://launchpad.net/~costales # # Folder Color is free software; you can redistribute it and/or modify @@ -442,32 +442,36 @@ win.set_title(_("Folder Color Preferences")) win.set_resizable(False) - vbox = Gtk.VBox(spacing=6) # Change global color - label = Gtk.Label(_("Global Color:")) - label.set_justify(Gtk.Justification.LEFT) - vbox.pack_start(label, True, True, 0) + vbox = Gtk.VBox(spacing=6) # Add current theme colors hbox = Gtk.HBox(spacing=6) - # Load colors + # Colors name_colors = Gtk.ListStore(str, str) colors = self.foldercolor.get_available_icons()[1] for color in colors: name_colors.append([color[1], color[0]]) name_colors.append([_("Default"), 'default']) - self.cb_colors = Gtk.ComboBox.new_with_model(name_colors) - renderer_text = Gtk.CellRendererText() + self.cb_colors = Gtk.ComboBox.new_with_model(name_colors) self.cb_colors.pack_start(renderer_text, True) self.cb_colors.add_attribute(renderer_text, "text", 0) self.cb_colors.set_entry_text_column(1) self.cb_colors.set_active(0) - hbox.pack_start(self.cb_colors, False, False, 0) + label = Gtk.Label(_("Global Color:")) button = Gtk.Button(_("Apply")) button.connect('clicked', self._on_color_changed) - hbox.pack_start(button, True, True, 0) + exp1 = Gtk.AspectFrame() + exp1.set_shadow_type(0) + exp2 = Gtk.AspectFrame() + exp2.set_shadow_type(0) + hbox.pack_start(exp1, True, True, 0) + hbox.pack_start(label, False, False, 0) + hbox.pack_start(self.cb_colors, False, False, 0) + hbox.pack_start(button, False, False, 0) + hbox.pack_start(exp2, True, True, 0) vbox.pack_start(hbox, False, False, 0) label = Gtk.Label(_("(You may need to restart the file manager)")) @@ -476,15 +480,34 @@ # Donate if not os.path.exists(self.foldercolor.HIDE_DONATION): - vbox.pack_start(Gtk.HSeparator(), False, True, 6) # Separator - button = Gtk.LinkButton(self.foldercolor.URL_DONATE, _("Suppport this app with a donation")) - vbox.pack_start(button, True, True, 0) + self.vbox_donate = Gtk.VBox(spacing=6) + self.vbox_donate.pack_start(Gtk.HSeparator(), False, True, 6) + hbox = Gtk.HBox(spacing=6) + btn_donate = Gtk.LinkButton(self.foldercolor.URL_DONATE, _("Suppport this app with a donation")) + img_hide = Gtk.Image(stock=Gtk.STOCK_CLOSE) + btn_hide = Gtk.Button(image=img_hide) + btn_hide.connect("clicked", self._on_donate_hide) + btn_hide.set_tooltip_text(_("Hide donation forever")) + hbox.pack_start(btn_donate, False, False, 0) + hbox.pack_start(btn_hide, False, False, 0) + self.vbox_donate.pack_start(hbox, False, False, 0) + vbox.pack_start(self.vbox_donate, False, False, 0) win.add(vbox) win.connect('delete-event', self._close_win) win.show_all() Gtk.main() + def _on_donate_hide(self, null): + self.vbox_donate.hide() + # Hide donation after show it + try: + os.makedirs(self.foldercolor.HIDE_DONATION) + except OSError as exception: + pass + except: + pass + def _close_win(self, null1, null2): self.lock.remove() Gtk.main_quit() @@ -595,6 +618,12 @@ shutil.copy2(src_file, dst_file) dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 3)) # folder_home.svg shutil.copy2(src_file, dst_file) + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 4)) # network-workgroup.svg + shutil.copy2(src_file, dst_file) + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 5)) # folder-remote.svg + shutil.copy2(src_file, dst_file) + dst_file = os.path.join(self.foldercolor.USER_PATH_THEME, name, 'scalable', 'places', self._get_folder_icon(None, 6)) # document-open-recent.svg + shutil.copy2(src_file, dst_file) # Generate index.theme index_file = '/'.join([os.path.join(self.foldercolor.USER_PATH_THEME, name), 'index.theme']) @@ -626,7 +655,13 @@ """Compose icon by default""" # Need hacks if folder == None: - if special == 3: + if special == 6: + iconname = 'document-open-recent.svg' + elif special == 5: + iconname = 'folder-remote.svg' + elif special == 4: + iconname = 'network-workgroup.svg' + elif special == 3: iconname = 'folder_home.svg' elif special == 2: iconname = 'user-home.svg' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/folder-color/setup.py new/folder-color/setup.py --- old/folder-color/setup.py 2015-03-17 21:43:18.000000000 +0100 +++ new/folder-color/setup.py 2015-03-18 19:41:59.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Folder Color 0.0.61 - http://launchpad.net/folder-color +# Folder Color 0.0.62 - http://launchpad.net/folder-color # Copyright (C) 2012-2015 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.61", + version = "0.0.62", description = "Change your folder color in Nautilus", author = "Marcos Alvarez Costales https://launchpad.net/~costales";, author_email = "https://launchpad.net/~costales";, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
