Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge: change base class to gtk.Dialog

Changeset 0dee8aa0dbc7…

Parent 4a62db95ba75…

by Yuki KODAMA

Changes to one file · Browse files at 0dee8aa0dbc7 Showing diff from parent 4a62db95ba75 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
17
18
19
20
 
21
22
23
24
 
25
26
27
 
28
29
30
 
40
41
42
43
44
45
46
47
48
49
50
 
51
52
53
54
55
56
 
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
 
77
78
79
80
81
82
83
84
85
86
 
 
 
 
87
88
89
 
91
92
93
94
95
 
 
 
96
97
98
 
17
18
19
 
20
21
22
23
 
24
25
26
27
28
29
30
31
 
41
42
43
 
 
 
44
45
46
47
 
48
49
50
51
52
53
 
54
55
56
57
58
59
 
 
 
 
60
61
 
 
 
 
62
63
 
64
65
66
67
 
 
 
 
 
 
 
 
 
68
69
70
71
72
73
74
 
76
77
78
 
 
79
80
81
82
83
84
@@ -17,14 +17,15 @@
   from tortoisehg.hgtk import changesetinfo, gtklib, commit, gdialog, hgcmd   -class MergeDialog(gtk.Window): +class MergeDialog(gtk.Dialog):   """ Dialog to merge revisions of a Mercurial repo """   def __init__(self, rev=None):   """ Initialize the Dialog """ - gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL) + gtk.Dialog.__init__(self)   gtklib.set_tortoise_icon(self, 'menumerge.ico')   gtklib.set_tortoise_keys(self)   self.set_default_size(350, 120) + self.set_has_separator(False)   self.notify_func = None     if not rev: @@ -40,50 +41,34 @@
  return   self.set_title(_('Merging in %s') % hglib.get_reponame(repo))   - vbox = gtk.VBox() - self.add(vbox) -   frame = gtk.Frame(_('Merge target (other)'))   other, desc = changesetinfo.changesetinfo(repo, rev, True)   frame.add(desc)   frame.set_border_width(5) - vbox.pack_start(frame, False, False, 2) + self.vbox.pack_start(frame, False, False)     frame = gtk.Frame(_('Current revision (local)'))   local, desc = changesetinfo.changesetinfo(repo, '.', True)   frame.add(desc)   frame.set_border_width(5) - vbox.pack_start(frame, False, False, 2) + self.vbox.pack_start(frame, False, False)     accelgroup = gtk.AccelGroup()   self.add_accel_group(accelgroup)   mod = gtklib.get_thg_modifier()   - hbbox = gtk.HButtonBox() - hbbox.set_layout(gtk.BUTTONBOX_END) - vbox.pack_start(hbbox, False, False, 2) -   close = gtk.Button(_('Close'))   close.connect('clicked', lambda x: self.destroy()) - key, modifier = gtk.accelerator_parse('Escape') - close.add_accelerator('clicked', accelgroup, key, 0, - gtk.ACCEL_VISIBLE) -   undo = gtk.Button(_('Undo'))   undo.set_sensitive(False) -   commit = gtk.Button(_('Commit'))   commit.set_sensitive(False) + merge = gtk.Button(_('Merge'))   - merge = gtk.Button(_('Merge')) - key, modifier = gtk.accelerator_parse(mod+'Return') - merge.add_accelerator('clicked', accelgroup, key, modifier, - gtk.ACCEL_VISIBLE) - - hbbox.add(merge) - hbbox.add(commit) - hbbox.add(undo) - hbbox.add(close) + self.action_area.add(merge) + self.action_area.add(commit) + self.action_area.add(undo) + self.action_area.add(close)     vlist = gtk.ListStore(str, bool)   combo = gtk.ComboBoxEntry(vlist, 0) @@ -91,8 +76,9 @@
  combo.set_row_separator_func(lambda model, path: model[path][1])   combo.child.set_width_chars(8)   lbl = gtk.Label(_('mergetool:')) - hbbox.add(lbl) - hbbox.add(combo) + lbl.set_alignment(1, 0.5) + self.action_area.add(lbl) + self.action_area.add(combo)   vlist.append(('', False))   for tool in hglib.mergetools(repo.ui):   vlist.append((hglib.toutf(tool), False))