169 self.logTree.setIconSize( |
169 self.logTree.setIconSize( |
170 QSize(100 * self.__rowHeight, self.__rowHeight)) |
170 QSize(100 * self.__rowHeight, self.__rowHeight)) |
171 self.BookmarksColumn = self.logTree.columnCount() |
171 self.BookmarksColumn = self.logTree.columnCount() |
172 self.logTree.headerItem().setText( |
172 self.logTree.headerItem().setText( |
173 self.BookmarksColumn, self.tr("Bookmarks")) |
173 self.BookmarksColumn, self.tr("Bookmarks")) |
174 if self.vcs.version < (2, 1): |
|
175 self.logTree.setColumnHidden(self.PhaseColumn, True) |
|
176 |
174 |
177 self.__initActionsMenu() |
175 self.__initActionsMenu() |
178 |
176 |
179 def __initActionsMenu(self): |
177 def __initActionsMenu(self): |
180 """ |
178 """ |
181 Private method to initialize the actions menu. |
179 Private method to initialize the actions menu. |
182 """ |
180 """ |
183 self.__actionsMenu = QMenu() |
181 self.__actionsMenu = QMenu() |
184 if self.vcs.version >= (2, 0): |
182 self.__graftAct = self.__actionsMenu.addAction( |
185 self.__graftAct = self.__actionsMenu.addAction( |
183 self.tr("Copy Changesets"), self.__graftActTriggered) |
186 self.tr("Copy Changesets"), self.__graftActTriggered) |
184 self.__graftAct.setToolTip(self.tr( |
187 self.__graftAct.setToolTip(self.tr( |
185 "Copy the selected changesets to the current branch")) |
188 "Copy the selected changesets to the current branch")) |
186 |
189 else: |
187 self.__phaseAct = self.__actionsMenu.addAction( |
190 self.__graftAct = None |
188 self.tr("Change Phase"), self.__phaseActTriggered) |
191 |
189 self.__phaseAct.setToolTip(self.tr( |
192 if self.vcs.version >= (2, 1): |
190 "Change the phase of the selected revisions")) |
193 self.__phaseAct = self.__actionsMenu.addAction( |
191 self.__phaseAct.setWhatsThis(self.tr( |
194 self.tr("Change Phase"), self.__phaseActTriggered) |
192 """<b>Change Phase</b>\n<p>This changes the phase of the""" |
195 self.__phaseAct.setToolTip(self.tr( |
193 """ selected revisions. The selected revisions have to have""" |
196 "Change the phase of the selected revisions")) |
194 """ the same current phase.</p>""")) |
197 self.__phaseAct.setWhatsThis(self.tr( |
|
198 """<b>Change Phase</b>\n<p>This changes the phase of the""" |
|
199 """ selected revisions. The selected revisions have to have""" |
|
200 """ the same current phase.</p>""")) |
|
201 else: |
|
202 self.__phaseAct = None |
|
203 |
195 |
204 self.__tagAct = self.__actionsMenu.addAction( |
196 self.__tagAct = self.__actionsMenu.addAction( |
205 self.tr("Tag"), self.__tagActTriggered) |
197 self.tr("Tag"), self.__tagActTriggered) |
206 self.__tagAct.setToolTip(self.tr("Tag the selected revision")) |
198 self.__tagAct.setToolTip(self.tr("Tag the selected revision")) |
207 |
199 |
214 |
206 |
215 self.__pullAct = self.__actionsMenu.addAction( |
207 self.__pullAct = self.__actionsMenu.addAction( |
216 self.tr("Pull Changes"), self.__pullActTriggered) |
208 self.tr("Pull Changes"), self.__pullActTriggered) |
217 self.__pullAct.setToolTip(self.tr( |
209 self.__pullAct.setToolTip(self.tr( |
218 "Pull changes from a remote repository")) |
210 "Pull changes from a remote repository")) |
219 if self.vcs.version >= (2, 0): |
211 self.__lfPullAct = self.__actionsMenu.addAction( |
220 self.__lfPullAct = self.__actionsMenu.addAction( |
212 self.tr("Pull Large Files"), self.__lfPullActTriggered) |
221 self.tr("Pull Large Files"), self.__lfPullActTriggered) |
213 self.__lfPullAct.setToolTip(self.tr( |
222 self.__lfPullAct.setToolTip(self.tr( |
214 "Pull large files for selected revisions")) |
223 "Pull large files for selected revisions")) |
|
224 else: |
|
225 self.__lfPullAct = None |
|
226 |
215 |
227 self.__actionsMenu.addSeparator() |
216 self.__actionsMenu.addSeparator() |
228 |
217 |
229 self.__pushAct = self.__actionsMenu.addAction( |
218 self.__pushAct = self.__actionsMenu.addAction( |
230 self.tr("Push Selected Changes"), self.__pushActTriggered) |
219 self.tr("Push Selected Changes"), self.__pushActTriggered) |
789 not self.fname == "." and \ |
778 not self.fname == "." and \ |
790 not self.stopCheckBox.isChecked(): |
779 not self.stopCheckBox.isChecked(): |
791 args.append('--follow') |
780 args.append('--follow') |
792 if self.commandMode == "log": |
781 if self.commandMode == "log": |
793 args.append('--copies') |
782 args.append('--copies') |
794 if self.vcs.version >= (3, 0): |
783 args.append('--template') |
795 args.append('--template') |
784 args.append(os.path.join(os.path.dirname(__file__), |
796 args.append(os.path.join(os.path.dirname(__file__), |
785 "templates", |
797 "templates", |
786 "logBrowserBookmarkPhase.tmpl")) |
798 "logBrowserBookmarkPhase.tmpl")) |
|
799 else: |
|
800 args.append('--style') |
|
801 if self.vcs.version >= (2, 1): |
|
802 args.append(os.path.join(os.path.dirname(__file__), |
|
803 "styles", |
|
804 "logBrowserBookmarkPhase.style")) |
|
805 else: |
|
806 args.append(os.path.join(os.path.dirname(__file__), |
|
807 "styles", |
|
808 "logBrowserBookmark.style")) |
|
809 if self.commandMode == "incoming": |
787 if self.commandMode == "incoming": |
810 if self.__bundle: |
788 if self.__bundle: |
811 args.append(self.__bundle) |
789 args.append(self.__bundle) |
812 elif not self.vcs.hasSubrepositories(): |
790 elif not self.vcs.hasSubrepositories(): |
813 project = e5App().getObject("Project") |
791 project = e5App().getObject("Project") |