Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.2 and tip

stable sync: add spacing around the synchronize dialog

This improves the appearance of the synchronize dialog while leaving the
workbench unaffected.

Changeset 8862a40beb96

Parent e5e1c681085a

by David Golub

Changes to one file · Browse files at 8862a40beb96 Showing diff from parent e5e1c681085a Diff from another changeset...

 
63
64
65
66
 
67
68
69
 
157
158
159
 
 
 
 
 
 
 
160
161
162
 
163
164
165
 
169
170
171
172
 
173
174
175
 
179
180
181
182
 
183
184
185
 
267
268
269
270
 
271
272
273
 
281
282
283
284
 
285
286
287
 
1496
1497
1498
1499
 
 
63
64
65
 
66
67
68
69
 
157
158
159
160
161
162
163
164
165
166
167
168
 
169
170
171
172
 
176
177
178
 
179
180
181
182
 
186
187
188
 
189
190
191
192
 
274
275
276
 
277
278
279
280
 
288
289
290
 
291
292
293
294
 
1503
1504
1505
 
1506
@@ -63,7 +63,7 @@
  showBusyIcon = pyqtSignal(QString)   hideBusyIcon = pyqtSignal(QString)   - def __init__(self, repo, parent, **opts): + def __init__(self, repo, parent, addmargin=False, **opts):   QWidget.__init__(self, parent)     layout = QVBoxLayout() @@ -157,9 +157,16 @@
  tb.addWidget(self.targetcheckbox)   tb.addWidget(self.targetcombo)   + bottomlayout = QVBoxLayout() + if addmargin: + bottomlayout.setContentsMargins(5, 5, 5, 5) + else: + bottomlayout.setContentsMargins(0, 0, 0, 0) + layout.addLayout(bottomlayout) +   hbox = QHBoxLayout()   hbox.setContentsMargins(0, 0, 0, 0) - layout.addLayout(hbox) + bottomlayout.addLayout(hbox)   self.optionshdrlabel = lbl = QLabel(_('<b>Selected Options:</b>'))   hbox.addWidget(lbl)   self.optionslabel = QLabel() @@ -169,7 +176,7 @@
    hbox = QHBoxLayout()   hbox.setContentsMargins(0, 0, 0, 0) - layout.addLayout(hbox) + bottomlayout.addLayout(hbox)   hbox.addWidget(QLabel(_('<b>Remote Repository:</b>')))   self.urllabel = QLabel()   self.urllabel.setTextInteractionFlags(Qt.TextSelectableByMouse) @@ -179,7 +186,7 @@
    hbox = QHBoxLayout()   hbox.setContentsMargins(0, 0, 0, 0) - layout.addLayout(hbox) + bottomlayout.addLayout(hbox)     self.pathEditToolbar = tbar = QToolBar(_('Path Edit Toolbar'))   tbar.setStyleSheet(qtlib.tbstylesheet) @@ -267,7 +274,7 @@
  pathsbox.addWidget(self.reltv)   hbox.addWidget(pathsframe)   - self.layout().addLayout(hbox, 1) + bottomlayout.addLayout(hbox, 1)     self.savebutton.triggered.connect(self.saveclicked)   self.securebutton.triggered.connect(self.secureclicked) @@ -281,7 +288,7 @@
  cmd.output.connect(self.output)   cmd.progress.connect(self.progress)   - layout.addWidget(cmd) + bottomlayout.addWidget(cmd)   cmd.setVisible(False)   self.cmd = cmd   @@ -1496,4 +1503,4 @@
   def run(ui, *pats, **opts):   repo = thgrepo.repository(ui, path=paths.find_root()) - return SyncWidget(repo, None, **opts) + return SyncWidget(repo, None, addmargin=True, **opts)