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

stable gdialog: fix escaping issues of common dialogs

Changeset 6c0cf7814f7f…

Parent e51850590d03…

by Yuki KODAMA

Changes to one file · Browse files at 6c0cf7814f7f Showing diff from parent e51850590d03 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​gdialog.py Stacked
 
34
35
36
37
38
 
 
39
40
41
42
43
44
 
45
46
47
 
55
56
57
58
 
 
59
60
61
62
63
64
65
66
 
 
67
68
69
 
84
85
86
87
88
 
89
90
91
 
34
35
36
 
 
37
38
39
40
41
42
43
 
44
45
46
47
 
55
56
57
 
58
59
60
61
62
63
64
65
 
 
66
67
68
69
70
 
85
86
87
 
 
88
89
90
91
@@ -34,14 +34,14 @@
  SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,   type, gtk.BUTTONS_CLOSE)   self.set_title('TortoiseHg') - self.set_markup('<b>' + hglib.toutf(title) + '</b>') - self.format_secondary_markup(hglib.toutf(message)) + self.set_markup(gtklib.markup(hglib.toutf(title), weight='bold')) + self.format_secondary_text(hglib.toutf(message))   mod = gtklib.get_thg_modifier()   key, modifier = gtk.accelerator_parse(mod+'Return')   accel_group = gtk.AccelGroup()   self.add_accel_group(accel_group)   buttons = self.get_children()[0].get_children()[1].get_children() - buttons[0].add_accelerator("clicked", accel_group, key, + buttons[0].add_accelerator('clicked', accel_group, key,   modifier, gtk.ACCEL_VISIBLE)    class CustomPrompt(gtk.MessageDialog): @@ -55,15 +55,16 @@
  gtk.MessageDialog.__init__(self, parent, gtk.DIALOG_MODAL,   gtk.MESSAGE_QUESTION)   self.set_title(hglib.toutf(title)) - self.format_secondary_markup('<b>' + hglib.toutf(message) + '</b>') + self.format_secondary_markup(gtklib.markup(hglib.toutf(message), + weight='bold'))   accel_group = gtk.AccelGroup()   self.add_accel_group(accel_group)   for i, s in enumerate(choices):   button = self.add_button(s.replace('&', '_'), i)   try:   char = s[s.index('&')+1].lower() - button.add_accelerator('clicked', accel_group, ord(char), 0, - gtk.ACCEL_VISIBLE) + button.add_accelerator('clicked', accel_group, ord(char), + 0, gtk.ACCEL_VISIBLE)   except ValueError:   pass   if default: @@ -84,8 +85,7 @@
  SimpleMessage.__init__(self, parent, gtk.DIALOG_MODAL,   gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO)   self.set_title(hglib.toutf(title)) - primary = '<b>' + primary + '</b>' - self.set_markup(hglib.toutf(primary)) + self.set_markup(gtklib.markup(hglib.toutf(primary), weight='bold'))   message = ''   for i, f in enumerate(files):   message += ' ' + f + '\n'