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

manifestdialog: move toolbar to ManifestWidget from ManifestDialog

It's embedded on top of tree view by default.

Changeset 3bd390a24731…

Parent f9693f2f5807…

by Yuya Nishihara

Changes to one file · Browse files at 3bd390a24731 Showing diff from parent f9693f2f5807 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
44
45
46
 
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
 
149
150
151
 
152
153
154
 
157
158
159
 
 
 
 
160
 
 
 
 
 
161
162
 
163
164
165
 
178
179
180
 
 
 
 
 
 
 
 
 
 
 
181
182
183
 
44
45
46
47
48
 
49
50
51
 
 
 
 
 
 
 
 
52
53
54
55
56
 
 
 
 
57
58
59
 
137
138
139
140
141
142
143
 
146
147
148
149
150
151
152
153
154
155
156
157
158
159
 
160
161
162
163
 
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
@@ -44,28 +44,16 @@
  self._manifest_widget = ManifestWidget(ui, repo, rev)   self._manifest_widget.revchanged.connect(self._updatewindowtitle)   self.setCentralWidget(self._manifest_widget) + self.addToolBar(self._manifest_widget.toolbar)   - self._initactions()   self._readsettings()   self._updatewindowtitle()   - def _initactions(self): - self._toolbar = QToolBar() - self.addToolBar(self._toolbar) - # TODO: not sure 'Annotate' mode is good for toolbar - self._action_annotate_mode = QAction(_('Annotate'), self, checkable=True) - self._action_annotate_mode.toggled.connect(self._annotate_mode_toggled) - self._toolbar.addAction(self._action_annotate_mode) -   @pyqtSlot()   def _updatewindowtitle(self):   self.setWindowTitle(_('Hg manifest viewer - %s:%s') % (   self._repo.root, self._manifest_widget.rev))   - @pyqtSlot(bool) - def _annotate_mode_toggled(self, checked): - self._manifest_widget.setfileview(checked and 'annotate' or 'cat') -   def closeEvent(self, event):   self._writesettings()   super(ManifestDialog, self).closeEvent(event) @@ -149,6 +137,7 @@
  self._rev = rev     self._initwidget() + self._initactions()   self._setupmodel()   self.setfileview('cat')   self._treeview.setCurrentIndex(self._treemodel.index(0, 0)) @@ -157,9 +146,18 @@
  self.setLayout(QVBoxLayout())   self._splitter = QSplitter()   self.layout().addWidget(self._splitter) + + navlayout = QVBoxLayout() + navlayout.setContentsMargins(0, 0, 0, 0) + self._toolbar = QToolBar()   self._treeview = QTreeView() + navlayout.addWidget(self._toolbar) + navlayout.addWidget(self._treeview) + navlayoutw = QWidget() + navlayoutw.setLayout(navlayout) +   self._contentview = QStackedWidget() - self._splitter.addWidget(self._treeview) + self._splitter.addWidget(navlayoutw)   self._splitter.addWidget(self._contentview)   self._splitter.setStretchFactor(0, 1)   self._splitter.setStretchFactor(1, 3) @@ -178,6 +176,17 @@
  self._contentview.currentChanged.connect(   lambda: self._fileselected(self._treeview.currentIndex()))   + def _initactions(self): + self._action_annotate_mode = QAction(_('Annotate'), self, checkable=True) + self._action_annotate_mode.toggled.connect( + lambda checked: self.setfileview(checked and 'annotate' or 'cat')) + self._toolbar.addAction(self._action_annotate_mode) + + @property + def toolbar(self): + """Return toolbar for manifest widget""" + return self._toolbar +   def _setupmodel(self):   self._treemodel = ManifestModel(self._repo, self._rev)   self._treeview.setModel(self._treemodel)