Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek shellext: renamed files for consistency

Changeset 652e3e046cc4…

Parent fbfb85e5272c…

by David Golub

Changes to 24 files · Browse files at 652e3e046cc4 Showing diff from parent fbfb85e5272c Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​DirectoryStatus.cpp Stacked
 
17
18
19
20
 
21
22
23
 
17
18
19
 
20
21
22
23
@@ -17,7 +17,7 @@
 #include "stdafx.h"    #include "DirectoryStatus.h" -#include "Thgstatus.h" +#include "THgStatus.h"  #include "TortoiseUtils.h"    char CDirectoryStatus::Status(CString strRelPath) const
Change 1 of 1 Show Entire File win32/​shellext/​Dirstate.cpp Stacked
renamed from win32/shellext/dirstate.cpp
 
17
18
19
20
 
21
22
23
 
17
18
19
 
20
21
22
23
@@ -17,7 +17,7 @@
   #include "stdafx.h"   -#include "dirstate.h" +#include "Dirstate.h"  #include "TortoiseUtils.h"    CAutoPtr<CDirstate> CDirstate::Read(const CString& strPath, bool& bUnset)
Show Entire File win32/​shellext/​Dirstate.h Stacked
renamed from win32/shellext/dirstate.h
(No changes)
Change 1 of 1 Show Entire File win32/​shellext/​DirstateCache.cpp Stacked
renamed from win32/shellext/Dirstatecache.cpp
 
18
19
20
21
22
 
 
23
24
25
 
18
19
20
 
 
21
22
23
24
25
@@ -18,8 +18,8 @@
 #include "stdafx.h"    #include "Dirstatecache.h" -#include "dirstate.h" -#include "Thgstatus.h" +#include "Dirstate.h" +#include "THgStatus.h"  #include "Winstat.h"    CAtlList<CDirstateCache::CEntry>& CDirstateCache::Cache()
Show Entire File win32/​shellext/​DirstateCache.h Stacked
renamed from win32/shellext/Dirstatecache.h
(No changes)
Change 1 of 1 Show Entire File win32/​shellext/​QueryDirstate.cpp Stacked
 
18
19
20
21
 
22
23
24
25
26
 
27
28
29
 
18
19
20
 
21
22
23
24
25
 
26
27
28
29
@@ -18,12 +18,12 @@
 #include "stdafx.h"    #include "QueryDirstate.h" -#include "dirstate.h" +#include "Dirstate.h"  #include "DirectoryStatus.h"  #include "Dirstatecache.h"  #include "Winstat.h"  #include "TortoiseUtils.h" -#include "Thgstatus.h" +#include "THgStatus.h"    class CQueryState  {
Change 1 of 1 Show Entire File win32/​shellext/​THgShell.cpp Stacked
renamed from win32/shellext/ShellExt.cpp
 
21
22
23
24
25
26
 
 
 
27
28
29
 
21
22
23
 
 
 
24
25
26
27
28
29
@@ -21,9 +21,9 @@
 #include "TortoiseUtils.h"  #include "StringUtils.h"  #include "InitStatus.h" -#include "CShellExtCMenu.h" -#include "CShellExtDnd.h" -#include "CShellExtOverlay.h" +#include "TortoiseHgCmenu.h" +#include "TortoiseHgDropHandler.h" +#include "TortoiseHgOverlay.h"    CComModule _Module;  
Change 1 of 1 Show Entire File win32/​shellext/​THgShell.def Stacked
renamed from win32/shellext/ShellExt.def
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-; shellext: Declares the module parameters for the DLL. +; THgShell.def: Declares the module parameters for the DLL.    EXPORTS   DllCanUnloadNow PRIVATE
Change 1 of 1 Show Entire File win32/​shellext/​THgShell.rc Stacked
renamed from win32/shellext/shellext.rc
 
4
5
6
7
8
 
 
9
10
11
 
4
5
6
 
 
7
8
9
10
11
@@ -4,8 +4,8 @@
   1 TYPELIB "THgShell.tlb"   -IDR_CMENU REGISTRY "CShellExtCMenu.rgs" -IDR_DRAGDROP REGISTRY "CShellExtDnd.rgs" +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"
Change 1 of 6 Show Entire File win32/​shellext/​THgShell.vcxproj Stacked
 
95
96
97
98
 
99
100
101
 
123
124
125
126
 
127
128
129
 
155
156
157
158
 
159
160
161
 
187
188
189
190
 
