Wed, 01 Jan 2020 11:59:01 +0100
Updated copyright for 2020.
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
326
67bcde9c65b9
Updated copyright for 2020.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
302
diff
changeset
|
3 | # Copyright (c) 2010 - 2020 Detlev Offenbach <detlev@die-offenbachs.de> |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the Inline dialog. |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
76 | 10 | from __future__ import unicode_literals |
50
a29c3d2e6dc0
rope for Python2 projects enabled, if running on Python2
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
43
diff
changeset
|
11 | |
87
1fbf5fdbe721
Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
76
diff
changeset
|
12 | from PyQt5.QtCore import pyqtSlot |
1fbf5fdbe721
Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
76
diff
changeset
|
13 | from PyQt5.QtWidgets import QDialogButtonBox, QAbstractButton |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | |
203
c38750e1bafd
Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
15 | from .Ui_InlineDialog import Ui_InlineDialog |
c38750e1bafd
Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
189
diff
changeset
|
16 | from .RefactoringDialogBase import RefactoringDialogBase |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | class InlineDialog(RefactoringDialogBase, Ui_InlineDialog): |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | """ |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | Class implementing the Inline dialog. |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | """ |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
23 | def __init__(self, refactoring, title, filename, offset, parent=None): |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | """ |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | Constructor |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | @param refactoring reference to the main refactoring object |
189
2711fdd91925
Renamed the 'Refactoring' module and class 'RefactoringServer'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
177
diff
changeset
|
28 | @type RefactoringServer |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
29 | @param title title of the dialog |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
30 | @type str |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
31 | @param filename file name to be worked on |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
32 | @type str |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
33 | @param offset offset within file |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
34 | @type int or None |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
35 | @param parent reference to the parent widget |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
36 | @type QWidget |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | """ |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | RefactoringDialogBase.__init__(self, refactoring, title, parent) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | self.setupUi(self) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
41 | self._changeGroupName = "Inline" |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
42 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
43 | self.__filename = filename |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
44 | self.__offset = offset |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
45 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
46 | self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
47 | self.__previewButton = self.buttonBox.addButton( |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
48 | self.tr("Preview"), QDialogButtonBox.ActionRole) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
49 | self.__previewButton.setDefault(True) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
50 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
51 | self.__inlinerKind = "" |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
53 | self._refactoring.sendJson("RequestInlineType", { |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
54 | "ChangeGroup": self._changeGroupName, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
55 | "Title": self._title, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
56 | "FileName": self.__filename, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
57 | "Offset": self.__offset, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
58 | }) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
59 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
60 | def __processInlineType(self, data): |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
61 | """ |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
62 | Private method to process the inline type data sent by the refactoring |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
63 | client in order to polish the dialog. |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
64 | |
177
963fc1b0ba6e
Fixed an issue related to the enable state of the Preview button and some code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
176
diff
changeset
|
65 | @param data dictionary containing the inline type data |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
66 | @type dict |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
67 | """ |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
68 | self.__inlinerKind = data["Kind"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
69 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
70 | if data["Kind"] == "parameter": |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | self.removeCheckBox.setVisible(False) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | self.currentCheckBox.setVisible(False) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | self.hierarchyCheckBox.setVisible(True) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | else: |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | self.removeCheckBox.setVisible(True) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | self.currentCheckBox.setVisible(True) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | self.hierarchyCheckBox.setVisible(False) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | self.resize(500, 20) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
80 | self.description.setText( |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
81 | self.tr("Inlining occurrences of <b>{0}</b> (type '<i>{1}</i>').") |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
82 | .format(data["Name"], data["Kind"])) |
74
0973b175e2ad
Fixed a window sizing issue.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
62
diff
changeset
|
83 | |
0973b175e2ad
Fixed a window sizing issue.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
62
diff
changeset
|
84 | msh = self.minimumSizeHint() |
0973b175e2ad
Fixed a window sizing issue.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
62
diff
changeset
|
85 | self.resize(max(self.width(), msh.width()), msh.height()) |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | @pyqtSlot(QAbstractButton) |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | def on_buttonBox_clicked(self, button): |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | """ |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | Private slot to act on the button pressed. |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
92 | @param button reference to the button pressed |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
93 | @type QAbstractButton |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | """ |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | if button == self.__previewButton: |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
96 | self.requestPreview() |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | elif button == self.__okButton: |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | self.applyChanges() |
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
100 | def _calculateChanges(self): |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | """ |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
102 | Protected method to initiate the calculation of the changes. |
6
07dabc6bb157
Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | """ |
176
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
104 | self._refactoring.sendJson("CalculateInlineChanges", { |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
105 | "ChangeGroup": self._changeGroupName, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
106 | "Title": self._title, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
107 | "FileName": self.__filename, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
108 | "Offset": self.__offset, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
109 | "Kind": self.__inlinerKind, |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
110 | "Hierarchy": self.hierarchyCheckBox.isChecked(), |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
111 | "Remove": self.removeCheckBox.isChecked(), |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
112 | "OnlyCurrent": self.currentCheckBox.isChecked(), |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
113 | }) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
114 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
115 | def processChangeData(self, data): |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
116 | """ |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
117 | Public method to process the change data sent by the refactoring |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
118 | client. |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
119 | |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
120 | @param data dictionary containing the change data |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
121 | @type dict |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
122 | """ |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
123 | subcommand = data["Subcommand"] |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
124 | if subcommand == "InlineType": |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
125 | self.__processInlineType(data) |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
126 | else: |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
127 | # pass on to base class |
117d86025a5c
Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
128 | RefactoringDialogBase.processChangeData(self, data) |