Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.1, 2.0.2, and 2.0.3

stable revdetails: rename mergeToolBar to filelistToolbar

Changeset 406be61d057f…

Parent e8185d5e416a…

by Adrian Buehlmann

Changes to one file · Browse files at 406be61d057f Showing diff from parent e8185d5e416a Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​revdetails.py Stacked
 
61
62
63
64
 
65
66
67
 
85
86
87
88
89
 
 
90
91
92
 
100
101
102
103
 
104
105
106
 
176
177
178
179
180
 
 
181
182
183
 
61
62
63
 
64
65
66
67
 
85
86
87
 
 
88
89
90
91
92
 
100
101
102
 
103
104
105
106
 
176
177
178
 
 
179
180
181
182
183
@@ -61,7 +61,7 @@
  # + revisiondetails_layout -----------------------------------------+   # |+ filelist_splitter ........ |   # | + tbarFileListFrame (vbox)| + cset_and_file_details_frame (vbox)| - # | + mergeToolbar | + revpanel | + # | + filelistToolbar | + revpanel |   # +---------------------------+-------------------------------------+   # | + filelist | + message_splitter |   # | | :+ message | @@ -85,8 +85,8 @@
  self.filelist_splitter.setOrientation(Qt.Horizontal)   self.filelist_splitter.setChildrenCollapsible(False)   - self.mergeToolBar = QToolBar(_('Merge Toolbar')) - self.mergeToolBar.setIconSize(QSize(16,16)) + self.filelistToolbar = QToolBar(_('File List Toolbar')) + self.filelistToolbar.setIconSize(QSize(16,16))   self.filelist = HgFileListView()     self.tbarFileListFrame = QFrame(self.filelist_splitter) @@ -100,7 +100,7 @@
  vbox = QVBoxLayout()   vbox.setSpacing(0)   vbox.setMargin(0) - vbox.addWidget(self.mergeToolBar) + vbox.addWidget(self.filelistToolbar)   vbox.addWidget(self.filelist)   self.tbarFileListFrame.setLayout(vbox)   @@ -176,8 +176,8 @@
  self.actionActivateFileAlt.setShortcuts([Qt.ALT+Qt.Key_Return,   Qt.ALT+Qt.Key_Enter])   self.actionActivateFileAlt.triggered.connect(fileActivated) - self.mergeToolBar.addAction(self.filelist.actionShowAllMerge) - self.mergeToolBar.addAction(self.filelist.actionSecondParent) + self.filelistToolbar.addAction(self.filelist.actionShowAllMerge) + self.filelistToolbar.addAction(self.filelist.actionSecondParent)     self.actionNextLine = QAction('Next line', self)   self.actionNextLine.setShortcut(Qt.SHIFT + Qt.Key_Down)