Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

hggtk: get rid of close buttons on toolbar

Changeset 88e98adbc4b2

Parent 4301178886fd

by Germ├бn P├│o-Caama├▒o

Changes to 11 files · Browse files at 88e98adbc4b2 Showing diff from parent 4301178886fd Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​backout.py Stacked
 
34
35
36
37
38
39
40
41
 
42
43
44
 
76
77
78
79
80
81
82
83
84
 
34
35
36
 
 
 
 
 
37
38
39
40
 
72
73
74
 
 
 
75
76
77
@@ -34,11 +34,7 @@
  tbuttons = [   self._toolbutton(gtk.STOCK_GO_BACK, 'Backout',   self._backout_clicked, - 'Backout selected changeset'), - sep, - self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, - 'Close Window') + 'Backout selected changeset')   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -76,9 +72,6 @@
  ' effect of the change being backed out.')   vbox.pack_start(frame, True, True, 4)   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def set_notify_func(self, func, *args):   self.notify_func = func   self.notify_args = args
Change 1 of 2 Show Entire File hggtk/​clone.py Stacked
 
68
69
70
71
72
73
74
75
76
77
78
79
80
 
185
186
187
188
189
190
191
192
193
 
68
69
70
 
 
 
 
 
 
 
71
72
73
 
178
179
180
 
 
 
181
182
183
@@ -68,13 +68,6 @@
  ]   for btn in tbuttons:   self.tbar.insert(btn, -1) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self.tbar.insert(sep, -1) - button = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application') - self.tbar.insert(button, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2) @@ -185,9 +178,6 @@
  vbox.pack_end(self._remote_cmd, False, False, 1)   vbox.pack_end(lbl, False, False, 1)   - def _close_clicked(self, toolbutton, data=None): - gtk.main_quit() -   def _toolbutton(self, stock, label, handler,   menu=None, userdata=None, tip=None):   if menu:
Change 1 of 2 Show Entire File hggtk/​gdialog.py Stacked
 
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
 
312
313
314
315
316
317
318
319
320
321
322
323
 
283
284
285
 
 
 
 
 
 
 
 
 
 
 
 
 
286
287
288
 
299
300
301
 
 
 
 
 
 
302
303
304
@@ -283,19 +283,6 @@
  tbuttons = self.get_tbbuttons()   for tbutton in tbuttons:   toolbar.insert(tbutton, -1) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - toolbar.insert(sep, -1) - if self.main: - name = 'Quit' - tip = 'Close Application' - else: - name = 'Close' - tip = 'Close Window' - button = self.make_toolbutton(gtk.STOCK_CLOSE, name, - self._quit_clicked, tip=tip) - toolbar.insert(button, -1)   self.toolbar = toolbar   vbox.pack_start(toolbar, False, False, 0)   @@ -312,12 +299,6 @@
  self.connect('delete_event', self.should_live)     - - def _quit_clicked(self, button, data=None): - if not self.should_live(): - self.destroy() - -   def _destroying(self, gtkobj):   try:   settings = self.save_settings()
Change 1 of 3 Show Entire File hggtk/​hgemail.py Stacked
 
31
32
33
34
35
36
37
38
39
40
41
42
 
44
45
46
47
48
49
 
50
51
52
 
174
175
176
177
178
179
180
181
182
 
31
32
33
 
 
 
 
 
 
34
35
36
 
38
39
40
 
 
 
41
42
43
44
 
166
167
168
 
 
 
169
170
171
@@ -31,12 +31,6 @@
  self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()   - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, 'Close Window') -   tbuttons = [   self._toolbutton(gtk.STOCK_GOTO_LAST, 'Send',   self._on_send_clicked, @@ -44,9 +38,7 @@
  gtk.SeparatorToolItem(),   self._toolbutton(gtk.STOCK_PREFERENCES, 'configure',   self._on_conf_clicked, - 'Configure email settings'), - sep, - self._btn_close + 'Configure email settings')   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -174,9 +166,6 @@
    self.connect('map_event', self._on_window_map_event)   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _toolbutton(self, stock, label, handler, tip):   tbutton = gtk.ToolButton(stock)   tbutton.set_label(label)
Change 1 of 2 Show Entire File hggtk/​hgignore.py Stacked
 
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
 
42
43
44
 
157
158
159
160
161
162
163
164
165
 
26
27
28
 
 
 
 
 
 
29
30
31
32
 
 
 
33
34
35
36
 
149
150
151
 
 
 
152
153
154
@@ -26,19 +26,11 @@
  self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()   - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, 'Close Window') -   tbuttons = [   self._toolbutton(gtk.STOCK_REFRESH,   'Refresh',   self._refresh_clicked, - tip='Reload hgignore'), - sep, - self._btn_close + tip='Reload hgignore')   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -157,9 +149,6 @@
  except IOError:   pass   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _toolbutton(self, stock, label, handler, tip):   tbutton = gtk.ToolButton(stock)   tbutton.set_label(label)
Change 1 of 2 Show Entire File hggtk/​merge.py Stacked
 
59
60
61
62
63
64
65
66
67
68
69
70
71
72
 
73
74
75
 
