diff options
| -rw-r--r-- | plugins/UserInfoEx/UInfoEx.vcxproj | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/UInfoEx.vcxproj.filters | 6 | ||||
| -rw-r--r-- | plugins/UserInfoEx/res/resource.rc | 6 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/psp_options.cpp | 21 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/resource.h | 1 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/stdafx.h | 1 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/svc_avatar.cpp | 162 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/svc_avatar.h | 34 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/svc_constants.h | 1 |
9 files changed, 7 insertions, 227 deletions
diff --git a/plugins/UserInfoEx/UInfoEx.vcxproj b/plugins/UserInfoEx/UInfoEx.vcxproj index f74f9dc408..52bd001f81 100644 --- a/plugins/UserInfoEx/UInfoEx.vcxproj +++ b/plugins/UserInfoEx/UInfoEx.vcxproj @@ -91,7 +91,6 @@ <ClCompile Include="src\stdafx.cxx">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="src\svc_avatar.cpp" />
<ClCompile Include="src\svc_constants.cpp" />
<ClCompile Include="src\svc_email.cpp" />
<ClCompile Include="src\svc_gender.cpp" />
@@ -120,7 +119,6 @@ <ClInclude Include="src\psp_options.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\stdafx.h" />
- <ClInclude Include="src\svc_avatar.h" />
<ClInclude Include="src\svc_constants.h" />
<ClInclude Include="src\svc_email.h" />
<ClInclude Include="src\svc_gender.h" />
diff --git a/plugins/UserInfoEx/UInfoEx.vcxproj.filters b/plugins/UserInfoEx/UInfoEx.vcxproj.filters index 8114020547..e4c9544b28 100644 --- a/plugins/UserInfoEx/UInfoEx.vcxproj.filters +++ b/plugins/UserInfoEx/UInfoEx.vcxproj.filters @@ -99,9 +99,6 @@ <ClCompile Include="src\stdafx.cxx">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\svc_avatar.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="src\svc_constants.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -188,9 +185,6 @@ <ClInclude Include="src\stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\svc_avatar.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\svc_constants.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc index d74f270163..4292d8ff8c 100644 --- a/plugins/UserInfoEx/res/resource.rc +++ b/plugins/UserInfoEx/res/resource.rc @@ -444,13 +444,11 @@ BEGIN CONTROL "Export/import items",RADIO_OPT_MI_ACCOUNT_EXIMPORT,
"Button",BS_AUTORADIOBUTTON,212,84,80,10
GROUPBOX "Misc",GROUP_OPT_EXTRAICONS2,6,105,298,72
- CONTROL "Use zodiac as default avatar",CHECK_OPT_ZODIACAVATAR,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,119,131,10
LTEXT "Country flags",TXT_OPT_FLAGS,13,134,288,8
CONTROL "Use &unknown flag if country cannot be determined",CHECK_OPT_FLAGSUNKNOWN,
- "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_GROUP | WS_TABSTOP,13,147,286,11
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_GROUP | WS_TABSTOP,13,119,286,11
CONTROL "Show country flag as &status icon on message window",CHECK_OPT_FLAGSMSGSTATUS,
- "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_GROUP | WS_TABSTOP,13,161,290,9
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_GROUP | WS_TABSTOP,13,133,290,9
END
IDD_CONTACT_ANNIVERSARY DIALOGEX 0, 0, 300, 169
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index f8e525a0d6..dac4bbee06 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -24,11 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define PSM_ENABLE_TABITEM (WM_USER+106)
static MenuOptionsList ctrl_Menu[] = {
- { SET_MI_MAIN, CHECK_OPT_MI_MAIN, RADIO_OPT_MI_MAIN_NONE, RADIO_OPT_MI_MAIN_ALL, RADIO_OPT_MI_MAIN_EXIMPORT },
- { SET_MI_CONTACT, CHECK_OPT_MI_CONTACT, RADIO_OPT_MI_CONTACT_NONE, RADIO_OPT_MI_CONTACT_ALL, RADIO_OPT_MI_CONTACT_EXIMPORT },
- { SET_MI_GROUP, CHECK_OPT_MI_GROUP, RADIO_OPT_MI_GROUP_NONE, RADIO_OPT_MI_GROUP_ALL, RADIO_OPT_MI_GROUP_EXIMPORT },
- { SET_MI_SUBGROUP, CHECK_OPT_MI_SUBGROUP, RADIO_OPT_MI_SUBGROUP_NONE, RADIO_OPT_MI_SUBGROUP_ALL, RADIO_OPT_MI_SUBGROUP_EXIMPORT },
- { SET_MI_ACCOUNT, CHECK_OPT_MI_ACCOUNT, RADIO_OPT_MI_ACCOUNT_NONE, RADIO_OPT_MI_ACCOUNT_ALL, RADIO_OPT_MI_ACCOUNT_EXIMPORT },
+ { SET_MI_MAIN, CHECK_OPT_MI_MAIN, RADIO_OPT_MI_MAIN_NONE, RADIO_OPT_MI_MAIN_ALL, RADIO_OPT_MI_MAIN_EXIMPORT },
+ { SET_MI_CONTACT, CHECK_OPT_MI_CONTACT, RADIO_OPT_MI_CONTACT_NONE, RADIO_OPT_MI_CONTACT_ALL, RADIO_OPT_MI_CONTACT_EXIMPORT },
+ { SET_MI_GROUP, CHECK_OPT_MI_GROUP, RADIO_OPT_MI_GROUP_NONE, RADIO_OPT_MI_GROUP_ALL, RADIO_OPT_MI_GROUP_EXIMPORT },
+ { SET_MI_SUBGROUP, CHECK_OPT_MI_SUBGROUP, RADIO_OPT_MI_SUBGROUP_NONE, RADIO_OPT_MI_SUBGROUP_ALL, RADIO_OPT_MI_SUBGROUP_EXIMPORT },
+ { SET_MI_ACCOUNT, CHECK_OPT_MI_ACCOUNT, RADIO_OPT_MI_ACCOUNT_NONE, RADIO_OPT_MI_ACCOUNT_ALL, RADIO_OPT_MI_ACCOUNT_EXIMPORT },
};
static FORCEINLINE void NotifyParentOfChange(HWND hDlg)
@@ -39,7 +39,6 @@ static FORCEINLINE void NotifyParentOfChange(HWND hDlg) static int FORCEINLINE ComboBox_FindByItemDataPtr(HWND hCombo, LPARAM pData)
{
int nItemIndex;
-
for (nItemIndex = ComboBox_GetCount(hCombo); (nItemIndex >= 0) && (ComboBox_GetItemData(hCombo, nItemIndex) != pData); nItemIndex--);
return nItemIndex;
}
@@ -258,7 +257,6 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) {
case WM_INITDIALOG:
TranslateDialogDefault(hDlg);
- ShowWindow(GetDlgItem(hDlg, CHECK_OPT_ZODIACAVATAR), SW_HIDE);
bInitialized = 0;
// menu item settings
@@ -280,9 +278,6 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, CheckDlgButton(hDlg, CHECK_OPT_FLAGSUNKNOWN, g_bUseUnknownFlag ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hDlg, CHECK_OPT_FLAGSMSGSTATUS, g_bShowStatusIconFlag ? BST_CHECKED : BST_UNCHECKED);
- // misc
- DBGetCheckBtn(hDlg, CHECK_OPT_ZODIACAVATAR, SET_ZODIAC_AVATARS, FALSE);
-
bInitialized = 1;
return TRUE;
@@ -321,11 +316,6 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, ExtraIcon_SetAll();
if (FlagsMsgWndChange)
UpdateStatusIcons();
-
- // misc
- uint8_t bEnabled = IsDlgButtonChecked(hDlg, CHECK_OPT_ZODIACAVATAR);
- g_plugin.setByte(SET_ZODIAC_AVATARS, bEnabled);
- NServices::NAvatar::Enable(bEnabled);
}
break;
@@ -364,7 +354,6 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, case RADIO_OPT_MI_ACCOUNT_EXIMPORT:
case CHECK_OPT_FLAGSUNKNOWN:
case CHECK_OPT_FLAGSMSGSTATUS:
- case CHECK_OPT_ZODIACAVATAR:
if (bInitialized)
NotifyParentOfChange(hDlg);
}
diff --git a/plugins/UserInfoEx/src/resource.h b/plugins/UserInfoEx/src/resource.h index 64f3ff512e..19246a14db 100644 --- a/plugins/UserInfoEx/src/resource.h +++ b/plugins/UserInfoEx/src/resource.h @@ -285,7 +285,6 @@ #define CHECK_OPT_GROUPS 40110
#define CHECK_OPT_SORTTREE 40111
#define CHECK_OPT_READONLY 40112
-#define CHECK_OPT_ZODIACAVATAR 40112
#define CHECK_OPT_CHANGEMYDETAILS 40113
#define CHECK_OPT_METACPY 40114
#define CHECK_OPT_AEROADAPTION 40114
diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h index 8fef10991d..cafc703717 100644 --- a/plugins/UserInfoEx/src/stdafx.h +++ b/plugins/UserInfoEx/src/stdafx.h @@ -108,7 +108,6 @@ using namespace std; #include "../IconPacks/default/src/icons.h"
#include "../IconPacks/ice/src/icons.h"
#include "svc_constants.h"
-#include "svc_avatar.h"
#include "svc_email.h"
#include "svc_homepage.h"
#include "svc_gender.h"
diff --git a/plugins/UserInfoEx/src/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp deleted file mode 100644 index 1f1f771d93..0000000000 --- a/plugins/UserInfoEx/src/svc_avatar.cpp +++ /dev/null @@ -1,162 +0,0 @@ -/*
-UserinfoEx plugin for Miranda IM
-
-Copyright:
-© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#include "stdafx.h"
-
-namespace NServices
-{
- namespace NAvatar
- {
- static HANDLE ghChangedHook = nullptr;
-
- static int GetContactAvatarFileName(LPCWSTR zodiac, LPWSTR szFileName, int cchFileName)
- {
- if (!Profile_GetPathW(cchFileName, szFileName)) {
- size_t len = mir_wstrlen(szFileName);
- mir_snwprintf(szFileName + len, cchFileName - len, L"\\avatars\\%s.png", zodiac);
-
- return !PathFileExistsW(szFileName);
- }
- return 1;
- }
-
- static void SetZodiacAvatar(MCONTACT hContact)
- {
- MAnnivDate mtb;
-
- // try to load birthday for contact
- if (!mtb.DBGetBirthDate(hContact)) {
- MZodiac zodiac;
- //ICONINFO iinfo;
- wchar_t szFileName[MAX_PATH];
-
- // get zodiac for birthday
- zodiac = mtb.Zodiac();
-
- if (!GetContactAvatarFileName(zodiac.pszName, szFileName, _countof(szFileName))) {
- // extract the bitmap from the icon
- //GetIconInfo(zodiac.hIcon, &iinfo);
-
- // save the bitmap to a file used as avatar later
- if (!CallService(MS_AV_SETAVATARW, hContact, (LPARAM)szFileName))
- db_set_b(hContact, "ContactPhoto", "IsZodiac", 1);
- }
- }
- }
-
- void DeleteAvatar(MCONTACT hContact)
- {
- if (hContact && db_get_b(hContact, "ContactPhoto", "IsZodiac", FALSE)) {
- db_unset(hContact, "ContactPhoto", "File");
- db_unset(hContact, "ContactPhoto", "RFile");
- db_unset(hContact, "ContactPhoto", "Backup");
- db_unset(hContact, "ContactPhoto", "ImageHash");
-
- db_set_b(hContact, "ContactPhoto", "IsZodiac", 0);
- }
- }
-
- static int OnAvatarChanged(MCONTACT hContact, AVATARCACHEENTRY *ace)
- {
- if (hContact) {
- // check valid parameters
- if (ace) {
- // set zodiac as avatar either if the desired avatar is invalid or a general protocol picture
- if (((ace->dwFlags & AVS_PROTOPIC) || !(ace->dwFlags & AVS_BITMAP_VALID))) {
- if (!db_get_b(hContact, "ContactPhoto", "IsZodiac", 0))
- SetZodiacAvatar(hContact);
- }
- else db_set_b(hContact, "ContactPhoto", "IsZodiac", 0);
- }
-
- // avatar was deleted, so we can set up a zodiac avatar
- else SetZodiacAvatar(hContact);
- }
- return 0;
- }
-
- void Enable(uint8_t bEnable)
- {
- DBVARIANT dbv;
-
- if (bEnable && !ghChangedHook) {
-
- // walk through all the contacts stored in the DB
- for (auto &hContact : Contacts()) {
- // don't set if avatar is locked!
- if (!db_get_b(hContact, "ContactPhoto", "Locked", 0)) {
- uint8_t bInvalidAvatar = TRUE;
-
- // the relative file is valid
- if (!DB::Setting::GetAString(hContact, "ContactPhoto", "RFile", &dbv)) {
- CHAR absolute[MAX_PATH]; absolute[0] = 0;
-
- // check if file exists
- if (!PathToAbsolute(dbv.pszVal, absolute)) {
- FILE *f = fopen(absolute, "rb");
- if (f) {
- bInvalidAvatar = FALSE;
- fclose(f);
- }
- }
- db_free(&dbv);
- }
-
- // the absolute file is valid
- if (bInvalidAvatar && !db_get(hContact, "ContactPhoto", "File", &dbv)) {
- FILE *f = fopen(dbv.pszVal, "rb");
- if (f) {
- bInvalidAvatar = FALSE;
- fclose(f);
- }
- db_free(&dbv);
- }
-
- // set the zodiac as avatar
- if (bInvalidAvatar)
- SetZodiacAvatar(hContact);
- }
- }
- ghChangedHook = HookEvent(ME_AV_AVATARCHANGED, (MIRANDAHOOK)OnAvatarChanged);
- }
- else if (!bEnable && ghChangedHook) {
- UnhookEvent(ghChangedHook);
- ghChangedHook = nullptr;
-
- // walk through all the contacts stored in the DB
- for (auto &hContact : Contacts())
- DeleteAvatar(hContact);
- }
- }
-
- /**
- * name: OnModulesLoaded
- * desc: initialize stuff, which require all standard modules to bee loaded
- * params: none
- * return: 0
- **/
- void OnModulesLoaded()
- {
- Enable(g_plugin.getByte(SET_ZODIAC_AVATARS, FALSE));
- }
-
- } /* namespace NAvatar */
-} /* namespace NServices */
\ No newline at end of file diff --git a/plugins/UserInfoEx/src/svc_avatar.h b/plugins/UserInfoEx/src/svc_avatar.h deleted file mode 100644 index 488a5c287f..0000000000 --- a/plugins/UserInfoEx/src/svc_avatar.h +++ /dev/null @@ -1,34 +0,0 @@ -/*
-UserinfoEx plugin for Miranda IM
-
-Copyright:
-© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef _UINFOEX_SVCAVATAR_H_INCLUDED_
-#define _UINFOEX_SVCAVATAR_H_INCLUDED_
-
-namespace NServices
-{
- namespace NAvatar
- {
- void Enable (uint8_t bEnable);
- void OnModulesLoaded ();
- }
-} /* namespace NServices */
-
-#endif /* _UINFOEX_SVCAVATAR_H_INCLUDED_ */
\ No newline at end of file diff --git a/plugins/UserInfoEx/src/svc_constants.h b/plugins/UserInfoEx/src/svc_constants.h index f9f7054dd2..6597db78f6 100644 --- a/plugins/UserInfoEx/src/svc_constants.h +++ b/plugins/UserInfoEx/src/svc_constants.h @@ -68,7 +68,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SET_CLIST_EXTRAICON_EMAIL "cliEmail"
#define SET_CLIST_EXTRAICON_PHONE "cliPhone"
#define SET_OPT_AUTOTIMEZONE "AutoTimezone"
-#define SET_ZODIAC_AVATARS "ZodicAvatars"
#define SET_META_SCAN "MetaScan"
// database settings (general psp)
|