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

Various minor bug fixes

Browse Source
This commit is contained in:
Kovid Goyal 2014-01-26 15:42:42 +05:30
parent 15bfb2aada
commit 8aa827baf6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/tweak_book/diff/main.py
View File

@ -82,7 +82,7 @@ def changed_files(list_of_names1, list_of_names2, get_data1, get_data2):
adds.discard(n) adds.discard(n)
break break
else: else:
cache.set_left(name, adata[name]) cache.set_left(name, rdata[name])
removed_names.add(name) removed_names.add(name)
for name in adds: for name in adds:
cache.set_right(name, adata[name]) cache.set_right(name, adata[name])
@ -217,12 +217,12 @@ class Diff(Dialog):
add(args, kwargs) add(args, kwargs)
for name in sorted(added_names, key=numeric_sort_key): for name in sorted(added_names, key=numeric_sort_key):
args = (_('[This file was added]'), name, None, cache.right(name)) args = (_('[%s was added]') % name, name, None, cache.right(name))
kwargs = {'syntax':syntax_map.get(name, None), 'context':self.context} kwargs = {'syntax':syntax_map.get(name, None), 'context':self.context}
add(args, kwargs) add(args, kwargs)
for name in sorted(removed_names, key=numeric_sort_key): for name in sorted(removed_names, key=numeric_sort_key):
args = (name, _('[This file was removed]'), cache.left(name), None) args = (name, _('[%s was removed]') % name, cache.left(name), None)
kwargs = {'syntax':syntax_map.get(name, None), 'context':self.context} kwargs = {'syntax':syntax_map.get(name, None), 'context':self.context}
add(args, kwargs) add(args, kwargs)

11
src/calibre/gui2/tweak_book/diff/view.py
View File

@ -461,7 +461,7 @@ class DiffSplit(QSplitter): # {{{
c.movePosition(c.End) c.movePosition(c.End)
c.insertText('[%s]\n\n' % _('The files are identical')) c.insertText('[%s]\n\n' % _('The files are identical'))
elif left_name != right_name and not left_text and not right_text: elif left_name != right_name and not left_text and not right_text:
self.add_text_diff(_('[This file was renamed to %s]') % right_name, _('[This file was renamed from %s]') % left_name, context, syntax) self.add_text_diff(_('[This file was renamed to %s]') % right_name, _('[This file was renamed from %s]') % left_name, context, None)
for v in (self.left, self.right): for v in (self.left, self.right):
v.appendPlainText('\n') v.appendPlainText('\n')
elif is_text: elif is_text:
@ -872,10 +872,11 @@ class DiffView(QWidget): # {{{
self.syncing = False self.syncing = False
def clear(self): def clear(self):
self.view.clear() with self:
self.changes = [] self.view.clear()
self.delta = 0 self.changes = []
self.scrollbar.setRange(0, 0) self.delta = 0
self.scrollbar.setRange(0, 0)
def adjust_range(self): def adjust_range(self):
ls, rs = self.view.left.verticalScrollBar(), self.view.right.verticalScrollBar() ls, rs = self.view.left.verticalScrollBar(), self.view.right.verticalScrollBar()