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

history: cleanup syncbar buttons

Apply/Reject/Stop buttons is displayed on demand.

Changeset 00c3b466f8ff…

Parent efa1a55204c3…

by Yuki KODAMA

Changes to one file · Browse files at 00c3b466f8ff Showing diff from parent efa1a55204c3 Diff from another changeset...

Change 1 of 16 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1047
1048
1049
 
 
 
 
 
 
 
1050
1051
1052
1053
1054
1055
1056
1057
1058
 
1062
1063
1064
1065
 
1066
1067
 
1068
1069
1070
1071
 
 
 
1072
1073
1074
 
1281
1282
1283
1284
1285
 
1286
1287
1288
 
1322
1323
1324
1325
 
1326
1327
1328
 
1335
1336
1337
1338
 
1339
1340
1341
 
1386
1387
1388
1389
1390
 
1391
1392
1393
 
1438
1439
1440
1441
 
1442
1443
1444
 
1458
1459
1460
1461
 
1462
1463
1464
 
1479
1480
1481
1482
 
1483
1484
1485
 
1500
1501
1502
1503
 
1504
1505
1506
 
1560
1561
1562
1563
 
1564
1565
1566
 
1573
1574
1575
1576
 
1577
1578
1579
 
2037
2038
2039
2040
 
2041
2042
2043
 
2051
2052
2053
2054
 
2055
2056
2057
 
2064
2065
2066
2067
 
2068
2069
2070
 
2085
2086
2087
2088
 
2089
2090
2091
 
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
 
 
 
 
1059
1060
1061
 
1065
1066
1067
 
1068
1069
 
1070
1071
 
 
 
1072
1073
1074
1075
1076
1077
 
1284
1285
1286
 
 
1287
1288
1289
1290
 
1324
1325
1326
 
1327
1328
1329
1330
 
1337
1338
1339
 
1340
1341
1342
1343
 
1388
1389
1390
 
 
1391
1392
1393
1394
 
1439
1440
1441
 
1442
1443
1444
1445
 
1459
1460
1461
 
1462
1463
1464
1465
 
1480
1481
1482
 
1483
1484
1485
1486
 
1501
1502
1503
 
1504
1505
1506
1507
 
1561
1562
1563
 
1564
1565
1566
1567
 
1574
1575
1576
 
1577
1578
1579
1580
 
2038
2039
2040
 
2041
2042
2043
2044
 
2052
2053
2054
 
2055
2056
2057
2058
 
2065
2066
2067
 
2068
2069
2070
2071
 
2086
2087
2088
 
2089
2090
2091
2092
@@ -1047,12 +1047,15 @@
  refresh = syncbox.append_stock(gtk.STOCK_REFRESH,   _('Reload revision history'))   syncbox.append_separator() + apply = syncbox.append_stock(gtk.STOCK_APPLY, + _('Accept changes from Bundle preview'), + group='bundle') + reject = syncbox.append_stock(gtk.STOCK_DIALOG_ERROR, + _('Reject changes from Bundle preview'), + group='bundle') + syncbox.append_separator(group='bundle')   incoming = syncbox.append_stock(gtk.STOCK_GO_DOWN,   _('Download and view incoming changesets')) - apply = syncbox.append_stock(gtk.STOCK_APPLY, - _('Accept changes from Bundle preview')) - reject = syncbox.append_stock(gtk.STOCK_DIALOG_ERROR, - _('Reject changes from Bundle preview'))   pull = syncbox.append_stock(gtk.STOCK_GOTO_BOTTOM,   _('Pull incoming changesets'))   syncbox.append_separator() @@ -1062,13 +1065,13 @@
  _('Push outgoing changesets'))   email = syncbox.append_stock(gtk.STOCK_GOTO_LAST,   _('Email outgoing changesets')) - syncbox.append_separator() + syncbox.append_separator(group='stop')   stop = syncbox.append_stock(gtk.STOCK_STOP, - _('Stop current transaction')) + _('Stop current transaction'), group='stop')   - stop.set_sensitive(False) - apply.set_sensitive(False) - reject.set_sensitive(False) + syncbox.set_visible('stop', False) + syncbox.set_visible('bundle', False) +   self.stop_button = stop   self.syncbar_apply = apply   self.syncbar_reject = reject @@ -1281,8 +1284,7 @@
  self.toolbar.remove(self.toolbar.get_nth_item(0))   self.cmd_set_sensitive('accept', False)   self.cmd_set_sensitive('reject', False) - self.syncbar_apply.set_sensitive(False) - self.syncbar_reject.set_sensitive(False) + self.syncbox.set_visible('bundle', False)   for w in self.incoming_disabled:   w.set_sensitive(True)   for cmd in self.incoming_disabled_cmds: @@ -1322,7 +1324,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.stop_button.set_sensitive(False) + self.syncbox.set_visible('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0 and os.path.isfile(bfile):   self.set_bundlefile(bfile) @@ -1335,7 +1337,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Incoming'))   self.stbar.begin(_('Checking incoming changesets...')) - self.stop_button.set_sensitive(True) + self.syncbox.set_visible('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -1386,8 +1388,7 @@
  self.incoming_disabled.append(w)   self.syncbox.foreach(disable_child)   - self.syncbar_apply.set_sensitive(True) - self.syncbar_reject.set_sensitive(True) + self.syncbox.set_visible('bundle', True)     self.bfile = bfile   oldtip = len(self.repo) @@ -1438,7 +1439,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.stop_button.set_sensitive(False) + self.syncbox.set_visible('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   self.repo.invalidate() @@ -1458,7 +1459,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Pull'))   self.stbar.begin(_('Pulling changesets...')) - self.stop_button.set_sensitive(True) + self.syncbox.set_visible('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -1479,7 +1480,7 @@
    def callback(return_code, buffer, *args):   self.stbar.end() - self.stop_button.set_sensitive(False) + self.syncbox.set_visible('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   outgoing = [] @@ -1500,7 +1501,7 @@
  if self.runner.execute(cmd, callback):   self.runner.set_title(_('Outgoing'))   self.stbar.begin(_('Checking outgoing changesets...')) - self.stop_button.set_sensitive(True) + self.syncbox.set_visible('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -1560,7 +1561,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.stop_button.set_sensitive(False) + self.syncbox.set_visible('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   if self.outgoing: @@ -1573,7 +1574,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Push'))   self.stbar.begin(_('Pushing changesets...')) - self.stop_button.set_sensitive(True) + self.syncbox.set_visible('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -2037,7 +2038,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.stop_button.set_sensitive(False) + self.syncbox.set_visible('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   if self.outgoing: @@ -2051,7 +2052,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Push to %s') % rev)   self.stbar.begin(_('Pushing changesets to revision %s...') % rev) - self.stop_button.set_sensitive(True) + self.syncbox.set_visible('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'), @@ -2064,7 +2065,7 @@
    def callback(return_code, *args):   self.stbar.end() - self.stop_button.set_sensitive(False) + self.syncbox.set_visible('stop', False)   self.cmd_set_sensitive('stop', False)   if return_code == 0:   curtip = len(hg.repository(self.ui, self.repo.root)) @@ -2085,7 +2086,7 @@
  if self.runner.execute(cmdline, callback):   self.runner.set_title(_('Pull to %s') % rev)   self.stbar.begin(_('Pulling changesets to revision %s...') % rev) - self.stop_button.set_sensitive(True) + self.syncbox.set_visible('stop', True)   self.cmd_set_sensitive('stop', True)   else:   gdialog.Prompt(_('Cannot run now'),