Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py
- changeset 8143
- 2c730d5fd177
- parent 7971
- ff2971513d6d
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 34 @param parent parent widget (QWidget) | 34 @param parent parent widget (QWidget) |
| 35 """ | 35 """ |
| 36 super(HgShelveBrowserDialog, self).__init__(parent) | 36 super(HgShelveBrowserDialog, self).__init__(parent) |
| 37 self.setupUi(self) | 37 self.setupUi(self) |
| 38 | 38 |
| 39 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) | 39 self.buttonBox.button( |
| 40 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) | 40 QDialogButtonBox.StandardButton.Close).setEnabled(False) |
| 41 self.buttonBox.button( | |
| 42 QDialogButtonBox.StandardButton.Cancel).setDefault(True) | |
| 41 | 43 |
| 42 self.__position = QPoint() | 44 self.__position = QPoint() |
| 43 | 45 |
| 44 self.__fileStatisticsRole = Qt.UserRole | 46 self.__fileStatisticsRole = Qt.ItemDataRole.UserRole |
| 45 self.__totalStatisticsRole = Qt.UserRole + 1 | 47 self.__totalStatisticsRole = Qt.ItemDataRole.UserRole + 1 |
| 46 | 48 |
| 47 self.shelveList.header().setSortIndicator(0, Qt.AscendingOrder) | 49 self.shelveList.header().setSortIndicator( |
| 50 0, Qt.SortOrder.AscendingOrder) | |
| 48 | 51 |
| 49 self.refreshButton = self.buttonBox.addButton( | 52 self.refreshButton = self.buttonBox.addButton( |
| 50 self.tr("&Refresh"), QDialogButtonBox.ActionRole) | 53 self.tr("&Refresh"), QDialogButtonBox.ButtonRole.ActionRole) |
| 51 self.refreshButton.setToolTip( | 54 self.refreshButton.setToolTip( |
| 52 self.tr("Press to refresh the list of shelves")) | 55 self.tr("Press to refresh the list of shelves")) |
| 53 self.refreshButton.setEnabled(False) | 56 self.refreshButton.setEnabled(False) |
| 54 | 57 |
| 55 self.vcs = vcs | 58 self.vcs = vcs |
| 95 | 98 |
| 96 def __resizeColumnsShelves(self): | 99 def __resizeColumnsShelves(self): |
| 97 """ | 100 """ |
| 98 Private method to resize the shelve list columns. | 101 Private method to resize the shelve list columns. |
| 99 """ | 102 """ |
| 100 self.shelveList.header().resizeSections(QHeaderView.ResizeToContents) | 103 self.shelveList.header().resizeSections( |
| 104 QHeaderView.ResizeMode.ResizeToContents) | |
| 101 self.shelveList.header().setStretchLastSection(True) | 105 self.shelveList.header().setStretchLastSection(True) |
| 102 | 106 |
| 103 def __generateShelveEntry(self, name, age, message, fileStatistics, | 107 def __generateShelveEntry(self, name, age, message, fileStatistics, |
| 104 totals): | 108 totals): |
| 105 """ | 109 """ |
| 121 | 125 |
| 122 def __getShelveEntries(self): | 126 def __getShelveEntries(self): |
| 123 """ | 127 """ |
| 124 Private method to retrieve the list of shelves. | 128 Private method to retrieve the list of shelves. |
| 125 """ | 129 """ |
| 126 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) | 130 self.buttonBox.button( |
| 127 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) | 131 QDialogButtonBox.StandardButton.Close).setEnabled(False) |
| 128 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) | 132 self.buttonBox.button( |
| 133 QDialogButtonBox.StandardButton.Cancel).setEnabled(True) | |
| 134 self.buttonBox.button( | |
| 135 QDialogButtonBox.StandardButton.Cancel).setDefault(True) | |
| 129 QApplication.processEvents() | 136 QApplication.processEvents() |
| 130 | 137 |
| 131 self.buf = [] | 138 self.buf = [] |
| 132 self.errors.clear() | 139 self.errors.clear() |
| 133 self.intercept = False | 140 self.intercept = False |
| 161 def __finish(self): | 168 def __finish(self): |
| 162 """ | 169 """ |
| 163 Private slot called when the process finished or the user pressed | 170 Private slot called when the process finished or the user pressed |
| 164 the button. | 171 the button. |
| 165 """ | 172 """ |
| 166 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) | 173 self.buttonBox.button( |
| 167 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) | 174 QDialogButtonBox.StandardButton.Close).setEnabled(True) |
| 168 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) | 175 self.buttonBox.button( |
| 176 QDialogButtonBox.StandardButton.Cancel).setEnabled(False) | |
| 177 self.buttonBox.button( | |
| 178 QDialogButtonBox.StandardButton.Close).setDefault(True) | |
| 169 | 179 |
| 170 self.refreshButton.setEnabled(True) | 180 self.refreshButton.setEnabled(True) |
| 171 | 181 |
| 172 def __processBuffer(self): | 182 def __processBuffer(self): |
| 173 """ | 183 """ |
| 236 """ | 246 """ |
| 237 Private slot called by a button of the button box clicked. | 247 Private slot called by a button of the button box clicked. |
| 238 | 248 |
| 239 @param button button that was clicked (QAbstractButton) | 249 @param button button that was clicked (QAbstractButton) |
| 240 """ | 250 """ |
| 241 if button == self.buttonBox.button(QDialogButtonBox.Close): | 251 if button == self.buttonBox.button( |
| 252 QDialogButtonBox.StandardButton.Close | |
| 253 ): | |
| 242 self.close() | 254 self.close() |
| 243 elif button == self.buttonBox.button(QDialogButtonBox.Cancel): | 255 elif button == self.buttonBox.button( |
| 256 QDialogButtonBox.StandardButton.Cancel | |
| 257 ): | |
| 244 self.cancelled = True | 258 self.cancelled = True |
| 245 self.__hgClient.cancel() | 259 self.__hgClient.cancel() |
| 246 elif button == self.refreshButton: | 260 elif button == self.refreshButton: |
| 247 self.on_refreshButton_clicked() | 261 self.on_refreshButton_clicked() |
| 248 | 262 |
| 257 self.statisticsList.clear() | 271 self.statisticsList.clear() |
| 258 if current: | 272 if current: |
| 259 for dataSet in current.data(0, self.__fileStatisticsRole): | 273 for dataSet in current.data(0, self.__fileStatisticsRole): |
| 260 QTreeWidgetItem(self.statisticsList, list(dataSet)) | 274 QTreeWidgetItem(self.statisticsList, list(dataSet)) |
| 261 self.statisticsList.header().resizeSections( | 275 self.statisticsList.header().resizeSections( |
| 262 QHeaderView.ResizeToContents) | 276 QHeaderView.ResizeMode.ResizeToContents) |
| 263 self.statisticsList.header().setStretchLastSection(True) | 277 self.statisticsList.header().setStretchLastSection(True) |
| 264 | 278 |
| 265 totals = current.data(0, self.__totalStatisticsRole) | 279 totals = current.data(0, self.__totalStatisticsRole) |
| 266 self.filesLabel.setText( | 280 self.filesLabel.setText( |
| 267 self.tr("%n file(s) changed", None, int(totals[0]))) | 281 self.tr("%n file(s) changed", None, int(totals[0]))) |
| 290 @pyqtSlot() | 304 @pyqtSlot() |
| 291 def on_refreshButton_clicked(self): | 305 def on_refreshButton_clicked(self): |
| 292 """ | 306 """ |
| 293 Private slot to refresh the list of shelves. | 307 Private slot to refresh the list of shelves. |
| 294 """ | 308 """ |
| 295 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) | 309 self.buttonBox.button( |
| 296 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) | 310 QDialogButtonBox.StandardButton.Close).setEnabled(False) |
| 297 self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) | 311 self.buttonBox.button( |
| 312 QDialogButtonBox.StandardButton.Cancel).setEnabled(True) | |
| 313 self.buttonBox.button( | |
| 314 QDialogButtonBox.StandardButton.Cancel).setDefault(True) | |
| 298 | 315 |
| 299 self.refreshButton.setEnabled(False) | 316 self.refreshButton.setEnabled(False) |
| 300 | 317 |
| 301 self.start() | 318 self.start() |
| 302 | 319 |
