/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: Mateusz Korniak
  • Date: 2007-09-11 10:17:33 UTC
  • mto: This revision was merged to the branch mainline in revision 275.
  • Revision ID: matkor@laptop-hp-20070911101733-k4ua1t0itz725o96
Add default_branch_path to MergeDialog and use it from olive-gtk

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
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. """