Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
- changeset 7260
- 4cc6f121119a
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7259:7c017076c12e | 7260:4cc6f121119a |
|---|---|
| 12 | 12 |
| 13 import pysvn | 13 import pysvn |
| 14 | 14 |
| 15 from PyQt5.QtCore import QMutexLocker, QDate, QRegExp, Qt, pyqtSlot, QPoint | 15 from PyQt5.QtCore import QMutexLocker, QDate, QRegExp, Qt, pyqtSlot, QPoint |
| 16 from PyQt5.QtGui import QCursor | 16 from PyQt5.QtGui import QCursor |
| 17 from PyQt5.QtWidgets import QHeaderView, QWidget, QApplication, \ | 17 from PyQt5.QtWidgets import ( |
| 18 QDialogButtonBox, QTreeWidgetItem | 18 QHeaderView, QWidget, QApplication, QDialogButtonBox, QTreeWidgetItem |
| 19 ) | |
| 19 | 20 |
| 20 from E5Gui import E5MessageBox | 21 from E5Gui import E5MessageBox |
| 21 | 22 |
| 22 from .SvnUtilities import formatTime, dateFromTime_t | 23 from .SvnUtilities import formatTime, dateFromTime_t |
| 23 from .SvnDialogMixin import SvnDialogMixin | 24 from .SvnDialogMixin import SvnDialogMixin |
| 75 self.__logTreeNormalFont.setBold(False) | 76 self.__logTreeNormalFont.setBold(False) |
| 76 self.__logTreeBoldFont = self.logTree.font() | 77 self.__logTreeBoldFont = self.logTree.font() |
| 77 self.__logTreeBoldFont.setBold(True) | 78 self.__logTreeBoldFont.setBold(True) |
| 78 | 79 |
| 79 self.client = self.vcs.getClient() | 80 self.client = self.vcs.getClient() |
| 80 self.client.callback_cancel = \ | 81 self.client.callback_cancel = self._clientCancelCallback |
| 81 self._clientCancelCallback | 82 self.client.callback_get_login = self._clientLoginCallback |
| 82 self.client.callback_get_login = \ | 83 self.client.callback_ssl_server_trust_prompt = ( |
| 83 self._clientLoginCallback | |
| 84 self.client.callback_ssl_server_trust_prompt = \ | |
| 85 self._clientSslServerTrustPromptCallback | 84 self._clientSslServerTrustPromptCallback |
| 85 ) | |
| 86 | 86 |
| 87 def __initData(self): | 87 def __initData(self): |
| 88 """ | 88 """ |
| 89 Private method to (re-)initialize some data. | 89 Private method to (re-)initialize some data. |
| 90 """ | 90 """ |
| 309 message = log["message"] | 309 message = log["message"] |
| 310 self.__generateLogItem( | 310 self.__generateLogItem( |
| 311 author, log["date"], message, | 311 author, log["date"], message, |
| 312 log["revision"], log['changed_paths']) | 312 log["revision"], log['changed_paths']) |
| 313 dt = dateFromTime_t(log["date"]) | 313 dt = dateFromTime_t(log["date"]) |
| 314 if not self.__maxDate.isValid() and \ | 314 if ( |
| 315 not self.__minDate.isValid(): | 315 not self.__maxDate.isValid() and |
| 316 not self.__minDate.isValid() | |
| 317 ): | |
| 316 self.__maxDate = dt | 318 self.__maxDate = dt |
| 317 self.__minDate = dt | 319 self.__minDate = dt |
| 318 else: | 320 else: |
| 319 if self.__maxDate < dt: | 321 if self.__maxDate < dt: |
| 320 self.__maxDate = dt | 322 self.__maxDate = dt |
| 580 searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) | 582 searchRx = QRegExp(self.rxEdit.text(), Qt.CaseInsensitive) |
| 581 | 583 |
| 582 currentItem = self.logTree.currentItem() | 584 currentItem = self.logTree.currentItem() |
| 583 for topIndex in range(self.logTree.topLevelItemCount()): | 585 for topIndex in range(self.logTree.topLevelItemCount()): |
| 584 topItem = self.logTree.topLevelItem(topIndex) | 586 topItem = self.logTree.topLevelItem(topIndex) |
| 585 if topItem.text(2) <= to_ and topItem.text(2) >= from_ and \ | 587 if ( |
| 586 searchRx.indexIn(topItem.text(fieldIndex)) > -1: | 588 topItem.text(2) <= to_ and |
| 589 topItem.text(2) >= from_ and | |
| 590 searchRx.indexIn(topItem.text(fieldIndex)) > -1 | |
| 591 ): | |
| 587 topItem.setHidden(False) | 592 topItem.setHidden(False) |
| 588 if topItem is currentItem: | 593 if topItem is currentItem: |
| 589 self.on_logTree_currentItemChanged(topItem, None) | 594 self.on_logTree_currentItemChanged(topItem, None) |
| 590 else: | 595 else: |
| 591 topItem.setHidden(True) | 596 topItem.setHidden(True) |
