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

Slightly clearer message after running Replace all

Browse Source
This commit is contained in:
Kovid Goyal 2016-06-18 16:40:13 +05:30
parent 8e49e002ad
commit b139e252d6
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/tweak_book/search.py
View File

@ -1320,8 +1320,12 @@ def run_search(
return no_replace(_( return no_replace(_(
'Currently selected text does not match the search query.')) 'Currently selected text does not match the search query.'))
def count_message(action, count, show_diff=False): def count_message(replaced, count, show_diff=False):
msg = _('%(action)s %(num)s occurrences of %(query)s') % dict(num=count, query=errfind, action=action) if replaced:
msg = _('Performed the replacement at {num} occurrences of {query}')
else:
msg = _('Found {num} occurrences of {query}')
msg = msg.format(num=count, query=errfind)
if show_diff and count > 0: if show_diff and count > 0:
d = MessageBox(MessageBox.INFO, _('Searching done'), prepare_string_for_xml(msg), parent=gui_parent, show_copy_button=False) d = MessageBox(MessageBox.INFO, _('Searching done'), prepare_string_for_xml(msg), parent=gui_parent, show_copy_button=False)
d.diffb = b = d.bb.addButton(_('See what &changed'), d.bb.ActionRole) d.diffb = b = d.bb.addButton(_('See what &changed'), d.bb.ActionRole)
@ -1376,7 +1380,7 @@ def run_search(
with current_container().open(n, 'wb') as f: with current_container().open(n, 'wb') as f:
f.write(raw.encode('utf-8')) f.write(raw.encode('utf-8'))
QApplication.restoreOverrideCursor() QApplication.restoreOverrideCursor()
count_message(_('Replaced') if replace else _('Found'), count, show_diff=replace) count_message(replace, count, show_diff=replace)
return count return count
with BusyCursor(): with BusyCursor():
@ -1388,7 +1392,7 @@ def run_search(
return do_find() return do_find()
if action == 'replace-all': if action == 'replace-all':
if marked: if marked:
return count_message(_('Replaced'), sum(editor.all_in_marked(p, repl) for p, repl in searches)) return count_message(True, sum(editor.all_in_marked(p, repl) for p, repl in searches))
add_savepoint(_('Before: Replace all')) add_savepoint(_('Before: Replace all'))
count = do_all() count = do_all()
if count == 0: if count == 0:
@ -1398,7 +1402,7 @@ def run_search(
return return
if action == 'count': if action == 'count':
if marked: if marked:
return count_message(_('Found'), sum(editor.all_in_marked(p) for p, __ in searches)) return count_message(False, sum(editor.all_in_marked(p) for p, __ in searches))
return do_all(replace=False) return do_all(replace=False)
if __name__ == '__main__': if __name__ == '__main__':