summaryrefslogtreecommitdiff
path: root/plugins/YAPP
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/YAPP')
-rw-r--r--plugins/YAPP/docs/yapp-translation.txt (renamed from plugins/YAPP/yapp-translation.txt)0
-rw-r--r--plugins/YAPP/res/PPh2.ico (renamed from plugins/YAPP/PPh2.ico)bin2038 -> 2038 bytes
-rw-r--r--plugins/YAPP/res/version.rc (renamed from plugins/YAPP/version.rc)2
-rw-r--r--plugins/YAPP/res/yapp.rc (renamed from plugins/YAPP/popups2.rc)2
-rw-r--r--plugins/YAPP/src/common.h (renamed from plugins/YAPP/common.h)0
-rw-r--r--plugins/YAPP/src/m_yapp.h (renamed from plugins/YAPP/docs/m_popup2.h)6
-rw-r--r--plugins/YAPP/src/message_pump.cpp (renamed from plugins/YAPP/message_pump.cpp)0
-rw-r--r--plugins/YAPP/src/message_pump.h (renamed from plugins/YAPP/message_pump.h)0
-rw-r--r--plugins/YAPP/src/notify.h (renamed from plugins/YAPP/notify.h)0
-rw-r--r--plugins/YAPP/src/notify_imp.cpp (renamed from plugins/YAPP/notify_imp.cpp)2
-rw-r--r--plugins/YAPP/src/options.cpp (renamed from plugins/YAPP/options.cpp)0
-rw-r--r--plugins/YAPP/src/options.h (renamed from plugins/YAPP/options.h)0
-rw-r--r--plugins/YAPP/src/popwin.cpp (renamed from plugins/YAPP/popwin.cpp)0
-rw-r--r--plugins/YAPP/src/popwin.h (renamed from plugins/YAPP/popwin.h)0
-rw-r--r--plugins/YAPP/src/resource.h (renamed from plugins/YAPP/resource.h)0
-rw-r--r--plugins/YAPP/src/services.cpp (renamed from plugins/YAPP/services.cpp)2
-rw-r--r--plugins/YAPP/src/services.h (renamed from plugins/YAPP/services.h)0
-rw-r--r--plugins/YAPP/src/version.h (renamed from plugins/YAPP/version.h)0
-rw-r--r--plugins/YAPP/src/yapp.cpp (renamed from plugins/YAPP/popups2.cpp)10
-rw-r--r--plugins/YAPP/src/yapp.h (renamed from plugins/YAPP/popups2.h)6
-rw-r--r--plugins/YAPP/src/yapp_history.cpp (renamed from plugins/YAPP/popup_history.cpp)2
-rw-r--r--plugins/YAPP/src/yapp_history.h (renamed from plugins/YAPP/popup_history.h)4
-rw-r--r--plugins/YAPP/src/yapp_history_dlg.cpp (renamed from plugins/YAPP/popup_history_dlg.cpp)2
-rw-r--r--plugins/YAPP/yapp_10.vcxproj (renamed from plugins/YAPP/popups2_10.vcxproj)48
-rw-r--r--plugins/YAPP/yapp_10.vcxproj.filters (renamed from plugins/YAPP/popups2_10.vcxproj.filters)40
25 files changed, 63 insertions, 63 deletions
diff --git a/plugins/YAPP/yapp-translation.txt b/plugins/YAPP/docs/yapp-translation.txt
index 82c150e612..82c150e612 100644
--- a/plugins/YAPP/yapp-translation.txt
+++ b/plugins/YAPP/docs/yapp-translation.txt
diff --git a/plugins/YAPP/PPh2.ico b/plugins/YAPP/res/PPh2.ico
index f8aa63abf2..f8aa63abf2 100644
--- a/plugins/YAPP/PPh2.ico
+++ b/plugins/YAPP/res/PPh2.ico
Binary files differ
diff --git a/plugins/YAPP/version.rc b/plugins/YAPP/res/version.rc
index c962918f07..3ad9c3a4b3 100644
--- a/plugins/YAPP/version.rc
+++ b/plugins/YAPP/res/version.rc
@@ -3,7 +3,7 @@
#endif //APSTUDIO_INVOKED
#include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
diff --git a/plugins/YAPP/popups2.rc b/plugins/YAPP/res/yapp.rc
index c59e253ff2..d4a7243199 100644
--- a/plugins/YAPP/popups2.rc
+++ b/plugins/YAPP/res/yapp.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/YAPP/common.h b/plugins/YAPP/src/common.h
index 1b2a52b74b..1b2a52b74b 100644
--- a/plugins/YAPP/common.h
+++ b/plugins/YAPP/src/common.h
diff --git a/plugins/YAPP/docs/m_popup2.h b/plugins/YAPP/src/m_yapp.h
index b23aecf7fb..26d9be0e2e 100644
--- a/plugins/YAPP/docs/m_popup2.h
+++ b/plugins/YAPP/src/m_yapp.h
@@ -1,5 +1,5 @@
-#ifndef __m_popup2_h__
-#define __m_popup2_h__
+#ifndef __m_yapp_h__
+#define __m_yapp_h__
#define NFOPT_POPUP2_BACKCOLOR "Popup2/BackColor"
#define NFOPT_POPUP2_TEXTCOLOR "Popup2/TextColor"
@@ -26,4 +26,4 @@
#define MPopup2Remove(a) (CallService(MS_POPUP2_REMOVE, 0, (LPARAM)(a)))
#endif
-#endif // __m_popup2_h__
+#endif // __m_yapp_h__
diff --git a/plugins/YAPP/message_pump.cpp b/plugins/YAPP/src/message_pump.cpp
index 7e2cea5f0c..7e2cea5f0c 100644
--- a/plugins/YAPP/message_pump.cpp
+++ b/plugins/YAPP/src/message_pump.cpp
diff --git a/plugins/YAPP/message_pump.h b/plugins/YAPP/src/message_pump.h
index 70671b157a..70671b157a 100644
--- a/plugins/YAPP/message_pump.h
+++ b/plugins/YAPP/src/message_pump.h
diff --git a/plugins/YAPP/notify.h b/plugins/YAPP/src/notify.h
index 7f39eb6d65..7f39eb6d65 100644
--- a/plugins/YAPP/notify.h
+++ b/plugins/YAPP/src/notify.h
diff --git a/plugins/YAPP/notify_imp.cpp b/plugins/YAPP/src/notify_imp.cpp
index 2f2ca9967b..061c30f1a2 100644
--- a/plugins/YAPP/notify_imp.cpp
+++ b/plugins/YAPP/src/notify_imp.cpp
@@ -2,7 +2,7 @@
#include "resource.h"
#include "notify.h"
#include "message_pump.h"
-#include "docs/m_popup2.h"
+#include "m_yapp.h"
HANDLE hhkShow=0, hhkUpdate=0, hhkRemove=0;
diff --git a/plugins/YAPP/options.cpp b/plugins/YAPP/src/options.cpp
index 7ba798e5fa..7ba798e5fa 100644
--- a/plugins/YAPP/options.cpp
+++ b/plugins/YAPP/src/options.cpp
diff --git a/plugins/YAPP/options.h b/plugins/YAPP/src/options.h
index 55b94d17db..55b94d17db 100644
--- a/plugins/YAPP/options.h
+++ b/plugins/YAPP/src/options.h
diff --git a/plugins/YAPP/popwin.cpp b/plugins/YAPP/src/popwin.cpp
index 682a3f7b05..682a3f7b05 100644
--- a/plugins/YAPP/popwin.cpp
+++ b/plugins/YAPP/src/popwin.cpp
diff --git a/plugins/YAPP/popwin.h b/plugins/YAPP/src/popwin.h
index 4d826ceade..4d826ceade 100644
--- a/plugins/YAPP/popwin.h
+++ b/plugins/YAPP/src/popwin.h
diff --git a/plugins/YAPP/resource.h b/plugins/YAPP/src/resource.h
index d7db4cda2e..d7db4cda2e 100644
--- a/plugins/YAPP/resource.h
+++ b/plugins/YAPP/src/resource.h
diff --git a/plugins/YAPP/services.cpp b/plugins/YAPP/src/services.cpp
index 84e4330151..4dd00fcd38 100644
--- a/plugins/YAPP/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -3,7 +3,7 @@
#include "popwin.h"
#include "message_pump.h"
#include "resource.h"
-#include "popup_history.h"
+#include "yapp_history.h"
#define NUM_SERVICES 20
HANDLE hService[NUM_SERVICES];
diff --git a/plugins/YAPP/services.h b/plugins/YAPP/src/services.h
index 8243b0ba8b..8243b0ba8b 100644
--- a/plugins/YAPP/services.h
+++ b/plugins/YAPP/src/services.h
diff --git a/plugins/YAPP/version.h b/plugins/YAPP/src/version.h
index 4118cc9091..4118cc9091 100644
--- a/plugins/YAPP/version.h
+++ b/plugins/YAPP/src/version.h
diff --git a/plugins/YAPP/popups2.cpp b/plugins/YAPP/src/yapp.cpp
index 5c6fd9261f..11067040b2 100644
--- a/plugins/YAPP/popups2.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -2,14 +2,14 @@
//
#include "common.h"
-#include "popups2.h"
+#include "yapp.h"
#include "version.h"
#include "message_pump.h"
#include "options.h"
#include "popwin.h"
#include "notify.h"
-#include "popup_history.h" //to be able to update the renderer
+#include "yapp_history.h" //to be able to update the renderer
HMODULE hInst = 0;
@@ -52,7 +52,7 @@ extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LP
return TRUE;
}
-extern "C" POPUPS2_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" YAPP_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
@@ -199,7 +199,7 @@ int PreShutdown(WPARAM wParam, LPARAM lParam) {
HANDLE hEventPreShutdown, hEventModulesLoaded;
-extern "C" int POPUPS2_API Load(void) {
+extern "C" int YAPP_API Load(void) {
mir_getLP(&pluginInfo);
@@ -227,7 +227,7 @@ extern "C" int POPUPS2_API Load(void) {
return 0;
}
-extern "C" int POPUPS2_API Unload()
+extern "C" int YAPP_API Unload()
{
if(hEventReloadFont)
UnhookEvent(hEventReloadFont);
diff --git a/plugins/YAPP/popups2.h b/plugins/YAPP/src/yapp.h
index 59e4f89baf..de86e26295 100644
--- a/plugins/YAPP/popups2.h
+++ b/plugins/YAPP/src/yapp.h
@@ -4,9 +4,9 @@
// that uses this DLL. This way any other project whose source files include this file see
// POPUPS2_API functions as being imported from a DLL, whereas this DLL sees symbols
// defined with this macro as being exported.
-#ifdef POPUPS2_EXPORTS
-#define POPUPS2_API __declspec(dllexport)
+#ifdef YAPP_EXPORTS
+#define YAPP_API __declspec(dllexport)
#else
-#define POPUPS2_API __declspec(dllimport)
+#define YAPP_API __declspec(dllimport)
#endif
diff --git a/plugins/YAPP/popup_history.cpp b/plugins/YAPP/src/yapp_history.cpp
index db0c53fa3a..d6b0c4b114 100644
--- a/plugins/YAPP/popup_history.cpp
+++ b/plugins/YAPP/src/yapp_history.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "popup_history.h"
+#include "yapp_history.h"
PopupHistoryList::PopupHistoryList(int renderer)
{
diff --git a/plugins/YAPP/popup_history.h b/plugins/YAPP/src/yapp_history.h
index f79b6ee7af..d527bc47f4 100644
--- a/plugins/YAPP/popup_history.h
+++ b/plugins/YAPP/src/yapp_history.h
@@ -1,5 +1,5 @@
-#ifndef __popup_history_h__
-#define __popup_history_h__
+#ifndef __yapp_history_h__
+#define __yapp_history_h__
#include "m_ieview.h" //need this for special renderers
diff --git a/plugins/YAPP/popup_history_dlg.cpp b/plugins/YAPP/src/yapp_history_dlg.cpp
index e192139c8a..534af1fe0c 100644
--- a/plugins/YAPP/popup_history_dlg.cpp
+++ b/plugins/YAPP/src/yapp_history_dlg.cpp
@@ -1,6 +1,6 @@
#include "common.h"
#include "resource.h"
-#include "popup_history.h"
+#include "yapp_history.h"
//************ Some helper resize stuff ******************
diff --git a/plugins/YAPP/popups2_10.vcxproj b/plugins/YAPP/yapp_10.vcxproj
index 0d65a05078..3761ad68d5 100644
--- a/plugins/YAPP/popups2_10.vcxproj
+++ b/plugins/YAPP/yapp_10.vcxproj
@@ -73,7 +73,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;YAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -101,7 +101,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;YAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -130,7 +130,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;YAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -155,7 +155,7 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;YAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>Disabled</Optimization>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -174,32 +174,32 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="message_pump.cpp" />
- <ClCompile Include="notify_imp.cpp" />
- <ClCompile Include="options.cpp" />
- <ClCompile Include="popup_history.cpp" />
- <ClCompile Include="popup_history_dlg.cpp" />
- <ClCompile Include="popups2.cpp">
+ <ClCompile Include="src\message_pump.cpp" />
+ <ClCompile Include="src\notify_imp.cpp" />
+ <ClCompile Include="src\options.cpp" />
+ <ClCompile Include="src\yapp_history.cpp" />
+ <ClCompile Include="src\yapp_history_dlg.cpp" />
+ <ClCompile Include="src\yapp.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="popwin.cpp" />
- <ClCompile Include="services.cpp" />
+ <ClCompile Include="src\popwin.cpp" />
+ <ClCompile Include="src\services.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="common.h" />
- <ClInclude Include="message_pump.h" />
- <ClInclude Include="notify.h" />
- <ClInclude Include="options.h" />
- <ClInclude Include="popup_history.h" />
- <ClInclude Include="popups2.h" />
- <ClInclude Include="popwin.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="services.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\common.h" />
+ <ClInclude Include="src\message_pump.h" />
+ <ClInclude Include="src\notify.h" />
+ <ClInclude Include="src\options.h" />
+ <ClInclude Include="src\yapp_history.h" />
+ <ClInclude Include="src\yapp.h" />
+ <ClInclude Include="src\popwin.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\services.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="popups2.rc" />
- <ResourceCompile Include="version.rc" />
+ <ResourceCompile Include="res\yapp.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/YAPP/popups2_10.vcxproj.filters b/plugins/YAPP/yapp_10.vcxproj.filters
index a3fc3c5946..cb0d887b30 100644
--- a/plugins/YAPP/popups2_10.vcxproj.filters
+++ b/plugins/YAPP/yapp_10.vcxproj.filters
@@ -15,68 +15,68 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="message_pump.cpp">
+ <ClCompile Include="src\message_pump.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="notify_imp.cpp">
+ <ClCompile Include="src\notify_imp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="options.cpp">
+ <ClCompile Include="src\options.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="popup_history.cpp">
+ <ClCompile Include="src\yapp_history.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="popup_history_dlg.cpp">
+ <ClCompile Include="src\yapp_history_dlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="popups2.cpp">
+ <ClCompile Include="src\yapp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="popwin.cpp">
+ <ClCompile Include="src\popwin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="services.cpp">
+ <ClCompile Include="src\services.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="common.h">
+ <ClInclude Include="src\common.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="message_pump.h">
+ <ClInclude Include="src\message_pump.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="notify.h">
+ <ClInclude Include="src\notify.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="options.h">
+ <ClInclude Include="src\options.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="popup_history.h">
+ <ClInclude Include="src\yapp_history.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="popups2.h">
+ <ClInclude Include="src\yapp.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="popwin.h">
+ <ClInclude Include="src\popwin.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="services.h">
+ <ClInclude Include="src\services.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="popups2.rc">
+ <ResourceCompile Include="res\yapp.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 16:40:48 +0000