191
192
193
 
204
205
206
207
208
209
210
211
212
213
214
 
 
215
216
217
218
219
220
221
222
223
 
 
 
 
 
 
224
225
226
227
228
229
230
231
232
233
234
235
236
 
 
237
238
239
 
242
243
244
245
246
 
 
 
 
 
247
248
249
250
251
252
253
254
 
255
 
 
256
257
258
259
260
261
 
262
263
264
 
95
96
97
 
98
99
100
101
 
123
124
125
 
126
127
128
129
 
155
156
157
 
158
159
160
161
 
187
188
189
 
190
191
192
193
 
204
205
206
 
 
 
207
208
209
 
 
210
211
212
213
214
215
 
216
217
 
 
218
219
220
221
222
223
224
225
226
227
228
 
 
 
229
230
231
 
 
232
233
234
235
236
 
239
240
241
 
 
242
243
244
245
246
247
248
249
250
251
 
 
 
252
253
254
255
256
257
258
259
260
 
261
262
263
264
@@ -95,7 +95,7 @@
  <SubSystem>Windows</SubSystem>   <GenerateDebugInformation>true</GenerateDebugInformation>   <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> - <ModuleDefinitionFile>ShellExt.def</ModuleDefinitionFile> + <ModuleDefinitionFile>THgShell.def</ModuleDefinitionFile>   </Link>   <CustomBuildStep>   <Command>hg parents --template "#define THG_PARENT_ID {node|short}\n" &gt; parentid.h</Command> @@ -123,7 +123,7 @@
  <SubSystem>Windows</SubSystem>   <GenerateDebugInformation>true</GenerateDebugInformation>   <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> - <ModuleDefinitionFile>ShellExt.def</ModuleDefinitionFile> + <ModuleDefinitionFile>THgShell.def</ModuleDefinitionFile>   </Link>   <CustomBuildStep>   <Command>hg parents --template "#define THG_PARENT_ID {node|short}\n" &gt; parentid.h</Command> @@ -155,7 +155,7 @@
  <EnableCOMDATFolding>true</EnableCOMDATFolding>   <OptimizeReferences>true</OptimizeReferences>   <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> - <ModuleDefinitionFile>ShellExt.def</ModuleDefinitionFile> + <ModuleDefinitionFile>THgShell.def</ModuleDefinitionFile>   </Link>   <CustomBuildStep>   <Command>hg parents --template "#define THG_PARENT_ID {node|short}\n" &gt; parentid.h</Command> @@ -187,7 +187,7 @@
  <EnableCOMDATFolding>true</EnableCOMDATFolding>   <OptimizeReferences>true</OptimizeReferences>   <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;shlwapi.lib;msi.lib;%(AdditionalDependencies)</AdditionalDependencies> - <ModuleDefinitionFile>ShellExt.def</ModuleDefinitionFile> + <ModuleDefinitionFile>THgShell.def</ModuleDefinitionFile>   </Link>   <CustomBuildStep>   <Command>hg parents --template "#define THG_PARENT_ID {node|short}\n" &gt; parentid.h</Command> @@ -204,36 +204,33 @@
  </Midl>   </ItemDefinitionGroup>   <ItemGroup> - <ClCompile Include="CShellExtCMenu.cpp" /> - <ClCompile Include="CShellExtDnd.cpp" /> - <ClCompile Include="CShellExtOverlay.cpp" />   <ClCompile Include="Directory.cpp" />   <ClCompile Include="DirectoryStatus.cpp" />   <ClCompile Include="Direntry.cpp" /> - <ClCompile Include="dirstate.cpp" /> - <ClCompile Include="Dirstatecache.cpp" /> + <ClCompile Include="Dirstate.cpp" /> + <ClCompile Include="DirstateCache.cpp" />   <ClCompile Include="IconBitmapUtils.cpp" />   <ClCompile Include="InitStatus.cpp" />   <ClCompile Include="QueryDirstate.cpp" />   <ClCompile Include="RegistryConfig.cpp" /> - <ClCompile Include="ShellExt.cpp" />   <ClCompile Include="StringUtils.cpp" />   <ClCompile Include="SysInfo.cpp" /> - <ClCompile Include="Thgstatus.cpp" /> - <ClCompile Include="ThgVersion.cpp" /> + <ClCompile Include="THgShell.cpp" /> + <ClCompile Include="THgStatus.cpp" /> + <ClCompile Include="THgVersion.cpp" /> + <ClCompile Include="TortoiseHgCmenu.cpp" /> + <ClCompile Include="TortoiseHgDropHandler.cpp" /> + <ClCompile Include="TortoiseHgOverlay.cpp" />   <ClCompile Include="TortoiseIconBitmap.cpp" />   <ClCompile Include="TortoiseUtils.cpp" />   <ClCompile Include="Winstat.cpp" />   </ItemGroup>   <ItemGroup> - <ClInclude Include="CShellExtCMenu.h" /> - <ClInclude Include="CShellExtDnd.h" /> - <ClInclude Include="CShellExtOverlay.h" />   <ClInclude Include="Directory.h" />   <ClInclude Include="DirectoryStatus.h" />   <ClInclude Include="Direntry.h" /> - <ClInclude Include="dirstate.h" /> - <ClInclude Include="Dirstatecache.h" /> + <ClInclude Include="Dirstate.h" /> + <ClInclude Include="DirstateCache.h" />   <ClInclude Include="IconBitmapUtils.h" />   <ClInclude Include="InitStatus.h" />   <ClInclude Include="QueryDirstate.h" /> @@ -242,23 +239,26 @@
  <ClInclude Include="stdafx.h" />   <ClInclude Include="StringUtils.h" />   <ClInclude Include="SysInfo.h" /> - <ClInclude Include="Thgstatus.h" /> - <ClInclude Include="ThgVersion.h" /> + <ClInclude Include="THgStatus.h" /> + <ClInclude Include="THgVersion.h" /> + <ClInclude Include="TortoiseHgCmenu.h" /> + <ClInclude Include="TortoiseHgDropHandler.h" /> + <ClInclude Include="TortoiseHgOverlay.h" />   <ClInclude Include="TortoiseIconBitmap.h" />   <ClInclude Include="TortoiseUtils.h" />   <ClInclude Include="Winstat.h" />   </ItemGroup>   <ItemGroup> - <None Include="CShellExtCMenu.rgs" /> - <None Include="CShellExtDnd.rgs" /> - <None Include="ShellExt.def" /> + <None Include="THgShell.def" />   <None Include="TortoiseHgAdded.rgs" /> + <None Include="TortoiseHgCmenu.rgs" /> + <None Include="TortoiseHgDropHandler.rgs" />   <None Include="TortoiseHgModified.rgs" />   <None Include="TortoiseHgNormal.rgs" />   <None Include="TortoiseHgUnversioned.rgs" />   </ItemGroup>   <ItemGroup> - <ResourceCompile Include="shellext.rc" /> + <ResourceCompile Include="THgShell.rc" />   </ItemGroup>   <ItemGroup>   <Midl Include="THgShell.idl" />