113
114
115
116
117
118
119
120
121
 
59
60
61
 
 
 
 
 
62
63
64
 
 
 
65
66
67
68
 
106
107
108
 
 
 
109
110
111
@@ -59,17 +59,10 @@
  self._btn_unmerge_clicked,   tip='Undo merging and return working directory to'   ' one of it parent revision') - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application')   tbuttons = [   self._btn_merge,   gtk.SeparatorToolItem(), - self._btn_unmerge, - sep, - self._btn_close + self._btn_unmerge   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -113,9 +106,6 @@
  # show them all   self._refresh()   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _toolbutton(self, stock, label, handler,   menu=None, userdata=None, tip=None):   if menu:
Change 1 of 2 Show Entire File hggtk/​recovery.py Stacked
 
75
76
77
78
79
80
81
82
83
84
85
86
87
 
101
102
103
104
105
106
107
108
109
 
75
76
77
 
 
 
 
 
 
 
78
79
80
 
94
95
96
 
 
 
97
98
99
@@ -75,13 +75,6 @@
  ]   for btn in tbuttons:   self.tbar.insert(btn, -1) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self.tbar.insert(sep, -1) - button = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application') - self.tbar.insert(button, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2) @@ -101,9 +94,6 @@
  self.stbar = gtklib.StatusBar()   vbox.pack_start(self.stbar, False, False, 2)   - def _close_clicked(self, *args): - self._do_close() -   def _delete(self, widget, event):   self._do_close()   return True
Change 1 of 3 Show Entire File hggtk/​serve.py Stacked
 
75
76
77
78
79
80
81
82
83
84
85
 
88
89
90
91
92
93
94
95
 
146
147
148
149
150
151
152
153
154
155
 
75
76
77
 
 
 
 
 
78
79
80
 
83
84
85
 
 
86
87
88
 
139
140
141
 
 
 
 
142
143
144
@@ -75,11 +75,6 @@
  'Configure',   self._on_conf_clicked,   None) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._button_close = self._toolbutton(gtk.STOCK_CLOSE, 'Quit', - self._close_clicked)     tbuttons = [   self._button_start, @@ -88,8 +83,6 @@
  self._button_browse,   gtk.SeparatorToolItem(),   self._button_conf, - sep, - self._button_close,   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -146,10 +139,6 @@
  tbutton.connect('clicked', handler, userdata)   return tbutton   - def _close_clicked(self, *args): - if self._server_stopped() == True: - gtk.main_quit() -   def _delete(self, widget, event):   if self._server_stopped() == True:   gtk.main_quit()
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
97
98
99
100
101
102
103
104
105
106
107
108
109
 
97
98
99
 
 
 
 
 
 
 
100
101
102
@@ -97,13 +97,6 @@
  ]   for btn in tbuttons:   self.tbar.insert(btn, -1) - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self.tbar.insert(sep, -1) - button = self._toolbutton(gtk.STOCK_CLOSE, 'Quit', - self._close_clicked, tip='Quit Application') - self.tbar.insert(button, -1)   vbox = gtk.VBox()   self.add(vbox)   vbox.pack_start(self.tbar, False, False, 2)
Change 1 of 3 Show Entire File hggtk/​tagadd.py Stacked
 
48
49
50
51
52
53
54
55
56
57
58
59
 
66
67
68
69
70
71
 
72
73
74
 
149
150
151
152
153
154
155
156
157
 
48
49
50
 
 
 
 
 
 
51
52
53
 
60
61
62
 
 
 
63
64
65
66
 
141
142
143
 
 
 
144
145
146
@@ -48,12 +48,6 @@
  self.tbar = gtk.Toolbar()   self.tips = gtk.Tooltips()   - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application') -   self._btn_addtag = self._toolbutton(   gtk.STOCK_ADD,   'Add', @@ -66,9 +60,7 @@
  tip='Remove tag from repository')   tbuttons = [   self._btn_addtag, - self._btn_rmtag, - sep, - self._btn_close, + self._btn_rmtag   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -149,9 +141,6 @@
  continue   self._tagslist.append([tagname])   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _btn_tag_clicked(self, button):   """ select tag from tags dialog """   import tags
Change 1 of 2 Show Entire File hggtk/​update.py Stacked
 
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
 
113
114
115
116
117
118
119
120
121
 
56
57
58
 
 
 
 
 
59
60
 
 
61
62
63
 
106
107
108
 
 
 
109
110
111
@@ -56,15 +56,8 @@
  'Update',   self._btn_update_clicked,   tip='Update working directory to selected revision') - sep = gtk.SeparatorToolItem() - sep.set_expand(True) - sep.set_draw(False) - self._btn_close = self._toolbutton(gtk.STOCK_CLOSE, 'Close', - self._close_clicked, tip='Close Application')   tbuttons = [   self._btn_update, - sep, - self._btn_close,   ]   for btn in tbuttons:   self.tbar.insert(btn, -1) @@ -113,9 +106,6 @@
  # show them all   self._refresh()   - def _close_clicked(self, toolbutton, data=None): - self.destroy() -   def _toolbutton(self, stock, label, handler,   menu=None, userdata=None, tip=None):   if menu: