Merge lp:~dorins/qbzr/qdiff-changes into lp:qbzr

[Dorin Scutarașu]

Implements the following changes on the qdiff window:

- Move actions from the bottom of the window on a toolbar, similar to the toolbar from the qannotate window
- Add a Find actions which toggles a find toolbar. Find action acts on the active panel - the panel that had focus last.
- Add shortcut keys for "Refresh", "Find" and "Toggle view mode" actions and show shortcut key hints on tooltips for these actions and also for "Find next", "Find previous" actions.
- Add an "Ignore whitespace changes" option.

[Alexander Belchenko (bialix)]

Looks nice.

Although it's not very intuitive that clicking lowered Side-by-side button will give me unidiff view.

[Alexander Belchenko (bialix)]

Shortcut for switching between Side-by-Side and Unidiff is Crtl+| which means pressing Ctrl+Shift+\ on my keyboard. Is using Shift intended here? Maybe it worth to use something simler instead?

[Alexander Belchenko (bialix)]

I see you have added Ignore whitespace changes option. Does it related to this merge proposal: https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-whitespace/+merge/35921 ?

[Alexander Belchenko (bialix)]

Alexander Belchenko пишет:
> Shortcut for switching between Side-by-Side and Unidiff is Crtl+| which means pressing Ctrl+Shift+\ on my keyboard. Is using Shift intended here? Maybe it worth to use something simler instead?

I suggest using Ctrl+U.

[Dorin Scutarașu (dorins)]

> I see you have added Ignore whitespace changes option. Does it related to this
> merge proposal: https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-
> whitespace/+merge/35921 ?

Yes. Looks like the other branch has similar changes except that the UI is different: I added a menu item to toggle whitespace changes, the other branch uses a command line parameter.

[lp:~dorins/qbzr/qdiff-changes]

1317. By Dorin Scutarașu on 2010-10-06

* Replaced "Side by side" toolbar button with "Unidiff" button to reflect default view mode.
* Changed shortcut key for toggling view mode to "Ctrl-U".

[Dorin Scutarașu (dorins)]

> Although it's not very intuitive that clicking lowered Side-by-side button
> will give me unidiff view.

I replaced the "Side by side" button with a "Unidiff" button which makes more sense since side by side is the default. Also, I changed the shortcut key to "Ctrl-U". Thanks for the feedback.

[Alexander Belchenko (bialix)]

I like new variant. I have some doubts about using 3-panel icon for Unidiff button now, but I have no good suggestions.

Also I found that External Diff button does not work. Have you tested it?

[Alexander Belchenko (bialix)]

Dorin Scutarașu пишет:
>> I see you have added Ignore whitespace changes option. Does it related to this
>> merge proposal: https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-
>> whitespace/+merge/35921 ?
>
> Yes. Looks like the other branch has similar changes except that the UI is different: I added a menu item to toggle whitespace changes, the other branch uses a command line parameter.

@Dorin, can you merge the changes from the other branch, so I can land
both branches soon? Or I can land the other branch first and you will
update your patch later?

@Glen, can you help Dorin to merge your patches, or do you prefer to
land your patch first?

Maybe you guys can collaborate on this feature?

[Glen Mailer (glenjamin)]

I think the best approach will be to merge my command line changes stuff into this branch - I can have a go at that this weekend.

Interestingly my first approach to whitespace removal was the regular expression substitution, but I replaced it with string.whitespace and string.translate after seeing Dorin's approach - meanwhile Dorin appears to have started with string.whitespace and moved to regular expression substitution.

Any ideas which is preferrable?

[Dorin Scutarașu (dorins)]

On 7 octombrie 2010, 13:43, Glen Mailer <email address hidden> wrote:
> I think the best approach will be to merge my command line changes stuff into this branch - I can have a go at that this weekend.
>

Sounds like a plan.

> Interestingly my first approach to whitespace removal was the regular expression substitution, but I replaced it with string.whitespace and string.translate after seeing Dorin's approach - meanwhile Dorin appears to have started with string.whitespace and moved to regular expression substitution.
>
> Any ideas which is preferrable?
> --
> https://code.launchpad.net/~dorins/qbzr/qdiff-changes/+merge/34710
> You are the owner of lp:~dorins/qbzr/qdiff-changes.
>

I made some tests and it looks like string.translate is fastest. I
switched to using regular expresion substitution because I had some
problems with string.translate:

* python >= 2.6 accepts None as the first parameter, but older python
  versions don't.

* string.translate delegates to either str.translate(s, table,
  delchars=None) or unicode.translate(s, table), so it crashes for unicode
  strings when passing delchars argument.

I switched to regular expressions at the time thinking that I'll get back
to it and figure out how to use 'translate' safely, but I didn't manage to
do that so far.

[lp:~dorins/qbzr/qdiff-changes]

1318. By Dorin Scutarașu on 2010-10-14

Fixed "External Diff" toolbar button.

1319. By Dorin Scutarașu on 2010-10-14

Add shortcut keys: Alt+V pops up the view menu, Alt+E pops up the "External Diff" menu.

The shortcut keys are appended to the respective tool tips.
Also, "Complete" action is now accessible using "Alt+V,C" and "Ignore Whitespace changes" is accessible using "Alt+V,I".

1320. By Dorin Scutarașu on 2010-10-15

Merge with lp:~glenjamin/qbzr/qdiff-ignore-whitespace.
Adds --ignore-whitespace option in qdiff.

1321. By Dorin Scutarașu on 2010-10-15

Merge trunk.

[Dorin Scutarașu (dorins)]

> Also I found that External Diff button does not work. Have you tested it?

I missed that somehow. Anyway, I fixed it today.

> Dorin Scutarașu пишет:
> > > I see you have added Ignore whitespace changes option. Does it related to this
> > > merge proposal: https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-
> > > whitespace/+merge/35921 ?
> >
> > Yes. Looks like the other branch has similar changes except that the
> > UI is different: I added a menu item to toggle whitespace changes,
> > the other branch uses a command line parameter.

> @Dorin, can you merge the changes from the other branch, so I can land
> both branches soon? Or I can land the other branch first and you will
> update your patch later?

I just merged the changes from this merge proposal:
https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-whitespace/+merge/35921
, which exposes an --ignore-whitespace option to qdiff.

[lp:~dorins/qbzr/qdiff-changes]

1322. By Dorin Scutarașu on 2010-10-16

Cleanup.

[Glen Mailer (glenjamin)]

> > Also I found that External Diff button does not work. Have you tested it?
>
> I missed that somehow. Anyway, I fixed it today.
>
> > Dorin Scutarașu пишет:
> > > > I see you have added Ignore whitespace changes option. Does it related
> to this
> > > > merge proposal: https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-
> > > > whitespace/+merge/35921 ?
> > >
> > > Yes. Looks like the other branch has similar changes except that the
> > > UI is different: I added a menu item to toggle whitespace changes,
> > > the other branch uses a command line parameter.
>
> > @Dorin, can you merge the changes from the other branch, so I can land
> > both branches soon? Or I can land the other branch first and you will
> > update your patch later?
>
> I just merged the changes from this merge proposal:
> https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-
> whitespace/+merge/35921
> , which exposes an --ignore-whitespace option to qdiff.

Excellent! I was just about to take a look at this :)

[Alexander Belchenko (bialix)]

Glen Mailer пишет:
>>> Also I found that External Diff button does not work. Have you tested it?
>> I missed that somehow. Anyway, I fixed it today.
>>
>>> Dorin Scutarașu пишет:
>>>>> I see you have added Ignore whitespace changes option. Does it related
>> to this
>>>>> merge proposal: https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-
>>>>> whitespace/+merge/35921 ?
>>>> Yes. Looks like the other branch has similar changes except that the
>>>> UI is different: I added a menu item to toggle whitespace changes,
>>>> the other branch uses a command line parameter.
>>> @Dorin, can you merge the changes from the other branch, so I can land
>>> both branches soon? Or I can land the other branch first and you will
>>> update your patch later?
>> I just merged the changes from this merge proposal:
>> https://code.launchpad.net/~glenjamin/qbzr/qdiff-ignore-
>> whitespace/+merge/35921
>> , which exposes an --ignore-whitespace option to qdiff.
>
> Excellent! I was just about to take a look at this :)