Change 1 of 8 Show Entire File win32/​shellext/​THgShell.vcxproj.filters Stacked
 
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
 
33
34
35
36
 
37
38
39
 
40
41
42
 
51
52
53
54
55
56
57
58
59
60
61
62
63
 
64
65
66
 
 
 
 
 
 
 
 
 
 
 
 
 
67
68
69
 
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
 
95
96
97
98
 
99
100
101
 
102
103
104
 
122
123
124
125
 
126
127
128
 
 
 
 
 
 
 
 
 
 
129
130
131
 
142
143
144
145
 
146
147
148
 
149
150
151
 
152
153
154
 
155
156
157
 
165
166
167
168
 
169
170
171
 
15
16
17
 
 
 
 
 
 
 
 
 
18
19
20
 
24
25
26
 
27
28
29
 
30
31
32
33
 
42
43
44
 
 
 
45
46
47
48
49
50
 
51
52
53
 
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
 
77
78
79
 
 
 
 
 
 
 
 
 
80
81
82
 
86
87
88
 
89
90
91
 
92
93
94
95
 
113
114
115
 
116
117
118
 
119
120
121
122
123
124
125
126
127
128
129
130
131
 
142
143
144
 
145
146
147
 
148
149
150
 
151
152
153
 
154
155
156
157
 
165
166
167
 
