Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

revdetailswidget: use wildcard import for Qt things

Changeset 62369a04676b…

Parent c88a91fcc13c…

by Adrian Buehlmann

Changes to one file · Browse files at 62369a04676b Showing diff from parent c88a91fcc13c Diff from another changeset...

Change 1 of 12 Show Entire File tortoisehg/​hgqt/​revdetailswidget.py Stacked
 
8
9
10
11
12
13
14
15
 
22
23
24
25
26
27
 
 
28
 
29
30
31
32
33
 
 
 
 
34
35
36
 
41
42
43
44
 
45
46
47
 
59
60
61
62
 
63
64
 
65
66
67
 
70
71
72
73
 
74
75
 
76
77
78
79
80
81
82
 
 
83
84
 
85
86
87
88
 
89
90
91
 
93
94
95
96
 
97
98
99
100
101
 
102
103
104
105
106
107
108
 
109
110
 
111
112
 
113
114
115
116
 
117
118
119
120
121
122
123
124
 
 
125
126
127
 
134
135
136
137
138
 
 
139
140
141
 
146
147
148
149
 
150
151
152
 
158
159
160
161
 
162
163
164
 
183
184
185
186
 
187
188
189
190
191
 
192
193
194
195
196
 
197
198
199
200
201
 
202
203
204
205
206
 
207
208
209
210
211
212
213
 
214
215
 
216
217
218
 
254
255
256
257
 
258
259
260
 
275
276
277
278
 
279
280
281
282
283
284
285
 
286
287
288
 
8
9
10
 
 
11
12
13
 
20
21
22
 
 
 
23
24
25
26
27
 
28
 
 
29
30
31
32
33
34
35
 
40
41
42
 
43
44
45
46
 
58
59
60
 
61
62
 
63
64
65
66
 
69
70
71
 
72
73
 
74
75
76
77
78
79
 
 
80
81
82
 
83
84
85
86
 
87
88
89
90
 
92
93
94
 
95
96
97
98
99
 
100
101
102
103
104
105
106
 
107
108
 
109
110
 
111
112
113
114
 
115
116
117
118
119
120
121
 
 
122
123
124
125
126
 
133
134
135
 
 
136
137
138
139
140
 
145
146
147
 
148
149
150
151
 
157
158
159
 
160
161
162
163
 
182
183
184
 
185
186
187
188
189
 
190
191
192
193
194
 
195
196
197
198
199
 
200
201
202
203
204
 
205
206
207
208
209
210
211
 
212
213
 
214
215
216
217
 
253
254
255
 
256
257
258
259
 
274
275
276
 
277
278
279
280
281
282
283
 