Thank you, guys! I will review it ASAP and I hope to land it soon.

--
All the dude wanted was his rug back

[Dorin Scutarașu (dorins)]

Could someone review this please? Is there anything I can do to speed things up?

[Alexander Belchenko (bialix)]

Dorin Scutarașu пишет:
> Could someone review this please? Is there anything I can do to speed things up?

I'm very very very sorry, but it seems your patch misses our deadline
for 0.20 final to be in sync with bzr 2.3.
We will merge it as soon as 0.20 will be ready.

Sorry for the delay :-/

--
All the dude wanted was his rug back

[Dorin Scutarașu (dorins)]

> Sorry for the delay :-/

No problem. I was just curious as to what's holding this up. I was thinking about adding line numbers and "go to line" function, and wanted to work on top of this. I guess I need to figure out how the pipeline plug-in works.

[Alexander Belchenko (bialix)]

I was very busy last months, sorry. I'm going to merge it now. I think there is nothing we need to change or improve, and just need merge it, right?

Gary, are you have any comments on this patch?

review: Needs Information

[Dorin Scutarașu (dorins)]

> I was very busy last months, sorry. I'm going to merge it now. I think there
> is nothing we need to change or improve, and just need merge it, right?

Yes, as far as I know.

[Alexander Belchenko (bialix)]

Dorin, can you merge the trunk into your branch and resolve conflicts, please? There are some conflicted changes that look trivial, but I'm not quite sure about them. That will help me to do final review.

[Alexander Belchenko (bialix)]

> Dorin, can you merge the trunk into your branch and resolve conflicts, please?
> There are some conflicted changes that look trivial, but I'm not quite sure
> about them. That will help me to do final review.

I did it.

[Alexander Belchenko (bialix)]

Find is not intuitive because it search only on the left pane, I have to click on right pane to force it search there. I'd rather expect it searches both panes

[Alexander Belchenko (bialix)]

I've tested new qdiff but I haven't inspected every single line of your changes.

In the future please avoid unnecessary whitespace-only changes in contribution to QBzr. It breaks annotations and makes the review (without qdiff -w) much harder.

Also I wonder if we want to save state of "Ignore whitespace" knob in some config file (maybe in qbzr.conf or branch.conf) but I'm not sure yet. If you have any opinion on this we can discuss it in our google group ML.

Resume: many thanks for great work to you and Glenjamin. I'm going to land it to trunk and will release 0.21 beta1 soon so many people will have a chance to test it in the action.

review: Approve

=== added file 'data/22x22/system-run.png'
 Binary files data/22x22/system-run.png	1970-01-01 00:00:00 +0000 and data/22x22/system-run.png	2010-10-16 08:18:41 +0000 differ
=== added file 'data/22x22/view-split-left-right.png'
 Binary files data/22x22/view-split-left-right.png	1970-01-01 00:00:00 +0000 and data/22x22/view-split-left-right.png	2010-10-16 08:18:41 +0000 differ
=== modified file 'data/qbzr.qrc'
--- data/qbzr.qrc	2009-12-22 22:04:05 +0000
+++ data/qbzr.qrc	2010-10-16 08:18:41 +0000
@@ -32,6 +32,8 @@
     <file>22x22/go-jump.png</file>
     <file>22x22/go-next.png</file>
     <file>22x22/go-previous.png</file>
+    <file>22x22/view-split-left-right.png</file>
+    <file>22x22/system-run.png</file>
 
 </qresource>
-</RCC>
 \ No newline at end of file
+</RCC>
 
=== modified file 'lib/commands.py'
--- lib/commands.py	2010-10-11 13:05:30 +0000
+++ lib/commands.py	2010-10-16 08:18:41 +0000
@@ -144,7 +144,7 @@
        self.main_window should be instance of QBzrWindow or QBzrDialog
        with attribute "return_code" set to 0 or 1.
     """
-    
+
     @install_gettext
     @report_missing_pyqt
     def run(self, *args, **kwargs):
@@ -156,11 +156,11 @@
         std_ui_factory = ui.ui_factory
         try:
             ui.ui_factory = QUIFactory()
-            
+
             # Set up global exception handling.
             from bzrlib.plugins.qbzr.lib.trace import excepthook
             sys.excepthook = excepthook
-            
+
             try:
                 try:
                     ret_code = self._qbzr_run(*args, **kwargs)
@@ -251,7 +251,7 @@
             else:
                 tree = branch.repository.revision_tree(
                         revision_id = revision[0].in_history(branch).rev_id)
-            
+
             file_id = tree.path2id(relpath)
             if file_id is None:
                 raise errors.NotVersionedError(filename)
@@ -288,7 +288,7 @@
     """GUI for adding files or directories."""
     takes_args = ['selected*']
     takes_options = [ui_mode_option]
-    
+
     def _qbzr_run(self, selected_list=None, ui_mode=False):
         tree, selected_list = builtins.tree_files(selected_list)
         if selected_list == ['']:
@@ -387,6 +387,8 @@
         Option('modified', short_name='M',
                help='Show diff for modified files.'),
         Option('renamed', short_name='R', help='Show diff for renamed files.'),
+        Option('ignore-whitespace', short_name='w',
+               help="Ignore whitespace when finding differences"),
         bzr_option('diff', 'old'),
         bzr_option('diff', 'new'),
         ]
@@ -395,24 +397,26 @@
     aliases = ['qdi']
 
     def get_diff_window_args(self, processEvents, add_cleanup):
+        args = {}
         try:
             from bzrlib.diff import get_trees_and_branches_to_diff_locked
         except ImportError:
             from bzrlib.diff import get_trees_and_branches_to_diff
-            (old_tree, new_tree,
-             old_branch, new_branch,
-             specific_files, extra_trees) = \
+            (args["old_tree"], args["new_tree"],
+             args["old_branch"], args["new_branch"],
+             args["specific_files"], _) = \
                 get_trees_and_branches_to_diff(
                     self.file_list, self.revision, self.old, self.new)
         else:
-            (old_tree, new_tree,
-             old_branch, new_branch,
-             specific_files, extra_trees) = \
+            (args["old_tree"], args["new_tree"],
+             args["old_branch"], args["new_branch"],
+             args["specific_files"], _) = \
                 get_trees_and_branches_to_diff_locked(
                     self.file_list, self.revision, self.old, self.new,
                     add_cleanup)
-        return old_tree, new_tree, old_branch, new_branch, specific_files
-    
+        args["ignore_whitespace"] = self.ignore_whitespace
+        return args
+
     def get_ext_diff_args(self, processEvents):
         args = []
         if self.revision and len(self.revision) == 1:
@@ -425,14 +429,14 @@
             args.append("--new=%s" % self.new)
         if self.old and not self.old == CUR_DIR:
             args.append("--old=%s" % self.old)
-        
+
         if self.file_list:
             args.extend(self.file_list)
-        
-        return None, args    
+
+        return None, args
 
     def _qbzr_run(self, revision=None, file_list=None, complete=False,
-            encoding=None,
+            encoding=None, ignore_whitespace=False,
             added=None, deleted=None, modified=None, renamed=None,
             old=None, new=None, ui_mode=False):
 
@@ -445,11 +449,12 @@
         if not (added or deleted or modified or renamed):
             # if no filter option used then turn all on
             filter_options.all_enable()
-        
+
         self.revision = revision
         self.file_list = file_list
         self.old = old
         self.new = new
+        self.ignore_whitespace = ignore_whitespace
 
         window = DiffWindow(self,
                             complete=complete,
@@ -464,7 +469,7 @@
     """Show log of a repository, branch, file, or directory in a Qt window.
 
     By default show the log of the branch containing the working directory.
-    
+
     If multiple files are speciffied, they must be from the same branch.
 
     :Examples:
@@ -618,7 +623,7 @@
 
         if directory is None:
             directory = CUR_DIR
-        
+
         try:
             tree_to = WorkingTree.open_containing(directory)[0]
             branch_to = tree_to.branch
