From 502df0fb82d3a472ea31ba6846d7b69c64440892 Mon Sep 17 00:00:00 2001 From: "wishmaster51@gmail.com" Date: Sat, 5 May 2012 15:25:23 +0000 Subject: version bump 0.0.3.1 git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@249 c086bb3d-8645-0410-b8da-73a8550f86e7 --- Plugins/avatarhistory/AvatarDlg.cpp | 10 +- Plugins/avatarhistory/AvatarHistory.cpp | 2 +- Plugins/avatarhistory/AvatarHistory.vcxproj | 126 ++++++++++++++++++--- .../avatarhistory/Docs/avatarhist_changelog.txt | 3 +- Plugins/avatarhistory/options.cpp | 20 ++-- 5 files changed, 127 insertions(+), 34 deletions(-) diff --git a/Plugins/avatarhistory/AvatarDlg.cpp b/Plugins/avatarhistory/AvatarDlg.cpp index 14bbebc..10e64b3 100644 --- a/Plugins/avatarhistory/AvatarDlg.cpp +++ b/Plugins/avatarhistory/AvatarDlg.cpp @@ -88,7 +88,7 @@ int OpenAvatarDialog(HANDLE hContact, char* fn) } else { -#ifdef UNICODE +#ifdef _UNICODE MultiByteToWideChar(CP_ACP, 0, fn, -1, avdlg->fn, MAX_REGS(avdlg->fn)); #else lstrcpyn(avdlg->fn, fn, sizeof(avdlg->fn)); @@ -233,8 +233,9 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM l { case ID_AVATARLISTPOPUP_SAVEAS: { + HANDLE hContact = (HANDLE) GetWindowLongPtr(hwnd, GWLP_USERDATA); ListEntry *le = (ListEntry*) SendMessage(list, LB_GETITEMDATA, pos, 0); - ShowSaveDialog(hwnd, le->filename); + ShowSaveDialog(hwnd, le->filename, hContact); break; } case ID_AVATARLISTPOPUP_DELETE: @@ -589,7 +590,7 @@ int ShowSaveDialog(HWND hwnd, TCHAR* fn, HANDLE hContact) ofn.lpstrFile = file; ofn.nMaxFile = MAX_PATH; - ofn.Flags = OFN_PATHMUSTEXIST; + ofn.Flags = OFN_PATHMUSTEXIST | OFN_DONTADDTORECENT; ofn.lpstrDefExt = _tcsrchr(fn, '.')+1; if(ret) { @@ -601,6 +602,9 @@ int ShowSaveDialog(HWND hwnd, TCHAR* fn, HANDLE hContact) ofn.lpstrInitialDir = _T("."); } if(GetSaveFileName(&ofn)) + { CopyFile(fn, file, FALSE); + DBWriteContactSettingTString(hContact,MODULE_NAME,"SavedAvatarFolder",file); + } return 0; } diff --git a/Plugins/avatarhistory/AvatarHistory.cpp b/Plugins/avatarhistory/AvatarHistory.cpp index a6ef0d1..5d624db 100644 --- a/Plugins/avatarhistory/AvatarHistory.cpp +++ b/Plugins/avatarhistory/AvatarHistory.cpp @@ -76,7 +76,7 @@ PLUGININFOEX pluginInfo={ #else "Avatar History (Ansi)", #endif - PLUGIN_MAKE_VERSION(0,0,3,0), + PLUGIN_MAKE_VERSION(0,0,3,1), "This plugin keeps backups of all your contacts' avatar changes and/or shows popups", "Matthew Wild (MattJ), Ricardo Pescuma Domenecci", "mwild1@gmail.com", diff --git a/Plugins/avatarhistory/AvatarHistory.vcxproj b/Plugins/avatarhistory/AvatarHistory.vcxproj index 3aa45e7..e5b0fb0 100644 --- a/Plugins/avatarhistory/AvatarHistory.vcxproj +++ b/Plugins/avatarhistory/AvatarHistory.vcxproj @@ -118,34 +118,50 @@ true avatarhistW + $(SolutionDir)$(Platform)\$(Configuration)\Plugins\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\ true avatarhistW + $(SolutionDir)$(Platform)\$(Configuration)\Plugins\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\ true avatarhistW + $(SolutionDir)$(Platform)\$(Configuration)\Plugins\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\ true avatarhistW + $(SolutionDir)$(Platform)\$(Configuration)\Plugins\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\ false avatarhistW + $(SolutionDir)$(Platform)\$(Configuration)\Plugins\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\ false avatarhistW + $(SolutionDir)$(Platform)\$(Configuration)\Plugins\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\ false avatarhistW + $(SolutionDir)$(Platform)\$(Configuration)\Plugins\ + $(SolutionDir)obj\$(Platform)\$(Configuration)\ false avatarhistW + $(SolutionDir)obj\$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\Plugins\ @@ -159,8 +175,9 @@ EditAndContinue ../../include;sdk;%(AdditionalIncludeDirectories) DBGPOPUPS;WIN32;_DEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions) - true + false EnableFastChecks + AvatarHistory.h true @@ -175,7 +192,7 @@ true - .\Debug\AvatarHistory.bsc + $(IntDir)$(TargetName).bsc true @@ -184,7 +201,15 @@ Console .\Debug\avatarhist.lib comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).pdb + + if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\" +copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\" + + + Preparing Release + @@ -197,8 +222,9 @@ ProgramDatabase ../../include;sdk;%(AdditionalIncludeDirectories) DBGPOPUPS;_WIN64;_DEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions) - true + false EnableFastChecks + AvatarHistory.h true @@ -212,7 +238,7 @@ true - .\Debug\AvatarHistory.bsc + $(IntDir)$(TargetName).bsc true @@ -221,7 +247,15 @@ Console .\Debug\avatarhist.lib comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).pdb + + if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\" +copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\" + + + Preparing Release + @@ -235,8 +269,9 @@ EditAndContinue ../../include;sdk;%(AdditionalIncludeDirectories) DBGPOPUPS;WIN32;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions) - true + false EnableFastChecks + AvatarHistory.h true @@ -251,7 +286,7 @@ true - .\Unicode_Debug\AvatarHistory.bsc + $(IntDir)$(TargetName).bsc true @@ -259,7 +294,15 @@ true Console comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).pdb + + if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\" +copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\" + + + Preparing Release + @@ -272,8 +315,9 @@ ProgramDatabase ../../include;sdk;%(AdditionalIncludeDirectories) DBGPOPUPS;_WIN64;_DEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions) - true + false EnableFastChecks + AvatarHistory.h true @@ -287,7 +331,7 @@ true - .\Unicode_Debug\AvatarHistory.bsc + $(IntDir)$(TargetName).bsc true @@ -295,7 +339,15 @@ true Console comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).pdb + + if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\" +copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\" + + + Preparing Release + @@ -308,7 +360,8 @@ Level3 ../../include;sdk;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions) - true + false + AvatarHistory.h true @@ -323,16 +376,24 @@ true - .\Release\AvatarHistory.bsc + $(IntDir)$(TargetName).bsc true true Console false - .\Release\avatarhist.lib comctl32.lib;%(AdditionalDependencies) + false + $(OutDir)$(TargetName).pdb + + if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\" +copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\" + + + Preparing Release + @@ -345,7 +406,8 @@ Level3 ../../include;sdk;%(AdditionalIncludeDirectories) _WIN64;NDEBUG;_WINDOWS;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions) - true + false + AvatarHistory.h true @@ -359,7 +421,7 @@ true - .\Release\AvatarHistory.bsc + $(IntDir)$(TargetName).bsc true @@ -368,7 +430,16 @@ false .\Release\avatarhist.lib comctl32.lib;%(AdditionalDependencies) + false + $(OutDir)$(TargetName).pdb + + if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\" +copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\" + + + Preparing Release + @@ -381,7 +452,8 @@ Level3 ../../include;sdk;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions) - true + false + AvatarHistory.h true @@ -396,16 +468,24 @@ true - .\Unicode_Release\AvatarHistory.bsc + $(IntDir)$(TargetName).bsc true true Console false - .\Unicode_Release\avatarhistW.lib comctl32.lib;%(AdditionalDependencies) + false + $(OutDir)$(TargetName).pdb + + if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\" +copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\" + + + Preparing Release + @@ -418,7 +498,8 @@ Level3 ../../include;sdk;%(AdditionalIncludeDirectories) _WIN64;NDEBUG;_WINDOWS;_UNICODE;UNICODE;_USRDLL;AvatarHistory_EXPORTS;%(PreprocessorDefinitions) - true + false + AvatarHistory.h true @@ -432,7 +513,7 @@ true - .\Unicode_Release\AvatarHistory.bsc + $(IntDir)$(TargetName).bsc true @@ -440,7 +521,16 @@ Console false comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).pdb + false + + if not exist "$(OutputPath)Docs\" mkdir "$(OutputPath)Docs\" +copy "$(ProjectDir)Docs\*.*" "$(OutputPath)Docs\" + + + Preparing Release + diff --git a/Plugins/avatarhistory/Docs/avatarhist_changelog.txt b/Plugins/avatarhistory/Docs/avatarhist_changelog.txt index 57dfa8b..a7f48a4 100644 --- a/Plugins/avatarhistory/Docs/avatarhist_changelog.txt +++ b/Plugins/avatarhistory/Docs/avatarhist_changelog.txt @@ -2,12 +2,13 @@ Avatar History Changelog: +. 0.0.3.1 + 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 -* fixed duplicate avatar notifications +* fixed duplicate avatar notifications (thanks xaos) . 0.0.3.0 THIS REQUIRES MIRANDA IM 0.10 ALPHA #3 OR ABOVE!! diff --git a/Plugins/avatarhistory/options.cpp b/Plugins/avatarhistory/options.cpp index 1c7e07b..2d1a751 100644 --- a/Plugins/avatarhistory/options.cpp +++ b/Plugins/avatarhistory/options.cpp @@ -19,8 +19,6 @@ Avatar History Plugin */ #include "AvatarHistory.h" -#include -#include #include "../utils/mir_options.h" @@ -170,15 +168,15 @@ static INT_PTR CALLBACK PopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA { case WM_INITDIALOG: { - SendDlgItemMessage(hwndDlg, IDC_RIGHT_ACTION, CB_ADDSTRING, 0, (LONG) TranslateT("Do nothing")); - SendDlgItemMessage(hwndDlg, IDC_RIGHT_ACTION, CB_ADDSTRING, 0, (LONG) TranslateT("Close popup")); - SendDlgItemMessage(hwndDlg, IDC_RIGHT_ACTION, CB_ADDSTRING, 0, (LONG) TranslateT("Show avatar history")); - SendDlgItemMessage(hwndDlg, IDC_RIGHT_ACTION, CB_ADDSTRING, 0, (LONG) TranslateT("Show contact history")); - - SendDlgItemMessage(hwndDlg, IDC_LEFT_ACTION, CB_ADDSTRING, 0, (LONG) TranslateT("Do nothing")); - SendDlgItemMessage(hwndDlg, IDC_LEFT_ACTION, CB_ADDSTRING, 0, (LONG) TranslateT("Close popup")); - SendDlgItemMessage(hwndDlg, IDC_LEFT_ACTION, CB_ADDSTRING, 0, (LONG) TranslateT("Show avatar history")); - SendDlgItemMessage(hwndDlg, IDC_LEFT_ACTION, CB_ADDSTRING, 0, (LONG) TranslateT("Show contact history")); + SendDlgItemMessage(hwndDlg, IDC_RIGHT_ACTION, CB_ADDSTRING, 0, (LPARAM) TranslateT("Do nothing")); + SendDlgItemMessage(hwndDlg, IDC_RIGHT_ACTION, CB_ADDSTRING, 0, (LPARAM) TranslateT("Close popup")); + SendDlgItemMessage(hwndDlg, IDC_RIGHT_ACTION, CB_ADDSTRING, 0, (LPARAM) TranslateT("Show avatar history")); + SendDlgItemMessage(hwndDlg, IDC_RIGHT_ACTION, CB_ADDSTRING, 0, (LPARAM) TranslateT("Show contact history")); + + SendDlgItemMessage(hwndDlg, IDC_LEFT_ACTION, CB_ADDSTRING, 0, (LPARAM) TranslateT("Do nothing")); + SendDlgItemMessage(hwndDlg, IDC_LEFT_ACTION, CB_ADDSTRING, 0, (LPARAM) TranslateT("Close popup")); + SendDlgItemMessage(hwndDlg, IDC_LEFT_ACTION, CB_ADDSTRING, 0, (LPARAM) TranslateT("Show avatar history")); + SendDlgItemMessage(hwndDlg, IDC_LEFT_ACTION, CB_ADDSTRING, 0, (LPARAM) TranslateT("Show contact history")); // Needs to be called here in this case BOOL ret = SaveOptsDlgProc(popupsControls, MAX_REGS(popupsControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); -- cgit v1.2.3