/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to merge.py

  • Committer: Daniel Schierbeck
  • Date: 2008-04-02 23:21:11 UTC
  • mto: This revision was merged to the branch mainline in revision 481.
  • Revision ID: daniel.schierbeck@gmail.com-20080402232111-a2psy91ng4m9pvnb
Fixed bug where the broken lines markers were not drawn correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
28
28
from bzrlib.branch import Branch
29
29
import bzrlib.errors as errors
30
30
 
31
 
from olive.dialog import error_dialog, info_dialog, warning_dialog
 
31
from dialog import error_dialog, info_dialog, warning_dialog
32
32
from errors import show_bzr_error
33
33
from olive.guifiles import GLADEFILENAME
34
34
 
35
35
 
36
36
class MergeDialog:
37
37
    """ Display the Merge dialog and perform the needed actions. """
38
 
    def __init__(self, wt, wtpath):
 
38
    def __init__(self, wt, wtpath,default_branch_path=None):
39
39
        """ Initialize the Merge dialog. """
40
40
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_merge', 'olive-gtk')
41
41
        
54
54
        
55
55
        # Get some widgets
56
56
        self.entry = self.glade.get_widget('entry_merge')
 
57
        if default_branch_path:
 
58
            self.entry.set_text(default_branch_path)
57
59
 
58
60
    def display(self):
59
61
        """ Display the Add file(s) dialog. """