@@ -705,7 +710,7 @@
         tree_merger = self.merger.make_merger()
         self.tt = tree_merger.make_preview_transform()
         result_tree = self.tt.get_preview_tree()
-        return self.merger.this_tree, result_tree, None, None, None
+        return {"old_tree": self.merger.this_tree, "new_tree": result_tree}
 
     @install_gettext
     @report_missing_pyqt
@@ -713,7 +718,7 @@
         # Set up global execption handeling.
         from bzrlib.plugins.qbzr.lib.trace import excepthook
         sys.excepthook = excepthook
-        
+
         self.merger = merger
         try:
             window = DiffWindow(self, encoding=self._encoding)
@@ -761,12 +766,12 @@
 #     bzr qannotate commands.py -r1117
 
 class cmd_qsubprocess(Command):
-    """Run some bzr command as subprocess. 
+    """Run some bzr command as subprocess.
     Used with most of subprocess-based dialogs of QBzr.
-    
+
     If CMD argument starts with @ characters then it used as name of file with
     actual cmd string (in utf-8).
-    
+
     With --bencode option cmd string interpreted as bencoded list of utf-8
     strings. This is the recommended way to launch qsubprocess.
     """
@@ -929,7 +934,7 @@
 
     takes_args = ['submit_branch?', 'public_branch?']
     takes_options = [ui_mode_option]
-    
+
     def _qbzr_run(self, submit_branch=CUR_DIR, public_branch=None, ui_mode=False):
         branch = Branch.open_containing(submit_branch)[0]
         window = SendWindow(branch, ui_mode)
@@ -939,74 +944,74 @@
 
 class cmd_qswitch(QBzrCommand):
     """Set the branch of a checkout and update."""
-    
+
     takes_args = ['location?']
     takes_options = [ui_mode_option]
-    
+
     def _qbzr_run(self, location=None, ui_mode=False):
         from bzrlib.plugins.qbzr.lib.switch import QBzrSwitchWindow
-        
+
         branch = Branch.open_containing(CUR_DIR)[0]
         bzrdir = BzrDir.open_containing(CUR_DIR)[0]
         self.main_window = QBzrSwitchWindow(branch, bzrdir, location, ui_mode)
         self.main_window.show()
-        self._application.exec_() 
+        self._application.exec_()
 
 
 class cmd_qunbind(QBzrCommand):
     """Convert the current checkout into a regular branch."""
     takes_options = [ui_mode_option, execute_option]
-    
+
     def _qbzr_run(self, ui_mode=False, execute=False):
         from bzrlib.plugins.qbzr.lib.unbind import QBzrUnbindDialog
-        
+
         branch = Branch.open_containing(CUR_DIR)[0]
         if branch.get_bound_location() == None:
             raise errors.BzrCommandError("This branch is not bound.")
-        
+
         self.main_window = QBzrUnbindDialog(branch, ui_mode, execute)
         self.main_window.show()
-        self._application.exec_() 
+        self._application.exec_()
 
 
 class cmd_qexport(QBzrCommand):
     """Export current or past revision to a destination directory or archive.
-      
+
       DEST is the destination file or dir where the branch will be exported.
       If BRANCH_OR_SUBDIR is omitted then the branch containing the current working
       directory will be used.
     """
-    
+
     takes_args = ['dest?','branch_or_subdir?']
     takes_options = [ui_mode_option]
-    
+
     def _qbzr_run(self, dest=None, branch_or_subdir=None, ui_mode=False):
         from bzrlib.plugins.qbzr.lib.export import QBzrExportDialog
-        
+
         if branch_or_subdir == None:
             branch = Branch.open_containing(CUR_DIR)[0]
         else:
             branch = Branch.open_containing(branch_or_subdir)[0]
-        
+
         window = QBzrExportDialog(dest, branch, ui_mode)
         window.show()
-        self._application.exec_() 
+        self._application.exec_()
 
 
 class cmd_qbind(QBzrCommand):
     """Convert the current branch into a checkout of the supplied branch.
-    
+
     LOCATION is the branch where you want to bind your current branch.
     """
-    
+
     takes_args = ['location?']
     takes_options = [ui_mode_option]
-    
+
     def _qbzr_run(self, location=None, ui_mode=False):
         from bzrlib.plugins.qbzr.lib.bind import QBzrBindDialog
-        
+
         branch = Branch.open_containing(CUR_DIR)[0]
-        
+
         self.main_window = QBzrBindDialog(branch, location, ui_mode)
         self.main_window.show()
         self._application.exec_()
 
=== modified file 'lib/diff_arg.py'
--- lib/diff_arg.py	2010-05-05 12:40:43 +0000
+++ lib/diff_arg.py	2010-10-16 08:18:41 +0000
@@ -27,25 +27,30 @@
 class DiffArgProvider (object):
     """Contract class to pass arguments to either builtin diff window, or
     external diffs"""
-    
+
     def get_diff_window_args(self, processEvents, add_cleanup):
         """Returns the arguments for the builtin diff window.
-        
-        :return: (tree1, tree2, branch1, branch2, specific_files)
+
+        :return: {"old_tree": old_tree,
+                  "new_tree": new_tree,
+                  "old_branch": old_branch,           (optional)
+                  "new_branch": new_branch,           (optional)
+                  "specific_files": specific_files,   (optional)
+                  "ignore_whitespace": True or False} (optional)
         """
         raise NotImplementedError()
-    
+
     def get_ext_diff_args(self, processEvents):
         """Returns the command line arguments for running an ext diff window.
-        
+
         :return: (dir, List of command line arguments).
-        """        
+        """
         raise NotImplementedError()
 
 
 class InternalDiffArgProvider(DiffArgProvider):
     """Use for passing arguments from internal source."""
-    
+
     def __init__(self, old_revid, new_revid, old_branch, new_branch,
                  specific_files=None, specific_file_ids=None):
         self.old_revid = old_revid
@@ -57,21 +62,21 @@
 
         self.old_tree = None
         self.new_tree = None
-    
+
     def need_to_load_paths(self):
         return self.specific_file_ids is not None \
            and self.specific_files is None
-    
+
     def load_old_tree(self):
         if not self.old_tree:
             self.old_tree = \
                     self.old_branch.repository.revision_tree(self.old_revid)
-    
+
     def load_new_tree_and_paths(self):
         if not self.new_tree:
             self.new_tree = \
                     self.new_branch.repository.revision_tree(self.new_revid)
-        
+
         if self.need_to_load_paths():
             self.new_tree.lock_read()
             try:
@@ -85,14 +90,16 @@
         processEvents()
         self.load_new_tree_and_paths()
         processEvents()
-        
-        return (self.old_tree, self.new_tree,
-                self.old_branch, self.new_branch,
-                self.specific_files)
-        
+
+        return {"old_tree": self.old_tree,
+                "new_tree": self.new_tree,
+                "old_branch": self.old_branch,
+                "new_branch": self.new_branch,
+                "specific_files": self.specific_files}
+
     def get_revspec(self):
         return "-rrevid:%s..revid:%s" % (self.old_revid, self.new_revid)
-    
+
     def get_ext_diff_args(self, processEvents):
         from bzrlib import urlutils
         from bzrlib import errors
@@ -101,46 +108,46 @@
         revspec = self.get_revspec()
         if revspec:
             args.append(revspec)
-        
+
         from bzrlib.workingtree import WorkingTree
         def get_base(branch, tree):
             if tree and isinstance(tree, WorkingTree):
                 return urlutils.local_path_to_url(tree.basedir)
             return branch.base
-        
+
         old_base = get_base(self.old_branch, self.old_tree)
         new_base = get_base(self.new_branch, self.new_tree)
-        
+
         # We need to avoid using --new and --old because diff tools
         # does not support it. There are however some cases where
         # this is not possilble.
         need_old = False
         if not self.old_branch.base == self.new_branch.base:
             need_old = True
-        
+
         try:
             dir = urlutils.local_path_from_url(new_base)
         except errors.InvalidURL:
             dir = ""
             args.append("--new=%s" % new_base)
             need_old = True
