Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

history: catch up with new menu structure

Changeset 60e4023dd695

Parent 4c79056fd70f

by Yuki KODAMA

Changes to one file · Browse files at 60e4023dd695 Showing diff from parent 4c79056fd70f Diff from another changeset...

 
284
285
286
287
 
 
288
289
290
 
305
306
307
308
309
 
 
 
310
311
312
 
315
316
317
318
 
319
320
321
322
323
324
325
326
327
328
329
330
 
 
 
 
 
 
 
 
 
 
 
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
366
367
368
 
284
285
286
 
287
288
289
290
291
 
306
307
308
 
 
309
310
311
312
313
314
 
317
318
319
 
320
321
 
 
 
 
 
 
 
 
 
 
 
322
323
324
325
326
327
328
329
330
331
332
333
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
@@ -284,7 +284,8 @@
  else:   p4menu = []   - return [(_('_View'), [ + return [ + dict(text=_('_View'), subitems=[   dict(text=_('Load more Revisions'), name='load-more',   func=self.more_clicked, icon=gtk.STOCK_GO_DOWN),   dict(text=_('Load all Revisions'), name='load-all', @@ -305,8 +306,9 @@
  dict(text=_('Choose Details...'), func=self.details_clicked,   icon='general.ico'),   dict(text='----'), - dict(name='compact-graph', text=(_('Compact Graph')), ascheck=True, - func=self.toggle_compactgraph, check=self.compactgraph), + dict(name='compact-graph', text=(_('Compact Graph')), + ascheck=True, func=self.toggle_compactgraph, + check=self.compactgraph),   dict(name='color-by-branch', text=_('Color by Branch'),   ascheck=True, func=self.toggle_branchcolor,   check=self.branch_color), @@ -315,54 +317,54 @@
  dict(name='always-show-output', text=(_('Always Show Output')),   ascheck=True, func=self.toggle_showoutput,   check=self.showoutput), - ]), + ]),   - (_('_Navigate'), [ - dict(text=_('Tip'), func=navigate, args=['tip'], - icon=gtk.STOCK_ABOUT), - dict(text=_('Working Parent'), func=navigate, args=['.'], - icon=gtk.STOCK_HOME), - dict(text=_('Previously Selected'), icon=gtk.STOCK_GO_BACK, - func=lambda *a: self.goto_prev_sel()), - dict(text='----'), - dict(text=_('Revision...'), icon=gtk.STOCK_JUMP_TO, - func=lambda *a: self.show_goto_dialog()), - ] + bmenus), + dict(text=_('_Navigate'), subitems=[ + dict(text=_('Tip'), func=navigate, args=['tip'], + icon=gtk.STOCK_ABOUT), + dict(text=_('Working Parent'), func=navigate, args=['.'], + icon=gtk.STOCK_HOME), + dict(text=_('Previously Selected'), icon=gtk.STOCK_GO_BACK, + func=lambda *a: self.goto_prev_sel()), + dict(text='----'), + dict(text=_('Revision...'), icon=gtk.STOCK_JUMP_TO, + func=lambda *a: self.show_goto_dialog()), + ] + bmenus),   - (_('_Synchronize'), [ - dict(text=_('Incoming'), name='incoming', - func=self.incoming_clicked, icon=gtk.STOCK_GO_DOWN), - dict(text=_('Pull'), name='pull', - func=self.pull_clicked, icon=gtk.STOCK_GOTO_BOTTOM), - dict(text=_('Outgoing'), name='outgoing', - func=self.outgoing_clicked, icon=gtk.STOCK_GO_UP), - dict(text=_('Push'), name='push', - func=self.push_clicked, icon=gtk.STOCK_GOTO_TOP), - dict(text=_('Email...'), name='email', - func=self.email_clicked, icon=gtk.STOCK_GOTO_LAST), - dict(text=_('Stop'), name='stop', sensitive=False, - func=self.stop_clicked, icon=gtk.STOCK_STOP), - dict(text='----'), - dict(text=_('Accept Bundle'), name='accept', - sensitive=bool(self.bfile), - func=self.apply_clicked, icon=gtk.STOCK_APPLY), - dict(text=_('Reject Bundle'), name='reject', - sensitive=bool(self.bfile), - func=self.reject_clicked, icon=gtk.STOCK_DIALOG_ERROR), - dict(text='----'), - dict(text=_('Import...'), name='import', - func=self.import_clicked, icon='menuimport.ico'), - dict(text=_('Add Bundle...'), name='add-bundle', - sensitive=not bool(self.bfile), - func=self.add_bundle_clicked, icon=gtk.STOCK_ADD), - dict(text='----'), - dict(text=_('Configure Paths...'), name='path', - func=self.conf_clicked, icon=gtk.STOCK_PREFERENCES), - dict(text='----'), - dict(text=_('Use proxy server'), name='use-proxy-server', - ascheck=True, func=toggle_proxy), - dict(text=_('Force push'), ascheck=True, func=toggle_force), - ]) + dict(text=_('_Synchronize'), subitems=[ + dict(text=_('Incoming'), name='incoming', + func=self.incoming_clicked, icon=gtk.STOCK_GO_DOWN), + dict(text=_('Pull'), name='pull', + func=self.pull_clicked, icon=gtk.STOCK_GOTO_BOTTOM), + dict(text=_('Outgoing'), name='outgoing', + func=self.outgoing_clicked, icon=gtk.STOCK_GO_UP), + dict(text=_('Push'), name='push', + func=self.push_clicked, icon=gtk.STOCK_GOTO_TOP), + dict(text=_('Email...'), name='email', + func=self.email_clicked, icon=gtk.STOCK_GOTO_LAST), + dict(text=_('Stop'), name='stop', sensitive=False, + func=self.stop_clicked, icon=gtk.STOCK_STOP), + dict(text='----'), + dict(text=_('Accept Bundle'), name='accept', + sensitive=bool(self.bfile), + func=self.apply_clicked, icon=gtk.STOCK_APPLY), + dict(text=_('Reject Bundle'), name='reject', + sensitive=bool(self.bfile), + func=self.reject_clicked, icon=gtk.STOCK_DIALOG_ERROR), + dict(text='----'), + dict(text=_('Import...'), name='import', + func=self.import_clicked, icon='menuimport.ico'), + dict(text=_('Add Bundle...'), name='add-bundle', + sensitive=not bool(self.bfile), + func=self.add_bundle_clicked, icon=gtk.STOCK_ADD), + dict(text='----'), + dict(text=_('Configure Paths...'), name='path', + func=self.conf_clicked, icon=gtk.STOCK_PREFERENCES), + dict(text='----'), + dict(text=_('Use proxy server'), name='use-proxy-server', + ascheck=True, func=toggle_proxy), + dict(text=_('Force push'), ascheck=True, func=toggle_force), + ]),   ] + p4menu     def toggle_view_column(self, button, property):