Update rebase pick\squash\edit\skip icon

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/Resources/menucombine.ico b/src/Resources/menucombine.ico
new file mode 100644 (file)
index 0000000..2bb35a9
Binary files /dev/null and b/src/Resources/menucombine.ico differ

diff --git a/src/Resources/menuedit.ico b/src/Resources/menuedit.ico
new file mode 100644 (file)
index 0000000..2630463
Binary files /dev/null and b/src/Resources/menuedit.ico differ

diff --git a/src/Resources/menupick.ico b/src/Resources/menupick.ico
new file mode 100644 (file)
index 0000000..514df6d
Binary files /dev/null and b/src/Resources/menupick.ico differ

diff --git a/src/Resources/menurebase.ico b/src/Resources/menurebase.ico
new file mode 100644 (file)
index 0000000..9764f7f
Binary files /dev/null and b/src/Resources/menurebase.ico differ

diff --git a/src/Resources/menuskip.ico b/src/Resources/menuskip.ico
new file mode 100644 (file)
index 0000000..4e3e7ac
Binary files /dev/null and b/src/Resources/menuskip.ico differ

diff --git a/src/Resources/menusquash.ico b/src/Resources/menusquash.ico
new file mode 100644 (file)
index 0000000..658d8cc
Binary files /dev/null and b/src/Resources/menusquash.ico differ

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index cd5b06f..9e1f9e7 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -1029,16 +1029,16 @@ void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point)
        {\r
 \r
                if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_PICK))\r
-                       popup.AppendMenuIcon(ID_REBASE_PICK,   _T("Pick"),   IDI_OPEN);\r
+                       popup.AppendMenuIcon(ID_REBASE_PICK,   _T("Pick"),   IDI_PICK);\r
 \r
                if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_SQUASH))\r
-                       popup.AppendMenuIcon(ID_REBASE_SQUASH, _T("Squash"), IDI_OPEN);\r
+                       popup.AppendMenuIcon(ID_REBASE_SQUASH, _T("Squash"), IDI_SQUASH);\r
 \r
                if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_EDIT))\r
-                       popup.AppendMenuIcon(ID_REBASE_EDIT,   _T("Edit"),   IDI_OPEN);\r
+                       popup.AppendMenuIcon(ID_REBASE_EDIT,   _T("Edit"),   IDI_EDIT);\r
 \r
                if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_SKIP))\r
-                       popup.AppendMenuIcon(ID_REBASE_SKIP,   _T("SKIP"),   IDI_OPEN);\r
+                       popup.AppendMenuIcon(ID_REBASE_SKIP,   _T("SKIP"),   IDI_SKIP);\r
                \r
                if(m_ContextMenuMask&(GetContextMenuBit(ID_REBASE_SKIP)|GetContextMenuBit(ID_REBASE_EDIT)|\r
                              GetContextMenuBit(ID_REBASE_SQUASH)|GetContextMenuBit(ID_REBASE_PICK)))\r
@@ -1119,7 +1119,7 @@ void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point)
 \r
                        if(pSelLogEntry->m_CommitHash != m_HeadHash)\r
                                if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_TO_VERSION))\r
-                                       popup.AppendMenuIcon(ID_REBASE_TO_VERSION, str , IDI_EXPORT);                   \r
+                                       popup.AppendMenuIcon(ID_REBASE_TO_VERSION, str , IDI_REBASE);                   \r
 \r
                        if(m_ContextMenuMask&GetContextMenuBit(ID_EXPORT))\r
                                popup.AppendMenuIcon(ID_EXPORT, _T("Export this version"), IDI_EXPORT); \r

diff --git a/src/TortoiseShell/ContextMenu.cpp b/src/TortoiseShell/ContextMenu.cpp
index d4d7386..7f99798 100644 (file)
--- a/src/TortoiseShell/ContextMenu.cpp
+++ b/src/TortoiseShell/ContextMenu.cpp
@@ -73,7 +73,7 @@ CShellExt::MenuInfo CShellExt::menuInfo[] =
        { ShellMenuShowChanged,                                 MENUSHOWCHANGED,        IDI_SHOWCHANGED,                IDS_MENUSHOWCHANGED,            IDS_MENUDESCSHOWCHANGED,\r
        ITEMIS_INSVN|ITEMIS_ONLYONE, 0, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0},\r
 \r