168
169
170
171
@@ -15,15 +15,6 @@
  </Filter>   </ItemGroup>   <ItemGroup> - <ClCompile Include="CShellExtCMenu.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="CShellExtDnd.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="CShellExtOverlay.cpp"> - <Filter>Source Files</Filter> - </ClCompile>   <ClCompile Include="Directory.cpp">   <Filter>Source Files</Filter>   </ClCompile> @@ -33,10 +24,10 @@
  <ClCompile Include="Direntry.cpp">   <Filter>Source Files</Filter>   </ClCompile> - <ClCompile Include="dirstate.cpp"> + <ClCompile Include="Dirstate.cpp">   <Filter>Source Files</Filter>   </ClCompile> - <ClCompile Include="Dirstatecache.cpp"> + <ClCompile Include="DirstateCache.cpp">   <Filter>Source Files</Filter>   </ClCompile>   <ClCompile Include="IconBitmapUtils.cpp"> @@ -51,19 +42,28 @@
  <ClCompile Include="RegistryConfig.cpp">   <Filter>Source Files</Filter>   </ClCompile> - <ClCompile Include="ShellExt.cpp"> - <Filter>Source Files</Filter> - </ClCompile>   <ClCompile Include="StringUtils.cpp">   <Filter>Source Files</Filter>   </ClCompile>   <ClCompile Include="SysInfo.cpp">   <Filter>Source Files</Filter>   </ClCompile> - <ClCompile Include="Thgstatus.cpp"> + <ClCompile Include="THgShell.cpp">   <Filter>Source Files</Filter>   </ClCompile> - <ClCompile Include="ThgVersion.cpp"> + <ClCompile Include="THgStatus.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="THgVersion.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="TortoiseHgCmenu.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="TortoiseHgDropHandler.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="TortoiseHgOverlay.cpp">   <Filter>Source Files</Filter>   </ClCompile>   <ClCompile Include="TortoiseIconBitmap.cpp"> @@ -77,15 +77,6 @@
  </ClCompile>   </ItemGroup>   <ItemGroup> - <ClInclude Include="CShellExtCMenu.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="CShellExtDnd.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="CShellExtOverlay.h"> - <Filter>Header Files</Filter> - </ClInclude>   <ClInclude Include="Directory.h">   <Filter>Header Files</Filter>   </ClInclude> @@ -95,10 +86,10 @@
  <ClInclude Include="Direntry.h">   <Filter>Header Files</Filter>   </ClInclude> - <ClInclude Include="dirstate.h"> + <ClInclude Include="Dirstate.h">   <Filter>Header Files</Filter>   </ClInclude> - <ClInclude Include="Dirstatecache.h"> + <ClInclude Include="DirstateCache.h">   <Filter>Header Files</Filter>   </ClInclude>   <ClInclude Include="IconBitmapUtils.h"> @@ -122,10 +113,19 @@
  <ClInclude Include="SysInfo.h">   <Filter>Header Files</Filter>   </ClInclude> - <ClInclude Include="Thgstatus.h"> + <ClInclude Include="THgStatus.h">   <Filter>Header Files</Filter>   </ClInclude> - <ClInclude Include="ThgVersion.h"> + <ClInclude Include="THgVersion.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="TortoiseHgCmenu.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="TortoiseHgDropHandler.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="TortoiseHgOverlay.h">   <Filter>Header Files</Filter>   </ClInclude>   <ClInclude Include="TortoiseIconBitmap.h"> @@ -142,16 +142,16 @@
  </ClInclude>   </ItemGroup>   <ItemGroup> - <None Include="ShellExt.def"> + <None Include="THgShell.def">   <Filter>Source Files</Filter>   </None> - <None Include="CShellExtCMenu.rgs"> + <None Include="TortoiseHgAdded.rgs">   <Filter>Resource Files</Filter>   </None> - <None Include="CShellExtDnd.rgs"> + <None Include="TortoiseHgCmenu.rgs">   <Filter>Resource Files</Filter>   </None> - <None Include="TortoiseHgAdded.rgs"> + <None Include="TortoiseHgDropHandler.rgs">   <Filter>Resource Files</Filter>   </None>   <None Include="TortoiseHgModified.rgs"> @@ -165,7 +165,7 @@
  </None>   </ItemGroup>   <ItemGroup> - <ResourceCompile Include="shellext.rc"> + <ResourceCompile Include="THgShell.rc">   <Filter>Resource Files</Filter>   </ResourceCompile>   </ItemGroup>
Change 1 of 1 Show Entire File win32/​shellext/​THgStatus.cpp Stacked
renamed from win32/shellext/Thgstatus.cpp
 
16
17
18
19
 
20
21
22
 
16
17
18
 
19
20
21
22
@@ -16,7 +16,7 @@
   #include "stdafx.h"   -#include "Thgstatus.h" +#include "THgStatus.h"    CString GetPipeName()  {
