Mercurial Repositories > eric / changeset

--- a/Helpviewer/UrlBar/BookmarkInfoDialog.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/Helpviewer/UrlBar/BookmarkInfoDialog.py	Fri Jun 03 13:01:16 2011 +0200
@@ -33,7 +33,7 @@
         
         self.__bookmark = bookmark
         
-        self.icon.setPixmap(UI.PixmapCache.getPixmap("bookmarkBig.png"))
+        self.icon.setPixmap(UI.PixmapCache.getPixmap("bookmark32.png"))
         
         font = QFont()
         font.setPointSize(font.pointSize() + 2)

--- a/Helpviewer/UrlBar/UrlBar.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/Helpviewer/UrlBar/UrlBar.py	Fri Jun 03 13:01:16 2011 +0200
@@ -48,7 +48,7 @@
         self.__privateMode = QWebSettings.globalSettings().testAttribute(
             QWebSettings.PrivateBrowsingEnabled)
         
-        self.__bmActiveIcon = UI.PixmapCache.getIcon("bookmark.png")
+        self.__bmActiveIcon = UI.PixmapCache.getIcon("bookmark16.png")
         self.__bmInactiveIcon = QIcon(self.__bmActiveIcon.pixmap(16, 16, QIcon.Disabled))
         
         self.__favicon = FavIconLabel(self)

--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py	Fri Jun 03 13:01:16 2011 +0200
@@ -168,6 +168,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
+        menu.setIcon(UI.PixmapCache.getIcon("bookmark22.png"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgBookmarkDefineAct)

--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Fri Jun 03 13:01:16 2011 +0200
@@ -57,6 +57,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
+        menu.setIcon(UI.PixmapCache.getIcon("vcsUpdate.png"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgFetchAct)

--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Fri Jun 03 13:01:16 2011 +0200
@@ -81,6 +81,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
+        menu.setIcon(UI.PixmapCache.getIcon("changesetSign.png"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgGpgListAct)

--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Fri Jun 03 13:01:16 2011 +0200
@@ -104,6 +104,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
+        menu.setIcon(UI.PixmapCache.getIcon("fileDelete.png"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgPurgeAct)

--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Fri Jun 03 13:01:16 2011 +0200
@@ -81,6 +81,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
+        menu.setIcon(UI.PixmapCache.getIcon("vcsRebase.png"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgRebaseAct)

--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py	Fri Jun 03 13:01:16 2011 +0200
@@ -68,6 +68,7 @@
         @return populated menu (QMenu)
         """
         menu = QMenu(self.menuTitle(), mainMenu)
+        menu.setIcon(UI.PixmapCache.getIcon("vcsTransplant.png"))
         menu.setTearOffEnabled(True)
         
         menu.addAction(self.hgTransplantAct)

--- a/QScintilla/Editor.py	Thu Jun 02 20:43:06 2011 +0200
+++ b/QScintilla/Editor.py	Fri Jun 03 13:01:16 2011 +0200
@@ -248,7 +248,7 @@
         self.dbreakpoint = \
             self.markerDefine(UI.PixmapCache.getPixmap("breakDisabled.png"))
         self.bookmark = \
-            self.markerDefine(UI.PixmapCache.getPixmap("bookmark.png"))
+            self.markerDefine(UI.PixmapCache.getPixmap("bookmark16.png"))
         self.syntaxerror = \
             self.markerDefine(UI.PixmapCache.getPixmap("syntaxError.png"))
         self.notcovered = \

--- a/eric5.e4p	Thu Jun 02 20:43:06 2011 +0200
+++ b/eric5.e4p	Fri Jun 03 13:01:16 2011 +0200
@@ -1271,6 +1271,8 @@
     <Other>CSSs/default.css</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmark.style</Other>
     <Other>Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmark.style</Other>
+    <Other>icons/default/bookmark16.png</Other>
+    <Other>icons/default/bookmark32.png</Other>
   </Others>
   <MainScript>eric5.py</MainScript>
   <Vcs>

Binary file icons/default/bookmark.png has changed

Binary file icons/default/bookmark16.png has changed

Binary file icons/default/bookmark22.png has changed

Binary file icons/default/bookmark32.png has changed

Binary file icons/default/bookmarkBig.png has changed