summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/MenuItemEx/docs/menuitemex-translation.txt (renamed from plugins/MenuItemEx/menuitemex-translation.txt)0
-rw-r--r--plugins/MenuItemEx/menuex.rc156
-rw-r--r--plugins/MenuItemEx/menuex_10.vcxproj34
-rw-r--r--plugins/MenuItemEx/menuex_10.vcxproj.filters62
-rw-r--r--plugins/MenuItemEx/res/Always Visible.ico (renamed from plugins/MenuItemEx/icons/Always Visible.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/MenuItemEx/res/CopyID_overlay.ico (renamed from plugins/MenuItemEx/icons/CopyID_overlay.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/CopyMirVer.ico (renamed from plugins/MenuItemEx/icons/CopyMirVer.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/Ignore_list.ico (renamed from plugins/MenuItemEx/icons/Ignore_list.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/Never Visible.ico (renamed from plugins/MenuItemEx/icons/Never Visible.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/MenuItemEx/res/auth_added.ico (renamed from plugins/MenuItemEx/icons/auth_added.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/auth_ask.ico (renamed from plugins/MenuItemEx/icons/auth_ask.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/change_proto.ico (renamed from plugins/MenuItemEx/icons/change_proto.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/copyip_overlay.ico (renamed from plugins/MenuItemEx/icons/copyip_overlay.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/hide_from_list.ico (renamed from plugins/MenuItemEx/icons/hide_from_list.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/msg_status.ico (renamed from plugins/MenuItemEx/icons/msg_status.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/msg_xStatus.ico (renamed from plugins/MenuItemEx/icons/msg_xStatus.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/recv_files.ico (renamed from plugins/MenuItemEx/icons/recv_files.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/resource.rc (renamed from plugins/MenuItemEx/resource.rc)71
-rw-r--r--plugins/MenuItemEx/res/salad.right.ico (renamed from plugins/MenuItemEx/icons/salad.right.ico)bin2550 -> 2550 bytes
-rw-r--r--plugins/MenuItemEx/res/show_in_list.ico (renamed from plugins/MenuItemEx/icons/show_in_list.ico)bin1150 -> 1150 bytes
-rw-r--r--plugins/MenuItemEx/res/version.rc (renamed from plugins/MenuItemEx/version.rc)3
-rw-r--r--plugins/MenuItemEx/src/images.cpp (renamed from plugins/MenuItemEx/images.cpp)0
-rw-r--r--plugins/MenuItemEx/src/images.h (renamed from plugins/MenuItemEx/images.h)0
-rw-r--r--plugins/MenuItemEx/src/main.cpp (renamed from plugins/MenuItemEx/main.cpp)2
-rw-r--r--plugins/MenuItemEx/src/menuex.h (renamed from plugins/MenuItemEx/menuex.h)0
-rw-r--r--plugins/MenuItemEx/src/options.cpp (renamed from plugins/MenuItemEx/options.cpp)0
-rw-r--r--plugins/MenuItemEx/src/resource.h (renamed from plugins/MenuItemEx/resource.h)0
-rw-r--r--plugins/MenuItemEx/src/version.h (renamed from plugins/MenuItemEx/version.h)16
28 files changed, 43 insertions, 301 deletions
diff --git a/plugins/MenuItemEx/menuitemex-translation.txt b/plugins/MenuItemEx/docs/menuitemex-translation.txt
index e894e19776..e894e19776 100644
--- a/plugins/MenuItemEx/menuitemex-translation.txt
+++ b/plugins/MenuItemEx/docs/menuitemex-translation.txt
diff --git a/plugins/MenuItemEx/menuex.rc b/plugins/MenuItemEx/menuex.rc
deleted file mode 100644
index be750a05b7..0000000000
--- a/plugins/MenuItemEx/menuex.rc
+++ /dev/null
@@ -1,156 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <windows.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1250)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON0 ICON "icons\\hide_from_list.ico"
-IDI_ICON1 ICON "icons\\Always Visible.ico"
-IDI_ICON2 ICON "icons\\Never Visible.ico"
-IDI_ICON3 ICON "icons\\copyid_overlay.ico"
-IDI_ICON4 ICON "icons\\auth_added.ico"
-IDI_ICON5 ICON "icons\\auth_ask.ico"
-IDI_ICON6 ICON "icons\\change_proto.ico"
-IDI_ICON7 ICON "icons\\ignore_list.ico"
-IDI_ICON8 ICON "icons\\show_in_list.ico"
-IDI_ICON9 ICON "icons\\msg_status.ico"
-IDI_ICON10 ICON "icons\\msg_xstatus.ico"
-IDI_ICON11 ICON "icons\\copyip_overlay.ico"
-IDI_ICON12 ICON "icons\\recv_files.ico"
-IDI_ICON13 ICON "icons\\CopyMirVer.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_AUTHREQ DIALOGEX 0, 0, 186, 95
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Enter an authorization request"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "&Send",IDOK,34,74,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,98,74,50,14
- EDITTEXT IDC_REASON,7,7,172,59,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN
-END
-
-IDD_OPTIONS DIALOGEX 0, 0, 280, 183
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- GROUPBOX "Shown menu items",IDC_STATIC,7,7,266,180
- CONTROL "Visibility",IDC_VIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,18,77,10
- CONTROL "Show alpha icons",IDC_SHOWALPHAICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,18,104,10
- CONTROL "Hide from list",IDC_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,30,77,10
- CONTROL "Ignore",IDC_IGNORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,42,140,10
- CONTROL "Copy to Account (Ctrl+click for move to Account)",IDC_PROTOS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,54,192,10
- CONTROL "Send 'You were added'",IDC_ADDED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,66,158,10
- CONTROL "Request Authorization",IDC_AUTHREQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,78,157,10
- CONTROL "Browse Received Files",IDC_RECVFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,90,158,10
- CONTROL "Copy IP",IDC_COPYIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,102,157,10
- CONTROL "Copy MirVer",IDC_COPYMIRVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,114,157,10
- CONTROL "Copy Status Message",IDC_STATUSMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,126,144,10
- CONTROL "Add item name",IDC_SMNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,126,104,10
- CONTROL "Copy ID",IDC_COPYID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,138,76,10
- CONTROL "Add protocol name",IDC_COPYIDNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,138,104,10
- CONTROL "Show ID in menu item",IDC_SHOWID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,150,132,10
- CONTROL "Trim too long ID",IDC_TRIMID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,150,104,10
- LTEXT "* Use Ctrl+click to see popup with the copied text",IDC_HINT1,15,164,249,18
- CONTROL "Hide contact on 'Ignore all'",IDC_IGNOREHIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,42,104,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
- IDD_AUTHREQ, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 179
- TOPMARGIN, 7
- BOTTOMMARGIN, 64
- END
-
- IDD_OPTIONS, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 273
- TOPMARGIN, 7
- BOTTOMMARGIN, 177
- END
-END
-#endif // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
- "version.rc\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include <windows.h>\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/plugins/MenuItemEx/menuex_10.vcxproj b/plugins/MenuItemEx/menuex_10.vcxproj
index fd55658b45..48e23a80ac 100644
--- a/plugins/MenuItemEx/menuex_10.vcxproj
+++ b/plugins/MenuItemEx/menuex_10.vcxproj
@@ -132,7 +132,6 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalOptions>/filealign:0x200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -161,7 +160,6 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalOptions>/filealign:0x200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -175,33 +173,19 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="images.cpp" />
- <ClCompile Include="main.cpp" />
- <ClCompile Include="options.cpp" />
+ <ClCompile Include="src\images.cpp" />
+ <ClCompile Include="src\main.cpp" />
+ <ClCompile Include="src\options.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="menuex.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\images.h" />
+ <ClInclude Include="src\menuex.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="icons\Always Visible.ico" />
- <None Include="icons\auth_added.ico" />
- <None Include="icons\auth_ask.ico" />
- <None Include="icons\change_proto.ico" />
- <None Include="icons\copyid_overlay.ico" />
- <None Include="icons\copyip_overlay.ico" />
- <None Include="icons\CopyMirVer.ico" />
- <None Include="icons\hide_from_list.ico" />
- <None Include="icons\ignore_list.ico" />
- <None Include="icons\msg_status.ico" />
- <None Include="icons\msg_xstatus.ico" />
- <None Include="icons\Never Visible.ico" />
- <None Include="icons\recv_files.ico" />
- <None Include="icons\show_in_list.ico" />
+ <ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/MenuItemEx/menuex_10.vcxproj.filters b/plugins/MenuItemEx/menuex_10.vcxproj.filters
index bd0660ac98..19cda8f373 100644
--- a/plugins/MenuItemEx/menuex_10.vcxproj.filters
+++ b/plugins/MenuItemEx/menuex_10.vcxproj.filters
@@ -15,74 +15,36 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="images.cpp">
+ <ClCompile Include="src\images.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="options.cpp">
+ <ClCompile Include="src\options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="menuex.h">
+ <ClInclude Include="src\images.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\menuex.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="icons\hide_from_list.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\Always Visible.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\Never Visible.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\copyid_overlay.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\auth_added.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\auth_ask.ico">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
- </None>
- <None Include="icons\change_proto.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\ignore_list.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\show_in_list.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\msg_status.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\msg_xstatus.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\copyip_overlay.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\recv_files.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\CopyMirVer.ico">
- <Filter>Resource Files</Filter>
- </None>
+ </ResourceCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/MenuItemEx/icons/Always Visible.ico b/plugins/MenuItemEx/res/Always Visible.ico
index 25c1a925ee..25c1a925ee 100644
--- a/plugins/MenuItemEx/icons/Always Visible.ico
+++ b/plugins/MenuItemEx/res/Always Visible.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/CopyID_overlay.ico b/plugins/MenuItemEx/res/CopyID_overlay.ico
index 4c5bc0af9e..4c5bc0af9e 100644
--- a/plugins/MenuItemEx/icons/CopyID_overlay.ico
+++ b/plugins/MenuItemEx/res/CopyID_overlay.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/CopyMirVer.ico b/plugins/MenuItemEx/res/CopyMirVer.ico
index 9b7bc67cf9..9b7bc67cf9 100644
--- a/plugins/MenuItemEx/icons/CopyMirVer.ico
+++ b/plugins/MenuItemEx/res/CopyMirVer.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/Ignore_list.ico b/plugins/MenuItemEx/res/Ignore_list.ico
index 5635149232..5635149232 100644
--- a/plugins/MenuItemEx/icons/Ignore_list.ico
+++ b/plugins/MenuItemEx/res/Ignore_list.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/Never Visible.ico b/plugins/MenuItemEx/res/Never Visible.ico
index 131ae02580..131ae02580 100644
--- a/plugins/MenuItemEx/icons/Never Visible.ico
+++ b/plugins/MenuItemEx/res/Never Visible.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/auth_added.ico b/plugins/MenuItemEx/res/auth_added.ico
index fa37e9357c..fa37e9357c 100644
--- a/plugins/MenuItemEx/icons/auth_added.ico
+++ b/plugins/MenuItemEx/res/auth_added.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/auth_ask.ico b/plugins/MenuItemEx/res/auth_ask.ico
index d8879d15bb..d8879d15bb 100644
--- a/plugins/MenuItemEx/icons/auth_ask.ico
+++ b/plugins/MenuItemEx/res/auth_ask.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/change_proto.ico b/plugins/MenuItemEx/res/change_proto.ico
index 07c72f9287..07c72f9287 100644
--- a/plugins/MenuItemEx/icons/change_proto.ico
+++ b/plugins/MenuItemEx/res/change_proto.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/copyip_overlay.ico b/plugins/MenuItemEx/res/copyip_overlay.ico
index 2823f13456..2823f13456 100644
--- a/plugins/MenuItemEx/icons/copyip_overlay.ico
+++ b/plugins/MenuItemEx/res/copyip_overlay.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/hide_from_list.ico b/plugins/MenuItemEx/res/hide_from_list.ico
index 69fb9f91c4..69fb9f91c4 100644
--- a/plugins/MenuItemEx/icons/hide_from_list.ico
+++ b/plugins/MenuItemEx/res/hide_from_list.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/msg_status.ico b/plugins/MenuItemEx/res/msg_status.ico
index 1d0607d4ad..1d0607d4ad 100644
--- a/plugins/MenuItemEx/icons/msg_status.ico
+++ b/plugins/MenuItemEx/res/msg_status.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/msg_xStatus.ico b/plugins/MenuItemEx/res/msg_xStatus.ico
index d057d353ff..d057d353ff 100644
--- a/plugins/MenuItemEx/icons/msg_xStatus.ico
+++ b/plugins/MenuItemEx/res/msg_xStatus.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/recv_files.ico b/plugins/MenuItemEx/res/recv_files.ico
index d8e15aa836..d8e15aa836 100644
--- a/plugins/MenuItemEx/icons/recv_files.ico
+++ b/plugins/MenuItemEx/res/recv_files.ico
Binary files differ
diff --git a/plugins/MenuItemEx/resource.rc b/plugins/MenuItemEx/res/resource.rc
index 9424bfb831..bec11ac250 100644
--- a/plugins/MenuItemEx/resource.rc
+++ b/plugins/MenuItemEx/res/resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -26,20 +26,20 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ICON0 ICON "icons\\hide_from_list.ico"
-IDI_ICON1 ICON "icons\\Always Visible.ico"
-IDI_ICON2 ICON "icons\\Never Visible.ico"
-IDI_ICON3 ICON "icons\\copyid_overlay.ico"
-IDI_ICON4 ICON "icons\\auth_added.ico"
-IDI_ICON5 ICON "icons\\auth_ask.ico"
-IDI_ICON6 ICON "icons\\change_proto.ico"
-IDI_ICON7 ICON "icons\\ignore_list.ico"
-IDI_ICON8 ICON "icons\\show_in_list.ico"
-IDI_ICON9 ICON "icons\\msg_status.ico"
-IDI_ICON10 ICON "icons\\msg_xstatus.ico"
-IDI_ICON11 ICON "icons\\copyip_overlay.ico"
-IDI_ICON12 ICON "icons\\recv_files.ico"
-IDI_ICON13 ICON "icons\\CopyMirVer.ico"
+IDI_ICON0 ICON "hide_from_list.ico"
+IDI_ICON1 ICON "Always Visible.ico"
+IDI_ICON2 ICON "Never Visible.ico"
+IDI_ICON3 ICON "copyid_overlay.ico"
+IDI_ICON4 ICON "auth_added.ico"
+IDI_ICON5 ICON "auth_ask.ico"
+IDI_ICON6 ICON "change_proto.ico"
+IDI_ICON7 ICON "ignore_list.ico"
+IDI_ICON8 ICON "show_in_list.ico"
+IDI_ICON9 ICON "msg_status.ico"
+IDI_ICON10 ICON "msg_xstatus.ico"
+IDI_ICON11 ICON "copyip_overlay.ico"
+IDI_ICON12 ICON "recv_files.ico"
+IDI_ICON13 ICON "CopyMirVer.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -128,8 +128,7 @@ END
1 TEXTINCLUDE
BEGIN
- "resource.h\0"
- "version.rc\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
@@ -146,44 +145,6 @@ END
#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,9
- PRODUCTVERSION 1,3,0,9
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "FileDescription", "MenuItemEx plugin for Miranda IM"
- VALUE "FileVersion", "1.3.0.9"
- VALUE "InternalName", "menuex"
- VALUE "LegalCopyright", "© 2001-03 Heiko Schillinger, © 2006-08 Baloo, © 2009-10 Billy_Bons, © 2011-12 Robert Posel"
- VALUE "OriginalFilename", "menuex.dll"
- VALUE "ProductName", "menuex"
- VALUE "ProductVersion", "1.3.0.9"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/MenuItemEx/icons/salad.right.ico b/plugins/MenuItemEx/res/salad.right.ico
index 03dd1f4e9d..03dd1f4e9d 100644
--- a/plugins/MenuItemEx/icons/salad.right.ico
+++ b/plugins/MenuItemEx/res/salad.right.ico
Binary files differ
diff --git a/plugins/MenuItemEx/icons/show_in_list.ico b/plugins/MenuItemEx/res/show_in_list.ico
index bea1dfd738..bea1dfd738 100644
--- a/plugins/MenuItemEx/icons/show_in_list.ico
+++ b/plugins/MenuItemEx/res/show_in_list.ico
Binary files differ
diff --git a/plugins/MenuItemEx/version.rc b/plugins/MenuItemEx/res/version.rc
index 822cdf2568..981fcdaebc 100644
--- a/plugins/MenuItemEx/version.rc
+++ b/plugins/MenuItemEx/res/version.rc
@@ -2,7 +2,8 @@
#error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include "version.h"
+#include "..\src\version.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/MenuItemEx/images.cpp b/plugins/MenuItemEx/src/images.cpp
index 51903294bb..51903294bb 100644
--- a/plugins/MenuItemEx/images.cpp
+++ b/plugins/MenuItemEx/src/images.cpp
diff --git a/plugins/MenuItemEx/images.h b/plugins/MenuItemEx/src/images.h
index e8288714f7..e8288714f7 100644
--- a/plugins/MenuItemEx/images.h
+++ b/plugins/MenuItemEx/src/images.h
diff --git a/plugins/MenuItemEx/main.cpp b/plugins/MenuItemEx/src/main.cpp
index ed053b2223..760520ce91 100644
--- a/plugins/MenuItemEx/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -101,7 +101,7 @@ PLUGININFOEX pluginInfoEx = {
__AUTHORS,
__EMAIL,
__COPYRIGHTS,
- __WEB __PLUGIN_ID_STR,
+ __WEB,
UNICODE_AWARE,
MIID_MENUEX
};
diff --git a/plugins/MenuItemEx/menuex.h b/plugins/MenuItemEx/src/menuex.h
index 5f6540827a..5f6540827a 100644
--- a/plugins/MenuItemEx/menuex.h
+++ b/plugins/MenuItemEx/src/menuex.h
diff --git a/plugins/MenuItemEx/options.cpp b/plugins/MenuItemEx/src/options.cpp
index 0aa0bbb68b..0aa0bbb68b 100644
--- a/plugins/MenuItemEx/options.cpp
+++ b/plugins/MenuItemEx/src/options.cpp
diff --git a/plugins/MenuItemEx/resource.h b/plugins/MenuItemEx/src/resource.h
index 18b7de34cd..18b7de34cd 100644
--- a/plugins/MenuItemEx/resource.h
+++ b/plugins/MenuItemEx/src/resource.h
diff --git a/plugins/MenuItemEx/version.h b/plugins/MenuItemEx/src/version.h
index 355dfa6bf4..b98a1d6faf 100644
--- a/plugins/MenuItemEx/version.h
+++ b/plugins/MenuItemEx/src/version.h
@@ -1,19 +1,9 @@
#define __FILEVERSION_STRING 1,3,0,9
#define __VERSION_STRING "1.3.0.9"
-#define __VERSION_DWORD 0x01030008
-
-#if defined (_WIN64)
-#define __PLUGIN_NAME "MenuItemEx (x64) plugin for Miranda IM"
-#define __PLUGIN_ID 4304
-#define __PLUGIN_ID_STR "4304"
-#else (_UNICODE)
-#define __PLUGIN_NAME "MenuItemEx (Unicode) plugin for Miranda IM"
-#define __PLUGIN_ID 4036
-#define __PLUGIN_ID_STR "4036"
-#endif
-
-#define __WEB "http://addons.miranda-im.org/details.php?action=viewfile&id="
+#define __VERSION_DWORD 0x01030009
+#define __PLUGIN_NAME "MenuItemEx"
+#define __WEB "http://nightly.miranda.im"
#define __DESC "Adds some useful options to a contacts menu."
#define __AUTHORS "Heiko Schillinger, Baloo, Billy_Bons, Robert Posel"
#define __EMAIL "micron@nexgo.de, baloo@bk.ru, tatarinov.sergey@gmail.com, robyer@seznam.cz"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 20:24:34 +0000