Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable repowidget: no longer share commit and sync widgets between tabs

Changeset 6536a00ad721…

Parent 94010af8d9b6…

by Steve Borho

Changes to one file · Browse files at 6536a00ad721 Showing diff from parent 94010af8d9b6 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
16
17
18
19
 
20
21
22
 
226
227
228
229
230
 
 
 
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
 
 
 
 
 
 
 
 
 
249
250
251
252
253
254
255
256
 
257
258
259
 
269
270
271
272
273
274
275
276
 
277
278
279
 
16
17
18
 
19
20
21
22
 
226
227
228
 
 
229
230
231
232
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
233
234
235
236
237
238
239
240
241
242
 
243
244
245
246
 
247
248
249
250
251
 
261
262
263
 
 
 
 
 
264
265
266
267
@@ -16,7 +16,7 @@
 from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib  from tortoisehg.hgqt.qtlib import QuestionMsgBox, InfoMsgBox -from tortoisehg.hgqt.qtlib import CustomPrompt, SharedWidget, DemandWidget +from tortoisehg.hgqt.qtlib import CustomPrompt, DemandWidget  from tortoisehg.hgqt.repomodel import HgRepoListModel  from tortoisehg.hgqt import cmdui, update, tag, backout, merge, visdiff  from tortoisehg.hgqt import archive, thgimport, thgstrip, run, purge, bookmark @@ -226,34 +226,26 @@
    QDesktopServices.openUrl(QUrl(link))   - def getCommitWidget(self): - return getattr(self.repo, '_commitwidget', None) # TODO: ugly + def createCommitWidget(self): + pats, opts = {}, {} + cw = CommitWidget(pats, opts, self.repo.root, True, self)   - def createCommitWidget(self): - cw = self.getCommitWidget() - if not cw: - pats = {} - opts = {} - b = QPushButton(_('Commit')) - b.setAutoDefault(True) - f = b.font() - f.setWeight(QFont.Bold) - b.setFont(f) - cw = CommitWidget(pats, opts, self.repo.root, True, self) - cw.buttonHBox.addWidget(b) - cw.commitButtonEnable.connect(b.setEnabled) - b.clicked.connect(cw.commit) - cw.loadSettings(QSettings(), 'workbench') - QTimer.singleShot(0, cw.reload) - self.repo._commitwidget = cw + b = QPushButton(_('Commit')) + b.setAutoDefault(True) + f = b.font() + f.setWeight(QFont.Bold) + b.setFont(f) + cw.buttonHBox.addWidget(b) + cw.commitButtonEnable.connect(b.setEnabled) + b.clicked.connect(cw.commit) + cw.loadSettings(QSettings(), 'workbench')   - cw = SharedWidget(cw)   cw.output.connect(self.output)   cw.progress.connect(self.progress)   cw.makeLogVisible.connect(self.makeLogVisible)   cw.linkActivated.connect(self._openLink) -   cw.showMessage.connect(self.showMessage) + QTimer.singleShot(0, cw.reload)   return cw     def createManifestWidget(self): @@ -269,11 +261,7 @@
  return w     def createSyncWidget(self): - sw = getattr(self.repo, '_syncwidget', None) # TODO: ugly - if not sw: - sw = SyncWidget(self.repo, self) - self.repo._syncwidget = sw - sw = SharedWidget(sw) + sw = SyncWidget(self.repo, self)   sw.output.connect(self.output)   sw.progress.connect(self.progress)   sw.makeLogVisible.connect(self.makeLogVisible)