284
285
286
287
@@ -8,8 +8,6 @@
 # This software may be used and distributed according to the terms  # of the GNU General Public License, incorporated herein by reference.   -from PyQt4 import QtCore, QtGui -  from mercurial import hg    from tortoisehg.hgqt.i18n import _ @@ -22,15 +20,16 @@
 from revpanelwidget import RevPanelWidget  from revmessage import RevMessage   -Qt = QtCore.Qt -connect = QtCore.QObject.connect -SIGNAL = QtCore.SIGNAL +from PyQt4.QtCore import * +from PyQt4.QtGui import *   +connect = QObject.connect   -class RevDetailsWidget(QtGui.QWidget):   - showMessageSignal = QtCore.pyqtSignal(str) - revisionLinkClicked = QtCore.pyqtSignal(str) +class RevDetailsWidget(QWidget): + + showMessageSignal = pyqtSignal(str) + revisionLinkClicked = pyqtSignal(str)     def __init__(self, repo, repoview):   self.repo = repo @@ -41,7 +40,7 @@
    self.splitternames = []   - QtGui.QWidget.__init__(self) + QWidget.__init__(self)     self.load_config()   @@ -59,9 +58,9 @@
  self.restoreSettings()     def setupUi(self): - SP = QtGui.QSizePolicy + SP = QSizePolicy   - self.hbox = QtGui.QHBoxLayout(self) + self.hbox = QHBoxLayout(self)   self.hbox.setSpacing(0)   self.hbox.setMargin(0)   @@ -70,22 +69,22 @@
  self.hbox.addWidget(self.revisionDetailsWidget)     def setupRevisionDetailsWidget(self): - SP = QtGui.QSizePolicy + SP = QSizePolicy   - self.revisionDetailsWidget = QtGui.QFrame() + self.revisionDetailsWidget = QFrame()   sp = SP(SP.Preferred, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0)   sp.setHeightForWidth(self.revisionDetailsWidget.sizePolicy().hasHeightForWidth())   self.revisionDetailsWidget.setSizePolicy(sp) - self.revisionDetailsWidget.setFrameShape(QtGui.QFrame.NoFrame) - self.revisionDetailsWidget.setFrameShadow(QtGui.QFrame.Plain) + self.revisionDetailsWidget.setFrameShape(QFrame.NoFrame) + self.revisionDetailsWidget.setFrameShadow(QFrame.Plain)   - revisiondetails_layout = QtGui.QVBoxLayout(self.revisionDetailsWidget) + revisiondetails_layout = QVBoxLayout(self.revisionDetailsWidget)   revisiondetails_layout.setSpacing(0)   revisiondetails_layout.setMargin(0)   - self.filelist_splitter = QtGui.QSplitter(self.revisionDetailsWidget) + self.filelist_splitter = QSplitter(self.revisionDetailsWidget)   self.splitternames.append('filelist_splitter')     sp = SP(SP.Expanding, SP.Expanding) @@ -93,35 +92,35 @@
  sp.setVerticalStretch(0)   sp.setHeightForWidth(self.filelist_splitter.sizePolicy().hasHeightForWidth())   self.filelist_splitter.setSizePolicy(sp) - self.filelist_splitter.setOrientation(QtCore.Qt.Horizontal) + self.filelist_splitter.setOrientation(Qt.Horizontal)   self.filelist_splitter.setChildrenCollapsible(False)     self.tableView_filelist = HgFileListView(self.filelist_splitter)   - self.cset_and_file_details_frame = QtGui.QFrame(self.filelist_splitter) + self.cset_and_file_details_frame = QFrame(self.filelist_splitter)   sp = SP(SP.Preferred, SP.Preferred)   sp.setHorizontalStretch(1)   sp.setVerticalStretch(0)   sp.setHeightForWidth(   self.cset_and_file_details_frame.sizePolicy().hasHeightForWidth())   self.cset_and_file_details_frame.setSizePolicy(sp) - self.cset_and_file_details_frame.setFrameShape(QtGui.QFrame.NoFrame) + self.cset_and_file_details_frame.setFrameShape(QFrame.NoFrame)   - vbox = QtGui.QVBoxLayout(self.cset_and_file_details_frame) + vbox = QVBoxLayout(self.cset_and_file_details_frame)   vbox.setSpacing(0) - vbox.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint) + vbox.setSizeConstraint(QLayout.SetDefaultConstraint)   vbox.setMargin(0)   cset_and_file_details_layout = vbox   - self.message_splitter = QtGui.QSplitter(self.cset_and_file_details_frame) + self.message_splitter = QSplitter(self.cset_and_file_details_frame)   self.splitternames.append('message_splitter')   sp = SP(SP.Preferred, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0)   sp.setHeightForWidth(self.message_splitter.sizePolicy().hasHeightForWidth())   self.message_splitter.setSizePolicy(sp) - self.message_splitter.setMinimumSize(QtCore.QSize(50, 50)) - self.message_splitter.setFrameShape(QtGui.QFrame.NoFrame) + self.message_splitter.setMinimumSize(QSize(50, 50)) + self.message_splitter.setFrameShape(QFrame.NoFrame)   self.message_splitter.setLineWidth(0)   self.message_splitter.setMidLineWidth(0)   self.message_splitter.setOrientation(Qt.Vertical) @@ -134,8 +133,8 @@
  sp.setVerticalStretch(0)   sp.setHeightForWidth(self.message.sizePolicy().hasHeightForWidth())   self.message.setSizePolicy(sp) - self.message.setMinimumSize(QtCore.QSize(0, 0)) - font = QtGui.QFont() + self.message.setMinimumSize(QSize(0, 0)) + font = QFont()   font.setFamily("Courier")   font.setPointSize(9)   self.message.setFont(font) @@ -146,7 +145,7 @@
  sp.setVerticalStretch(1)   sp.setHeightForWidth(self.fileview.sizePolicy().hasHeightForWidth())   self.fileview.setSizePolicy(sp) - self.fileview.setMinimumSize(QtCore.QSize(0, 0)) + self.fileview.setMinimumSize(QSize(0, 0))     self.revpanel = RevPanelWidget(self.repo, self.repoview)   @@ -158,7 +157,7 @@
  def load_config(self):   cfg = HgConfig(self.repo.ui)   fontstr = cfg.getFont() - font = QtGui.QFont() + font = QFont()   try:   if not font.fromString(fontstr):   raise Exception @@ -183,36 +182,36 @@
  self.showMessageSignal.emit(msg)     def showEvent(self, event): - QtGui.QWidget.showEvent(self, event) + QWidget.showEvent(self, event)   self.showMessageSignal.emit(self.currentMessage)     def createActions(self):   # navigate in file viewer - self.actionNextLine = QtGui.QAction('Next line', self) + self.actionNextLine = QAction('Next line', self)   self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)   connect(self.actionNextLine, SIGNAL('triggered()'),   self.fileview.nextLine)   self.addAction(self.actionNextLine) - self.actionPrevLine = QtGui.QAction('Prev line', self) + self.actionPrevLine = QAction('Prev line', self)   self.actionPrevLine.setShortcut(Qt.SHIFT + Qt.Key_Up)   connect(self.actionPrevLine, SIGNAL('triggered()'),   self.fileview.prevLine)   self.addAction(self.actionPrevLine) - self.actionNextCol = QtGui.QAction('Next column', self) + self.actionNextCol = QAction('Next column', self)   self.actionNextCol.setShortcut(Qt.SHIFT + Qt.Key_Right)   connect(self.actionNextCol, SIGNAL('triggered()'),   self.fileview.nextCol)   self.addAction(self.actionNextCol) - self.actionPrevCol = QtGui.QAction('Prev column', self) + self.actionPrevCol = QAction('Prev column', self)   self.actionPrevCol.setShortcut(Qt.SHIFT + Qt.Key_Left)   connect(self.actionPrevCol, SIGNAL('triggered()'),   self.fileview.prevCol)   self.addAction(self.actionPrevCol)     # Activate file (file diff navigator) - self.actionActivateFile = QtGui.QAction('Activate file', self) + self.actionActivateFile = QAction('Activate file', self)   - self.actionActivateFileAlt = QtGui.QAction('Activate alt. file', self) + self.actionActivateFileAlt = QAction('Activate alt. file', self)   self.actionActivateFileAlt.setShortcuts([Qt.ALT+Qt.Key_Return, Qt.ALT+Qt.Key_Enter])   connect(self.actionActivateFileAlt, SIGNAL('triggered()'),   lambda self=self: @@ -254,7 +253,7 @@
    def on_filled(self):   self.tableView_filelist.selectFile(self._reload_file) - +   def file_displayed(self, filename):   #self.actionPrevDiff.setEnabled(False)   pass @@ -275,14 +274,14 @@
  self.setupModels(self.repomodel)     def storeSettings(self): - s = QtCore.QSettings() + s = QSettings()   wb = "RevDetailsWidget/"   for n in self.splitternames:   s.setValue(wb + n, getattr(self, n).saveState())   s.setValue(wb + 'revpanel.expanded', self.revpanel.is_expanded())     def restoreSettings(self): - s = QtCore.QSettings() + s = QSettings()   wb = "RevDetailsWidget/"   for n in self.splitternames:   getattr(self, n).restoreState(s.value(wb + n).toByteArray())