diff options
author | wishmaster51@gmail.com <wishmaster51@gmail.com@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2012-03-27 17:47:30 +0000 |
---|---|---|
committer | wishmaster51@gmail.com <wishmaster51@gmail.com@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2012-03-27 17:47:30 +0000 |
commit | 709917c49a37d6511c27dcd1b3ad7e99b7e903d7 (patch) | |
tree | 7e9a683752c0445f132950ee3f06daa8bf468024 | |
parent | b6b56ba35f8e907b7e897ee766eb4e5155d233f0 (diff) |
+ Show Contact Name in Avatar History dialog title
+ Show picture path in avatar history dialog
+ support for WindowList
* fixed some issues reported by borkra
+ updated m_folders.h
git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@243 c086bb3d-8645-0410-b8da-73a8550f86e7
-rw-r--r-- | Plugins/avatarhistory/AvatarDlg.cpp | 63 | ||||
-rw-r--r-- | Plugins/avatarhistory/AvatarHistory.cpp | 57 | ||||
-rw-r--r-- | Plugins/avatarhistory/AvatarHistory.h | 4 | ||||
-rw-r--r-- | Plugins/avatarhistory/AvatarHistory.rc | 31 | ||||
-rw-r--r-- | Plugins/avatarhistory/AvatarHistory.vcxproj | 30 | ||||
-rw-r--r-- | Plugins/avatarhistory/AvatarHistory.vcxproj.filters | 82 | ||||
-rw-r--r-- | Plugins/avatarhistory/Docs/avatarhist_changelog.txt | 6 | ||||
-rw-r--r-- | Plugins/avatarhistory/m_avatarhist.h | 1 | ||||
-rw-r--r-- | Plugins/avatarhistory/resource.h | 5 |
9 files changed, 169 insertions, 110 deletions
diff --git a/Plugins/avatarhistory/AvatarDlg.cpp b/Plugins/avatarhistory/AvatarDlg.cpp index 53772fd..58e6ab1 100644 --- a/Plugins/avatarhistory/AvatarDlg.cpp +++ b/Plugins/avatarhistory/AvatarDlg.cpp @@ -73,6 +73,14 @@ public: int OpenAvatarDialog(HANDLE hContact, char* fn)
{
+ HWND hAvatarWindow = WindowList_Find(hAvatarWindowsList, hContact);
+ if (hAvatarWindow)
+ {
+ SetForegroundWindow(hAvatarWindow);
+ SetFocus(hAvatarWindow);
+ return 0;
+ }
+
DWORD dwId;
struct AvatarDialogData *avdlg = (struct AvatarDialogData*)malloc(sizeof(struct AvatarDialogData));
ZeroMemory(avdlg, sizeof(struct AvatarDialogData));
@@ -118,9 +126,6 @@ void EnableDisableControls(HWND hwnd) EnableWindow(GetDlgItem(hwnd, IDC_BACK), cursel > 0);
EnableWindow(GetDlgItem(hwnd, IDC_NEXT), cursel < count-1);
}
-
- EnableWindow(GetDlgItem(hwnd, IDC_SAVE), cursel != LB_ERR);
- EnableWindow(GetDlgItem(hwnd, IDC_DELETE), cursel != LB_ERR);
}
static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
@@ -136,6 +141,13 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l FillAvatarListFromDB(GetDlgItem(hwnd, IDC_AVATARLIST), data->hContact);
else if (opts.log_per_contact_folders)
FillAvatarListFromFolder(GetDlgItem(hwnd, IDC_AVATARLIST), data->hContact);
+ TCHAR *displayName = (TCHAR*) CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM) data->hContact,GCDNF_TCHAR);
+ if(displayName)
+ {
+ TCHAR title[MAX_PATH];
+ mir_sntprintf(title,MAX_PATH,TranslateT("Avatar History for %s"),displayName);
+ SetWindowText(hwnd,title);
+ }
SetWindowLongPtr(hwnd, GWLP_USERDATA, (ULONG_PTR)data->hContact);
UpdateAvatarPic(hwnd);
@@ -143,7 +155,8 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l CheckDlgButton(hwnd, IDC_POPUPUSER, (UINT)db_byte_get(data->hContact, MODULE_NAME, "AvatarPopups", BST_INDETERMINATE));
CheckDlgButton(hwnd, IDC_HISTORYUSER, (UINT)db_byte_get(data->hContact, MODULE_NAME, "LogToHistory", BST_INDETERMINATE));
ShowWindow(GetDlgItem(hwnd, IDC_OPENFOLDER), opts.log_per_contact_folders ? SW_SHOW : SW_HIDE);
- Utils_RestoreWindowPosition(hwnd,NULL,MODULE_NAME,"AvatarHistoryDialog");
+ Utils_RestoreWindowPositionNoSize(hwnd,NULL,MODULE_NAME,"AvatarHistoryDialog");
+ WindowList_Add(hAvatarWindowsList,hwnd,data->hContact);
TranslateDialogDefault(hwnd);
EnableDisableControls(hwnd);
free(data);
@@ -159,6 +172,7 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l case WM_DESTROY:
{
Utils_SaveWindowPosition(hwnd,NULL,MODULE_NAME,"AvatarHistoryDialog");
+ WindowList_Remove(hAvatarWindowsList,hwnd);
DestroyIcon((HICON)SendMessage(hwnd, WM_SETICON, ICON_BIG, 0));
DestroyIcon((HICON)SendMessage(hwnd, WM_SETICON, ICON_SMALL, 0));
HWND list = GetDlgItem(hwnd, IDC_AVATARLIST);
@@ -318,32 +332,9 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l {
HANDLE hContact = (HANDLE) GetWindowLongPtr(hwnd, GWLP_USERDATA);
- if(IsDlgButtonChecked(hwnd, IDC_POPUPUSER) != BST_INDETERMINATE)
- {
- db_byte_set(hContact, MODULE_NAME, "AvatarPopups", (BYTE) IsDlgButtonChecked(hwnd, IDC_POPUPUSER));
- }
- else
- {
- DBDeleteContactSetting(hContact, MODULE_NAME, "AvatarPopups");
- }
-
- if(IsDlgButtonChecked(hwnd, IDC_LOGUSER) != BST_INDETERMINATE)
- {
- db_byte_set(hContact, MODULE_NAME, "LogToDisk", (BYTE) IsDlgButtonChecked(hwnd, IDC_LOGUSER));
- }
- else
- {
- DBDeleteContactSetting(hContact, MODULE_NAME, "LogToDisk");
- }
-
- if(IsDlgButtonChecked(hwnd, IDC_HISTORYUSER) != BST_INDETERMINATE)
- {
- db_byte_set(hContact, MODULE_NAME, "LogToHistory", (BYTE) IsDlgButtonChecked(hwnd, IDC_HISTORYUSER));
- }
- else
- {
- DBDeleteContactSetting(hContact, MODULE_NAME, "LogToHistory");
- }
+ db_byte_set(hContact, MODULE_NAME, "AvatarPopups", (BYTE) IsDlgButtonChecked(hwnd, IDC_POPUPUSER));
+ db_byte_set(hContact, MODULE_NAME, "LogToDisk", (BYTE) IsDlgButtonChecked(hwnd, IDC_LOGUSER));
+ db_byte_set(hContact, MODULE_NAME, "LogToHistory", (BYTE) IsDlgButtonChecked(hwnd, IDC_HISTORYUSER));
CleanupAvatarPic(hwnd);
EndDialog(hwnd, 0);
@@ -364,7 +355,6 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l if (opts.log_per_contact_folders)
{
TCHAR avfolder[MAX_PATH];
- HWND list = GetDlgItem(hwnd, IDC_AVATARLIST);
HANDLE hContact = (HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA);
GetContactFolder(avfolder, hContact);
ShellExecute(NULL, db_byte_get(NULL, MODULE_NAME, "OpenFolderMethod", 0) ? _T("explore") : _T("open"), avfolder, NULL, NULL, SW_SHOWNORMAL);
@@ -506,7 +496,12 @@ BOOL UpdateAvatarPic(HWND hwnd) HWND list = GetDlgItem(hwnd, IDC_AVATARLIST);
TCHAR *filename = GetCurrentSelFile(list);
- if(!filename) return 0;
+ if(!filename)
+ {
+ SetDlgItemText(hwnd,IDC_AVATARPATH,TranslateT("avatar path is null."));
+ return 0;
+ }
+ SetDlgItemText(hwnd,IDC_AVATARPATH,filename);
HBITMAP avpic = (HBITMAP) CallService(MS_IMG_LOAD, (WPARAM) filename, IMGL_TCHAR);
@@ -552,14 +547,14 @@ void InitMenuItem() CLISTMENUITEM mi = {0};
- hServices[2] = CreateServiceFunction("AvatarHistory/ShowDialog", ShowDialogSvc);
+ hServices[2] = CreateServiceFunction(MS_AVATARHISTORY_SHOWDIALOG, ShowDialogSvc);
mi.cbSize = sizeof(mi);
mi.ptszName = LPGENT("View Avatar History");
mi.flags = CMIF_TCHAR;
mi.position = 1000090010;
mi.hIcon = createDefaultOverlayedIcon(FALSE);
- mi.pszService = "AvatarHistory/ShowDialog";
+ mi.pszService = MS_AVATARHISTORY_SHOWDIALOG;
hMenu = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi);
DestroyIcon(mi.hIcon);
}
diff --git a/Plugins/avatarhistory/AvatarHistory.cpp b/Plugins/avatarhistory/AvatarHistory.cpp index d8c4a8d..a1be638 100644 --- a/Plugins/avatarhistory/AvatarHistory.cpp +++ b/Plugins/avatarhistory/AvatarHistory.cpp @@ -39,7 +39,9 @@ char *metacontacts_proto = NULL; TCHAR profilePath[MAX_PATH]; // database profile path (read at startup only)
TCHAR basedir[MAX_PATH];
MM_INTERFACE mmi;
+UTF8_INTERFACE utfi;
int hLangpack = 0;
+HANDLE hAvatarWindowsList = NULL;
static int ModulesLoaded(WPARAM wParam, LPARAM lParam);
static int PreShutdown(WPARAM wParam, LPARAM lParam);
@@ -168,7 +170,16 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) {
pluginLink=link;
- mir_getMMI(&mmi);
+ if(mir_getMMI(&mmi))
+ {
+ MessageBox(NULL,_T("Avatar History"),_T("Miranda Memory manager not initialized, plugin cannot load.\nPlease update Miranda IM to the latest version."),MB_OK | MB_TOPMOST);
+ return 1;
+ }
+ if(mir_getUTFI(&utfi))
+ {
+ MessageBox(NULL,_T("Avatar History"),_T("Miranda UTF8 interface not initialized, plugin cannot load.\nPlease update Miranda IM to the latest version."),MB_OK | MB_TOPMOST);
+ return 1;
+ }
mir_getLP(&pluginInfo);
// Is first run?
@@ -210,6 +221,8 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) hHooks[0] = HookEvent(ME_SYSTEM_MODULESLOADED,ModulesLoaded);
hHooks[1] = HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);
+ hHooks[2] = HookEvent(ME_AV_CONTACTAVATARCHANGED, AvatarChanged);
+ hHooks[3] = HookEvent(ME_OPT_INITIALISE, OptInit);
hServices[0] = CreateServiceFunction(MS_AVATARHISTORY_ENABLED, IsEnabled);
hServices[1] = CreateServiceFunction(MS_AVATARHISTORY_GET_CACHED_AVATAR, GetCachedAvatar);
@@ -220,6 +233,11 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) SkinAddNewSoundExT("avatar_changed",LPGENT("Avatar History"),LPGENT("Contact changed avatar"));
SkinAddNewSoundExT("avatar_removed",LPGENT("Avatar History"),LPGENT("Contact removed avatar"));
+ hAvatarWindowsList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
+
+ SetupIcoLib();
+ InitMenuItem();
+
return 0;
}
@@ -229,11 +247,6 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) hFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("Avatar History"),
PROFILE_PATHT _T("\\") CURRENT_PROFILET _T("\\Avatars History"));
-
- hHooks[2] = HookEvent(ME_AV_CONTACTAVATARCHANGED, AvatarChanged);
- hHooks[3] = HookEvent(ME_OPT_INITIALISE, OptInit);
- SetupIcoLib();
- InitMenuItem();
InitPopups();
if (ServiceExists(MS_MC_GETPROTOCOLNAME))
@@ -293,6 +306,8 @@ static int PreShutdown(WPARAM wParam, LPARAM lParam) for (i = 0; i < MAX_REGS(hServices); i++)
DestroyServiceFunction(hServices[i]);
+ WindowList_Broadcast(hAvatarWindowsList,WM_CLOSE,0,0);
+
return 0;
}
@@ -605,10 +620,16 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam) if (ContactEnabled(hContact, "LogToHistory", AVH_DEF_LOGTOHISTORY))
{
- char rel_path[MAX_PATH] = "";
- INPLACE_TCHAR_TO_CHAR(tmp, MAX_PATH, history_filename);
- CallService(MS_UTILS_PATHTORELATIVE,(WPARAM)tmp,(LPARAM)rel_path);
- HistoryEvents_AddToHistoryEx(hContact, EVENTTYPE_AVATAR_CHANGE, 0, NULL, 0, (PBYTE) rel_path, (int) strlen(rel_path) + 1, DBEF_READ);
+ TCHAR rel_path[MAX_PATH] = _T("");
+ CallService(MS_UTILS_PATHTORELATIVET,(WPARAM)history_filename,(LPARAM)rel_path);
+#ifdef _UNICODE
+ char *blob = mir_utf8encodeT(rel_path);
+ int flags = DBEF_READ | DBEF_UTF;
+#else
+ char *blob = mir_strdup(rel_path);
+ int flags = DBEF_READ;
+#endif
+ HistoryEvents_AddToHistoryEx(hContact, EVENTTYPE_AVATAR_CHANGE, 0, NULL, 0, (PBYTE) blob, (int) strlen(blob) + 1, flags);
}
}
@@ -725,6 +746,7 @@ int GetUIDFromHContact(HANDLE contact, TCHAR* uinout, size_t uinout_len) TCHAR * GetHistoryFolder(TCHAR *fn)
{
+ if (fn == NULL) return NULL;
FoldersGetCustomPathT(hFolder, fn, MAX_PATH, basedir);
if(!CreateDirectory(fn, NULL))
ErrorExit(NULL,_T("GetHistoryFolder"));
@@ -973,13 +995,16 @@ void * GetHistoryEventText(HANDLE hContact, HANDLE hDbEvent, DBEVENTINFO *dbe, i {
TCHAR absFile[MAX_PATH] = _T("");
CallService(MS_UTILS_PATHTOABSOLUTET,(WPARAM) &dbe->pBlob[i], (LPARAM)absFile);
- HBITMAP hBmp = (HBITMAP) CallService(MS_IMG_LOAD, (WPARAM) absFile, IMGL_TCHAR);
-
- if (hBmp != NULL)
+ if(absFile != NULL)
{
- buffer.append("\\line ", 7);
- GetRTFFor(&buffer, hBmp);
- DeleteObject(hBmp);
+ HBITMAP hBmp = (HBITMAP) CallService(MS_IMG_LOAD, (WPARAM) absFile, IMGL_TCHAR);
+
+ if (hBmp != NULL)
+ {
+ buffer.append("\\line ", 7);
+ GetRTFFor(&buffer, hBmp);
+ DeleteObject(hBmp);
+ }
}
}
diff --git a/Plugins/avatarhistory/AvatarHistory.h b/Plugins/avatarhistory/AvatarHistory.h index efc1d25..0973030 100644 --- a/Plugins/avatarhistory/AvatarHistory.h +++ b/Plugins/avatarhistory/AvatarHistory.h @@ -29,6 +29,7 @@ extern HINSTANCE hInst;
extern HANDLE hMenu;
extern DWORD mirVer;
+extern HANDLE hAvatarWindowsList;
#include "resource.h"
#include "m_avatarhist.h"
@@ -99,6 +100,3 @@ extern Options opts; #include "popup.h"
-
-
-BOOL ContactEnabled(HANDLE hContact, char *setting, int def);
diff --git a/Plugins/avatarhistory/AvatarHistory.rc b/Plugins/avatarhistory/AvatarHistory.rc index 9fbde35..c9da3d1 100644 --- a/Plugins/avatarhistory/AvatarHistory.rc +++ b/Plugins/avatarhistory/AvatarHistory.rc @@ -40,22 +40,23 @@ END // Dialog
//
-IDD_AVATARDLG DIALOGEX 0, 0, 216, 166
+IDD_AVATARDLG DIALOGEX 0, 0, 216, 195
STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Avatar History"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LISTBOX IDC_AVATARLIST,7,7,110,74,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_AVATAR,"Static",SS_BITMAP | SS_NOTIFY | SS_CENTERIMAGE | SS_REALSIZEIMAGE | SS_SUNKEN,125,7,84,74
+ LTEXT "Static",IDC_AVATARPATH,7,105,204,26
PUSHBUTTON "Open Folder",IDC_OPENFOLDER,6,81,49,14
PUSHBUTTON "<",IDC_BACK,138,82,31,10,BS_CENTER | BS_VCENTER
PUSHBUTTON ">",IDC_NEXT,172,82,31,10,BS_CENTER | BS_VCENTER
CONTROL "Store this user's old avatars in disk",IDC_LOGUSER,
- "Button",BS_AUTO3STATE | WS_TABSTOP,7,100,202,10
+ "Button",BS_AUTO3STATE | WS_TABSTOP,7,135,202,10
CONTROL "Log this user's avatars changes to history",IDC_HISTORYUSER,
- "Button",BS_AUTO3STATE | WS_TABSTOP,7,112,202,10
- CONTROL "Show popups for this user",IDC_POPUPUSER,"Button",BS_AUTO3STATE | WS_TABSTOP,7,124,202,10
- DEFPUSHBUTTON "OK",IDOK,73,138,50,14
+ "Button",BS_AUTO3STATE | WS_TABSTOP,7,147,202,10
+ CONTROL "Show popups for this user",IDC_POPUPUSER,"Button",BS_AUTO3STATE | WS_TABSTOP,7,159,202,10
+ DEFPUSHBUTTON "OK",IDOK,73,169,50,14
END
IDD_OPTIONS DIALOGEX 0, 0, 314, 173
@@ -187,26 +188,6 @@ END /////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_NEWAVATAR ICON "NewAvatar.ico"
-IDI_AVATARHISTORY ICON "AvatarHistory.ico"
-#endif // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
// English (United Kingdom) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
diff --git a/Plugins/avatarhistory/AvatarHistory.vcxproj b/Plugins/avatarhistory/AvatarHistory.vcxproj index 663899d..9656a21 100644 --- a/Plugins/avatarhistory/AvatarHistory.vcxproj +++ b/Plugins/avatarhistory/AvatarHistory.vcxproj @@ -159,10 +159,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
- <ObjectFileName>.\Debug\</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<Midl>
@@ -200,10 +197,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
- <ObjectFileName>.\Debug\</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<Midl>
@@ -241,10 +235,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Unicode_Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
- <ObjectFileName>.\Unicode_Debug\</ObjectFileName>
- <ProgramDataBaseFileName>.\Unicode_Debug\</ProgramDataBaseFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<Midl>
@@ -282,10 +273,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Unicode_Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
- <ObjectFileName>.\Unicode_Debug\</ObjectFileName>
- <ProgramDataBaseFileName>.\Unicode_Debug\</ProgramDataBaseFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<Midl>
@@ -307,7 +295,6 @@ <LinkDLL>true</LinkDLL>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
- <ImportLibrary>.\Unicode_Debug\avatarhistW.lib</ImportLibrary>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -322,10 +309,7 @@ <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
- <ObjectFileName>.\Release\</ObjectFileName>
- <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
</ClCompile>
<Midl>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -362,10 +346,7 @@ <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
- <ObjectFileName>.\Release\</ObjectFileName>
- <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
</ClCompile>
<Midl>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -401,10 +382,7 @@ <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Unicode_Release\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
- <ObjectFileName>.\Unicode_Release\</ObjectFileName>
- <ProgramDataBaseFileName>.\Unicode_Release\</ProgramDataBaseFileName>
</ClCompile>
<Midl>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -441,10 +419,7 @@ <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Unicode_Release\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
- <ObjectFileName>.\Unicode_Release\</ObjectFileName>
- <ProgramDataBaseFileName>.\Unicode_Release\</ProgramDataBaseFileName>
</ClCompile>
<Midl>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -465,7 +440,6 @@ <LinkDLL>true</LinkDLL>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ImportLibrary>.\Unicode_Release\avatarhistW.lib</ImportLibrary>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -495,10 +469,6 @@ <CustomBuild Include="Docs\avatarhist_version.txt" />
<CustomBuild Include="Docs\langpack_avatarhist.txt" />
</ItemGroup>
- <ItemGroup>
- <None Include="AvatarHistory.ico" />
- <None Include="NewAvatar.ico" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/Plugins/avatarhistory/AvatarHistory.vcxproj.filters b/Plugins/avatarhistory/AvatarHistory.vcxproj.filters new file mode 100644 index 0000000..b405a21 --- /dev/null +++ b/Plugins/avatarhistory/AvatarHistory.vcxproj.filters @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{82b52cc9-91bf-46bb-b045-52e8df41b13d}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{e28f6fa3-76df-4c8d-8454-ee929e07f290}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{6ad471fb-470c-4466-b817-ec90cb51260c}</UniqueIdentifier>
+ <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+ </Filter>
+ <Filter Include="Docs">
+ <UniqueIdentifier>{72021e6b-0e9b-4cf3-b35f-db87ed4f6541}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="AvatarDlg.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="AvatarHistory.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="icolib.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\utils\mir_options.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="options.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="popup.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="AvatarHistory.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="m_avatarhist.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\utils\mir_buffer.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\utils\mir_memory.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\utils\mir_options.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="popup.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="AvatarHistory.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="Docs\avatarhist_changelog.txt">
+ <Filter>Docs</Filter>
+ </CustomBuild>
+ <CustomBuild Include="Docs\avatarhist_readme.txt">
+ <Filter>Docs</Filter>
+ </CustomBuild>
+ <CustomBuild Include="Docs\avatarhist_version.txt">
+ <Filter>Docs</Filter>
+ </CustomBuild>
+ <CustomBuild Include="Docs\langpack_avatarhist.txt">
+ <Filter>Docs</Filter>
+ </CustomBuild>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/Plugins/avatarhistory/Docs/avatarhist_changelog.txt b/Plugins/avatarhistory/Docs/avatarhist_changelog.txt index 9f2cf13..b8a8918 100644 --- a/Plugins/avatarhistory/Docs/avatarhist_changelog.txt +++ b/Plugins/avatarhistory/Docs/avatarhist_changelog.txt @@ -2,6 +2,12 @@ Avatar History Changelog:
++ Show Contact Name in Avatar History dialog title
++ Show picture path in avatar history dialog
++ support for WindowList
+* fixed some issues reported by borkra
++ updated m_folders.h
+
. 0.0.3.0
THIS REQUIRES MIRANDA IM 0.10 ALPHA #3 OR ABOVE!!
+ added x64 version
diff --git a/Plugins/avatarhistory/m_avatarhist.h b/Plugins/avatarhistory/m_avatarhist.h index 8dc352b..6f1e5c8 100644 --- a/Plugins/avatarhistory/m_avatarhist.h +++ b/Plugins/avatarhistory/m_avatarhist.h @@ -49,6 +49,7 @@ return: (TCHAR *) NULL if none is found or the path to the avatar. You need to f #define MS_AVATARHISTORY_GET_CACHED_AVATAR "AvatarHistory/GetCachedAvatar"
+#define MS_AVATARHISTORY_SHOWDIALOG "AvatarHistory/ShowDialog"
diff --git a/Plugins/avatarhistory/resource.h b/Plugins/avatarhistory/resource.h index 146be59..9ec6008 100644 --- a/Plugins/avatarhistory/resource.h +++ b/Plugins/avatarhistory/resource.h @@ -1,5 +1,5 @@ //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
// Used by AvatarHistory.rc
//
#define IDD_OPTIONS_OLD 101
@@ -46,6 +46,7 @@ #define IDC_MIR_SAME 1022
#define IDC_LEFT_ACTION 1023
#define IDC_MIR_PROTO 1023
+#define IDC_AVATARPATH 1023
#define IDC_MIR_SHORT 1024
#define IDC_SHORT 1025
#define IDC_DUP 1026
@@ -81,7 +82,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 110
#define _APS_NEXT_COMMAND_VALUE 40004
-#define _APS_NEXT_CONTROL_VALUE 1023
+#define _APS_NEXT_CONTROL_VALUE 1025
#define _APS_NEXT_SYMED_VALUE 103
#endif
#endif
|