diff -r 919147f2b518 -r 949812411ab8 Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Sat May 07 17:56:31 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py Sat May 07 20:31:28 2011 +0200
@@ -12,6 +12,8 @@
from E5Gui.E5Action import E5Action
+import UI.PixmapCache
+
class BookmarksProjectHelper(QObject):
"""
@@ -50,6 +52,7 @@
Public method to generate the action objects.
"""
self.hgBookmarksListAct = E5Action(self.trUtf8('List bookmarks'),
+ UI.PixmapCache.getIcon("listBookmarks.png"),
self.trUtf8('List bookmarks...'),
0, 0, self, 'mercurial_list_bookmarks')
self.hgBookmarksListAct.setStatusTip(self.trUtf8(
@@ -63,6 +66,7 @@
self.actions.append(self.hgBookmarksListAct)
self.hgBookmarkDefineAct = E5Action(self.trUtf8('Define bookmark'),
+ UI.PixmapCache.getIcon("addBookmark.png"),
self.trUtf8('Define bookmark...'),
0, 0, self, 'mercurial_define_bookmark')
self.hgBookmarkDefineAct.setStatusTip(self.trUtf8(
@@ -76,6 +80,7 @@
self.actions.append(self.hgBookmarkDefineAct)
self.hgBookmarkDeleteAct = E5Action(self.trUtf8('Delete bookmark'),
+ UI.PixmapCache.getIcon("deleteBookmark.png"),
self.trUtf8('Delete bookmark...'),
0, 0, self, 'mercurial_delete_bookmark')
self.hgBookmarkDeleteAct.setStatusTip(self.trUtf8(
@@ -89,6 +94,7 @@
self.actions.append(self.hgBookmarkDeleteAct)
self.hgBookmarkRenameAct = E5Action(self.trUtf8('Rename bookmark'),
+ UI.PixmapCache.getIcon("renameBookmark.png"),
self.trUtf8('Rename bookmark...'),
0, 0, self, 'mercurial_rename_bookmark')
self.hgBookmarkRenameAct.setStatusTip(self.trUtf8(
@@ -102,6 +108,7 @@
self.actions.append(self.hgBookmarkRenameAct)
self.hgBookmarkMoveAct = E5Action(self.trUtf8('Move bookmark'),
+ UI.PixmapCache.getIcon("moveBookmark.png"),
self.trUtf8('Move bookmark...'),
0, 0, self, 'mercurial_move_bookmark')
self.hgBookmarkMoveAct.setStatusTip(self.trUtf8(
@@ -113,6 +120,66 @@
))
self.hgBookmarkMoveAct.triggered[()].connect(self.__hgBookmarkMove)
self.actions.append(self.hgBookmarkMoveAct)
+
+ self.hgBookmarkIncomingAct = E5Action(self.trUtf8('Show incoming bookmarks'),
+ UI.PixmapCache.getIcon("vcsUpdate.png"),
+ self.trUtf8('Show incoming bookmarks'),
+ 0, 0, self, 'mercurial_incoming_bookmarks')
+ self.hgBookmarkIncomingAct.setStatusTip(self.trUtf8(
+ 'Show a list of incoming bookmarks'
+ ))
+ self.hgBookmarkIncomingAct.setWhatsThis(self.trUtf8(
+ """<b>Show incoming bookmarks</b>"""
+ """<p>This shows a list of new bookmarks available at the remote"""
+ """ repository.</p>"""
+ ))
+ self.hgBookmarkIncomingAct.triggered[()].connect(self.__hgBookmarkIncoming)
+ self.actions.append(self.hgBookmarkIncomingAct)
+
+ self.hgBookmarkPullAct = E5Action(self.trUtf8('Pull bookmark'),
+ UI.PixmapCache.getIcon("vcsUpdate.png"),
+ self.trUtf8('Pull bookmark'),
+ 0, 0, self, 'mercurial_pull_bookmark')
+ self.hgBookmarkPullAct.setStatusTip(self.trUtf8(
+ 'Pull a bookmark from a remote repository'
+ ))
+ self.hgBookmarkPullAct.setWhatsThis(self.trUtf8(
+ """<b>Pull bookmark</b>"""
+ """<p>This pulls a bookmark from a remote repository into the """
+ """local repository.</p>"""
+ ))
+ self.hgBookmarkPullAct.triggered[()].connect(self.__hgBookmarkPull)
+ self.actions.append(self.hgBookmarkPullAct)
+
+ self.hgBookmarkOutgoingAct = E5Action(self.trUtf8('Show outgoing bookmarks'),
+ UI.PixmapCache.getIcon("vcsCommit.png"),
+ self.trUtf8('Show outgoing bookmarks'),
+ 0, 0, self, 'mercurial_outgoing_bookmarks')
+ self.hgBookmarkOutgoingAct.setStatusTip(self.trUtf8(
+ 'Show a list of outgoing bookmarks'
+ ))
+ self.hgBookmarkOutgoingAct.setWhatsThis(self.trUtf8(
+ """<b>Show outgoing bookmarks</b>"""
+ """<p>This shows a list of new bookmarks available at the local"""
+ """ repository.</p>"""
+ ))
+ self.hgBookmarkOutgoingAct.triggered[()].connect(self.__hgBookmarkOutgoing)
+ self.actions.append(self.hgBookmarkOutgoingAct)
+
+ self.hgBookmarkPushAct = E5Action(self.trUtf8('Push bookmark'),
+ UI.PixmapCache.getIcon("vcsCommit.png"),
+ self.trUtf8('Push bookmark'),
+ 0, 0, self, 'mercurial_push_bookmark')
+ self.hgBookmarkPushAct.setStatusTip(self.trUtf8(
+ 'Push a bookmark to a remote repository'
+ ))
+ self.hgBookmarkPushAct.setWhatsThis(self.trUtf8(
+ """<b>Push bookmark</b>"""
+ """<p>This pushes a bookmark from the local repository to a """
+ """remote repository.</p>"""
+ ))
+ self.hgBookmarkPushAct.triggered[()].connect(self.__hgBookmarkPush)
+ self.actions.append(self.hgBookmarkPushAct)
def initMenu(self, mainMenu):
"""
@@ -129,6 +196,12 @@
menu.addAction(self.hgBookmarkMoveAct)
menu.addSeparator()
menu.addAction(self.hgBookmarksListAct)
+ menu.addSeparator()
+ menu.addAction(self.hgBookmarkIncomingAct)
+ menu.addAction(self.hgBookmarkPullAct)
+ menu.addSeparator()
+ menu.addAction(self.hgBookmarkOutgoingAct)
+ menu.addAction(self.hgBookmarkPushAct)
return menu
@@ -166,3 +239,31 @@
"""
self.vcs.getExtensionObject("bookmarks")\
.hgBookmarkMove(self.project.getProjectPath())
+
+ def __hgBookmarkIncoming(self):
+ """
+ Private slot used to show a list of incoming bookmarks.
+ """
+ self.vcs.getExtensionObject("bookmarks")\
+ .hgBookmarkIncoming(self.project.getProjectPath())
+
+ def __hgBookmarkOutgoing(self):
+ """
+ Private slot used to show a list of outgoing bookmarks.
+ """
+ self.vcs.getExtensionObject("bookmarks")\
+ .hgBookmarkOutgoing(self.project.getProjectPath())
+
+ def __hgBookmarkPull(self):
+ """
+ Private slot used to pull a bookmark from a remote repository.
+ """
+ self.vcs.getExtensionObject("bookmarks")\
+ .hgBookmarkPull(self.project.getProjectPath())
+
+ def __hgBookmarkPush(self):
+ """
+ Private slot used to push a bookmark to a remote repository.
+ """
+ self.vcs.getExtensionObject("bookmarks")\
+ .hgBookmarkPush(self.project.getProjectPath())
