Changeset 6cb7aa7dbade…
Parent 283d6c72b633…
by
Changes to 5 files · Browse files at 6cb7aa7dbade Showing diff from parent 283d6c72b633 Diff from another changeset...
@@ -1,81 +1,75 @@ - #include "windows.h"
-#include "parentid.h"
-#include "resource.h"
-
-1 TYPELIB "THgShell.tlb"
-
-IDR_CMENU REGISTRY "TortoiseHgCmenu.rgs"
-IDR_DRAGDROP REGISTRY "TortoiseHgDropHandler.rgs"
-IDR_NORMAL REGISTRY "TortoiseHgNormal.rgs"
-IDR_ADDED REGISTRY "TortoiseHgAdded.rgs"
-IDR_MODIFIED REGISTRY "TortoiseHgModified.rgs"
-IDR_UNVERSIONED REGISTRY "TortoiseHgUnversioned.rgs"
-
-#ifndef THG_VERSION_FIRST
-/* dummy version for shellext development */
-#define THG_VERSION_FIRST 0
-#define THG_VERSION_SECOND 0
-#define THG_VERSION_THIRD 55555
-#endif
-
-#ifndef THG_VERSION_SECOND
-#define THG_VERSION_SECOND 0
-#endif
-
-#ifndef THG_VERSION_THIRD
-#define THG_VERSION_THIRD 0
-#endif
-
-#ifndef THG_PRODUCT_ID
-#define THG_PRODUCT_ID ?
-#endif
-
-#define TOSTR(x) #x
-#define TOSTR2(x) TOSTR(x)
-
-#define THG_VERSION_BINARY \
- THG_VERSION_FIRST, THG_VERSION_SECOND, THG_VERSION_THIRD, 0
-
-#define THG_VERSION_STRING \
- TOSTR2(THG_VERSION_FIRST) "." \
- TOSTR2(THG_VERSION_SECOND) "." \
- TOSTR2(THG_VERSION_THIRD) "-" \
- TOSTR2(THG_PARENT_ID)
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION THG_VERSION_BINARY
- PRODUCTVERSION THG_VERSION_BINARY
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "Comments", "TortoiseHg Shell Extension"
- VALUE "CompanyName", "TortoiseHg Project"
- VALUE "FileDescription", "TortoiseHg Shell Extension"
- VALUE "FileVersion", THG_VERSION_STRING
- VALUE "InternalName", "shellext"
- VALUE "LegalCopyright", "Copyright (C) 2010 Steve Borho and others"
-#ifdef _WIN64
- VALUE "OriginalFilename", "THgShellx64.dll"
-#else
- VALUE "OriginalFilename", "THgShellx86.dll"
-#endif
- VALUE "ProductName", "TortoiseHg " TOSTR2(THG_PRODUCT_ID)
- VALUE "ProductVersion", THG_VERSION_STRING
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// REGISTRY
+//
+
+IDR_CMENU REGISTRY "TortoiseHgCmenu.rgs"
+IDR_DRAGDROP REGISTRY "TortoiseHgDropHandler.rgs"
+IDR_NORMAL REGISTRY "TortoiseHgNormal.rgs"
+IDR_ADDED REGISTRY "TortoiseHgAdded.rgs"
+IDR_MODIFIED REGISTRY "TortoiseHgModified.rgs"
+IDR_UNVERSIONED REGISTRY "TortoiseHgUnversioned.rgs"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""winres.h""\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "1 TYPELIB ""THgShell.tlb""\r\n"
+ "\r\n"
+ "#include ""THgShell.rc2""\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+1 TYPELIB "THgShell.tlb"
+
+#include "THgShell.rc2"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
|
|
@@ -0,0 +1,85 @@ + // Copyright (C) 2011 Fog Creek Software
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "parentid.h"
+
+#ifndef THG_VERSION_FIRST
+/* dummy version for THgShell development */
+#define THG_VERSION_FIRST 0
+#define THG_VERSION_SECOND 0
+#define THG_VERSION_THIRD 1
+#endif
+
+#ifndef THG_VERSION_SECOND
+#define THG_VERSION_SECOND 0
+#endif
+
+#ifndef THG_VERSION_THIRD
+#define THG_VERSION_THIRD 0
+#endif
+
+#ifndef THG_PRODUCT_ID
+#define THG_PRODUCT_ID ?
+#endif
+
+#define TOSTR(x) #x
+#define TOSTR2(x) TOSTR(x)
+
+#define THG_VERSION_BINARY \
+ THG_VERSION_FIRST, THG_VERSION_SECOND, THG_VERSION_THIRD, 0
+
+#define THG_VERSION_STRING \
+ TOSTR2(THG_VERSION_FIRST) "." \
+ TOSTR2(THG_VERSION_SECOND) "." \
+ TOSTR2(THG_VERSION_THIRD) "-" \
+ TOSTR2(THG_PARENT_ID)
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION THG_VERSION_BINARY
+ PRODUCTVERSION THG_VERSION_BINARY
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "TortoiseHg Shell Extension"
+ VALUE "CompanyName", "TortoiseHg Project"
+ VALUE "FileDescription", "TortoiseHg Shell Extension"
+ VALUE "FileVersion", THG_VERSION_STRING
+ VALUE "InternalName", "shellext"
+ VALUE "LegalCopyright", "Copyright (C) 2010 Steve Borho and others"
+#ifdef _WIN64
+ VALUE "OriginalFilename", "THgShellx64.dll"
+#else
+ VALUE "OriginalFilename", "THgShellx86.dll"
+#endif
+ VALUE "ProductName", "TortoiseHg " TOSTR2(THG_PRODUCT_ID)
+ VALUE "ProductVersion", THG_VERSION_STRING
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
|
@@ -248,6 +248,7 @@ </ItemGroup>
<ItemGroup>
<None Include="THgShell.def" />
+ <None Include="THgShell.rc2" />
<None Include="TortoiseHgAdded.rgs" />
<None Include="TortoiseHgCmenu.rgs" />
<None Include="TortoiseHgDropHandler.rgs" />
|
@@ -157,6 +157,9 @@ <None Include="TortoiseHgUnversioned.rgs">
<Filter>Resource Files</Filter>
</None>
+ <None Include="THgShell.rc2">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="THgShell.rc">
|
@@ -1,21 +1,21 @@ - // Copyright (C) 2011 Fog Creek Software
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#define IDR_CMENU 1
-#define IDR_DRAGDROP 2
-#define IDR_NORMAL 3
-#define IDR_ADDED 4
-#define IDR_MODIFIED 5
-#define IDR_UNVERSIONED 6
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by THgShell.rc
+//
+#define IDR_CMENU 101
+#define IDR_DRAGDROP 102
+#define IDR_NORMAL 103
+#define IDR_ADDED 104
+#define IDR_MODIFIED 105
+#define IDR_UNVERSIONED 106
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 107
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
|
Loading...