-        
+
         if need_old:
             args.append("--old=%s" % old_base)
-        
+
         if self.need_to_load_paths():
             self.load_new_tree_and_paths()
             processEvents()
         if self.specific_files:
             args.extend(self.specific_files)
-        
+
         return dir, args
 
 
 class InternalWTDiffArgProvider(InternalDiffArgProvider):
     """Use for passing arguments from internal source where the new tree is
     the working tree."""
-    
+
     def __init__(self, old_revid, new_tree, old_branch, new_branch,
                  specific_files=None):
         self.old_revid = old_revid
@@ -148,7 +155,7 @@
         self.old_branch = old_branch
         self.new_branch = new_branch
         self.specific_files = specific_files
-        
+
         self.old_tree = None
 
     def load_old_tree(self):
@@ -161,16 +168,18 @@
     def get_diff_window_args(self, processEvents, add_cleanup):
         self.load_old_tree()
         processEvents()
-        
-        return (self.old_tree, self.new_tree,
-                self.old_branch, self.new_branch,
-                self.specific_files)
+
+        return {"old_tree": self.old_tree,
+                "new_tree": self.new_tree,
+                "old_branch": self.old_branch,
+                "new_branch": self.new_branch,
+                "specific_files": self.specific_files}
 
     def get_revspec(self):
         if self.old_revid is not None:
             return "-rrevid:%s" % (self.old_revid,)
         else:
             return None
-    
+
     def need_to_load_paths(self):
         return False
 
=== modified file 'lib/diffwindow.py'
--- lib/diffwindow.py	2010-05-05 12:40:43 +0000
+++ lib/diffwindow.py	2010-10-16 08:18:41 +0000
@@ -22,6 +22,7 @@
 
 import errno
 import time
+import string
 
 from PyQt4 import QtCore, QtGui
 
@@ -47,19 +48,20 @@
 
 from bzrlib.plugins.qbzr.lib.i18n import gettext, ngettext, N_
 from bzrlib.plugins.qbzr.lib.util import (
-    BTN_CLOSE, BTN_REFRESH,
     FilterOptions,
     QBzrWindow,
-    ThrobberWidget,
-    StandardButton,
+    ToolBarThrobberWidget,
     get_set_encoding,
     is_binary_content,
     run_in_loading_queue,
-    runs_in_loading_queue
+    runs_in_loading_queue,
+    FindToolbar,
+    get_icon,
+    show_shortcut_hint
     )
 from bzrlib.plugins.qbzr.lib.uifactory import ui_current_widget
 from bzrlib.plugins.qbzr.lib.trace import reports_exception
-from bzrlib.plugins.qbzr.lib.encoding_selector import EncodingSelector
+from bzrlib.plugins.qbzr.lib.encoding_selector import EncodingMenuSelector
 
 try:
     from bzrlib.errors import FileTimestampUnavailable
@@ -81,13 +83,13 @@
     branch_title = ""
     if None not in (branch, other_branch) and branch.base != other_branch.base:
         branch_title = branch.nick
-    
+
     if isinstance(tree, WorkingTree):
         if branch_title:
             return gettext("Working Tree for %s") % branch_title
         else:
             return gettext("Working Tree")
-    
+
     elif isinstance(tree, (RevisionTree, DirStateRevisionTree)):
         # revision_id_to_revno is faster, but only works on mainline rev
         revid = tree.get_revision_id()
@@ -117,7 +119,7 @@
     elif isinstance(tree, _PreviewTree):
         return gettext('Merge Preview')
 
-    # XXX I don't know what other cases we need to handle    
+    # XXX I don't know what other cases we need to handle
     return 'Unknown tree'
 
 
@@ -138,9 +140,9 @@
         if filter_options is None:
             self.filter_options = FilterOptions(all_enable=True)
         self.complete = complete
+        self.ignore_whitespace = False
+        self.delayed_signal_connections = []
 
-        self.throbber = ThrobberWidget(self)
-        
         self.diffview = SidebySideDiffView(self)
         self.sdiffview = SimpleDiffView(self)
         self.views = (self.diffview, self.sdiffview)
@@ -148,74 +150,163 @@
         self.stack = QtGui.QStackedWidget(self.centralwidget)
         self.stack.addWidget(self.diffview)
         self.stack.addWidget(self.sdiffview)
-
         vbox = QtGui.QVBoxLayout(self.centralwidget)
-        vbox.addWidget(self.throbber)
         vbox.addWidget(self.stack)
 
-        diffsidebyside = QtGui.QRadioButton(gettext("Side by side"),
-                                            self.centralwidget)
-        self.connect(diffsidebyside,
-                     QtCore.SIGNAL("clicked(bool)"),
-                     self.click_diffsidebyside)
-        diffsidebyside.setChecked(True);
-
-        unidiff = QtGui.QRadioButton(gettext("Unidiff"), self.centralwidget)
-        self.connect(unidiff,
-                     QtCore.SIGNAL("clicked(bool)"),
-                     self.click_unidiff)
+        for browser in self.diffview.browsers:
+            browser.installEventFilter(self)
+
+        self.create_main_toolbar()
+        self.addToolBarBreak()
+        self.find_toolbar = FindToolbar(self, self.diffview.browsers[0],
+                self.show_find)
+        self.find_toolbar.hide()
+        self.addToolBar(self.find_toolbar)
+
+    def connect_later(self, *args, **kwargs):
+        """Schedules a signal to be connected after loading CLI arguments.
+        
+        Accepts the same arguments as QObject.connect method.
+        """
+        self.delayed_signal_connections.append((args, kwargs))
+
+    def process_delayed_connections(self):
+        for (args, kwargs) in self.delayed_signal_connections:
+            self.connect(*args, **kwargs)
+
+    def create_main_toolbar(self):
+        toolbar = self.addToolBar(gettext("Diff"))
+        toolbar.setMovable (False)
+        toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
+
+        self.show_find = self.create_find_action()
+        toolbar.addAction(self.show_find)
+        toolbar.addAction(self.create_toggle_view_mode())
+        self.view_refresh = self.create_refresh_action()
+        toolbar.addAction(self.view_refresh)
+
+        if has_ext_diff():
+            show_ext_diff_menu = self.create_ext_diff_action()
+            toolbar.addAction(show_ext_diff_menu)
+            widget = toolbar.widgetForAction(show_ext_diff_menu)
+            widget.setPopupMode(QtGui.QToolButton.InstantPopup)
+            widget.setShortcut("Alt+E")
+            show_shortcut_hint(widget)
+
+        show_view_menu = self.create_view_menu()
+        toolbar.addAction(show_view_menu)
+        widget = toolbar.widgetForAction(show_view_menu)
+        widget.setPopupMode(QtGui.QToolButton.InstantPopup)
+        widget.setShortcut("Alt+V")
+        show_shortcut_hint(widget)
+
+        spacer = QtGui.QWidget()
+        spacer.setSizePolicy(QtGui.QSizePolicy.Expanding,
+                QtGui.QSizePolicy.Expanding)
+        toolbar.addWidget(spacer)
+
+        self.throbber = ToolBarThrobberWidget(self)
+        toolbar.addWidget(self.throbber)
+        return toolbar
+
+    def create_find_action(self):
+        action = QtGui.QAction(get_icon("edit-find"),
+                gettext("&Find"), self)
+        action.setShortcut(QtGui.QKeySequence.Find)
+        action.setToolTip(gettext("Find on active panel"))
+        show_shortcut_hint(action)
+        action.setCheckable(True)
+        return action
+
+    def create_toggle_view_mode(self):
+        action = QtGui.QAction(get_icon("view-split-left-right"),
+                gettext("Unidiff"), self)
+        action.setToolTip(
+                gettext("Toggle between Side by side and Unidiff view modes"))
+        action.setShortcut("Ctrl+U")
+        show_shortcut_hint(action)
+        action.setCheckable(True)
+        action.setChecked(False);
+        self.connect(action,
+                     QtCore.SIGNAL("toggled (bool)"),
+                     self.click_toggle_view_mode)
+        return action
+
+    def create_refresh_action(self):
+        action = QtGui.QAction(get_icon("view-refresh"),
+                gettext("&Refresh"), self)
+        action.setShortcut("Ctrl+R")
+        show_shortcut_hint(action)
+        self.connect(action,
+                     QtCore.SIGNAL("triggered (bool)"),
+                     self.click_refresh)
+        return action
+
+    def create_ext_diff_action(self):
+        action = QtGui.QAction(get_icon("system-run"),
+                gettext("&External Diff"), self)
+        action.setToolTip(
+            gettext("Launch an external diff application"))
+        ext_diff_menu = ExtDiffMenu(parent=self, include_builtin = False)
+        action.setMenu(ext_diff_menu)
+        self.connect(ext_diff_menu,
+                QtCore.SIGNAL("triggered(QString)"),
+                self.ext_diff_triggered)
+        return action
+
+
+    def create_view_menu(self):
+        show_view_menu = QtGui.QAction(get_icon("document-properties"), gettext("&View Options"), self)
+        view_menu = QtGui.QMenu(gettext('View Options'), self)
+        show_view_menu.setMenu(view_menu)
+
+        view_complete = QtGui.QAction(gettext("&Complete"), self)
+        view_complete.setCheckable(True)
+        self.connect(view_complete,
+                     QtCore.SIGNAL("toggled (bool)"),
+                     self.click_complete)
+        view_menu.addAction(view_complete)
+
+        self.ignore_whitespace_action = self.create_ignore_ws_action()
+        view_menu.addAction(self.ignore_whitespace_action)
 
         def on_left_encoding_changed(encoding):
             if self.branches:
                 get_set_encoding(encoding, self.branches[0])
             self.click_refresh()
