Update Shell push icon

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

diff --git a/src/Resources/icon1.ico b/src/Resources/icon1.ico
deleted file mode 100644 (file)
index f1282c6..0000000
Binary files a/src/Resources/icon1.ico and /dev/null differ

diff --git a/src/TortoiseShell/ContextMenu.cpp b/src/TortoiseShell/ContextMenu.cpp
index 5d6db7f..699db4c 100644 (file)
--- a/src/TortoiseShell/ContextMenu.cpp
+++ b/src/TortoiseShell/ContextMenu.cpp
@@ -36,9 +36,9 @@ CShellExt::MenuInfo CShellExt::menuInfo[] =
        ITEMIS_FOLDER, ITEMIS_INSVN|ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0, 0 },\r
 \r
        { ShellMenuPull,                                                MENUPULL,                       IDI_PULL,                               IDS_MENUPULL,\r
-       ITEMIS_INSVN,   ITEMIS_INSVN, ITEMIS_FOLDERINSVN, 0,0,0, 0,0,0},\r
+       ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
        { ShellMenuPush,                                                MENUPUSH,                       IDI_PUSH,                               IDS_MENUPUSH,\r
-       ITEMIS_INSVN,   ITEMIS_INSVN, ITEMIS_FOLDERINSVN, 0,0,0, 0,0,0},\r
+       ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0 },\r
 \r
 //     { ShellMenuCheckout,                                    MENUCHECKOUT,           IDI_CHECKOUT,                   IDS_MENUCHECKOUT,                       IDS_MENUDESCCHECKOUT,\r
 //     ITEMIS_FOLDER, ITEMIS_INSVN|ITEMIS_FOLDERINSVN, 0, 0, 0, 0, 0, 0 },\r

diff --git a/src/TortoiseShell/resourceshell.rc b/src/TortoiseShell/resourceshell.rc
index ce41b0b..f4b2c83 100644 (file)
--- a/src/TortoiseShell/resourceshell.rc
+++ b/src/TortoiseShell/resourceshell.rc
@@ -69,7 +69,7 @@ IDI_PROPERTIES          ICON                    "..\\Resources\\menuproperties.i
 IDI_DELUNVERSIONED      ICON                    "..\\Resources\\menudelunversioned.ico"\r
 IDI_APPSMALL            ICON                    "..\\Resources\\TortoiseSmall.ico"\r
 IDI_CLIPPASTE           ICON                    "..\\Resources\\clippaste.ico"\r
-IDI_PUSH                ICON                    "..\\resources\\pull1.ico"\r
+IDI_PUSH                ICON                    "..\\resources\\Push.ico"\r
 IDI_CLONE               ICON                    "..\\resources\\checkout.ico"\r
 #endif    // Neutral resources\r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -91,7 +91,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 \r
 // Icon with lowest ID value placed first to ensure application icon\r
 // remains consistent on all systems.\r
-IDI_ICON1               ICON                    "..\\resources\\icon1.ico"\r
+\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r