Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Two fixes:

Browse Source 
1) fix for bug 1436690. Apostrophes in file names create syntax errors. The fix is to remove the apostrophes.
2) fix icon not appearing  in the combo box until the rule editor is closed and reopened.
This commit is contained in:
Charles Haley 2015-03-26 14:17:57 +01:00
parent f60e51248f
commit 4768d695d0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/gui2/preferences/coloring.py
View File

@ -493,6 +493,12 @@ class RuleEditor(QDialog): # {{{
<span style="color: {c}; background-color: {bg2}">&nbsp;{st}&nbsp;</span> <span style="color: {c}; background-color: {bg2}">&nbsp;{st}&nbsp;</span>
'''.format(c=c, bg1=bg1, bg2=bg2, st=_('Sample Text'))) '''.format(c=c, bg1=bg1, bg2=bg2, st=_('Sample Text')))
def sanitize_icon_file_name(self, icon_path):
n = lower(sanitize_file_name_unicode(
os.path.splitext(
os.path.basename(icon_path))[0]+'.png'))
return n.replace("'", '_')
def filename_button_clicked(self): def filename_button_clicked(self):
try: try:
path = choose_files(self, 'choose_category_icon', path = choose_files(self, 'choose_category_icon',
@ -501,13 +507,9 @@ class RuleEditor(QDialog): # {{{
all_files=False, select_only_single_file=True) all_files=False, select_only_single_file=True)
if path: if path:
icon_path = path[0] icon_path = path[0]
icon_name = lower(sanitize_file_name_unicode( icon_name = self.sanitize_icon_file_name(icon_path)
os.path.splitext(
os.path.basename(icon_path))[0]+'.png'))
if icon_name not in self.icon_file_names: if icon_name not in self.icon_file_names:
self.icon_file_names.append(icon_name) self.icon_file_names.append(icon_name)
self.update_filename_box()
self.update_remove_button()
try: try:
p = QIcon(icon_path).pixmap(QSize(128, 128)) p = QIcon(icon_path).pixmap(QSize(128, 128))
d = self.icon_folder d = self.icon_folder
@ -519,6 +521,8 @@ class RuleEditor(QDialog): # {{{
except: except:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
self.update_filename_box()
self.update_remove_button()
if self.doing_multiple: if self.doing_multiple:
if icon_name not in self.rule_icon_files: if icon_name not in self.rule_icon_files:
self.rule_icon_files.append(icon_name) self.rule_icon_files.append(icon_name)