-        self.encoding_selector_left = EncodingSelector(encoding,
-                                            gettext("Left side encoding:"),
-                                            on_left_encoding_changed)
+
+        self.encoding_selector_left = EncodingMenuSelector(self.encoding,
+            gettext("Left side encoding"),
+            on_left_encoding_changed)
+        view_menu.addMenu(self.encoding_selector_left)
 
         def on_right_encoding_changed(encoding):
             if self.branches:
                 get_set_encoding(encoding, self.branches[1])
             self.click_refresh()
-        self.encoding_selector_right = EncodingSelector(encoding,
-                                            gettext("Right side encoding:"),
-                                            on_right_encoding_changed)
-
-
-        complete = QtGui.QCheckBox (gettext("Complete"),
-                                            self.centralwidget)
-        self.connect(complete,
-                     QtCore.SIGNAL("clicked(bool)"),
-                     self.click_complete)
-        complete.setChecked(self.complete);
-        
-        if has_ext_diff():
-            self.menu = ExtDiffMenu(include_builtin = False)
-            ext_diff_button = QtGui.QPushButton(gettext('Using'), self)
-            ext_diff_button.setMenu(self.menu)
-            self.connect(self.menu, QtCore.SIGNAL("triggered(QString)"),
-                         self.ext_diff_triggered)
-
-        buttonbox = self.create_button_box(BTN_CLOSE)
-
-        refresh = StandardButton(BTN_REFRESH)
-        refresh.setEnabled(self.can_refresh())
-        buttonbox.addButton(refresh, QtGui.QDialogButtonBox.ActionRole)
-        self.connect(refresh,
-                     QtCore.SIGNAL("clicked()"),
-                     self.click_refresh)
-        self.refresh_button = refresh
-
-        hbox = QtGui.QHBoxLayout()
-        hbox.addWidget(diffsidebyside)
-        hbox.addWidget(unidiff)
-        hbox.addWidget(complete)
-        if has_ext_diff():
-            hbox.addWidget(ext_diff_button)
-        hbox.addWidget(self.encoding_selector_left)
-        hbox.addWidget(self.encoding_selector_right)
-        hbox.addWidget(buttonbox)
-        vbox.addLayout(hbox)
+
+        self.encoding_selector_right = EncodingMenuSelector(self.encoding,
+            gettext("Right side encoding"),
+            on_right_encoding_changed)
+        view_menu.addMenu(self.encoding_selector_right)
+        return show_view_menu
+
+    def create_ignore_ws_action(self):
+        action = QtGui.QAction(gettext("&Ignore whitespace changes"), self)
+        action.setCheckable(True)
+        action.setChecked(self.ignore_whitespace);
+        self.connect_later(action,
+                     QtCore.SIGNAL("toggled (bool)"),
+                     self.click_ignore_whitespace)
+        return action
+
+    def eventFilter(self, object, event):
+        if event.type() == QtCore.QEvent.FocusIn:
+            if object in self.diffview.browsers:
+                self.find_toolbar.text_edit = object
+        return QBzrWindow.eventFilter(self, object, event)
+        # Why doesn't this work?
+        #return super(DiffWindow, self).eventFilter(object, event)
 
     def show(self):
         QBzrWindow.show(self)
@@ -233,33 +324,33 @@
         self.throbber.show()
         op.add_cleanup(self.throbber.hide)
         op.run()
-    
+
     def _initial_load(self, op):
-        (tree1, tree2,
-         branch1, branch2,
-         specific_files) = self.arg_provider.get_diff_window_args(
-                                        self.processEvents, op.add_cleanup)
-        
-        self.trees = (tree1, tree2)
-        self.branches = (branch1, branch2)
-        self.specific_files = specific_files
-        
+        args = self.arg_provider.get_diff_window_args(self.processEvents, op.add_cleanup)
+
+        self.trees = (args["old_tree"], args["new_tree"])
+        self.branches = (args.get("old_branch", None), args.get("new_branch",None))
+        self.specific_files = args.get("specific_files", None)
+        self.ignore_whitespace = args.get("ignore_whitespace", False)
+        self.ignore_whitespace_action.setChecked(self.ignore_whitespace)
+
+        self.process_delayed_connections()
         self.load_branch_info()
         self.load_diff()
-    
+
     def load_branch_info(self):
         self.set_diff_title()
-        
+
         self.encoding_selector_left.encoding = get_set_encoding(self.encoding, self.branches[0])
         self.encoding_selector_right.encoding = get_set_encoding(self.encoding, self.branches[1])
         self.processEvents()
-    
+
     def set_diff_title(self):
         rev1_title = get_title_for_tree(self.trees[0], self.branches[0],
                                         self.branches[1])
         rev2_title = get_title_for_tree(self.trees[1], self.branches[1],
                                         self.branches[0])
-        
+
         title = [gettext("Diff"), "%s..%s" % (rev1_title, rev2_title)]
 
         if self.specific_files:
@@ -277,7 +368,7 @@
         self.processEvents()
 
     def load_diff(self):
-        self.refresh_button.setEnabled(False)
+        self.view_refresh.setEnabled(False)
         for tree in self.trees: tree.lock_read()
         self.processEvents()
         try:
@@ -337,7 +428,7 @@
                                 # ghosts around us (see Bug #513096)
                                 dates[ix] = 0  # using 1970/1/1 instead
 
