From 184cfd6515bea3ffe4c61c71dfd3a65c87eb880b Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 17 Jun 2012 15:57:56 +0000 Subject: cosmetic settings fix git-svn-id: http://svn.miranda-ng.org/main/trunk@459 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/chat/services.cpp | 4 ++-- plugins/TabSRMM/include/nen.h | 4 ++-- plugins/TabSRMM/src/eventpopups.cpp | 12 ++++++------ plugins/TabSRMM/src/mim.cpp | 9 +++++++-- plugins/TabSRMM/src/utils.cpp | 8 ++++---- 5 files changed, 21 insertions(+), 16 deletions(-) (limited to 'plugins') diff --git a/plugins/TabSRMM/chat/services.cpp b/plugins/TabSRMM/chat/services.cpp index a7033f8a62..a8f40a4dec 100644 --- a/plugins/TabSRMM/chat/services.cpp +++ b/plugins/TabSRMM/chat/services.cpp @@ -580,7 +580,7 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT } } if(PluginConfig.m_bIsWin7 && PluginConfig.m_useAeroPeek && CSkin::m_skinEnabled && !M->GetByte("forceAeroPeek", 0)) - CWarning::show(CWarning::WARN_AEROPEEK_SKIN, CWarning::CWF_UNTRANSLATED|MB_ICONWARNING|MB_OK); + CWarning::show(CWarning::WARN_AEROPEEK_SKIN, MB_ICONWARNING|MB_OK); return hwndNew; // return handle of the new dialog } @@ -859,7 +859,7 @@ int CreateServiceFunctions(void) PluginConfig.m_chat_enabled = false; if(ServiceExists(MS_GC_REGISTER)) { - LRESULT result = CWarning::show(CWarning::WARN_CHAT_ENABLED, CWarning::CWF_NOALLOWHIDE | CWarning::CWF_UNTRANSLATED | MB_YESNOCANCEL | MB_ICONQUESTION); + LRESULT result = CWarning::show(CWarning::WARN_CHAT_ENABLED, CWarning::CWF_NOALLOWHIDE | MB_YESNOCANCEL | MB_ICONQUESTION); if(result == IDYES) M->WriteByte("PluginDisable", "chat.dll", 1); return(0); diff --git a/plugins/TabSRMM/include/nen.h b/plugins/TabSRMM/include/nen.h index d3a8fa8bdd..a84d8a84de 100644 --- a/plugins/TabSRMM/include/nen.h +++ b/plugins/TabSRMM/include/nen.h @@ -55,8 +55,8 @@ int tabSRMM_ShowPopup(WPARAM wParam, LPARAM lParam, WORD eventType, int windowOp #define DEFAULT_COLTEXT RGB(0,0,0) #define DEFAULT_MASKNOTIFY (MASK_MESSAGE|MASK_URL|MASK_FILE|MASK_OTHER) #define DEFAULT_MASKACTL (MASK_OPEN|MASK_DISMISS) -#define DEFAULT_MASKACTR (MASK_DISMISS) -#define DEFAULT_DELAY -1 +#define DEFAULT_MASKACTR (MASK_DISMISS|MASK_REMOVE) +#define DEFAULT_DELAY 0 #define MASK_MESSAGE 0x0001 #define MASK_URL 0x0002 diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp index 5dfc2e8245..0ba639cf09 100644 --- a/plugins/TabSRMM/src/eventpopups.cpp +++ b/plugins/TabSRMM/src/eventpopups.cpp @@ -80,8 +80,8 @@ static void PU_CleanUp() if ((*it)->hContact == 0) { //_DebugTraceW(_T("found stale popup %s"), (*it)->eventData->szText); if ((*it)->eventData) - free((*it)->eventData); - free(*it); + mir_free((*it)->eventData); + mir_free(*it); it = PopupList.erase(it); continue; } @@ -737,7 +737,7 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent if(hEvent == 0 && hContact == 0) dbe.szModule = Translate("Unknown module or contact"); - pdata = (PLUGIN_DATAT *)malloc(sizeof(PLUGIN_DATAT)); + pdata = (PLUGIN_DATAT *)mir_alloc(sizeof(PLUGIN_DATAT)); ZeroMemory((void *)pdata, sizeof(PLUGIN_DATAT)); pdata->eventType = eventType; @@ -768,7 +768,7 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent } else mir_sntprintf(pud.lptzText, MAX_SECONDLINE, _T(" ")); - pdata->eventData = (EVENT_DATAT *)malloc(NR_MERGED * sizeof(EVENT_DATAT)); + pdata->eventData = (EVENT_DATAT *)mir_alloc(NR_MERGED * sizeof(EVENT_DATAT)); pdata->eventData[0].hEvent = hEvent; pdata->eventData[0].timestamp = dbe.timestamp; _tcsncpy(pdata->eventData[0].szText, pud.lptzText, MAX_SECONDLINE); @@ -780,8 +780,8 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent if (CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&pud, 0) < 0) { // failed to display, perform cleanup if (pdata->eventData) - free(pdata->eventData); - free(pdata); + mir_free(pdata->eventData); + mir_free(pdata); } else PopupList.push_back(pdata); diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index 1e412817be..dfd38998fd 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -423,10 +423,15 @@ INT_PTR CMimAPI::foldersPathChanged() const TCHAR* CMimAPI::getUserDir() { if(m_userDir[0] == 0) { - wchar_t* userdata = ::Utils_ReplaceVarsT(L"%miranda_userdata%"); + wchar_t* userdata; + if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) + userdata = L"%%miranda_userdata%%"; + else + userdata = ::Utils_ReplaceVarsT(L"%miranda_userdata%"); mir_sntprintf(m_userDir, MAX_PATH, userdata); Utils::ensureTralingBackslash(m_userDir); - mir_free(userdata); + if (!ServiceExists(MS_FOLDERS_REGISTER_PATH)) + mir_free(userdata); } return(m_userDir); } diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index dcbab49b0a..e80882a456 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -1189,12 +1189,12 @@ HMODULE Utils::loadSystemLibrary(const wchar_t* szFilename) static wchar_t* warnings[] = { LPGENT("Important release notes|A test warning message"), /* WARN_TEST */ /* reserved for important notes after upgrade - NOT translatable */ - LPGENT("Icon pack version check|The installed icon pack is outdated and might be incompatible with TabSRMM version 3.\n\n\\b1Missing or misplaced icons are possible issues with the currently installed icon pack.\\b0"), /* WARN_ICONPACKVERSION */ /* NOT TRANSLATABLE */ + LPGENT("Icon pack version check|The installed icon pack is outdated and might be incompatible with TabSRMM version 3.\n\n\\b1Missing or misplaced icons are possible issues with the currently installed icon pack.\\b0"), /* WARN_ICONPACKVERSION */ LPGENT("Edit user notes|You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode"), /* WARN_EDITUSERNOTES */ - LPGENT("Missing component|The icon pack is missing. Please install it to the default icons folder.\n\nNo icons will be available"), /* WARN_ICONPACKMISSING */ /* NOT TRANSLATABLE */ + LPGENT("Missing component|The icon pack is missing. Please install it to the default icons folder.\n\nNo icons will be available"), /* WARN_ICONPACKMISSING */ LPGENT("Aero peek warning|You have enabled Aero Peek features and loaded a custom container window skin\n\nThis can result in minor visual anomalies in the live preview feature."), /* WARN_AEROPEEKSKIN */ - LPGENT("TabSRMM group chat module|TabSRMM could not enable its group chat module. The most likely cause is that you have installed and enabled \\b1chat.dll\\b0 or another plugin that provides groupchat services.\n\nShould I try to fix this now \\b1(a restart of Miranda is required to apply these changes)?\\b0"), /* WARN_CHAT_ENABLED */ /* NOT TRANSLATABLE */ - L"Filetransfer problem|Sending the image by file transfer failed.\n\nPossible reasons: File transfers not supported, either you or the target contact is offline, or you are invisible and the target contact is not on your visibilty list.", /* WARN_IMGSVC_MISSING */ /* NOT TRANSLATABLE */ + LPGENT("TabSRMM group chat module|TabSRMM could not enable its group chat module. The most likely cause is that you have installed and enabled \\b1chat.dll\\b0 or another plugin that provides groupchat services.\n\nShould I try to fix this now \\b1(a restart of Miranda is required to apply these changes)?\\b0"), /* WARN_CHAT_ENABLED */ + LPGENT("Filetransfer problem|Sending the image by file transfer failed.\n\nPossible reasons: File transfers not supported, either you or the target contact is offline, or you are invisible and the target contact is not on your visibilty list."), /* WARN_IMGSVC_MISSING */ LPGENT("Settings problem|The option \\b1 History->Imitate IEView API\\b0 is enabled and the History++ plugin is active. This can cause problems when using IEView as message log viewer.\n\nShould I correct the option (a restart is required)?"), /* WARN_HPP_APICHECK */ L" ", /* WARN_NO_SENDLATER */ /*uses "Configuration issue|The unattended send feature is disabled. The \\b1 send later\\b0 and \\b1 send to multiple contacts\\b0 features depend on it.\n\nYou must enable it under \\b1Options->Message Sessions->Advanced tweaks\\b0. Changing this option requires a restart." */ LPGENT("Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?"), /* WARN_CLOSEWINDOW */ -- cgit v1.2.3