Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

revdetails: normalize variable names

Changeset cfa9b6f34f1a…

Parent ba3a838a7755…

by Steve Borho

Changes to one file · Browse files at cfa9b6f34f1a Showing diff from parent ba3a838a7755 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
 
55
56
57
58
59
60
61
 
 
 
 
62
63
 
64
65
66
67
68
69
70
71
72
 
 
 
 
73
74
75
 
 
 
 
76
77
78
79
80
81
82
83
 
 
 
 
84
85
86
 
 
87
88
89
90
 
91
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
127
128
129
130
131
132
133
 
 
 
 
 
 
 
 
 
134
135
136
 
147
148
149
150
 
151
152
153
 
165
166
167
168
169
170
171
 
 
172
173
174
 
186
187
188
189
 
190
191
192
193
 
 
194
195
196
 
55
56
57
 
 
 
 
58
59
60
61
62
 
63
64
65
66
67
68
 
 
 
 
69
70
71
72
73
 
 
74
75
76
77
78
79
80
81
 
 
 
 
82
83
84
85
86
 
 
87
88
89
90
91
 
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
 
 
 
 
 
 
 
 
 
127
128
129
130
131
132
133
134
135
136
137
138
 
149
150
151
 
152
153
154
155
 
167
168
169
 
 
 
 
170
171
172
173
174
 
186
187
188
 