-                    properties_changed = [] 
+                    properties_changed = []
                     if bool(executable[0]) != bool(executable[1]):
                         descr = {True: "+x", False: "-x", None: None}
                         properties_changed.append((descr[executable[0]],
@@ -374,12 +465,7 @@
                             elif versioned == (False, True):
                                 groups = [[('insert', 0, 0, 0, len(lines[1]))]]
                             else:
-                                matcher = SequenceMatcher(None, lines[0], lines[1])
-                                self.processEvents()
-                                if self.complete:
-                                    groups = list([matcher.get_opcodes()])
-                                else:
-                                    groups = list(matcher.get_grouped_opcodes())
+                                groups = self.difference_groups(lines[0], lines[1])
                             ulines = []
                             for l, encoding in zip(lines, [self.encoding_selector_left.encoding,
                                                            self.encoding_selector_right.encoding]):
@@ -416,18 +502,34 @@
             QtGui.QMessageBox.information(self, gettext('Diff'),
                 gettext('No changes found.'),
                 gettext('&OK'))
-        self.refresh_button.setEnabled(self.can_refresh())
-
-    def click_unidiff(self, checked):
-        if checked:
-            self.sdiffview.rewind()
-            self.stack.setCurrentIndex(1)
-
-    def click_diffsidebyside(self, checked):
-        if checked:
-            self.diffview.rewind()
-            self.stack.setCurrentIndex(0)
-    
+        self.view_refresh.setEnabled(self.can_refresh())
+
+    def difference_groups(self, left, right):
+        if self.ignore_whitespace:
+            table = string.maketrans("", "")
+            strip = lambda l : l.translate(table, string.whitespace)
+            left  = (line.translate(table, string.whitespace) for line in left)
+            right = (line.translate(table, string.whitespace) for line in right)
+        matcher = SequenceMatcher(None, left, right)
+        self.processEvents()
+        if self.complete:
+            groups = list([matcher.get_opcodes()])
+        else:
+            groups = list(matcher.get_grouped_opcodes())
+
+        return groups
+
+    def click_toggle_view_mode(self, checked):
+        if checked:
+            view = self.sdiffview
+            self.find_toolbar.text_edit = view
+        else:
+            view = self.diffview
+            self.find_toolbar.text_edit = view.browsers[0]
+        view.rewind()
+        index = self.stack.indexOf(view)
+        self.stack.setCurrentIndex(index)
+
     def click_complete(self, checked ):
         self.complete = checked
         #Has the side effect of refreshing...
@@ -448,7 +550,15 @@
         if isinstance(tree1, MutableTree) or isinstance(tree2, MutableTree):
             return True
         return False
-    
+
     def ext_diff_triggered(self, ext_diff):
         """@param ext_diff: path to external diff executable."""
         show_diff(self.arg_provider, ext_diff=ext_diff, parent_window = self)
+
+    def click_ignore_whitespace(self, checked ):
+        self.ignore_whitespace = checked
+        #Has the side effect of refreshing...
+        self.diffview.clear()
+        self.sdiffview.clear()
+        run_in_loading_queue(self.load_diff)
+
 
=== modified file 'lib/resources.py'
--- lib/resources.py	2009-12-22 22:04:05 +0000
+++ lib/resources.py	2010-10-16 08:18:41 +0000
@@ -2,8 +2,8 @@
 
 # Resource object code
 #
-# Created: Fri Dec 18 15:04:38 2009
-#      by: The Resource Compiler for PyQt (Qt v4.5.2)
+# Created: Ma aug. 31 02:22:47 2010
+#      by: The Resource Compiler for PyQt (Qt v4.7.0)
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -323,6 +323,111 @@
 \x62\x92\x6e\xdf\x1c\xb8\x35\x76\xd9\x24\xeb\x89\x72\x63\xe8\xfd\
 \xc4\xfa\x07\x16\xd6\x69\xc5\x45\xde\xc7\x7f\x00\x00\x00\x00\x49\
 \x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x05\x0c\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x16\x00\x00\x00\x16\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\
+\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\
+\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\
+\x1b\xaf\x01\x5e\x1a\x91\x1c\x00\x00\x00\x07\x74\x49\x4d\x45\x07\
+\xd7\x0c\x1c\x0b\x31\x3b\x67\xd3\x82\x66\x00\x00\x04\x99\x49\x44\
+\x41\x54\x78\xda\xa5\x55\x5d\x48\x64\x65\x18\x7e\xe6\xcc\x9f\xff\
+\x4e\x88\xbf\xad\x4e\xce\xe8\xec\x68\xe9\x62\x20\x76\xb1\x26\x95\
+\xe0\xb6\x5d\x2d\x6d\xc4\xae\x17\xe1\x55\x14\xe6\x85\x8a\x46\x17\
+\xe2\x7a\x25\x4a\x48\x17\x11\x0a\x09\x11\x11\xc4\x8a\x11\x2b\xe5\
+\x4f\xcb\x6a\x8b\xcb\x48\x6a\xd6\xd8\x34\xea\xe8\x8e\xab\xe3\xff\
+\xfc\xff\x9e\x99\x39\xa7\xf7\x3b\x71\x16\xd4\xc2\xa2\x07\x1e\xe6\
+\xcc\xf9\xbe\x79\xbf\xf7\x7d\xde\xe7\x7b\x47\x81\x7f\x81\xf1\xf1\
+\xf1\xb7\xd2\xd3\xd3\xcb\x95\x4a\x25\xf6\xf7\xf7\xd7\x9a\x9b\x9b\
+\xef\xe2\xff\xa2\xba\xba\x5a\x65\xb1\x58\x62\xa1\x50\x48\x64\x5c\
+\x58\x58\x88\xd5\xd6\xd6\xaa\x70\x01\x38\x9c\x41\x4f\x4f\x4f\xfd\
+\xd0\xd0\x50\x93\xfc\xbd\xb0\xb0\xb0\x88\xb2\x55\xb3\x6c\x19\xd3\
+\xd2\xd2\xd4\x45\x04\x79\x7d\x72\x72\xf2\xda\xe8\xe8\x68\x3d\xce\
+\xe0\x94\x14\x7d\x7d\x7d\xb7\x08\x5f\xa8\x54\x2a\x6e\x6c\x6c\xec\
+\x4e\x59\x59\x59\xa5\xc9\x64\xba\x51\x52\x52\xa2\x05\x41\x14\x45\
+\x89\xbb\xbb\xbb\x31\x87\xc3\x31\xae\xd1\x68\x6c\x54\x51\x4f\x22\
+\x91\x10\xa6\xa7\xa7\xdf\x69\x69\x69\xf9\x1a\x67\xd1\xde\xde\x5e\
+\xbf\xba\xba\xca\xfb\x7c\x3e\x51\x2e\x3b\x1c\x0e\x4b\x9f\xc1\x60\
+\x50\x0c\x04\x02\xa2\xdf\xef\x17\xbd\x5e\xaf\xe8\xf1\x78\x44\xb7\
+\xdb\x2d\x9e\x9c\x9c\x88\xc7\xc7\xc7\x22\xe9\x2e\xda\xed\x76\xbe\
+\xbb\xbb\xfb\xaa\x1c\xef\xa9\x56\x54\x6e\x1a\x65\xc3\x45\x22\x11\
+\x64\x64\x64\x80\xb2\x06\x43\x38\x1c\x81\xc3\xe9\x82\x3f\x18\x41\
+\x32\x29\x20\x3d\x55\x03\xfd\xb3\xb9\xd0\x68\xd4\x2c\x7b\x7a\x97\
+\x04\xcf\xf3\xa0\x24\x38\x42\x86\x1c\x4f\x29\x3f\xcc\xcd\xcd\x39\
+\x8c\x46\x23\xca\xcb\xcb\x5f\x11\x04\x01\xa9\xa9\xa9\xb0\x3b\xb6\
+\x61\x59\x71\x20\x29\x72\x10\x88\x7c\x42\xc0\x89\x37\x8c\xe5\xdf\
+\xb7\xc0\x21\x89\x67\xb2\x33\x10\x8b\xc5\x58\x50\x4c\x4c\x4c\xdc\
+\xe9\xed\xed\xfd\xfc\x5c\xc6\x0c\x59\x59\x59\x2f\x50\x50\x69\xf3\
+\xe2\x8a\x0d\x6b\xce\x13\x6a\x56\x0a\x3c\xbe\x20\xe2\x89\xa4\x44\
+\x9e\x4f\xd0\x01\x22\xee\x2f\x6c\x20\xc6\xc7\x71\x29\x5f\xc7\xf6\
+\xb3\x2a\xcd\x90\x21\x67\x5c\x57\x57\xa7\x22\x16\x37\x36\x36\x7e\
+\x9a\x9d\x9d\xad\x64\x25\xff\x68\xb1\xb3\xde\x4a\x52\x94\x17\xeb\
+\x00\x21\x86\x9d\x7d\x2f\x42\x31\x01\x5e\x7f\x08\xc1\x50\x04\x36\
+\x87\x0b\x95\x86\x5c\x30\x68\xb5\x5a\x33\xf5\xe7\x4b\x9d\x4e\x17\
+\xa4\xe6\x0a\x8a\xe1\xe1\xe1\x9b\x55\x55\x55\x5f\x69\x48\x34\x5a\
+\x54\x30\x6d\x1f\xbb\xdc\x78\xb8\xb4\x05\x25\x3d\xd7\x3c\x6f\xc4\
+\xeb\x2f\x57\x81\x9a\x08\xb7\xc7\x83\x9f\x7f\xdd\x80\xc5\xea\xc2\
+\x91\x3b\x80\x60\x30\x84\xdb\xd7\x6b\x70\xd9\x50\x28\x59\x31\x1a\
+\x8d\x8a\xe4\x90\x38\x79\xbd\x99\xa3\xee\x9a\x48\x74\x0d\x4b\x8f\
+\x35\x82\xf1\xf1\xce\x31\xf6\x0e\x3d\xf0\xf8\xa3\x88\x0b\xdc\xd3\
+\x26\x69\x35\x1a\xbc\x76\xf5\x45\xbc\x7f\xfb\x55\x7a\xaf\x80\xeb\
+\xd0\x0d\xdb\xd6\x01\x0b\x2a\xad\x2b\xfe\x82\x86\x1c\x64\xe2\x98\
+\x3e\xf1\x78\x1c\x74\x12\xa3\xb4\xe1\xe0\xd8\x8b\xbb\xdf\x3f\xc2\
+\xdc\xd2\x26\x5c\x27\x61\xc8\x20\xfd\xa5\x75\x97\x3b\x86\x95\xb5\
+\x3d\xd8\x37\x5d\x14\x8c\x63\xef\xe5\xdf\xb3\x58\x8c\x0a\x15\x95\
+\xe8\x20\x2f\xc6\xc9\x6e\xaa\xcc\xcc\x4c\x05\x08\xa6\xd2\x02\x29\
+\xcb\x48\x94\x47\x30\x92\x80\x0c\x7f\x8c\xc3\xec\xe2\x21\x7e\x98\
+\xfb\x4d\xd2\x9f\xb6\xe0\x32\xed\x95\x03\x32\xaf\x53\xbc\x04\xf9\
+\x7e\x43\x35\x38\x38\xf8\x4d\x4e\x4e\xce\x77\x15\x15\x15\x97\x3a\
+\x3b\x3b\xad\xf9\xf9\xf9\x1a\xf3\x73\xb9\x30\x96\xe4\xe1\xd0\xe7\
+\xc3\x4f\xcb\x5b\x28\x2b\x2d\x86\x36\x2d\x0b\xf6\x9d\x04\x9c\x4f\
+\xfc\xa4\x65\x04\xa1\x80\x0f\x65\xfa\x3c\x98\xf4\xb9\xe4\x94\x18\
+\x0e\x0e\x0e\xf8\xfe\xfe\xfe\x6a\x9b\xcd\xf6\x84\x9a\x18\x91\x5c\
+\x41\x97\x22\xb1\xbd\xbd\xed\x6e\x68\x68\xb8\x92\x97\x97\x57\x09\
+\xc2\x15\xb3\x1e\xf7\xee\x2f\x92\x2b\xa2\xd8\xf7\x09\xf0\x47\x15\
+\xf0\xf9\x03\x70\x3a\x9d\xd8\x5c\xb7\x21\x1a\xf2\xe2\xe3\x0f\x6f\
+\x21\x3d\x85\x93\x32\x5e\x5f\x5f\x1f\x1f\x19\x19\xf9\x8c\xa4\x8d\
+\x9f\xf3\x31\x5d\x51\x2b\x2d\xdc\x64\x37\x29\x37\x5b\x8d\x4f\x3e\
+\x7a\x1b\x83\xa3\x53\x78\x34\x37\x03\xeb\x2f\x3a\x30\x04\xfc\x3e\
+\xe8\x0b\xb3\x31\x3c\xf4\x01\xcc\x86\x02\x96\xa9\x14\x98\xe4\xb4\
+\xfe\xed\x10\xa2\xd3\x9a\xe8\xd6\x4d\xa8\xd5\x6a\x25\x81\x5d\x69\
+\x89\x6a\x72\xc2\x1f\x9b\xfb\x58\x77\x1e\x82\x53\x28\x60\x36\x16\
+\x51\x35\x25\xcc\x01\x60\x60\x49\xd0\xfc\x00\xe9\x9a\x5c\x5a\x5a\
+\x7a\xa3\xa3\xa3\x63\xf2\x54\xc6\x54\x4a\xc2\x60\x30\x88\x34\x16\
+\x21\x8f\x48\xb2\x21\x44\xea\xb8\xb9\x34\x9f\x91\x05\x63\x64\xd2\
+\x9d\x72\x0a\x25\xc3\xdc\x22\xba\x5c\xae\xc4\xb9\x59\x31\x3f\x3f\
+\xbf\x45\xe3\xd1\xa5\xd7\xeb\xaf\xd3\x66\x91\x66\xc7\x20\x35\x61\
+\x2f\x25\x25\xc5\x48\x73\x43\xc5\x02\xca\x81\x8e\x8e\x8e\xa2\x56\
+\xab\xf5\xdb\xe5\xe5\xe5\x7b\xd4\x93\x97\xe8\x20\x61\x66\x66\xe6\
+\xbd\x81\x81\x81\x31\xfc\x13\xda\xda\xda\x9a\xba\xba\xba\x6e\x30\
+\x99\x18\x6b\x6a\x6a\x4c\xb3\xb3\xb3\x02\x8d\x54\x91\xf1\xc1\x83\
+\x07\x02\x7b\x27\xaf\x53\xe9\x6f\xb6\xb6\xb6\x5e\xc3\x7f\x45\x41\
+\x41\x81\x76\x6a\x6a\x8a\x27\x1b\x89\x8c\xf4\x8f\xc1\xd3\x1f\x88\
+\x16\x17\x40\x85\x0b\x40\x43\x9c\xa7\x8c\xdf\xa5\x60\x26\x10\x48\
+\xc7\x35\x22\x8f\x0b\xf0\x27\x9b\x2f\xb2\xa4\xb3\x87\x63\xc7\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x3c\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x16\x00\x00\x00\x16\x08\x06\x00\x00\x00\xc4\xb4\x6c\x3b\
+\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\
+\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\
+\x00\x00\x09\x70\x48\x59\x73\x00\x00\x06\xec\x00\x00\x06\xec\x01\
+\x1e\x75\x38\x35\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xd8\x0c\x1c\
+\x14\x18\x23\xd6\xd5\xd3\x43\x00\x00\x00\xbc\x49\x44\x41\x54\x38\
+\xcb\xed\x95\xc1\x0a\x82\x40\x14\x45\xcf\xe8\xe4\x62\x92\x90\x96\
+\x05\xf5\x0b\xd1\xb7\x4b\xbf\xd1\x1f\x08\xba\x6a\x6d\xe5\x62\xe6\
+\x4d\xb6\x28\xb4\x85\x88\x81\x42\x90\x77\x75\x07\xce\x3b\x0c\xbc\
+\xc5\x53\xbc\xa2\x18\x37\xb5\x02\x56\xc0\x1e\x58\x8c\x24\x75\x40\
+\xae\x81\x5d\x55\x55\xe7\xc7\xa3\x0e\xc7\xb0\x06\x81\xf2\xc6\x98\
+\x83\x06\xa2\xb2\xbc\x86\x5a\x6b\x00\x6e\xb7\x7b\xef\x60\x1c\x2f\
+\x1b\xae\xab\x8b\x48\x08\x44\xfa\xfd\xa0\x28\x72\x00\x92\x64\xdd\
+\x2b\xce\xb2\x4b\xc3\x75\xf5\xcd\x66\x0b\x80\x06\x70\x4e\x30\x26\
+\x06\xc0\x5a\xdb\x2b\xfe\xe4\xba\xba\x73\xd2\x8a\xbd\x17\x44\x64\
+\x94\xcd\x79\xdf\x7a\x8e\xf5\xc0\xa4\xe9\x69\x10\x07\x1c\x83\xef\
+\x36\x3e\x1c\x9f\xc5\xb3\xf8\x0f\xc5\xfc\xc6\x8f\xed\x04\x62\x3b\
+\xd9\x69\x52\x53\x1d\xd3\x27\xd3\xf0\x95\x3a\x8b\x52\x56\x44\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
 \x00\x00\x02\x90\
 \x89\
 \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
@@ -1714,6 +1819,15 @@
 \x00\x68\x15\xe7\
 \x00\x62\
 \x00\x7a\x00\x72\x00\x2d\x00\x33\x00\x32\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0e\
+\x09\x14\x31\x07\
+\x00\x73\
+\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x2d\x00\x72\x00\x75\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x01\x7d\x34\xe7\
+\x00\x76\
+\x00\x69\x00\x65\x00\x77\x00\x2d\x00\x73\x00\x70\x00\x6c\x00\x69\x00\x74\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2d\x00\x72\
+\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\
 \x00\x11\
 \x01\x82\x9d\x27\
 \x00\x69\
@@ -1824,36 +1938,38 @@
 
 qt_resource_struct = "\
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x05\x00\x00\x00\x01\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x10\x00\x00\x00\x0f\
-\x00\x00\x00\x10\x00\x02\x00\x00\x00\x09\x00\x00\x00\x06\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x10\x00\x00\x00\x11\
+\x00\x00\x00\x10\x00\x02\x00\x00\x00\x0b\x00\x00\x00\x06\
 \x00\x00\x00\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x09\xe9\
 \x00\x00\x00\x54\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x79\
 \x00\x00\x00\x20\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x00\x90\x00\x00\x00\x00\x00\x01\x00\x00\x18\x35\
+\x00\x00\x00\xc8\x00\x00\x00\x00\x00\x01\x00\x00\x19\x75\
+\x00\x00\x01\x10\x00\x00\x00\x00\x00\x01\x00\x00\x20\x4f\
+\x00\x00\x01\xca\x00\x00\x00\x00\x00\x01\x00\x00\x36\x18\
+\x00\x00\x01\x84\x00\x00\x00\x00\x00\x01\x00\x00\x2a\x68\
+\x00\x00\x01\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x30\xc0\
 \x00\x00\x00\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x13\x25\
-\x00\x00\x00\xb6\x00\x00\x00\x00\x00\x01\x00\x00\x19\xff\
-\x00\x00\x01\x70\x00\x00\x00\x00\x00\x01\x00\x00\x2f\xc8\
-\x00\x00\x01\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x24\x18\
-\x00\x00\x01\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x2a\x70\
-\x00\x00\x00\x96\x00\x00\x00\x00\x00\x01\x00\x00\x15\xb9\
-\x00\x00\x01\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x20\x72\
-\x00\x00\x01\x90\x00\x00\x00\x00\x00\x01\x00\x00\x36\x2f\
-\x00\x00\x00\xea\x00\x00\x00\x00\x00\x01\x00\x00\x1c\xb3\
-\x00\x00\x02\x00\x00\x00\x00\x00\x00\x01\x00\x00\x42\xe2\
-\x00\x00\x03\xb4\x00\x00\x00\x00\x00\x01\x00\x00\x63\x38\
-\x00\x00\x01\xd8\x00\x00\x00\x00\x00\x01\x00\x00\x40\x66\
-\x00\x00\x03\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x55\xd4\
-\x00\x00\x01\xac\x00\x00\x00\x00\x00\x01\x00\x00\x3a\x51\
-\x00\x00\x03\x68\x00\x00\x00\x00\x00\x01\x00\x00\x5b\x14\
-\x00\x00\x01\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x5c\xd3\
-\x00\x00\x02\x8c\x00\x00\x00\x00\x00\x01\x00\x00\x4c\x2b\
-\x00\x00\x03\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x58\x40\
-\x00\x00\x02\xde\x00\x00\x00\x00\x00\x01\x00\x00\x51\x0a\
-\x00\x00\x02\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x49\xac\
-\x00\x00\x02\x16\x00\x00\x00\x00\x00\x01\x00\x00\x44\x4f\
-\x00\x00\x02\x42\x00\x00\x00\x00\x00\x01\x00\x00\x47\x0a\
-\x00\x00\x03\x86\x00\x00\x00\x00\x00\x01\x00\x00\x60\x67\
-\x00\x00\x02\xb4\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x89\
-\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x53\x00\
+\x00\x00\x00\xf0\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x09\
+\x00\x00\x01\x68\x00\x00\x00\x00\x00\x01\x00\x00\x26\xc2\
+\x00\x00\x01\xea\x00\x00\x00\x00\x00\x01\x00\x00\x3c\x7f\
+\x00\x00\x01\x44\x00\x00\x00\x00\x00\x01\x00\x00\x23\x03\
+\x00\x00\x02\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x49\x32\
+\x00\x00\x04\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x69\x88\
+\x00\x00\x02\x32\x00\x00\x00\x00\x00\x01\x00\x00\x46\xb6\
+\x00\x00\x03\x78\x00\x00\x00\x00\x00\x01\x00\x00\x5c\x24\
+\x00\x00\x02\x06\x00\x00\x00\x00\x00\x01\x00\x00\x40\xa1\
+\x00\x00\x03\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x61\x64\
+\x00\x00\x01\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x63\x23\
+\x00\x00\x02\xe6\x00\x00\x00\x00\x00\x01\x00\x00\x52\x7b\
+\x00\x00\x03\x96\x00\x00\x00\x00\x00\x01\x00\x00\x5e\x90\
+\x00\x00\x03\x38\x00\x00\x00\x00\x00\x01\x00\x00\x57\x5a\
+\x00\x00\x02\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x4f\xfc\
+\x00\x00\x02\x70\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x9f\
+\x00\x00\x02\x9c\x00\x00\x00\x00\x00\x01\x00\x00\x4d\x5a\
+\x00\x00\x03\xe0\x00\x00\x00\x00\x00\x01\x00\x00\x66\xb7\
+\x00\x00\x03\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x54\xd9\
+\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x59\x50\
 "
 
 def qInitResources():
 
=== modified file 'lib/util.py'
--- lib/util.py	2010-09-06 09:13:15 +0000
+++ lib/util.py	2010-10-16 08:18:41 +0000
@@ -745,6 +745,15 @@
             done.add(item)
             combo.addItem(item)
 
+def show_shortcut_hint(action):
+    """Show this action's shortcut, if any, as part of the tooltip.
+    
+    Make sure to set the shortcut and tooltip *before* calling this.
+    """
+    shortcut = action.shortcut()
+    if shortcut and shortcut.toString():
+        toolTip = action.toolTip()
+        action.setToolTip("%s (%s)" % (toolTip, shortcut.toString()))
 
 def iter_saved_pull_locations():
     """ Iterate the 'pull' locations we have previously saved for the user.
@@ -1022,9 +1031,11 @@
         
         prev = self.addAction(get_icon("go-previous"), gettext("Previous"))
         prev.setShortcut(QtGui.QKeySequence.FindPrevious)
+        show_shortcut_hint(prev)
         
         next = self.addAction(get_icon("go-next"), gettext("Next"))
         next.setShortcut(QtGui.QKeySequence.FindNext)
+        show_shortcut_hint(next)
         
         self.case_sensitive = QtGui.QCheckBox(gettext("Case sensitive"), self)
         self.addWidget(self.case_sensitive)
@@ -1088,7 +1099,7 @@
         self.find(self.text_edit.textCursor().selectionStart(), 0,
                   self.find_get_flags())
     
-    def find_next(self, state):
+    def find_next(self):
         self.find(self.text_edit.textCursor().selectionEnd(), 0,
                   self.find_get_flags())
     
@@ -1112,6 +1123,10 @@
         else:
             self.text_edit.setTextCursor(cursor)
 
+    def set_text_edit(self, new_text_edit):
+        if self.text_edit:
+            self.text_edit.setTextCursor(QtGui.QTextCursor())
+        self.text_edit = new_text_edit
 
 class InfoWidget(QtGui.QFrame):
     def __init__(self, parent=None):