-       { ShellMenuRebase,                                          MENUREBASE,                 IDI_SHOWCHANGED,                IDS_MENUREBASE,                         IDS_MENUREBASE,\r
+       { ShellMenuRebase,                                          MENUREBASE,                 IDI_REBASE,                             IDS_MENUREBASE,                         IDS_MENUREBASE,\r
        ITEMIS_INSVN|ITEMIS_ONLYONE, 0, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0},\r
 \r
 //     { ShellMenuRevisionGraph,                               MENUREVISIONGRAPH,      IDI_REVISIONGRAPH,              IDS_MENUREVISIONGRAPH,          IDS_MENUDESCREVISIONGRAPH,\r

diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index e345be0..1b54c51 100644 (file)
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="TortoiseShell"\r
        ProjectGUID="{E873DD32-5A31-4DE1-8341-A56A2A5489EA}"\r
        RootNamespace="TortoiseShell"\r
@@ -691,6 +691,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\menucombine.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Resources\menucommit.ico"\r
                                >\r
                        </File>\r
@@ -759,6 +763,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\menurebase.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Resources\menurelocate.ico"\r
                                >\r
                        </File>\r

diff --git a/src/TortoiseShell/resource.h b/src/TortoiseShell/resource.h
index 17913f5..8fe42d9 100644 (file)
--- a/src/TortoiseShell/resource.h
+++ b/src/TortoiseShell/resource.h
@@ -223,6 +223,12 @@
 #define IDI_PUSH                        5166\r
 #define IDI_CLONE                       5167\r
 #define IDI_TAG                                                        5168\r
+#define IDI_REBASE                                             5169\r
+#define IDI_COMBINE                                            5170\r
+#define IDI_SKIP                                               5171\r
+#define IDI_EDIT                                               5172\r
+#define IDI_SQUASH                                             5173\r
+#define IDI_PICK                                               5174\r
 #define IDC_LOCKOWNER                   11019\r
 #define IDC_LOCKDATE                    11020\r
 #define IDC_EDITPROPERTIES              11021\r

diff --git a/src/TortoiseShell/resourceshell.rc b/src/TortoiseShell/resourceshell.rc
index fe58498..73cd472 100644 (file)
--- a/src/TortoiseShell/resourceshell.rc
+++ b/src/TortoiseShell/resourceshell.rc
@@ -72,6 +72,12 @@ IDI_CLIPPASTE           ICON                    "..\\Resources\\clippaste.ico"
 IDI_PUSH                ICON                    "..\\resources\\Push.ico"\r
 IDI_CLONE               ICON                    "..\\resources\\checkout.ico"\r
 IDI_TAG                                        ICON                                    "..\\resources\\Tag.ico"\r
+IDI_REBASE                             ICON                                    "..\\resources\\menurebase.ico"\r
+IDI_COMBINE                            ICON                                    "..\\resources\\menucombine.ico"\r
+IDI_SKIP                               ICON                                    "..\\resources\\menuskip.ico"\r
+IDI_SQUASH                             ICON                                    "..\\resources\\menusquash.ico"\r
+IDI_EDIT                               ICON                                    "..\\resources\\menuedit.ico"\r
+IDI_PICK                               ICON                                    "..\\resources\\menupick.ico"\r
 #endif    // Neutral resources\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
@@ -255,7 +261,7 @@ BEGIN
        IDS_MENUIMPORTPATCH             "Apply Patch Serial"\r
        IDS_MENUCHERRYPICK              "Cherry Pick"\r
        IDS_MENUFETCH                   "Fetch..."\r
-       IDS_MENUREBASE                  "Rebase..."\r
+       IDS_MENUREBASE                  "*Rebase..."\r
 END\r
 \r
 STRINGTABLE \r