Show Entire File win32/​shellext/​THgStatus.h Stacked
renamed from win32/shellext/Thgstatus.h
(No changes)
Change 1 of 1 Show Entire File win32/​shellext/​THgVersion.cpp Stacked
renamed from win32/shellext/ThgVersion.cpp
 
14
15
16
17
 
 
18
19
20
 
14
15
16
 
17
18
19
20
21
@@ -14,7 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.    #include "stdafx.h" -#include "ThgVersion.h" + +#include "THgVersion.h"  #include "parentid.h"    #define TOSTR(x) L ## #x
Show Entire File win32/​shellext/​THgVersion.h Stacked
renamed from win32/shellext/ThgVersion.h
(No changes)
Change 1 of 1 Show Entire File win32/​shellext/​TortoiseHgCmenu.cpp Stacked
renamed from win32/shellext/CShellExtCMenu.cpp
 
18
19
20
21
 
22
23
24
25
26
27
28
 
 
29
30
31
 
18
19
20
 
21
22
23
24
25
26
 
 
27
28
29
30
31
@@ -18,14 +18,14 @@
   #include "TortoiseUtils.h"  #include "StringUtils.h" -#include "Thgstatus.h" +#include "THgStatus.h"  #include "Winstat.h"  #include "InitStatus.h"  #include "SysInfo.h"  #include "RegistryConfig.h"  #include "TortoiseIconBitmap.h" -#include "ThgVersion.h" -#include "CShellExtCMenu.h" +#include "THgVersion.h" +#include "TortoiseHgCmenu.h"    #include <msi.h>  
Show Entire File win32/​shellext/​TortoiseHgCmenu.h Stacked
renamed from win32/shellext/CShellExtCMenu.h
(No changes)
Show Entire File win32/​shellext/​TortoiseHgCmenu.rgs Stacked
renamed from win32/shellext/CShellExtCMenu.rgs
(No changes)
Change 1 of 1 Show Entire File win32/​shellext/​TortoiseHgDropHandler.cpp Stacked
renamed from win32/shellext/CShellExtDnd.cpp
 
17
18
19
20
 
21
22
23
 
17
18
19
 
20
21
22
23
@@ -17,7 +17,7 @@
 #include "THgShell_h.h"    #include "TortoiseUtils.h" -#include "CShellExtDnd.h" +#include "TortoiseHgDropHandler.h"    // According to http://msdn.microsoft.com/en-us/library/bb776094%28VS.85%29.aspx  // the help texts for the commands should be reasonably short (under 40 characters)
Change 1 of 1 Show Entire File win32/​shellext/​TortoiseHgDropHandler.h Stacked
renamed from win32/shellext/CShellExtDnd.h
 
16
17
18
19
 
20
21
22
 
16
17
18
 
19
20
21
22
@@ -16,7 +16,7 @@
 #ifndef _CShellExtDnd_h_  #define _CShellExtDnd_h_   -#include "CShellExtCMenu.h" +#include "TortoiseHgCmenu.h"    // CTortoiseHgCmenuBase implements IContextMenu3, IShellExtInit  class CTortoiseHgDropHandler :
Show Entire File win32/​shellext/​TortoiseHgDropHandler.rgs Stacked
renamed from win32/shellext/CShellExtDnd.rgs
(No changes)
Change 1 of 1 Show Entire File win32/​shellext/​TortoiseHgOverlay.cpp Stacked
renamed from win32/shellext/CShellExtOverlay.cpp
 
20
21
22
23
 
24
25
26
 
20
21
22
 
23
24
25
26
@@ -20,7 +20,7 @@
 #include "StringUtils.h"  #include "QueryDirstate.h"  #include "RegistryConfig.h" -#include "CShellExtOverlay.h" +#include "TortoiseHgOverlay.h"    CComAutoCriticalSection CTortoiseHgOverlay::m_cs;  
Show Entire File win32/​shellext/​TortoiseHgOverlay.h Stacked
renamed from win32/shellext/CShellExtOverlay.h
(No changes)
Change 1 of 1 Show Entire File win32/​shellext/​terminate.cpp Stacked
 
15
16
17
18
 
19
20
21
 
15
16
17
 
18
19
20
21
@@ -15,7 +15,7 @@
   #include "stdafx.h"   -#include "Thgstatus.h" +#include "THgStatus.h"    // terminates the overlay icon server