189
190
191
 
 
192
193
194
195
196
@@ -55,82 +55,84 @@
  sp.setHeightForWidth(self.sizePolicy().hasHeightForWidth())   self.setSizePolicy(sp)   - # + revisiondetails_layout -----------------------------------------+ - # |+ filelist_splitter ........ | - # | + tbarFileListFrame (vbox)| + cset_and_file_details_frame (vbox)| - # | + filelistToolbar | + revpanel | + # + basevbox -------------------------------------------------------+ + # |+ filelistsplit ........ | + # | + filelistframe (vbox) | + panelframe (vbox) | + # | + filelisttbar | + revpanel |   # +---------------------------+-------------------------------------+ - # | + filelist | + message_splitter | + # | + filelist | + messagesplitter |   # | | :+ message |   # | | :----------------------------------+   # | | + fileview |   # +---------------------------+-------------------------------------+   - revisiondetails_layout = QVBoxLayout(self) - revisiondetails_layout.setSpacing(0) - revisiondetails_layout.setMargin(0) - revisiondetails_layout.setContentsMargins(2, 2, 2, 2) + basevbox = QVBoxLayout(self) + basevbox.setSpacing(0) + basevbox.setMargin(0) + basevbox.setContentsMargins(2, 2, 2, 2)   - self.filelist_splitter = QSplitter(self) - self.splitternames.append('filelist_splitter') + self.filelistsplit = QSplitter(self) + basevbox.addWidget(self.filelistsplit) + + self.splitternames.append('filelistsplit')     sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(0) - sp.setHeightForWidth(self.filelist_splitter.sizePolicy().hasHeightForWidth()) - self.filelist_splitter.setSizePolicy(sp) - self.filelist_splitter.setOrientation(Qt.Horizontal) - self.filelist_splitter.setChildrenCollapsible(False) + sp.setHeightForWidth(self.filelistsplit.sizePolicy().hasHeightForWidth()) + self.filelistsplit.setSizePolicy(sp) + self.filelistsplit.setOrientation(Qt.Horizontal) + self.filelistsplit.setChildrenCollapsible(False)   - self.filelistToolbar = QToolBar(_('File List Toolbar')) - self.filelistToolbar.setIconSize(QSize(16,16)) + self.filelisttbar = QToolBar(_('File List Toolbar')) + self.filelisttbar.setIconSize(QSize(16,16))   self.filelist = HgFileListView(self.repo, self)   self.filelist.linkActivated.connect(self.linkActivated)   - self.tbarFileListFrame = QFrame(self.filelist_splitter) + self.filelistframe = QFrame(self.filelistsplit)   sp = SP(SP.Preferred, SP.Preferred)   sp.setHorizontalStretch(3)   sp.setVerticalStretch(0)   sp.setHeightForWidth( - self.tbarFileListFrame.sizePolicy().hasHeightForWidth()) - self.tbarFileListFrame.setSizePolicy(sp) - self.tbarFileListFrame.setFrameShape(QFrame.NoFrame) + self.filelistframe.sizePolicy().hasHeightForWidth()) + self.filelistframe.setSizePolicy(sp) + self.filelistframe.setFrameShape(QFrame.NoFrame)   vbox = QVBoxLayout()   vbox.setSpacing(0)   vbox.setMargin(0) - vbox.addWidget(self.filelistToolbar) + vbox.addWidget(self.filelisttbar)   vbox.addWidget(self.filelist) - self.tbarFileListFrame.setLayout(vbox) + self.filelistframe.setLayout(vbox)   - self.cset_and_file_details_frame = QFrame(self.filelist_splitter) + self.fileviewframe = QFrame(self.filelistsplit)   sp = SP(SP.Preferred, SP.Preferred)   sp.setHorizontalStretch(7)   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(QFrame.NoFrame) + self.fileviewframe.sizePolicy().hasHeightForWidth()) + self.fileviewframe.setSizePolicy(sp) + self.fileviewframe.setFrameShape(QFrame.NoFrame)   - vbox = QVBoxLayout(self.cset_and_file_details_frame) + vbox = QVBoxLayout(self.fileviewframe)   vbox.setSpacing(0)   vbox.setSizeConstraint(QLayout.SetDefaultConstraint)   vbox.setMargin(0) - cset_and_file_details_layout = vbox + panelframevbox = vbox   - self.message_splitter = QSplitter(self.cset_and_file_details_frame) - self.splitternames.append('message_splitter') + self.messagesplitter = QSplitter(self.fileviewframe) + self.splitternames.append('messagesplitter')   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(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) - self.message_splitter.setOpaqueResize(True) - self.message = QTextBrowser(self.message_splitter, + sp.setHeightForWidth(self.messagesplitter.sizePolicy().hasHeightForWidth()) + self.messagesplitter.setSizePolicy(sp) + self.messagesplitter.setMinimumSize(QSize(50, 50)) + self.messagesplitter.setFrameShape(QFrame.NoFrame) + self.messagesplitter.setLineWidth(0) + self.messagesplitter.setMidLineWidth(0) + self.messagesplitter.setOrientation(Qt.Vertical) + self.messagesplitter.setOpaqueResize(True) + self.message = QTextBrowser(self.messagesplitter,   lineWrapMode=QTextEdit.NoWrap,   openLinks=False)   self.message.minimumSizeHint = lambda: QSize(0, 25) @@ -147,7 +149,7 @@
  self.message.setFont(f.font())   f.changed.connect(self.forwardFont)   - self.fileview = HgFileView(self.repo, self.message_splitter) + self.fileview = HgFileView(self.repo, self.messagesplitter)   sp = SP(SP.Expanding, SP.Expanding)   sp.setHorizontalStretch(0)   sp.setVerticalStretch(5) @@ -165,10 +167,8 @@
  self.revpanel = RevPanelWidget(self.repo)   self.revpanel.linkActivated.connect(self.linkActivated)   - cset_and_file_details_layout.addWidget(self.revpanel) - cset_and_file_details_layout.addWidget(self.message_splitter) - - revisiondetails_layout.addWidget(self.filelist_splitter) + panelframevbox.addWidget(self.revpanel) + panelframevbox.addWidget(self.messagesplitter)     def forwardFont(self, font):   self.message.setFont(font) @@ -186,11 +186,11 @@
  Qt.ALT+Qt.Key_Enter])   self.actionActivateFileAlt.triggered.connect(fileActivated)   - self.actionUpdate = a = self.filelistToolbar.addAction( + self.actionUpdate = a = self.filelisttbar.addAction(   geticon('hg-update'), _('Update to this revision'))   a.triggered.connect(lambda: self.updateToRevision.emit(self._last_rev)) - self.filelistToolbar.addSeparator() - self.filelistToolbar.addAction(self.filelist.actionShowAllMerge) + self.filelisttbar.addSeparator() + self.filelisttbar.addAction(self.filelist.actionShowAllMerge)     self.actionNextLine = QAction('Next line', self)   self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)