Tue, 15 Nov 2016 19:03:24 +0100
Started to implement a context menu for the Mercurial bookmarks list dialog.
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
4631
5c1a96925da4
Updated copyright for 2016.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4278
diff
changeset
|
3 | # Copyright (c) 2011 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing a dialog to show a list of bookmarks. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
3145
a9de05d4a22f
# __IGNORE_WARNING__ added/ removed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3060
diff
changeset
|
10 | from __future__ import unicode_literals |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2302
diff
changeset
|
11 | try: |
3484 | 12 | str = unicode |
13 | except NameError: | |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2302
diff
changeset
|
14 | pass |
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2302
diff
changeset
|
15 | |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | import os |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
18 | from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication, \ |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
19 | QPoint |
3656
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3591
diff
changeset
|
20 | from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
21 | QTreeWidgetItem, QLineEdit, QMenu |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
23 | from E5Gui.E5Application import e5App |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | from E5Gui import E5MessageBox |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | from .Ui_HgBookmarksListDialog import Ui_HgBookmarksListDialog |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
28 | import UI.PixmapCache |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
30 | |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | class HgBookmarksListDialog(QDialog, Ui_HgBookmarksListDialog): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | Class implementing a dialog to show a list of bookmarks. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | def __init__(self, vcs, parent=None): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | Constructor |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | @param vcs reference to the vcs object |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | @param parent parent widget (QWidget) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | """ |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2302
diff
changeset
|
42 | super(HgBookmarksListDialog, self).__init__(parent) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | self.setupUi(self) |
4278
ccd1e13cb9bd
Fixed issues where dialogs could not be minimized on some desktop environments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4212
diff
changeset
|
44 | self.setWindowFlags(Qt.Window) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
46 | self.refreshButton = self.buttonBox.addButton( |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
47 | self.tr("Refresh"), QDialogButtonBox.ActionRole) |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
48 | self.refreshButton.setToolTip( |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
49 | self.tr("Press to refresh the bookmarks display")) |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
50 | self.refreshButton.setEnabled(False) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | self.process = QProcess() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | self.vcs = vcs |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | self.__bookmarksList = None |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
57 | self.__repoDir = None |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
58 | self.__hgClient = vcs.getClient() |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
59 | self.__bookmarksDefined = False |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
60 | self.__currentRevision = "" |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
62 | self.bookmarksList.headerItem().setText( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
63 | self.bookmarksList.columnCount(), "") |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | self.bookmarksList.header().setSortIndicator(3, Qt.AscendingOrder) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | self.process.finished.connect(self.__procFinished) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | self.process.readyReadStandardOutput.connect(self.__readStdout) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | self.process.readyReadStandardError.connect(self.__readStderr) |
1260
9488a3aceb0e
Added code to some Mercurial dialogs to improve user experience.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1256
diff
changeset
|
69 | |
9488a3aceb0e
Added code to some Mercurial dialogs to improve user experience.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1256
diff
changeset
|
70 | self.show() |
9488a3aceb0e
Added code to some Mercurial dialogs to improve user experience.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1256
diff
changeset
|
71 | QCoreApplication.processEvents() |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | def closeEvent(self, e): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | """ |
3591
2f2a4a76dd22
Corrected a bunch of source docu issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3562
diff
changeset
|
75 | Protected slot implementing a close event handler. |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | @param e close event (QCloseEvent) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | """ |
1256
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
79 | if self.__hgClient: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
80 | if self.__hgClient.isExecuting(): |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
81 | self.__hgClient.cancel() |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
82 | else: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
83 | if self.process is not None and \ |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
84 | self.process.state() != QProcess.NotRunning: |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
85 | self.process.terminate() |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
86 | QTimer.singleShot(2000, self.process.kill) |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
87 | self.process.waitForFinished(3000) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | e.accept() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | def start(self, path, bookmarksList): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | Public slot to start the bookmarks command. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | @param path name of directory to be listed (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | @param bookmarksList reference to string list receiving the bookmarks |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | (list of strings) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | """ |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
99 | self.bookmarksList.clear() |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
100 | self.__bookmarksDefined = False |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
101 | |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | self.errorGroup.hide() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | self.intercept = False |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
105 | self.activateWindow() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | self.__bookmarksList = bookmarksList |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
108 | del self.__bookmarksList[:] # clear the list |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
109 | |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | dname, fname = self.vcs.splitPath(path) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | # find the root of the repo |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | repodir = dname |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | repodir = os.path.dirname(repodir) |
1318
6fa303bd65d6
Fixed issues in various Mercurial files that could cause infinite loops on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1260
diff
changeset
|
116 | if os.path.splitdrive(repodir)[1] == os.sep: |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | return |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
118 | self.__repoDir = repodir |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
120 | args = self.vcs.initCommand("bookmarks") |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
122 | if self.__hgClient: |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | self.inputGroup.setEnabled(False) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | self.inputGroup.hide() |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
125 | self.refreshButton.setEnabled(False) |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
126 | |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
127 | out, err = self.__hgClient.runcommand(args) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
128 | if err: |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
129 | self.__showError(err) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
130 | if out: |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
131 | for line in out.splitlines(): |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
132 | self.__processOutputLine(line) |
1256
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
133 | if self.__hgClient.wasCanceled(): |
885706dbb69f
Refined the Mercurial command server interface.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1251
diff
changeset
|
134 | break |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
135 | self.__finish() |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
136 | else: |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
137 | self.process.kill() |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
138 | self.process.setWorkingDirectory(repodir) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
139 | |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
140 | self.process.start('hg', args) |
2771
281c9b30dd91
Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
141 | procStarted = self.process.waitForStarted(5000) |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
142 | if not procStarted: |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
143 | self.inputGroup.setEnabled(False) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
144 | self.inputGroup.hide() |
3020
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
145 | E5MessageBox.critical( |
542e97d4ecb3
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3008
diff
changeset
|
146 | self, |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
147 | self.tr('Process Generation Error'), |
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
148 | self.tr( |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
149 | 'The process {0} could not be started. ' |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
150 | 'Ensure, that it is in the search path.' |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
151 | ).format('hg')) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
152 | else: |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
153 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
154 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
155 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
156 | |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
157 | self.inputGroup.setEnabled(True) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
158 | self.inputGroup.show() |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
159 | self.refreshButton.setEnabled(False) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | def __finish(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
162 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
163 | Private slot called when the process finished or the user pressed |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
164 | the button. |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | if self.process is not None and \ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | self.process.state() != QProcess.NotRunning: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | self.process.terminate() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | QTimer.singleShot(2000, self.process.kill) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | self.process.waitForFinished(3000) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | self.inputGroup.setEnabled(False) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | self.inputGroup.hide() |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
174 | self.refreshButton.setEnabled(True) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
175 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
176 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
177 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
179 | self.buttonBox.button(QDialogButtonBox.Close).setFocus( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
180 | Qt.OtherFocusReason) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
181 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | if self.bookmarksList.topLevelItemCount() == 0: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | # no bookmarks defined |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
184 | self.__generateItem( |
3190
a9a94491c4fd
Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3160
diff
changeset
|
185 | self.tr("no bookmarks defined"), "", "", "") |
5322
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
186 | self.__bookmarksDefined = False |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
187 | else: |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
188 | self.__bookmarksDefined = True |
c2cabdca0734
Added bookmark actions to the Mercurial Log Browser tools menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
189 | |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | self.__resizeColumns() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | self.__resort() |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
192 | |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
193 | # restore current item |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
194 | if self.__currentRevision: |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
195 | items = self.bookmarksList.findItems( |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
196 | self.__currentRevision, Qt.MatchExactly, 0) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
197 | if items: |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
198 | self.bookmarksList.setCurrentItem(items[0]) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
199 | self.__currentRevision = "" |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
200 | self.bookmarksList.setFocus(Qt.OtherFocusReason) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
202 | def on_buttonBox_clicked(self, button): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
203 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | Private slot called by a button of the button box clicked. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
205 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | @param button button that was clicked (QAbstractButton) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | if button == self.buttonBox.button(QDialogButtonBox.Close): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | self.close() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | elif button == self.buttonBox.button(QDialogButtonBox.Cancel): |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
211 | if self.__hgClient: |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
212 | self.__hgClient.cancel() |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
213 | else: |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
214 | self.__finish() |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
215 | elif button == self.refreshButton: |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
216 | self.on_refreshButton_clicked() |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
217 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | def __procFinished(self, exitCode, exitStatus): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
220 | Private slot connected to the finished signal. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | @param exitCode exit code of the process (integer) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | @param exitStatus exit status of the process (QProcess.ExitStatus) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | self.__finish() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | def __resort(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | Private method to resort the tree. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | """ |
3023
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
231 | self.bookmarksList.sortItems( |
34ce20603bf7
Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3020
diff
changeset
|
232 | self.bookmarksList.sortColumn(), |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
233 | self.bookmarksList.header().sortIndicatorOrder()) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
235 | def __resizeColumns(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
236 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | Private method to resize the list columns. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
238 | """ |
3008
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
239 | self.bookmarksList.header().resizeSections( |
7848489bcb92
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2771
diff
changeset
|
240 | QHeaderView.ResizeToContents) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | self.bookmarksList.header().setStretchLastSection(True) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
243 | def __generateItem(self, revision, changeset, status, name): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
244 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | Private method to generate a bookmark item in the bookmarks list. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
247 | @param revision revision of the bookmark (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
248 | @param changeset changeset of the bookmark (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
249 | @param status of the bookmark (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
250 | @param name name of the bookmark (string) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
251 | """ |
1640
1699d46026cd
Fixed a compatibility issue with Qt 4.8.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1532
diff
changeset
|
252 | itm = QTreeWidgetItem(self.bookmarksList) |
3562
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
253 | if revision[0].isdecimal(): |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
254 | # valid bookmark entry |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
255 | itm.setData(0, Qt.DisplayRole, int(revision)) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
256 | itm.setData(1, Qt.DisplayRole, changeset) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
257 | itm.setData(2, Qt.DisplayRole, status) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
258 | itm.setData(3, Qt.DisplayRole, name) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
259 | itm.setTextAlignment(0, Qt.AlignRight) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
260 | itm.setTextAlignment(1, Qt.AlignRight) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
261 | itm.setTextAlignment(2, Qt.AlignHCenter) |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
262 | else: |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
263 | # error message |
ef3f13a2c599
Moved the Mercurial bookmarks to the Mercurial core because they are no extension since Mercurial 1.8 anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3484
diff
changeset
|
264 | itm.setData(0, Qt.DisplayRole, revision) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
265 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
266 | def __readStdout(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | Private slot to handle the readyReadStdout signal. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
270 | It reads the output of the process, formats it and inserts it into |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
271 | the contents pane. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
272 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
273 | self.process.setReadChannel(QProcess.StandardOutput) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
274 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
275 | while self.process.canReadLine(): |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
276 | s = str(self.process.readLine(), self.vcs.getEncoding(), |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
277 | 'replace').strip() |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
278 | self.__processOutputLine(s) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
279 | |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
280 | def __processOutputLine(self, line): |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
281 | """ |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
282 | Private method to process the lines of output. |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
283 | |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
284 | @param line output line to be processed (string) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
285 | """ |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
286 | li = line.split() |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
287 | if li[-1][0] in "1234567890": |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
288 | # last element is a rev:changeset |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
289 | rev, changeset = li[-1].split(":", 1) |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
290 | del li[-1] |
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
291 | if li[0] == "*": |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
292 | status = "current" |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
293 | del li[0] |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
294 | else: |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
295 | status = "" |
3034
7ce719013078
Fixed various coding style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3023
diff
changeset
|
296 | name = " ".join(li) |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
297 | self.__generateItem(rev, changeset, status, name) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
298 | if self.__bookmarksList is not None: |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
299 | self.__bookmarksList.append(name) |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | def __readStderr(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
302 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
303 | Private slot to handle the readyReadStderr signal. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
304 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
305 | It reads the error output of the process and inserts it into the |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
306 | error pane. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
308 | if self.process is not None: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
309 | s = str(self.process.readAllStandardError(), |
3302
e92f0dd51979
Removed the Mercurial support for a command options dialog and added useable global options to the Mercurial config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3190
diff
changeset
|
310 | self.vcs.getEncoding(), 'replace') |
1251
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
311 | self.__showError(s) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
312 | |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
313 | def __showError(self, out): |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
314 | """ |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
315 | Private slot to show some error. |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
316 | |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
317 | @param out error to be shown (string) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
318 | """ |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
319 | self.errorGroup.show() |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
320 | self.errors.insertPlainText(out) |
d40491ba96ce
Continued implementing an interface to the Mercurial command server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
321 | self.errors.ensureCursorVisible() |
1011
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
322 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
323 | def on_passwordCheckBox_toggled(self, isOn): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
324 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
325 | Private slot to handle the password checkbox toggled. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
326 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
327 | @param isOn flag indicating the status of the check box (boolean) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
328 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
329 | if isOn: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
330 | self.input.setEchoMode(QLineEdit.Password) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
331 | else: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
332 | self.input.setEchoMode(QLineEdit.Normal) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
333 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
334 | @pyqtSlot() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
335 | def on_sendButton_clicked(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
336 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
337 | Private slot to send the input to the subversion process. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
338 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
339 | input = self.input.text() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
340 | input += os.linesep |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
341 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
342 | if self.passwordCheckBox.isChecked(): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
343 | self.errors.insertPlainText(os.linesep) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
344 | self.errors.ensureCursorVisible() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | else: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | self.errors.insertPlainText(input) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
347 | self.errors.ensureCursorVisible() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
348 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
349 | self.process.write(input) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
350 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
351 | self.passwordCheckBox.setChecked(False) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
352 | self.input.clear() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
353 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
354 | def on_input_returnPressed(self): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
355 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
356 | Private slot to handle the press of the return key in the input field. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
357 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
358 | self.intercept = True |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
359 | self.on_sendButton_clicked() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
360 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
361 | def keyPressEvent(self, evt): |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
362 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
363 | Protected slot to handle a key press event. |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
364 | |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
365 | @param evt the key press event (QKeyEvent) |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
366 | """ |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
367 | if self.intercept: |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
368 | self.intercept = False |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
369 | evt.accept() |
0b118aefae5b
Started implementing the Mercurial bookmarks support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
370 | return |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2302
diff
changeset
|
371 | super(HgBookmarksListDialog, self).keyPressEvent(evt) |
4126
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
372 | |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
373 | @pyqtSlot() |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
374 | def on_refreshButton_clicked(self): |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
375 | """ |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
376 | Private slot to refresh the status display. |
c28d0cf3b639
Some changes to the various VCS interfaces to use one dialog instead of creating a new one each time.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
377 | """ |
5325
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
378 | # save the current items commit ID |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
379 | itm = self.bookmarksList.currentItem() |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
380 | if itm is not None: |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
381 | self.__currentRevision = itm.text(0) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
382 | else: |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
383 | self.__currentRevision = "" |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
384 | |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
385 | self.start(self.__repoDir, self.__bookmarksList) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
386 | |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
387 | @pyqtSlot(QPoint) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
388 | def on_bookmarksList_customContextMenuRequested(self, pos): |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
389 | """ |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
390 | Private slot to handle the context menu request. |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
391 | |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
392 | @param pos position the context menu was requetsed at |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
393 | @type QPoint |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
394 | """ |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
395 | itm = self.bookmarksList.itemAt(pos) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
396 | if itm is not None: |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
397 | menu = QMenu(self.bookmarksList) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
398 | menu.addAction( |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
399 | UI.PixmapCache.getIcon("vcsSwitch.png"), |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
400 | self.tr("Switch to"), self.__switchTo) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
401 | menu.addSeparator() |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
402 | menu.popup(self.bookmarksList.mapToGlobal(pos)) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
403 | |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
404 | def __switchTo(self): |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
405 | """ |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
406 | Private slot to switch the working directory to the selected revision. |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
407 | """ |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
408 | itm = self.bookmarksList.currentItem() |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
409 | bookmark = itm.text(3).strip() |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
410 | if bookmark: |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
411 | shouldReopen = self.vcs.vcsUpdate( |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
412 | self.__repoDir, revision=bookmark) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
413 | if shouldReopen: |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
414 | res = E5MessageBox.yesNo( |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
415 | None, |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
416 | self.tr("Switch"), |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
417 | self.tr( |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
418 | """The project should be reread. Do this now?"""), |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
419 | yesDefault=True) |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
420 | if res: |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
421 | e5App().getObject("Project").reopenProject() |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
422 | return |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
423 | |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
424 | self.on_refreshButton_clicked() |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
425 | # TODO: Add context menu with these actions |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
426 | # - Delete Bookmark |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
427 | # - Rename Bookmark |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
428 | # - Pull Bookmark |
d0b6adb1721f
Started to implement a context menu for the Mercurial bookmarks list dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5322
diff
changeset
|
429 | # - Push Bookmark |