Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

sync: improved layout of options dialog box

Changeset 37267d91fb3e…

Parent 18b9182523ec…

by David Golub

Changes to one file · Browse files at 37267d91fb3e Showing diff from parent 18b9182523ec Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
1522
1523
1524
1525
 
1526
1527
1528
1529
1530
1531
 
1532
1533
1534
1535
1536
 
1537
1538
1539
1540
1541
 
1542
1543
1544
1545
1546
 
1547
1548
1549
1550
1551
1552
1553
 
 
 
 
1554
1555
1556
1557
1558
1559
 
1560
1561
1562
1563
1564
1565
 
1566
1567
1568
 
1522
1523
1524
 
1525
1526
1527
1528
1529
1530
 
1531
1532
1533
1534
1535
 
1536
1537
1538
1539
1540
 
1541
1542
1543
1544
1545
 
1546
1547
1548
1549
1550
1551
1552
 
1553
1554
1555
1556
1557
1558
1559
1560
1561
 
1562
1563
1564
1565
1566
1567
 
1568
1569
1570
1571
@@ -1522,47 +1522,50 @@
  self.setWindowTitle(_('%s - sync options') % parent.repo.displayname)   self.repo = parent.repo   - layout = QFormLayout() + layout = QVBoxLayout()   self.setLayout(layout)     self.newbranchcb = QCheckBox(   _('Allow push of a new branch (--new-branch)'))   self.newbranchcb.setChecked(opts.get('new-branch', False)) - layout.addRow(self.newbranchcb, None) + layout.addWidget(self.newbranchcb)     self.forcecb = QCheckBox(   _('Force push or pull (override safety checks, --force)'))   self.forcecb.setChecked(opts.get('force', False)) - layout.addRow(self.forcecb, None) + layout.addWidget(self.forcecb)     self.subrepocb = QCheckBox(   _('Recurse into subrepositories') + u' (--subrepos)')   self.subrepocb.setChecked(opts.get('subrepos', False)) - layout.addRow(self.subrepocb, None) + layout.addWidget(self.subrepocb)     self.noproxycb = QCheckBox(   _('Temporarily disable configured HTTP proxy'))   self.noproxycb.setChecked(opts.get('noproxy', False)) - layout.addRow(self.noproxycb, None) + layout.addWidget(self.noproxycb)   proxy = self.repo.ui.config('http_proxy', 'host')   self.noproxycb.setEnabled(bool(proxy))     self.debugcb = QCheckBox(   _('Emit debugging output (--debug)'))   self.debugcb.setChecked(opts.get('debug', False)) - layout.addRow(self.debugcb, None) + layout.addWidget(self.debugcb) + + form = QFormLayout() + layout.addLayout(form)     lbl = QLabel(_('Remote command:'))   self.remotele = QLineEdit()   if opts.get('remotecmd'):   self.remotele.setText(hglib.tounicode(opts['remotecmd'])) - layout.addRow(lbl, self.remotele) + form.addRow(lbl, self.remotele)     lbl = QLabel(_('Branch:'))   self.branchle = QLineEdit()   if opts.get('branch'):   self.branchle.setText(hglib.tounicode(opts['branch'])) - layout.addRow(lbl, self.branchle) + form.addRow(lbl, self.branchle)     BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Ok|BB.Cancel)