Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable status: cleanup standalone status dialog

Changeset a71eec775f3b…

Parent c58b2476f253…

by Steve Borho

Changes to one file · Browse files at a71eec775f3b Showing diff from parent c58b2476f253 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
676
677
678
679
680
681
682
683
684
685
 
688
689
690
 
691
 
692
693
694
695
696
697
698
 
 
 
 
699
700
 
701
702
703
 
 
 
 
 
704
705
706
707
708
709
 
 
 
710
711
712
 
676
677
678
 
 
 
 
679
680
681
 
684
685
686
687
688
689
690
691
 
 
 
 
 
692
693
694
695
696
 
697
698
699
700
701
702
703
704
705
706
707
708
 
 
 
709
710
711
712
713
714
@@ -676,10 +676,6 @@
  self.stwidget = StatusWidget(pats, opts, root, self)   layout.addWidget(self.stwidget, 1)   - s = QSettings() - self.stwidget.loadSettings(s, 'status') - self.restoreGeometry(s.value('status/geom').toByteArray()) -   self.statusbar = cmdui.ThgStatusBar(self)   layout.addWidget(self.statusbar)   self.stwidget.showMessage.connect(self.statusbar.showMessage) @@ -688,25 +684,31 @@
    self.setWindowTitle(self.stwidget.getTitle())   self.setWindowFlags(Qt.Window) + self.loadSettings()   + QShortcut(QKeySequence.Refresh, self, self.stwidget.refreshWctx)   QTimer.singleShot(0, self.stwidget.refreshWctx)   - def keyPressEvent(self, event): - if event.matches(QKeySequence.Refresh): - self.stwidget.refreshWctx() - else: - return super(StatusDialog, self).keyPressEvent(event) + def loadSettings(self): + s = QSettings() + self.stwidget.loadSettings(s, 'status') + self.restoreGeometry(s.value('status/geom').toByteArray())   - def accept(self): + def saveSettings(self):   s = QSettings()   self.stwidget.saveSettings(s, 'status')   s.setValue('status/geom', self.saveGeometry()) + + def accept(self): + if not self.stwidget.canExit(): + return + self.saveSettings()   QDialog.accept(self)     def reject(self): - s = QSettings() - self.stwidget.saveSettings(s, 'status') - s.setValue('status/geom', self.saveGeometry()) + if not self.stwidget.canExit(): + return + self.saveSettings()   QDialog.reject(self)    def run(ui, *pats, **opts):