summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-08-24 09:14:28 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-08-24 09:14:28 +0000
commit3383932a9bdee5d1166e8fdb560079da517fb568 (patch)
treee401e37faa156ed5d06e2d1fab9c7e07f95e6131
parent278212c375c66cb5d4c95082f86b9014137dca19 (diff)
- ShellExt:
Delphi plugin moved to Deprecated C++ plugin added to solutions Preferences moved from 'Plugins' to 'Services' git-svn-id: http://svn.miranda-ng.org/main/trunk@5807 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat
-rw-r--r--bin10/mir_full.sln10
-rw-r--r--bin10/mir_full_pro.sln11
-rw-r--r--bin10/pascal32.bat5
-rw-r--r--bin10/pascal64.bat5
-rw-r--r--bin11/mir_full.sln10
-rw-r--r--bin11/pascal32.bat5
-rw-r--r--bin11/pascal64.bat5
-rw-r--r--plugins/!Deprecated/ShlExt/clean.bat (renamed from plugins/ShlExt/clean.bat)0
-rw-r--r--plugins/!Deprecated/ShlExt/docs/HowToBuild.txt (renamed from plugins/ShlExt/docs/HowToBuild.txt)0
-rw-r--r--plugins/!Deprecated/ShlExt/docs/shlext release notes.txt (renamed from plugins/ShlExt/docs/shlext release notes.txt)0
-rw-r--r--plugins/!Deprecated/ShlExt/make.bat (renamed from plugins/ShlExt/make.bat)0
-rw-r--r--plugins/!Deprecated/ShlExt/resource.h (renamed from plugins/ShlExt/resource.h)0
-rw-r--r--plugins/!Deprecated/ShlExt/shlc.inc (renamed from plugins/ShlExt/shlc.inc)0
-rw-r--r--plugins/!Deprecated/ShlExt/shlcom.pas (renamed from plugins/ShlExt/shlcom.pas)0
-rw-r--r--plugins/!Deprecated/ShlExt/shldlgs.rc (renamed from plugins/ShlExt/shldlgs.rc)0
-rw-r--r--plugins/!Deprecated/ShlExt/shldlgs.res (renamed from plugins/ShlExt/shldlgs.res)bin2616 -> 2616 bytes
-rw-r--r--plugins/!Deprecated/ShlExt/shlext.dpr (renamed from plugins/ShlExt/shlext.dpr)0
-rw-r--r--plugins/!Deprecated/ShlExt/shlicons.pas (renamed from plugins/ShlExt/shlicons.pas)0
-rw-r--r--plugins/!Deprecated/ShlExt/shlipc.pas (renamed from plugins/ShlExt/shlipc.pas)0
-rw-r--r--plugins/ShellExt/src/options.cpp2
20 files changed, 32 insertions, 21 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 3e9f698c1a..8ca614eee2 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -405,6 +405,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Skype", "..\protocols\Skype
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebView", "..\plugins\WebView\webview_10.vcxproj", "{475ED6ED-C311-4188-ACB2-1C41830B22EE}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShlExt", "..\plugins\ShellExt\shellext_10.vcxproj", "{B27B85B5-0EF1-496D-99D7-0702A98A342A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1813,6 +1815,14 @@ Global
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|Win32.Build.0 = Release|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|x64.ActiveCfg = Release|x64
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|x64.Build.0 = Release|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|Win32.Build.0 = Debug|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|x64.ActiveCfg = Debug|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|x64.Build.0 = Debug|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|Win32.ActiveCfg = Release|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|Win32.Build.0 = Release|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|x64.ActiveCfg = Release|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index d376769aac..fbb2c5ffcd 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -441,6 +441,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Skype", "..\protocols\Skype
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebView", "..\plugins\WebView\webview_10.vcxproj", "{475ED6ED-C311-4188-ACB2-1C41830B22EE}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShlExt", "..\plugins\ShellExt\shellext_10.vcxproj", "{B27B85B5-0EF1-496D-99D7-0702A98A342A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1849,6 +1851,14 @@ Global
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|Win32.Build.0 = Release|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|x64.ActiveCfg = Release|x64
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|x64.Build.0 = Release|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|Win32.Build.0 = Debug|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|x64.ActiveCfg = Debug|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|x64.Build.0 = Debug|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|Win32.ActiveCfg = Release|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|Win32.Build.0 = Release|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|x64.ActiveCfg = Release|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1912,6 +1922,7 @@ Global
{73482497-9F57-4819-A9AB-5D841A9F072D} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{AA5CA2D0-F096-4001-B1B6-439C7FC11E77} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{3E9DA555-4C7B-463C-AD5C-214073DE29D6} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{20D781FB-4A20-4B75-B863-304A47182966} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}
{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}
{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}
diff --git a/bin10/pascal32.bat b/bin10/pascal32.bat
index 17db2ba432..eb5e3376e0 100644
--- a/bin10/pascal32.bat
+++ b/bin10/pascal32.bat
@@ -22,11 +22,6 @@ call make.bat fpc 10
if errorlevel 1 goto :Error
popd
-pushd ShlExt
-call make.bat fpc 10
-if errorlevel 1 goto :Error
-popd
-
pushd Watrack
call make.bat fpc 10
if errorlevel 1 goto :Error
diff --git a/bin10/pascal64.bat b/bin10/pascal64.bat
index b3772d3a81..4708d8f4b2 100644
--- a/bin10/pascal64.bat
+++ b/bin10/pascal64.bat
@@ -17,11 +17,6 @@ call make.bat fpc64 10
if errorlevel 1 goto :Error
popd
-pushd ShlExt
-call make.bat fpc64 10
-if errorlevel 1 goto :Error
-popd
-
pushd Watrack
call make.bat fpc64 10
if errorlevel 1 goto :Error
diff --git a/bin11/mir_full.sln b/bin11/mir_full.sln
index 16a4473859..ef5739f24b 100644
--- a/bin11/mir_full.sln
+++ b/bin11/mir_full.sln
@@ -405,6 +405,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Skype", "..\protocols\Skype
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebView", "..\plugins\WebView\webview_11.vcxproj", "{475ED6ED-C311-4188-ACB2-1C41830B22EE}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShlExt", "..\plugins\ShellExt\shellext_11.vcxproj", "{B27B85B5-0EF1-496D-99D7-0702A98A342A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1813,6 +1815,14 @@ Global
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|Win32.Build.0 = Release|Win32
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|x64.ActiveCfg = Release|x64
{475ED6ED-C311-4188-ACB2-1C41830B22EE}.Release|x64.Build.0 = Release|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|Win32.Build.0 = Debug|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|x64.ActiveCfg = Debug|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Debug|x64.Build.0 = Debug|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|Win32.ActiveCfg = Release|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|Win32.Build.0 = Release|Win32
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|x64.ActiveCfg = Release|x64
+ {B27B85B5-0EF1-496D-99D7-0702A98A342A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin11/pascal32.bat b/bin11/pascal32.bat
index 45a11e982a..000bf42ebb 100644
--- a/bin11/pascal32.bat
+++ b/bin11/pascal32.bat
@@ -22,11 +22,6 @@ call make.bat fpc 11
if errorlevel 1 goto :Error
popd
-pushd ShlExt
-call make.bat fpc 11
-if errorlevel 1 goto :Error
-popd
-
pushd Watrack
call make.bat fpc 11
if errorlevel 1 goto :Error
diff --git a/bin11/pascal64.bat b/bin11/pascal64.bat
index eefa9dc699..6394c69082 100644
--- a/bin11/pascal64.bat
+++ b/bin11/pascal64.bat
@@ -17,11 +17,6 @@ call make.bat fpc64 11
if errorlevel 1 goto :Error
popd
-pushd ShlExt
-call make.bat fpc64 11
-if errorlevel 1 goto :Error
-popd
-
pushd Watrack
call make.bat fpc64 11
if errorlevel 1 goto :Error
diff --git a/plugins/ShlExt/clean.bat b/plugins/!Deprecated/ShlExt/clean.bat
index 575eed729c..575eed729c 100644
--- a/plugins/ShlExt/clean.bat
+++ b/plugins/!Deprecated/ShlExt/clean.bat
diff --git a/plugins/ShlExt/docs/HowToBuild.txt b/plugins/!Deprecated/ShlExt/docs/HowToBuild.txt
index 53b6738616..53b6738616 100644
--- a/plugins/ShlExt/docs/HowToBuild.txt
+++ b/plugins/!Deprecated/ShlExt/docs/HowToBuild.txt
diff --git a/plugins/ShlExt/docs/shlext release notes.txt b/plugins/!Deprecated/ShlExt/docs/shlext release notes.txt
index 0e58edf9ff..0e58edf9ff 100644
--- a/plugins/ShlExt/docs/shlext release notes.txt
+++ b/plugins/!Deprecated/ShlExt/docs/shlext release notes.txt
diff --git a/plugins/ShlExt/make.bat b/plugins/!Deprecated/ShlExt/make.bat
index f97c5ed9a3..f97c5ed9a3 100644
--- a/plugins/ShlExt/make.bat
+++ b/plugins/!Deprecated/ShlExt/make.bat
diff --git a/plugins/ShlExt/resource.h b/plugins/!Deprecated/ShlExt/resource.h
index c89660a88d..c89660a88d 100644
--- a/plugins/ShlExt/resource.h
+++ b/plugins/!Deprecated/ShlExt/resource.h
diff --git a/plugins/ShlExt/shlc.inc b/plugins/!Deprecated/ShlExt/shlc.inc
index 2952de8c74..2952de8c74 100644
--- a/plugins/ShlExt/shlc.inc
+++ b/plugins/!Deprecated/ShlExt/shlc.inc
diff --git a/plugins/ShlExt/shlcom.pas b/plugins/!Deprecated/ShlExt/shlcom.pas
index 93a5d27695..93a5d27695 100644
--- a/plugins/ShlExt/shlcom.pas
+++ b/plugins/!Deprecated/ShlExt/shlcom.pas
diff --git a/plugins/ShlExt/shldlgs.rc b/plugins/!Deprecated/ShlExt/shldlgs.rc
index 0e9cd82b04..0e9cd82b04 100644
--- a/plugins/ShlExt/shldlgs.rc
+++ b/plugins/!Deprecated/ShlExt/shldlgs.rc
diff --git a/plugins/ShlExt/shldlgs.res b/plugins/!Deprecated/ShlExt/shldlgs.res
index 3de576e992..3de576e992 100644
--- a/plugins/ShlExt/shldlgs.res
+++ b/plugins/!Deprecated/ShlExt/shldlgs.res
Binary files differ
diff --git a/plugins/ShlExt/shlext.dpr b/plugins/!Deprecated/ShlExt/shlext.dpr
index c23ee75f93..c23ee75f93 100644
--- a/plugins/ShlExt/shlext.dpr
+++ b/plugins/!Deprecated/ShlExt/shlext.dpr
diff --git a/plugins/ShlExt/shlicons.pas b/plugins/!Deprecated/ShlExt/shlicons.pas
index 195033ae8d..195033ae8d 100644
--- a/plugins/ShlExt/shlicons.pas
+++ b/plugins/!Deprecated/ShlExt/shlicons.pas
diff --git a/plugins/ShlExt/shlipc.pas b/plugins/!Deprecated/ShlExt/shlipc.pas
index 17ab511e52..17ab511e52 100644
--- a/plugins/ShlExt/shlipc.pas
+++ b/plugins/!Deprecated/ShlExt/shlipc.pas
diff --git a/plugins/ShellExt/src/options.cpp b/plugins/ShellExt/src/options.cpp
index 1e92422fcb..ccc2d3eb6a 100644
--- a/plugins/ShellExt/src/options.cpp
+++ b/plugins/ShellExt/src/options.cpp
@@ -110,7 +110,7 @@ int OnOptionsInit(WPARAM wParam, LPARAM lParam)
{
OPTIONSDIALOGPAGE opt = { sizeof(opt) };
opt.flags = ODPF_BOLDGROUPS;
- opt.pszGroup = "Plugins";
+ opt.pszGroup = "Services";
opt.position = -1066;
opt.pszTitle = "Shell context menus";
opt.pszTemplate = MAKEINTRESOURCEA(IDD_SHLOPTS);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 01:24:57 +0000