diff options
| author | George Hazan <ghazan@miranda.im> | 2016-10-22 22:26:17 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2016-10-22 22:26:17 +0300 |
| commit | e8d65f59c8ebee1a196d5e354c1a3c0182822536 (patch) | |
| tree | f709073737f85de0bab76165c84612759a8a2364 | |
| parent | 6332669686271b321e3cc142392801965e4b5a79 (diff) | |
| parent | 00c92727207587b0b4277a623bcf4a25ed0090ee (diff) | |
Merge branch 'master' of https://github.com/miranda-ng/miranda-ng
| -rw-r--r-- | bin10/mir_dev.sln | 40 | ||||
| -rw-r--r-- | bin10/mir_full.sln | 44 | ||||
| -rw-r--r-- | bin10/mir_full_pro.sln | 47 | ||||
| -rw-r--r-- | bin12/mir_dev.sln | 44 | ||||
| -rw-r--r-- | bin12/mir_full.sln | 44 | ||||
| -rw-r--r-- | bin14/mir_dev.sln | 46 | ||||
| -rw-r--r-- | bin14/mir_full.sln | 46 | ||||
| -rw-r--r-- | langpacks/english/=CORE=.txt | 2 | ||||
| -rw-r--r-- | langpacks/english/Plugins/AdvancedAutoAway.txt | 164 | ||||
| -rw-r--r-- | langpacks/english/Plugins/StartupStatus.txt | 178 | ||||
| -rw-r--r-- | langpacks/english/Plugins/StatusManager.txt (renamed from langpacks/english/Plugins/KeepStatus.txt) | 379 | ||||
| -rw-r--r-- | langpacks/english/Plugins/VKontakte.txt | 2 | ||||
| -rw-r--r-- | plugins/Dropbox/src/api/upload.h | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/DlgUpdate.cpp | 3 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj (renamed from plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters (renamed from plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj (renamed from plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj.filters (renamed from plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj (renamed from plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj.filters (renamed from plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp (renamed from plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/advancedautoaway.h (renamed from plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/fsm.jpg (renamed from plugins/StatusPlugins/AdvancedAutoAway/fsm.jpg) | bin | 62997 -> 62997 bytes | |||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/main.cpp (renamed from plugins/StatusPlugins/AdvancedAutoAway/main.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/msgoptions.cpp (renamed from plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/options.cpp (renamed from plugins/StatusPlugins/AdvancedAutoAway/options.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/AdvancedAutoAway/version.h (renamed from plugins/StatusPlugins/AdvancedAutoAway/version.h) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus.txt (renamed from plugins/StatusPlugins/KeepStatus/KeepStatus.txt) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj (renamed from plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters (renamed from plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj (renamed from plugins/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj.filters (renamed from plugins/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj (renamed from plugins/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj.filters (renamed from plugins/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/keepstatus.cpp (renamed from plugins/StatusPlugins/KeepStatus/keepstatus.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/keepstatus.h (renamed from plugins/StatusPlugins/KeepStatus/keepstatus.h) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/main.cpp (renamed from plugins/StatusPlugins/KeepStatus/main.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/options.cpp (renamed from plugins/StatusPlugins/KeepStatus/options.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/KeepStatus/version.h (renamed from plugins/StatusPlugins/KeepStatus/version.h) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus.rc (renamed from plugins/StatusPlugins/StartupStatus/StartupStatus.rc) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj (renamed from plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters (renamed from plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj (renamed from plugins/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj.filters (renamed from plugins/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj (renamed from plugins/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj.filters (renamed from plugins/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj.filters) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/main.cpp (renamed from plugins/StatusPlugins/StartupStatus/main.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/options.cpp (renamed from plugins/StatusPlugins/StartupStatus/options.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/profiles.cpp (renamed from plugins/StatusPlugins/StartupStatus/profiles.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/res/ttbDown.ico (renamed from plugins/StatusPlugins/StartupStatus/res/ttbDown.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/res/ttbUp.ico (renamed from plugins/StatusPlugins/StartupStatus/res/ttbUp.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/startupstatus.cpp (renamed from plugins/StatusPlugins/StartupStatus/startupstatus.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/startupstatus.h (renamed from plugins/StatusPlugins/StartupStatus/startupstatus.h) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/toolbars.cpp (renamed from plugins/StatusPlugins/StartupStatus/toolbars.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/StartupStatus/version.h (renamed from plugins/StatusPlugins/StartupStatus/version.h) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/commonstatus.cpp (renamed from plugins/StatusPlugins/commonstatus.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/commonstatus.h (renamed from plugins/StatusPlugins/commonstatus.h) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/confirmdialog.cpp (renamed from plugins/StatusPlugins/confirmdialog.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/copying.txt (renamed from plugins/StatusPlugins/copying.txt) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/notick.ico (renamed from plugins/StatusPlugins/notick.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/notick1.ico (renamed from plugins/StatusPlugins/notick1.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/resource.h (renamed from plugins/StatusPlugins/resource.h) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/resource.rc (renamed from plugins/StatusPlugins/resource.rc) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/stdafx.cpp (renamed from plugins/StatusPlugins/stdafx.cpp) | 0 | ||||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/useronli.ico (renamed from plugins/StatusPlugins/useronli.ico) | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | tools/_deprecated/StatusPlugins/version.rc (renamed from plugins/StatusPlugins/version.rc) | 0 | ||||
| -rw-r--r-- | tools/lpgen/lpgen.js | 11 |
67 files changed, 291 insertions, 761 deletions
diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 725e7935cb..a798819c6a 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -104,12 +104,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\Smi EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_10.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeepStatus", "..\plugins\StatusPlugins\KeepStatus\KeepStatus_10.vcxproj", "{D548A54E-310B-4A86-A545-64BDD5748745}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupStatus", "..\plugins\StatusPlugins\StartupStatus\StartupStatus_10.vcxproj", "{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpam", "..\plugins\StopSpamPlus\stopspam.vcxproj", "{3E6CEC79-5E93-4607-B10E-498586ECF6A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tipper", "..\plugins\TipperYM\tipper_ym.vcxproj", "{2C818919-A38F-44FF-BD91-A6A204AC592A}"
@@ -445,6 +439,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusManager", "..\plugins\StatusManager\StatusManager.vcxproj", "{D2EF305F-5255-49E8-A738-D4206D62D2B8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -853,30 +849,6 @@ Global {5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|Win32.Build.0 = Release|Win32
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.ActiveCfg = Release|x64
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.Build.0 = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.ActiveCfg = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.Build.0 = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.ActiveCfg = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.Build.0 = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.ActiveCfg = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.Build.0 = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.ActiveCfg = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.Build.0 = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.ActiveCfg = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.Build.0 = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.ActiveCfg = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.Build.0 = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.ActiveCfg = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.Build.0 = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.ActiveCfg = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.Build.0 = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.ActiveCfg = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.Build.0 = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.ActiveCfg = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.Build.0 = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.ActiveCfg = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.Build.0 = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.ActiveCfg = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.Build.0 = Release|x64
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.Build.0 = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2036,6 +2008,14 @@ Global {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.Build.0 = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.ActiveCfg = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.Build.0 = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.ActiveCfg = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.Build.0 = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.ActiveCfg = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 85b0f2dda1..11156a43b5 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
ProjectSection(ProjectDependencies) = postProject
{538E451F-E667-4D07-BCE6-976ECC7BB8D1} = {538E451F-E667-4D07-BCE6-976ECC7BB8D1}
@@ -104,12 +104,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\Smi EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_10.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeepStatus", "..\plugins\StatusPlugins\KeepStatus\KeepStatus_10.vcxproj", "{D548A54E-310B-4A86-A545-64BDD5748745}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupStatus", "..\plugins\StatusPlugins\StartupStatus\StartupStatus_10.vcxproj", "{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpam", "..\plugins\StopSpamPlus\stopspam.vcxproj", "{3E6CEC79-5E93-4607-B10E-498586ECF6A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tipper", "..\plugins\TipperYM\tipper_ym.vcxproj", "{2C818919-A38F-44FF-BD91-A6A204AC592A}"
@@ -427,7 +421,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\libs\liblua\li EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winapi", "..\plugins\MirLua\Modules\WinAPI\WinAPI.vcxproj", "{045BAC91-34D1-4B43-B52B-566801BE7F85}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaxolotl", "..\libs\libaxolotl\libaxolotl.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
EndProject
@@ -443,6 +437,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusManager", "..\plugins\StatusManager\StatusManager.vcxproj", "{D2EF305F-5255-49E8-A738-D4206D62D2B8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -851,30 +847,6 @@ Global {5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|Win32.Build.0 = Release|Win32
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.ActiveCfg = Release|x64
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.Build.0 = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.ActiveCfg = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.Build.0 = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.ActiveCfg = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.Build.0 = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.ActiveCfg = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.Build.0 = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.ActiveCfg = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.Build.0 = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.ActiveCfg = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.Build.0 = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.ActiveCfg = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.Build.0 = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.ActiveCfg = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.Build.0 = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.ActiveCfg = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.Build.0 = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.ActiveCfg = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.Build.0 = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.ActiveCfg = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.Build.0 = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.ActiveCfg = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.Build.0 = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.ActiveCfg = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.Build.0 = Release|x64
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.Build.0 = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2015,6 +1987,14 @@ Global {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.Build.0 = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.ActiveCfg = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.Build.0 = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.ActiveCfg = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.Build.0 = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.ActiveCfg = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.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 aa3013391b..d50ee63fa5 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -104,12 +104,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\Smi EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_10.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeepStatus", "..\plugins\StatusPlugins\KeepStatus\KeepStatus_10.vcxproj", "{D548A54E-310B-4A86-A545-64BDD5748745}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupStatus", "..\plugins\StatusPlugins\StartupStatus\StartupStatus_10.vcxproj", "{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpam", "..\plugins\StopSpamPlus\stopspam.vcxproj", "{3E6CEC79-5E93-4607-B10E-498586ECF6A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tipper", "..\plugins\TipperYM\tipper_ym.vcxproj", "{2C818919-A38F-44FF-BD91-A6A204AC592A}"
@@ -461,7 +455,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\libs\liblua\li EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winapi", "..\plugins\MirLua\Modules\WinAPI\WinAPI.vcxproj", "{045BAC91-34D1-4B43-B52B-566801BE7F85}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaxolotl", "..\libs\libaxolotl\libaxolotl.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
EndProject
@@ -477,6 +471,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusManager", "..\plugins\StatusManager\StatusManager.vcxproj", "{D2EF305F-5255-49E8-A738-D4206D62D2B8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -885,30 +881,6 @@ Global {5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|Win32.Build.0 = Release|Win32
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.ActiveCfg = Release|x64
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.Build.0 = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.ActiveCfg = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.Build.0 = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.ActiveCfg = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.Build.0 = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.ActiveCfg = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.Build.0 = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.ActiveCfg = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.Build.0 = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.ActiveCfg = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.Build.0 = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.ActiveCfg = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.Build.0 = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.ActiveCfg = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.Build.0 = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.ActiveCfg = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.Build.0 = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.ActiveCfg = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.Build.0 = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.ActiveCfg = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.Build.0 = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.ActiveCfg = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.Build.0 = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.ActiveCfg = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.Build.0 = Release|x64
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.Build.0 = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2041,6 +2013,14 @@ Global {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.Build.0 = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.ActiveCfg = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.Build.0 = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.ActiveCfg = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.Build.0 = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.ActiveCfg = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2127,7 +2107,6 @@ Global {B8928210-546C-4AE3-956B-E2B724E6B8E5} = {87D96006-542C-4396-87EF-68E3C3D2797F}
{6DA1396F-2A44-4D5C-8442-012F71006217} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{3A12F777-56A8-42EC-BD17-8F325524241E} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
- {E42870DB-9FED-44E7-9C93-4E64D0C87F51} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{01DDCB36-4DE2-405D-BC36-2C8BDEB86659} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{33276462-8313-4192-8306-13717ECCA60A} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
{7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
@@ -2216,14 +2195,12 @@ Global {7B072B7F-E2AA-4935-AAF5-5BEF99665AD3} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{8ACA3C8B-BDFA-47B2-8578-069555BA05B3} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{EDAAD28B-505B-4969-A8BB-97EAE818DEEA} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
- {66503A70-B1E8-4545-B4FF-2108DFB40C72} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
- {D548A54E-310B-4A86-A545-64BDD5748745} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{D3D80E27-D099-41EC-AFB2-A891A33F1608} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{2AD2FF74-06E1-4BD8-984A-526F3C6315B3} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{D09881C7-E189-49AD-919E-F64355F8EFD0} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{10F78F26-2B20-4158-869F-CB29533B4C2C} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{6A516E27-AC50-5374-756B-A1558DB2EFA9} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{9DE1F0B0-B9D1-4681-82E7-13CC3E047445} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}
{07137F45-8B5F-4561-BEC8-B883E9123785} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}
{850EC838-0EAD-45EB-6F1B-16DC90DCE18D} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}
diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index fe6c566b22..006ab68354 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
@@ -106,12 +106,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\Smi EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_12.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeepStatus", "..\plugins\StatusPlugins\KeepStatus\KeepStatus_12.vcxproj", "{D548A54E-310B-4A86-A545-64BDD5748745}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupStatus", "..\plugins\StatusPlugins\StartupStatus\StartupStatus_12.vcxproj", "{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpam", "..\plugins\StopSpamPlus\stopspam.vcxproj", "{3E6CEC79-5E93-4607-B10E-498586ECF6A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tipper", "..\plugins\TipperYM\tipper_ym.vcxproj", "{2C818919-A38F-44FF-BD91-A6A204AC592A}"
@@ -433,7 +427,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\libs\liblua\li EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winapi", "..\plugins\MirLua\Modules\WinAPI\WinAPI.vcxproj", "{045BAC91-34D1-4B43-B52B-566801BE7F85}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaxolotl", "..\libs\libaxolotl\libaxolotl.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
EndProject
@@ -449,6 +443,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusManager", "..\plugins\StatusManager\StatusManager.vcxproj", "{D2EF305F-5255-49E8-A738-D4206D62D2B8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -857,30 +853,6 @@ Global {5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|Win32.Build.0 = Release|Win32
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.ActiveCfg = Release|x64
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.Build.0 = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.ActiveCfg = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.Build.0 = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.ActiveCfg = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.Build.0 = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.ActiveCfg = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.Build.0 = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.ActiveCfg = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.Build.0 = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.ActiveCfg = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.Build.0 = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.ActiveCfg = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.Build.0 = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.ActiveCfg = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.Build.0 = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.ActiveCfg = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.Build.0 = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.ActiveCfg = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.Build.0 = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.ActiveCfg = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.Build.0 = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.ActiveCfg = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.Build.0 = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.ActiveCfg = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.Build.0 = Release|x64
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.Build.0 = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2047,6 +2019,14 @@ Global {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.Build.0 = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.ActiveCfg = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.Build.0 = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.ActiveCfg = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.Build.0 = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.ActiveCfg = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index f916bd77e8..72d5774113 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
@@ -106,12 +106,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\Smi EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_12.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeepStatus", "..\plugins\StatusPlugins\KeepStatus\KeepStatus_12.vcxproj", "{D548A54E-310B-4A86-A545-64BDD5748745}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupStatus", "..\plugins\StatusPlugins\StartupStatus\StartupStatus_12.vcxproj", "{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpam", "..\plugins\StopSpamPlus\stopspam.vcxproj", "{3E6CEC79-5E93-4607-B10E-498586ECF6A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tipper", "..\plugins\TipperYM\tipper_ym.vcxproj", "{2C818919-A38F-44FF-BD91-A6A204AC592A}"
@@ -431,7 +425,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\libs\liblua\li EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winapi", "..\plugins\MirLua\Modules\WinAPI\WinAPI.vcxproj", "{045BAC91-34D1-4B43-B52B-566801BE7F85}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaxolotl", "..\libs\libaxolotl\libaxolotl.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
EndProject
@@ -447,6 +441,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusManager", "..\plugins\StatusManager\StatusManager.vcxproj", "{D2EF305F-5255-49E8-A738-D4206D62D2B8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -855,30 +851,6 @@ Global {5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|Win32.Build.0 = Release|Win32
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.ActiveCfg = Release|x64
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.Build.0 = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.ActiveCfg = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.Build.0 = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.ActiveCfg = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.Build.0 = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.ActiveCfg = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.Build.0 = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.ActiveCfg = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.Build.0 = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.ActiveCfg = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.Build.0 = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.ActiveCfg = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.Build.0 = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.ActiveCfg = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.Build.0 = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.ActiveCfg = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.Build.0 = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.ActiveCfg = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.Build.0 = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.ActiveCfg = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.Build.0 = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.ActiveCfg = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.Build.0 = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.ActiveCfg = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.Build.0 = Release|x64
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.Build.0 = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2027,6 +1999,14 @@ Global {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.Build.0 = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.ActiveCfg = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.Build.0 = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.ActiveCfg = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.Build.0 = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.ActiveCfg = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index 315285d83c..4c098dc407 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio Express 14 for Windows Desktop
+VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
ProjectSection(ProjectDependencies) = postProject
@@ -106,12 +106,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\Smi EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_14.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeepStatus", "..\plugins\StatusPlugins\KeepStatus\KeepStatus_14.vcxproj", "{D548A54E-310B-4A86-A545-64BDD5748745}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupStatus", "..\plugins\StatusPlugins\StartupStatus\StartupStatus_14.vcxproj", "{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpam", "..\plugins\StopSpamPlus\stopspam.vcxproj", "{3E6CEC79-5E93-4607-B10E-498586ECF6A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tipper", "..\plugins\TipperYM\tipper_ym.vcxproj", "{2C818919-A38F-44FF-BD91-A6A204AC592A}"
@@ -433,7 +427,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\libs\liblua\li EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winapi", "..\plugins\MirLua\Modules\WinAPI\WinAPI.vcxproj", "{045BAC91-34D1-4B43-B52B-566801BE7F85}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaxolotl", "..\libs\libaxolotl\libaxolotl.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
EndProject
@@ -449,6 +443,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusManager", "..\plugins\StatusManager\StatusManager.vcxproj", "{D2EF305F-5255-49E8-A738-D4206D62D2B8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -857,30 +853,6 @@ Global {5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|Win32.Build.0 = Release|Win32
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.ActiveCfg = Release|x64
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.Build.0 = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.ActiveCfg = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.Build.0 = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.ActiveCfg = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.Build.0 = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.ActiveCfg = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.Build.0 = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.ActiveCfg = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.Build.0 = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.ActiveCfg = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.Build.0 = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.ActiveCfg = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.Build.0 = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.ActiveCfg = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.Build.0 = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.ActiveCfg = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.Build.0 = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.ActiveCfg = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.Build.0 = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.ActiveCfg = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.Build.0 = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.ActiveCfg = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.Build.0 = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.ActiveCfg = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.Build.0 = Release|x64
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.Build.0 = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2047,6 +2019,14 @@ Global {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.Build.0 = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.ActiveCfg = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.Build.0 = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.ActiveCfg = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.Build.0 = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.ActiveCfg = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index bdde48d36b..434a8c80c6 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio Express 14 for Windows Desktop
+VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
ProjectSection(ProjectDependencies) = postProject
@@ -106,12 +106,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmileyAdd", "..\plugins\Smi EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SplashScreen", "..\plugins\SplashScreen\splashscreen.vcxproj", "{5A6095F4-B037-4DA8-8410-8004A90C961A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvancedAutoAway", "..\plugins\StatusPlugins\AdvancedAutoAway\AdvancedAutoAway_14.vcxproj", "{66503A70-B1E8-4545-B4FF-2108DFB40C72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeepStatus", "..\plugins\StatusPlugins\KeepStatus\KeepStatus_14.vcxproj", "{D548A54E-310B-4A86-A545-64BDD5748745}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupStatus", "..\plugins\StatusPlugins\StartupStatus\StartupStatus_14.vcxproj", "{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StopSpam", "..\plugins\StopSpamPlus\stopspam.vcxproj", "{3E6CEC79-5E93-4607-B10E-498586ECF6A6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tipper", "..\plugins\TipperYM\tipper_ym.vcxproj", "{2C818919-A38F-44FF-BD91-A6A204AC592A}"
@@ -431,7 +425,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\libs\liblua\li EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winapi", "..\plugins\MirLua\Modules\WinAPI\WinAPI.vcxproj", "{045BAC91-34D1-4B43-B52B-566801BE7F85}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_json", "..\plugins\MirLua\Modules\m_json\m_json.vcxproj", "{8A645067-7F45-4E65-AAFC-AFDA81C29A1D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaxolotl", "..\libs\libaxolotl\libaxolotl.vcxproj", "{620E0BE7-3763-4F35-9DBD-4770104E269C}"
EndProject
@@ -447,6 +441,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m_msg_buttonsbar", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevent", "..\libs\libevent\libevent.vcxproj", "{46D53888-E60E-32A7-91EB-6336DE0D84D8}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusManager", "..\plugins\StatusManager\StatusManager.vcxproj", "{D2EF305F-5255-49E8-A738-D4206D62D2B8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -855,30 +851,6 @@ Global {5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|Win32.Build.0 = Release|Win32
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.ActiveCfg = Release|x64
{5A6095F4-B037-4DA8-8410-8004A90C961A}.Release|x64.Build.0 = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.ActiveCfg = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.Build.0 = Debug|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.ActiveCfg = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.Build.0 = Debug|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.ActiveCfg = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.Build.0 = Release|Win32
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.ActiveCfg = Release|x64
- {66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.Build.0 = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.ActiveCfg = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.Build.0 = Debug|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.ActiveCfg = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.Build.0 = Debug|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.ActiveCfg = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.Build.0 = Release|Win32
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.ActiveCfg = Release|x64
- {D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.Build.0 = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.ActiveCfg = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.Build.0 = Debug|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.ActiveCfg = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.Build.0 = Debug|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.ActiveCfg = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.Build.0 = Release|Win32
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.ActiveCfg = Release|x64
- {1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.Build.0 = Release|x64
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.ActiveCfg = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|Win32.Build.0 = Debug|Win32
{3E6CEC79-5E93-4607-B10E-498586ECF6A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -2027,6 +1999,14 @@ Global {46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|Win32.Build.0 = Release|Win32
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.ActiveCfg = Release|x64
{46D53888-E60E-32A7-91EB-6336DE0D84D8}.Release|x64.Build.0 = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|Win32.Build.0 = Debug|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.ActiveCfg = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Debug|x64.Build.0 = Debug|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.ActiveCfg = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|Win32.Build.0 = Release|Win32
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.ActiveCfg = Release|x64
+ {D2EF305F-5255-49E8-A738-D4206D62D2B8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index d71c22fa0a..eb1cae303d 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1204,9 +1204,9 @@ [Open logging options]
[Open 'Find user' dialog]
;file \src\mir_app\src\lpopts.cpp
+[built-in]
[(incompatible)]
[Unknown]
-[built-in]
[Languages]
;file \src\mir_app\src\menu_clist.cpp
[Custom status]
diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt deleted file mode 100644 index dedd897ab4..0000000000 --- a/langpacks/english/Plugins/AdvancedAutoAway.txt +++ /dev/null @@ -1,164 +0,0 @@ -#muuid {f0fdf73a-753d-499d-8dba-336db79cdd41}
-;============================================================
-; File: AdvancedAutoAway.dll
-; Plugin: Advanced Auto Away
-; Version: 0.8.1.1
-; Authors: P Boon
-;============================================================
-[An Auto Away module with some more options than the original.]
-;file \Plugins\StatusPlugins\resource.rc
-[Check connection]
-[Max. retries]
-[Account connection]
-[Delay between retries (secs)]
-[Show popups]
-[General]
-[Accounts to check]
-[Dial-Up]
-[Don't reconnect if no internet connection seems available]
-[Continuously check for internet connection]
-[Do so by pinging host]
-[Confirm status]
-[Close]
-[Cancel]
-[Profile]
-[Message]
-[Account]
-[Set]
-[when full-screen mode is active]
-[when screen saver engages]
-[when workstation is locked]
-[after]
-[minutes of inactivity]
-[minutes of level 1 mode]
-[only set when inactive]
-[Monitor Miranda's activity only]
-[Reset status on return]
-[Confirm resetting status]
-[Only set if current status is]
-[Command line]
-[Copy to clipboard]
-[Command line:]
-[Create shortcut]
-[Add new profile]
-[Profile name]
-[Set window state]
-[Show dialog]
-[Set status to offline before exit]
-[Show CMDL]
-[Activate status profile]
-[Set docked]
-[Other]
-[Status on startup]
-[ms]
-[Set after]
-[Timeout]
-[s]
-[Set window location]
-[Left]
-[Top]
-[Set window size]
-[Width]
-[Height]
-[Allow override]
-[Note: status profiles can be created in the 'Status profiles' options screen]
-[Window on startup]
-[Automatically dial on startup]
-[Automatically hang up on exit]
-[Dial-up (experimental)]
-[Background color]
-[Text color]
-[Use Windows colors]
-[Use default colors]
-[Delay]
-[On left click]
-[On right click]
-[Do nothing]
-[Close popup]
-[Cancel reconnecting]
-[Colors]
-[Preview]
-[Events]
-[Show when connection is lost]
-[Show when a connection attempt is made]
-[Show when reconnection has finished]
-[Show other messages]
-[From popup plugin]
-[Custom]
-[Permanent]
-[Show additional information in popups]
-[Use Miranda's message setting]
-[Use this message:]
-[Use %time% for the current time, %date% for the current date]
-[Variables...]
-[Specify settings for each account]
-[Use same settings for all accounts]
-[Ignore Caps Lock, Num Lock and Scroll Lock keys]
-[Check interval (secs)]
-[Confirm dialog timeout (secs)]
-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
-[Monitor keyboard activity]
-[Monitor mouse activity]
-[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
-[Ignore any key combination with above keys]
-[Accounts]
-[Enable checking]
-[Disable checking]
-[Set status message]
-[Status]
-[Add...]
-[Delete]
-[Create a TopToolBar button]
-[Show confirm dialog when loading]
-[Create a main menu item]
-[Status profiles]
-[Hotkey]
-[In submenu]
-[Max. delay (secs)]
-[Increase delay exponential]
-[Cancel all if an account connects from another location]
-[Reconnect on APM resume]
-[Stop trying to reconnect]
-[Set delay to]
-[React on login errors]
-[seconds]
-[Set account offline before a connection attempt]
-[Max. account connecting time (secs)]
-[Timers]
-[Reconnecting]
-[Ignore locked status of accounts]
-[Consider connection lost after]
-[failed pings]
-[Continuously check interval (secs)]
-[Entering first auto-away status]
-[Entering second auto-away status]
-[Leaving first auto-away status]
-[Leaving second auto-away status]
-[Becoming active without status change]
-[Pre-conditions]
-[TriggerData]
-[Status: The status the account will change to\r\nAccount: The account changing state]
-;file \plugins\StatusPlugins\AdvancedAutoAway\options.cpp
-[minutes of %s mode]
-[Rules]
-[Status messages]
-[Auto Away]
-;file \Plugins\StatusPlugins\commonstatus.cpp
-[I've been away since %time%.]
-[Give it up, I'm not in!]
-[Not right now.]
-[Give a guy some peace, would ya?]
-[I'm a chatbot!]
-[Yep, I'm here.]
-[Nope, not here.]
-[I'm hiding from the mafia.]
-[That'll be the phone.]
-[Mmm... food.]
-[idleeeeeeee]
-;file \Plugins\StatusPlugins\confirmdialog.cpp
-[Set %s message for %s.]
-[<last>]
-[<current>]
-[<n/a>]
-[Protocol]
-[Closing in %d]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt deleted file mode 100644 index d52d61d1a9..0000000000 --- a/langpacks/english/Plugins/StartupStatus.txt +++ /dev/null @@ -1,178 +0,0 @@ -#muuid {4b733944-5a70-4b52-ab2d-68b1ef38ffe8}
-;============================================================
-; File: StartupStatus.dll
-; Plugin: StartupStatus
-; Version: 0.8.0.48
-; Authors: P Boon
-;============================================================
-[StartupStatus, allows you to define the status Miranda should set on startup, configurable per protocol.]
-;file \Plugins\StatusPlugins\resource.rc
-[Check connection]
-[Max. retries]
-[Account connection]
-[Delay between retries (secs)]
-[Show popups]
-[General]
-[Accounts to check]
-[Dial-Up]
-[Don't reconnect if no internet connection seems available]
-[Continuously check for internet connection]
-[Do so by pinging host]
-[Confirm status]
-[Close]
-[Cancel]
-[Profile]
-[Message]
-[Account]
-[Set]
-[when full-screen mode is active]
-[when screen saver engages]
-[when workstation is locked]
-[after]
-[minutes of inactivity]
-[minutes of level 1 mode]
-[only set when inactive]
-[Monitor Miranda's activity only]
-[Reset status on return]
-[Confirm resetting status]
-[Only set if current status is]
-[Command line]
-[Copy to clipboard]
-[Command line:]
-[Create shortcut]
-[Add new profile]
-[Profile name]
-[Set window state]
-[Show dialog]
-[Set status to offline before exit]
-[Show CMDL]
-[Activate status profile]
-[Set docked]
-[Other]
-[Status on startup]
-[ms]
-[Set after]
-[Timeout]
-[s]
-[Set window location]
-[Left]
-[Top]
-[Set window size]
-[Width]
-[Height]
-[Allow override]
-[Note: status profiles can be created in the 'Status profiles' options screen]
-[Window on startup]
-[Automatically dial on startup]
-[Automatically hang up on exit]
-[Dial-up (experimental)]
-[Background color]
-[Text color]
-[Use Windows colors]
-[Use default colors]
-[Delay]
-[On left click]
-[On right click]
-[Do nothing]
-[Close popup]
-[Cancel reconnecting]
-[Colors]
-[Preview]
-[Events]
-[Show when connection is lost]
-[Show when a connection attempt is made]
-[Show when reconnection has finished]
-[Show other messages]
-[From popup plugin]
-[Custom]
-[Permanent]
-[Show additional information in popups]
-[Use Miranda's message setting]
-[Use this message:]
-[Use %time% for the current time, %date% for the current date]
-[Variables...]
-[Specify settings for each account]
-[Use same settings for all accounts]
-[Ignore Caps Lock, Num Lock and Scroll Lock keys]
-[Check interval (secs)]
-[Confirm dialog timeout (secs)]
-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
-[Monitor keyboard activity]
-[Monitor mouse activity]
-[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
-[Ignore any key combination with above keys]
-[Accounts]
-[Enable checking]
-[Disable checking]
-[Set status message]
-[Status]
-[Add...]
-[Delete]
-[Create a TopToolBar button]
-[Show confirm dialog when loading]
-[Create a main menu item]
-[Status profiles]
-[Hotkey]
-[In submenu]
-[Max. delay (secs)]
-[Increase delay exponential]
-[Cancel all if an account connects from another location]
-[Reconnect on APM resume]
-[Stop trying to reconnect]
-[Set delay to]
-[React on login errors]
-[seconds]
-[Set account offline before a connection attempt]
-[Max. account connecting time (secs)]
-[Timers]
-[Reconnecting]
-[Ignore locked status of accounts]
-[Consider connection lost after]
-[failed pings]
-[Continuously check interval (secs)]
-[Entering first auto-away status]
-[Entering second auto-away status]
-[Leaving first auto-away status]
-[Leaving second auto-away status]
-[Becoming active without status change]
-[Pre-conditions]
-[TriggerData]
-[Status: The status the account will change to\r\nAccount: The account changing state]
-;file \plugins\StatusPlugins\StartupStatus\options.cpp
-[<last>]
-[<current>]
-[<unknown>]
-[Right]
-[None]
-[size: %d x %d]
-[loc: %d x %d]
-[Hidden]
-[Minimized]
-[Normal]
-[Create a status menu item]
-[default]
-[unknown]
-[At least one profile must exist]
-[StartupStatus]
-[Your default profile will be changed]
-;file \plugins\StatusPlugins\StartupStatus\profiles.cpp
-;file \plugins\StatusPlugins\StartupStatus\toolbars.cpp
-[Pressed toolbar icon]
-[Released toolbar icon]
-;file \Plugins\StatusPlugins\commonstatus.cpp
-[I've been away since %time%.]
-[Give it up, I'm not in!]
-[Not right now.]
-[Give a guy some peace, would ya?]
-[I'm a chatbot!]
-[Yep, I'm here.]
-[Nope, not here.]
-[I'm hiding from the mafia.]
-[That'll be the phone.]
-[Mmm... food.]
-[idleeeeeeee]
-;file \Plugins\StatusPlugins\confirmdialog.cpp
-[Set %s message for %s.]
-[<n/a>]
-[Protocol]
-[Closing in %d]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/StatusManager.txt index 1170a32724..977bd1d953 100644 --- a/langpacks/english/Plugins/KeepStatus.txt +++ b/langpacks/english/Plugins/StatusManager.txt @@ -1,178 +1,201 @@ -#muuid {a5bb1b7a-b7cd-4cbb-a7db-ceb4eb71da49}
-;============================================================
-; File: KeepStatus.dll
-; Plugin: Keep status
-; Version: 0.9.0.2
-; Authors: P Boon
-;============================================================
-[KeepStatus, A connection checker, for use with (or without) StartupStatus and/or AdvancedAutoAway.]
-;file \Plugins\StatusPlugins\resource.rc
-[Check connection]
-[Max. retries]
-[Account connection]
-[Delay between retries (secs)]
-[Show popups]
-[General]
-[Accounts to check]
-[Dial-Up]
-[Don't reconnect if no internet connection seems available]
-[Continuously check for internet connection]
-[Do so by pinging host]
-[Confirm status]
-[Close]
-[Cancel]
-[Profile]
-[Message]
-[Account]
-[Set]
-[when full-screen mode is active]
-[when screen saver engages]
-[when workstation is locked]
-[after]
-[minutes of inactivity]
-[minutes of level 1 mode]
-[only set when inactive]
-[Monitor Miranda's activity only]
-[Reset status on return]
-[Confirm resetting status]
-[Only set if current status is]
-[Command line]
-[Copy to clipboard]
-[Command line:]
-[Create shortcut]
-[Add new profile]
-[Profile name]
-[Set window state]
-[Show dialog]
-[Set status to offline before exit]
-[Show CMDL]
-[Activate status profile]
-[Set docked]
-[Other]
-[Status on startup]
-[ms]
-[Set after]
-[Timeout]
-[s]
-[Set window location]
-[Left]
-[Top]
-[Set window size]
-[Width]
-[Height]
-[Allow override]
-[Note: status profiles can be created in the 'Status profiles' options screen]
-[Window on startup]
-[Automatically dial on startup]
-[Automatically hang up on exit]
-[Dial-up (experimental)]
-[Background color]
-[Text color]
-[Use Windows colors]
-[Use default colors]
-[Delay]
-[On left click]
-[On right click]
-[Do nothing]
-[Close popup]
-[Cancel reconnecting]
-[Colors]
-[Preview]
-[Events]
-[Show when connection is lost]
-[Show when a connection attempt is made]
-[Show when reconnection has finished]
-[Show other messages]
-[From popup plugin]
-[Custom]
-[Permanent]
-[Show additional information in popups]
-[Use Miranda's message setting]
-[Use this message:]
-[Use %time% for the current time, %date% for the current date]
-[Variables...]
-[Specify settings for each account]
-[Use same settings for all accounts]
-[Ignore Caps Lock, Num Lock and Scroll Lock keys]
-[Check interval (secs)]
-[Confirm dialog timeout (secs)]
-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
-[Monitor keyboard activity]
-[Monitor mouse activity]
-[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
-[Ignore any key combination with above keys]
-[Accounts]
-[Enable checking]
-[Disable checking]
-[Set status message]
-[Status]
-[Add...]
-[Delete]
-[Create a TopToolBar button]
-[Show confirm dialog when loading]
-[Create a main menu item]
-[Status profiles]
-[Hotkey]
-[In submenu]
-[Max. delay (secs)]
-[Increase delay exponential]
-[Cancel all if an account connects from another location]
-[Reconnect on APM resume]
-[Stop trying to reconnect]
-[Set delay to]
-[React on login errors]
-[seconds]
-[Set account offline before a connection attempt]
-[Max. account connecting time (secs)]
-[Timers]
-[Reconnecting]
-[Ignore locked status of accounts]
-[Consider connection lost after]
-[failed pings]
-[Continuously check interval (secs)]
-[Entering first auto-away status]
-[Entering second auto-away status]
-[Leaving first auto-away status]
-[Leaving second auto-away status]
-[Becoming active without status change]
-[Pre-conditions]
-[TriggerData]
-[Status: The status the account will change to\r\nAccount: The account changing state]
-;file \plugins\StatusPlugins\KeepStatus\keepstatus.cpp
-[Protocol]
-[%s connected from another location]
-[%s login error, cancel reconnecting]
-[%s login error (next retry (%d) in %d s)]
-[%s status error (next retry (%d) in %d s)]
-[Status error (next retry (%d) in %d s)]
-[%s\t(will be set to %s)\r\n]
-[Resetting status... (last try (%d))%s]
-[Resetting status... (next retry (%d) in %d s)%s]
-[No internet connection seems available... (last try (%d))]
-[No internet connection seems available... (next retry (%d) in %d s)]
-[Status was set ok]
-[Giving up]
-[KeepStatus]
-;file \plugins\StatusPlugins\KeepStatus\options.cpp
-[Basic]
-[Advanced]
-[You broke the Internet!]
-[Popups]
-;file \Plugins\StatusPlugins\commonstatus.cpp
-[I've been away since %time%.]
-[Give it up, I'm not in!]
-[Not right now.]
-[Give a guy some peace, would ya?]
-[I'm a chatbot!]
-[Yep, I'm here.]
-[Nope, not here.]
-[I'm hiding from the mafia.]
-[That'll be the phone.]
-[Mmm... food.]
-[idleeeeeeee]
-;file \Plugins\StatusPlugins\confirmdialog.cpp
-[Set %s message for %s.]
-[<last>]
-[<current>]
-[<n/a>]
-[Closing in %d]
+#muuid {fadd4a8a-1fd0-4398-83bd-e378b85ed8f1} +;============================================================ +; File: StatusManager.dll +; Plugin: Status manager +; Version: 0.11.0.0 +; Authors: P Boon +;============================================================ +;file \plugins\StatusManager\res\resource.rc +[Check connection] +[Maximum retries (0 - infinite)] +[Account connection] +[Delay between retries (secs)] +[Show popups] +[General] +[Accounts to check] +[Dial-Up] +[Don't reconnect if no internet connection seems available] +[Continuously check for internet connection] +[Do so by pinging host] +[Confirm status] +[Close] +[Cancel] +[Profile] +[Message] +[Account] +[Set] +[when full-screen mode is active] +[when screen saver engages] +[when workstation is locked] +[after] +[minutes of inactivity] +[minutes of level 1 mode] +[only set when inactive] +[Monitor Miranda's activity only] +[Reset status on return] +[Confirm resetting status] +[Only set if current status is] +[Command line] +[Copy to clipboard] +[Command line:] +[Create shortcut] +[Add new profile] +[Profile name] +[Set window state] +[Show dialog] +[Set status to offline before exit] +[Show CMDL] +[Activate status profile] +[Set docked] +[Other] +[Status on startup] +[ms] +[Set after] +[Timeout] +[s] +[Set window location] +[Left] +[Top] +[Set window size] +[Width] +[Height] +[Allow override] +[Note: status profiles can be created in the 'Status profiles' options screen] +[Window on startup] +[Automatically dial on startup] +[Automatically hang up on exit] +[Dial-up (experimental)] +[Background color] +[Text color] +[Use Windows colors] +[Use default colors] +[Delay] +[On left click] +[On right click] +[Do nothing] +[Close popup] +[Cancel reconnecting] +[Colors] +[Preview] +[Events] +[Show when connection is lost] +[Show when a connection attempt is made] +[Show when reconnection has finished] +[Show other messages] +[From popup plugin] +[Custom] +[Permanent] +[Show additional information in popups] +[Use Miranda's message setting] +[Use this message:] +[Use %time% for the current time, %date% for the current date] +[Variables...] +[Specify settings for each account] +[Use same settings for all accounts] +[Ignore Caps Lock, Num Lock and Scroll Lock keys] +[Check interval (secs)] +[Confirm dialog timeout (secs)] +[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.] +[Monitor keyboard activity] +[Monitor mouse activity] +[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys] +[Ignore any key combination with above keys] +[Accounts] +[Enable checking] +[Disable checking] +[Set status message] +[Status] +[Add...] +[Delete] +[Create a TopToolBar button] +[Show confirm dialog when loading] +[Create a main menu item] +[Status profiles] +[Hotkey] +[In submenu] +[Max. delay (secs)] +[Increase delay exponential] +[Cancel all if an account connects from another location] +[Reconnect on APM resume] +[Stop trying to reconnect] +[Set delay to] +[React on login errors] +[seconds] +[Set account offline before a connection attempt] +[Max. account connecting time (secs)] +[Timers] +[Reconnecting] +[Ignore locked status of accounts] +[Consider connection lost after] +[failed pings] +[Continuously check interval (secs)] +[Entering first auto-away status] +[Entering second auto-away status] +[Leaving first auto-away status] +[Leaving second auto-away status] +[Becoming active without status change] +[Pre-conditions] +[TriggerData] +[Status: The status the account will change to\r\nAccount: The account changing state] +;file \plugins\StatusManager\src\aaa_options.cpp +[minutes of %s mode] +[Rules] +[Status messages] +[Auto Away] +;file \plugins\StatusManager\src\commonstatus.cpp +[I've been away since %time%.] +[Give it up, I'm not in!] +[Not right now.] +[Give a guy some peace, would ya?] +[I'm a chatbot!] +[Yep, I'm here.] +[Nope, not here.] +[I'm hiding from the mafia.] +[That'll be the phone.] +[Mmm... food.] +[idleeeeeeee] +;file \plugins\StatusManager\src\confirmdialog.cpp +[Set %s message for %s.] +[<last>] +[<current>] +[<n/a>] +[Protocol] +[Closing in %d] +;file \plugins\StatusManager\src\keepstatus.cpp +[%s connected from another location] +[%s login error, cancel reconnecting] +[%s login error (next retry (%d) in %d s)] +[%s status error (next retry (%d) in %d s)] +[Status error (next retry (%d) in %d s)] +[%s\t(will be set to %s)\r\n] +[Resetting status... (last try (%d))%s] +[Resetting status... (next retry (%d) in %d s)%s] +[No internet connection seems available... (last try (%d))] +[No internet connection seems available... (next retry (%d) in %d s)] +[Status was set ok] +[Giving up] +[KeepStatus] +;file \plugins\StatusManager\src\ks_options.cpp +[Basic] +[Advanced] +[You broke the Internet!] +[Popups] +;file \plugins\StatusManager\src\ss_options.cpp +[<unknown>] +[Right] +[None] +[size: %d x %d] +[loc: %d x %d] +[Hidden] +[Minimized] +[Normal] +[Create a status menu item] +[default] +[unknown] +[At least one profile must exist] +[StartupStatus] +[Your default profile will be changed] +;file \plugins\StatusManager\src\ss_profiles.cpp +;file \plugins\StatusManager\src\ss_toolbars.cpp +[Pressed toolbar icon] +[Released toolbar icon] diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index a09efa45f0..33a96d5888 100644 --- a/langpacks/english/Plugins/VKontakte.txt +++ b/langpacks/english/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.2.6
+; Version: 0.1.2.7
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/plugins/Dropbox/src/api/upload.h b/plugins/Dropbox/src/api/upload.h index 7e1c501297..098d53e2d2 100644 --- a/plugins/Dropbox/src/api/upload.h +++ b/plugins/Dropbox/src/api/upload.h @@ -38,7 +38,7 @@ class AppendToUploadSessionRequest : public HttpRequest {
public:
AppendToUploadSessionRequest(const char *token, const char *sessionId, size_t offset, const char *data, size_t size) :
- HttpRequest(REQUEST_POST, DROPBOX_API_CU "/files/upload_session/append")
+ HttpRequest(REQUEST_POST, DROPBOX_API_CU "/files/upload_session/append_v2")
{
AddBearerAuthHeader(token);
AddHeader("Content-Type", "application/octet-stream");
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index c744c94139..0831e8053d 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -554,6 +554,9 @@ static renameTable[] = { L"skype.dll", L"Plugins\\skypeweb.dll" },
{ L"skypeclassic.dll", L"Plugins\\skypeweb.dll" },
{ L"historysweeper.dll", L"Plugins\\historysweeperlight.dll" },
+ { L"advancedautoaway.dll", L"Plugins\\statusmanager.dll" },
+ { L"keepstatus.dll", L"Plugins\\statusmanager.dll" },
+ { L"startupstatus.dll", L"Plugins\\statusmanager.dll" },
#if MIRANDA_VER >= 0x0A00
{ L"dbx_mmap_sa.dll", L"Plugins\\dbx_mmap.dll" },
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj index 98d9991c15..98d9991c15 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters index fc5daed232..fc5daed232 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj index c1b9ee6adb..c1b9ee6adb 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj.filters b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj.filters index fc5daed232..fc5daed232 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_12.vcxproj.filters diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj index e8467e23d8..e8467e23d8 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj.filters b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj.filters index fc5daed232..fc5daed232 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_14.vcxproj.filters diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp index 021674ab22..021674ab22 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/advancedautoaway.h index 4a96da2544..4a96da2544 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/advancedautoaway.h diff --git a/plugins/StatusPlugins/AdvancedAutoAway/fsm.jpg b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/fsm.jpg Binary files differindex 21066a3939..21066a3939 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/fsm.jpg +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/fsm.jpg diff --git a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/main.cpp index e271378c20..e271378c20 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/main.cpp diff --git a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/msgoptions.cpp index 9435d0db54..9435d0db54 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/msgoptions.cpp diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/options.cpp index 02516f3e9e..02516f3e9e 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/options.cpp diff --git a/plugins/StatusPlugins/AdvancedAutoAway/version.h b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/version.h index bda6bff95c..bda6bff95c 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/version.h +++ b/tools/_deprecated/StatusPlugins/AdvancedAutoAway/version.h diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus.txt b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus.txt index 55b3992487..55b3992487 100644 --- a/plugins/StatusPlugins/KeepStatus/KeepStatus.txt +++ b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus.txt diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj index ac91443e1c..ac91443e1c 100644 --- a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj +++ b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters index 9d4b6dcc2d..9d4b6dcc2d 100644 --- a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj index f79e8063b6..f79e8063b6 100644 --- a/plugins/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj +++ b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj.filters b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj.filters index 9d4b6dcc2d..9d4b6dcc2d 100644 --- a/plugins/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_12.vcxproj.filters diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj index 52ab7ac406..52ab7ac406 100644 --- a/plugins/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj +++ b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj.filters b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj.filters index 9d4b6dcc2d..9d4b6dcc2d 100644 --- a/plugins/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/KeepStatus/KeepStatus_14.vcxproj.filters diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/tools/_deprecated/StatusPlugins/KeepStatus/keepstatus.cpp index 54cb3028d4..54cb3028d4 100644 --- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp +++ b/tools/_deprecated/StatusPlugins/KeepStatus/keepstatus.cpp diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.h b/tools/_deprecated/StatusPlugins/KeepStatus/keepstatus.h index bf9f3e48f8..bf9f3e48f8 100644 --- a/plugins/StatusPlugins/KeepStatus/keepstatus.h +++ b/tools/_deprecated/StatusPlugins/KeepStatus/keepstatus.h diff --git a/plugins/StatusPlugins/KeepStatus/main.cpp b/tools/_deprecated/StatusPlugins/KeepStatus/main.cpp index b67757838d..b67757838d 100644 --- a/plugins/StatusPlugins/KeepStatus/main.cpp +++ b/tools/_deprecated/StatusPlugins/KeepStatus/main.cpp diff --git a/plugins/StatusPlugins/KeepStatus/options.cpp b/tools/_deprecated/StatusPlugins/KeepStatus/options.cpp index 3a7328a2e3..3a7328a2e3 100644 --- a/plugins/StatusPlugins/KeepStatus/options.cpp +++ b/tools/_deprecated/StatusPlugins/KeepStatus/options.cpp diff --git a/plugins/StatusPlugins/KeepStatus/version.h b/tools/_deprecated/StatusPlugins/KeepStatus/version.h index 81672eb0d3..81672eb0d3 100644 --- a/plugins/StatusPlugins/KeepStatus/version.h +++ b/tools/_deprecated/StatusPlugins/KeepStatus/version.h diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus.rc b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus.rc index a7a2bebb2a..a7a2bebb2a 100644 --- a/plugins/StatusPlugins/StartupStatus/StartupStatus.rc +++ b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus.rc diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj index 40f2155891..40f2155891 100644 --- a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj +++ b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters index 3078255c51..3078255c51 100644 --- a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj index c664325d2f..c664325d2f 100644 --- a/plugins/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj +++ b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj.filters b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj.filters index 3078255c51..3078255c51 100644 --- a/plugins/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_12.vcxproj.filters diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj index 794b36247e..794b36247e 100644 --- a/plugins/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj +++ b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj.filters b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj.filters index 3078255c51..3078255c51 100644 --- a/plugins/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj.filters +++ b/tools/_deprecated/StatusPlugins/StartupStatus/StartupStatus_14.vcxproj.filters diff --git a/plugins/StatusPlugins/StartupStatus/main.cpp b/tools/_deprecated/StatusPlugins/StartupStatus/main.cpp index 9a3ceb3e84..9a3ceb3e84 100644 --- a/plugins/StatusPlugins/StartupStatus/main.cpp +++ b/tools/_deprecated/StatusPlugins/StartupStatus/main.cpp diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/tools/_deprecated/StatusPlugins/StartupStatus/options.cpp index 87a969726b..87a969726b 100644 --- a/plugins/StatusPlugins/StartupStatus/options.cpp +++ b/tools/_deprecated/StatusPlugins/StartupStatus/options.cpp diff --git a/plugins/StatusPlugins/StartupStatus/profiles.cpp b/tools/_deprecated/StatusPlugins/StartupStatus/profiles.cpp index 51a4bccc71..51a4bccc71 100644 --- a/plugins/StatusPlugins/StartupStatus/profiles.cpp +++ b/tools/_deprecated/StatusPlugins/StartupStatus/profiles.cpp diff --git a/plugins/StatusPlugins/StartupStatus/res/ttbDown.ico b/tools/_deprecated/StatusPlugins/StartupStatus/res/ttbDown.ico Binary files differindex 84e3269c89..84e3269c89 100644 --- a/plugins/StatusPlugins/StartupStatus/res/ttbDown.ico +++ b/tools/_deprecated/StatusPlugins/StartupStatus/res/ttbDown.ico diff --git a/plugins/StatusPlugins/StartupStatus/res/ttbUp.ico b/tools/_deprecated/StatusPlugins/StartupStatus/res/ttbUp.ico Binary files differindex 150d8c3b0c..150d8c3b0c 100644 --- a/plugins/StatusPlugins/StartupStatus/res/ttbUp.ico +++ b/tools/_deprecated/StatusPlugins/StartupStatus/res/ttbUp.ico diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/tools/_deprecated/StatusPlugins/StartupStatus/startupstatus.cpp index 3cf1f07b49..3cf1f07b49 100644 --- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp +++ b/tools/_deprecated/StatusPlugins/StartupStatus/startupstatus.cpp diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.h b/tools/_deprecated/StatusPlugins/StartupStatus/startupstatus.h index 5303ab3468..5303ab3468 100644 --- a/plugins/StatusPlugins/StartupStatus/startupstatus.h +++ b/tools/_deprecated/StatusPlugins/StartupStatus/startupstatus.h diff --git a/plugins/StatusPlugins/StartupStatus/toolbars.cpp b/tools/_deprecated/StatusPlugins/StartupStatus/toolbars.cpp index acb76f5c28..acb76f5c28 100644 --- a/plugins/StatusPlugins/StartupStatus/toolbars.cpp +++ b/tools/_deprecated/StatusPlugins/StartupStatus/toolbars.cpp diff --git a/plugins/StatusPlugins/StartupStatus/version.h b/tools/_deprecated/StatusPlugins/StartupStatus/version.h index 1760bbdcfb..1760bbdcfb 100644 --- a/plugins/StatusPlugins/StartupStatus/version.h +++ b/tools/_deprecated/StatusPlugins/StartupStatus/version.h diff --git a/plugins/StatusPlugins/commonstatus.cpp b/tools/_deprecated/StatusPlugins/commonstatus.cpp index 621f5f372c..621f5f372c 100644 --- a/plugins/StatusPlugins/commonstatus.cpp +++ b/tools/_deprecated/StatusPlugins/commonstatus.cpp diff --git a/plugins/StatusPlugins/commonstatus.h b/tools/_deprecated/StatusPlugins/commonstatus.h index 2288cc0e34..2288cc0e34 100644 --- a/plugins/StatusPlugins/commonstatus.h +++ b/tools/_deprecated/StatusPlugins/commonstatus.h diff --git a/plugins/StatusPlugins/confirmdialog.cpp b/tools/_deprecated/StatusPlugins/confirmdialog.cpp index e19b1d0a55..e19b1d0a55 100644 --- a/plugins/StatusPlugins/confirmdialog.cpp +++ b/tools/_deprecated/StatusPlugins/confirmdialog.cpp diff --git a/plugins/StatusPlugins/copying.txt b/tools/_deprecated/StatusPlugins/copying.txt index cff645bda5..cff645bda5 100644 --- a/plugins/StatusPlugins/copying.txt +++ b/tools/_deprecated/StatusPlugins/copying.txt diff --git a/plugins/StatusPlugins/notick.ico b/tools/_deprecated/StatusPlugins/notick.ico Binary files differindex 7f93490642..7f93490642 100644 --- a/plugins/StatusPlugins/notick.ico +++ b/tools/_deprecated/StatusPlugins/notick.ico diff --git a/plugins/StatusPlugins/notick1.ico b/tools/_deprecated/StatusPlugins/notick1.ico Binary files differindex 609504d614..609504d614 100644 --- a/plugins/StatusPlugins/notick1.ico +++ b/tools/_deprecated/StatusPlugins/notick1.ico diff --git a/plugins/StatusPlugins/resource.h b/tools/_deprecated/StatusPlugins/resource.h index e64104da80..e64104da80 100644 --- a/plugins/StatusPlugins/resource.h +++ b/tools/_deprecated/StatusPlugins/resource.h diff --git a/plugins/StatusPlugins/resource.rc b/tools/_deprecated/StatusPlugins/resource.rc index 5553c4dbf6..5553c4dbf6 100644 --- a/plugins/StatusPlugins/resource.rc +++ b/tools/_deprecated/StatusPlugins/resource.rc diff --git a/plugins/StatusPlugins/stdafx.cpp b/tools/_deprecated/StatusPlugins/stdafx.cpp index 8adbd4ce11..8adbd4ce11 100644 --- a/plugins/StatusPlugins/stdafx.cpp +++ b/tools/_deprecated/StatusPlugins/stdafx.cpp diff --git a/plugins/StatusPlugins/useronli.ico b/tools/_deprecated/StatusPlugins/useronli.ico Binary files differindex 2760c47d5c..2760c47d5c 100644 --- a/plugins/StatusPlugins/useronli.ico +++ b/tools/_deprecated/StatusPlugins/useronli.ico diff --git a/plugins/StatusPlugins/version.rc b/tools/_deprecated/StatusPlugins/version.rc index 312430aa29..312430aa29 100644 --- a/plugins/StatusPlugins/version.rc +++ b/tools/_deprecated/StatusPlugins/version.rc diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js index 2300ecd360..40aec13a41 100644 --- a/tools/lpgen/lpgen.js +++ b/tools/lpgen/lpgen.js @@ -224,8 +224,6 @@ function GeneratePluginTranslate (pluginpath,langpackfilepath,vcxprojfile) { FindFiles(pluginpath,"\\.rc$",resourcefiles);
//find all source files and list files in array
FindFiles(pluginpath,"\\.h$|\\.cpp$|\\.c$|\\.pas$|\\.dpr$|\\.inc$",sourcefiles);
- //Check for "Status plugins". They have few common resource files to translate, which located one layer upper, than plugin folder.
- CheckStatusPlugins(plugin);
//Parse files "resourcefiles", put result into "foundstrings" using "ParseRCFile" function
ParseFiles(resourcefiles,foundstrings,ParseRCFile);
//Parse files "sourcefiles", put result into "foundstrings" using "ParseSourceFile" function
@@ -372,15 +370,6 @@ function GetMUUID (folder,array) { if (log) WScript.Echo(muuid);
};
-//For status plugins, namely KeepStatus, StartupStatus and AdvancedAutoAway we need add for all of them common source files to parsing array, because they exist one layer upper of pluginfolder
-function CheckStatusPlugins (plug) {
-if (plug.match(/(KeepStatus|StartupStatus|AdvancedAutoAway)/)) {
- resourcefiles.push(trunk+"\\Plugins\\StatusPlugins\\resource.rc");
- sourcefiles.push(trunk+"\\Plugins\\StatusPlugins\\commonstatus.cpp");
- sourcefiles.push(trunk+"\\Plugins\\StatusPlugins\\confirmdialog.cpp");
- }
-}
-
//read text file, removing all commented text for further processing
function ReadFile (file) {
//If file zero size, return;
|
