From 3e1d25be1eb2dfa0a6456636e2fcbf368c981243 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 9 Mar 2013 11:31:12 +0000 Subject: removed not used headers git-svn-id: http://svn.miranda-ng.org/main/trunk@3935 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Sessions/Src/Main.cpp | 84 ++++++++++++++++++++-------------------- plugins/Sessions/Src/Options.cpp | 44 ++++++++++----------- plugins/Sessions/Src/Sessions.h | 43 +++++++------------- plugins/Sessions/Src/Utils.cpp | 84 ++++++++++++++++++++-------------------- plugins/Sessions/Src/Version.h | 7 ---- plugins/Sessions/res/Sessions.rc | 69 ++++++++++----------------------- plugins/Sessions/res/Version.rc | 4 -- 7 files changed, 141 insertions(+), 194 deletions(-) (limited to 'plugins/Sessions') diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index 587dd12fb5..ae81054d33 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -67,7 +67,7 @@ PLUGININFOEX pluginInfo = { __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - // {60558872-2AAB-45aa-888D-097691C9B683} + // {60558872-2AAB-45AA-888D-097691C9B683} {0x60558872, 0x2aab, 0x45aa, {0x88, 0x8d, 0x9, 0x76, 0x91, 0xc9, 0xb6, 0x83}} }; @@ -100,14 +100,14 @@ INT_PTR CALLBACK ExitDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) SavePosition(hdlg, "ExitDlg"); SaveSessionDate(); SaveSessionHandles(0,0); - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastempty", 0); + DBWriteContactSettingByte(NULL, MODNAME, "lastempty", 0); DestroyWindow(hdlg); }break; case IDCANCEL: { SavePosition(hdlg, "ExitDlg"); - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastempty", 1); + DBWriteContactSettingByte(NULL, MODNAME, "lastempty", 1); DestroyWindow(hdlg); }break; } @@ -287,7 +287,7 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar { case WM_INITDIALOG: { - int iDelay=DBGetContactSettingWord(NULL, __INTERNAL_NAME, "StartupModeDelay", 1500); + int iDelay=DBGetContactSettingWord(NULL, MODNAME, "StartupModeDelay", 1500); if(g_hghostw==TRUE) SetTimer(hdlg, TIMERID_LOAD, iDelay, NULL); else @@ -359,7 +359,7 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar int i=0; while(session_list_recovered[i]) { - DBWriteContactSettingByte((HANDLE)session_list_recovered[i], __INTERNAL_NAME, "wasInLastSession", 0); + DBWriteContactSettingByte((HANDLE)session_list_recovered[i], MODNAME, "wasInLastSession", 0); i++; } ZeroMemory(session_list_recovered,SIZEOF(session_list_recovered)); @@ -494,7 +494,7 @@ int SaveSessionHandles(WPARAM wparam,LPARAM lparam) if(lparam==1) { g_ses_count++; - DBWriteContactSettingByte(0, __INTERNAL_NAME, "UserSessionsCount", (BYTE)g_ses_count); + DBWriteContactSettingByte(0, MODNAME, "UserSessionsCount", (BYTE)g_ses_count); } return 0; } @@ -522,7 +522,7 @@ INT_PTR OpenSessionsManagerWindow(WPARAM wparam,LPARAM lparam) ShowWindow(g_hDlg,SW_SHOW); return 0; } - if(g_bIncompletedSave||DBGetStringT(NULL, __INTERNAL_NAME, "SessionDate_0")||DBGetStringT(NULL, __INTERNAL_NAME, "UserSessionDsc_0")) + if(g_bIncompletedSave||DBGetStringT(NULL, MODNAME, "SessionDate_0")||DBGetStringT(NULL, MODNAME, "UserSessionDsc_0")) { g_hDlg=CreateDialog(hinstance,MAKEINTRESOURCE(IDD_WLCMDIALOG), 0, LoadSessionDlgProc); return 0; @@ -552,11 +552,11 @@ int SaveSessionDate() char szSessionDate[256]; DBVARIANT dbv = {0}; mir_snprintf(szSessionDate, SIZEOF(szSessionDate), "%s_%d", "SessionDate", 0); - DBGetContactSettingTString(NULL, __INTERNAL_NAME, szSessionDate, &dbv); + DBGetContactSettingTString(NULL, MODNAME, szSessionDate, &dbv); TCHAR *szSessionDateBuf_1 = mir_tstrdup(dbv.ptszVal); DBFreeVariant(&dbv); - DBWriteContactSettingTString(NULL, __INTERNAL_NAME, szSessionDate, szSessionTime); + DBWriteContactSettingTString(NULL, MODNAME, szSessionDate, szSessionTime); mir_free(szSessionTime); ResaveSettings("SessionDate", 1, ses_limit, szSessionDateBuf_1); @@ -566,7 +566,7 @@ int SaveSessionDate() mir_free(szDateBuf); } if(g_bCrashRecovery) - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastSaveCompleted", 1); + DBWriteContactSettingByte(NULL, MODNAME, "lastSaveCompleted", 1); return 0; } @@ -583,14 +583,14 @@ int SaveUserSessionName(TCHAR *szUSessionName) { szUserSessionName = mir_tstrdup(szUSessionName); mir_snprintf(szUserSessionNameBuf, SIZEOF(szUserSessionNameBuf), "%s_%u", "UserSessionDsc", 0); - if (!DBGetContactSettingTString(NULL, __INTERNAL_NAME, szUserSessionNameBuf, &dbv)) + if (!DBGetContactSettingTString(NULL, MODNAME, szUserSessionNameBuf, &dbv)) { szUserSessionNameBuf_1 = mir_tstrdup(dbv.ptszVal); DBFreeVariant(&dbv); ResaveSettings("UserSessionDsc",1,255,szUserSessionNameBuf_1); } - DBWriteContactSettingTString(NULL, __INTERNAL_NAME, szUserSessionNameBuf, szUserSessionName); + DBWriteContactSettingTString(NULL, MODNAME, szUserSessionNameBuf, szUserSessionName); //free(szUserSessionNameBuf_1); mir_free(szUserSessionName); @@ -704,33 +704,33 @@ int DelUserDefSession(int ses_count) } mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "UserSessionDsc", ses_count); - DBDeleteContactSetting(NULL, __INTERNAL_NAME, szSessionName); + DBDeleteContactSetting(NULL, MODNAME, szSessionName); mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "FavUserSession", ses_count); - DBDeleteContactSetting(NULL, __INTERNAL_NAME, szSessionName); + DBDeleteContactSetting(NULL, MODNAME, szSessionName); for (i=(ses_count+1);;i++) { mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "UserSessionDsc", i); - if ((szSessionNameBuf=DBGetStringT(NULL, __INTERNAL_NAME, szSessionName))/*&&(szSessionHandlesBuf=DBGetStringT(NULL,PLGNAME,szSessionHandles))*/) + if ((szSessionNameBuf=DBGetStringT(NULL, MODNAME, szSessionName))/*&&(szSessionHandlesBuf=DBGetStringT(NULL,PLGNAME,szSessionHandles))*/) { MarkUserDefSession(i-1,IsMarkedUserDefSession(i)); mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "UserSessionDsc", i-1); - DBWriteContactSettingTString(NULL, __INTERNAL_NAME, szSessionName, szSessionNameBuf); + DBWriteContactSettingTString(NULL, MODNAME, szSessionName, szSessionNameBuf); } else { mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "UserSessionDsc", i-1); - DBDeleteContactSetting(NULL, __INTERNAL_NAME, szSessionName); + DBDeleteContactSetting(NULL, MODNAME, szSessionName); mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "FavUserSession", i-1); - DBDeleteContactSetting(NULL, __INTERNAL_NAME, szSessionName); + DBDeleteContactSetting(NULL, MODNAME, szSessionName); break; } } g_ses_count--; - DBWriteContactSettingByte(0, __INTERNAL_NAME, "UserSessionsCount", (BYTE)g_ses_count); + DBWriteContactSettingByte(0, MODNAME, "UserSessionsCount", (BYTE)g_ses_count); mir_free(szSessionNameBuf); return 0; } @@ -751,22 +751,22 @@ int DeleteAutoSession(int ses_count) } mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "SessionDate", ses_count); - DBDeleteContactSetting(NULL, __INTERNAL_NAME, szSessionName); + DBDeleteContactSetting(NULL, MODNAME, szSessionName); for (i=(ses_count+1);;i++) { mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "SessionDate", i); - if ((szSessionNameBuf=DBGetStringT(NULL, __INTERNAL_NAME, szSessionName))/*&&(szSessionHandlesBuf=DBGetStringT(NULL,PLGNAME,szSessionHandles))*/) + if ((szSessionNameBuf=DBGetStringT(NULL, MODNAME, szSessionName))/*&&(szSessionHandlesBuf=DBGetStringT(NULL,PLGNAME,szSessionHandles))*/) { mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "SessionDate", i-1); - DBWriteContactSettingTString(NULL, __INTERNAL_NAME, szSessionName, szSessionNameBuf); + DBWriteContactSettingTString(NULL, MODNAME, szSessionName, szSessionNameBuf); } else { mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "SessionDate", i-1); - DBDeleteContactSetting(NULL, __INTERNAL_NAME, szSessionName); + DBDeleteContactSetting(NULL, MODNAME, szSessionName); break; } } @@ -789,30 +789,30 @@ int SessionPreShutdown(WPARAM wparam,LPARAM lparam) if(g_bIncompletedSave) { int i=0; while(session_list_recovered[i]) { - DBWriteContactSettingByte((HANDLE)session_list_recovered[i], __INTERNAL_NAME, "wasInLastSession", 0); + DBWriteContactSettingByte((HANDLE)session_list_recovered[i], MODNAME, "wasInLastSession", 0); i++; } } - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastSaveCompleted", 1); + DBWriteContactSettingByte(NULL, MODNAME, "lastSaveCompleted", 1); return 0; } int OkToExit(WPARAM wparam,LPARAM lparam) { - int exitmode=DBGetContactSettingByte(NULL, __INTERNAL_NAME, "ShutdownMode", 2); + int exitmode=DBGetContactSettingByte(NULL, MODNAME, "ShutdownMode", 2); DONT=1; if(exitmode==2&&session_list[0]!=0) { SaveSessionDate(); SaveSessionHandles(0,0); - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastempty", 0); + DBWriteContactSettingByte(NULL, MODNAME, "lastempty", 0); } else if(exitmode==1&&session_list[0]!=0) { DialogBox(hinstance,MAKEINTRESOURCE(IDD_EXDIALOG), 0, ExitDlgProc); } - else DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastempty", 1); + else DBWriteContactSettingByte(NULL, MODNAME, "lastempty", 1); return 0; } @@ -824,12 +824,12 @@ static int GetContactHandle(WPARAM wparam,LPARAM lParam) { if (strstr(MWeventdata->szModule,"tabSRMsg")) g_mode=1; AddToCurSession((DWORD)MWeventdata->hContact,0); - if(g_bCrashRecovery) DBWriteContactSettingByte(MWeventdata->hContact, __INTERNAL_NAME, "wasInLastSession", 1); + if(g_bCrashRecovery) DBWriteContactSettingByte(MWeventdata->hContact, MODNAME, "wasInLastSession", 1); } else if(MWeventdata->uType == MSG_WINDOW_EVT_CLOSE) { if (!DONT) DelFromCurSession((DWORD)MWeventdata->hContact,0); - if(g_bCrashRecovery) DBWriteContactSettingByte(MWeventdata->hContact, __INTERNAL_NAME, "wasInLastSession", 0); + if(g_bCrashRecovery) DBWriteContactSettingByte(MWeventdata->hContact, MODNAME, "wasInLastSession", 0); } return 0; @@ -890,17 +890,17 @@ static int PluginInit(WPARAM wparam,LPARAM lparam) hServiceSaveUserSession = CreateServiceFunction(MS_SESSIONS_SAVEUSERSESSION, SaveUserSessionHandles); hServiceCloseCurrentSession = CreateServiceFunction(MS_SESSIONS_CLOSESESSION, CloseCurrentSession); - g_ses_count = DBGetContactSettingByte(0, __INTERNAL_NAME, "UserSessionsCount", 0); + g_ses_count = DBGetContactSettingByte(0, MODNAME, "UserSessionsCount", 0); if (!g_ses_count) g_ses_count = DBGetContactSettingByte(0, "Sessions (Unicode)", "UserSessionsCount", 0); - ses_limit = DBGetContactSettingByte(0, __INTERNAL_NAME, "TrackCount", 10); - g_bExclHidden = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "ExclHidden", 0); - g_bWarnOnHidden = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "WarnOnHidden", 0); - g_bOtherWarnings = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "OtherWarnings", 1); - g_bCrashRecovery = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "CrashRecovery", 0); + ses_limit = DBGetContactSettingByte(0, MODNAME, "TrackCount", 10); + g_bExclHidden = DBGetContactSettingByte(NULL, MODNAME, "ExclHidden", 0); + g_bWarnOnHidden = DBGetContactSettingByte(NULL, MODNAME, "WarnOnHidden", 0); + g_bOtherWarnings = DBGetContactSettingByte(NULL, MODNAME, "OtherWarnings", 1); + g_bCrashRecovery = DBGetContactSettingByte(NULL, MODNAME, "CrashRecovery", 0); if(g_bCrashRecovery) - g_bIncompletedSave=!DBGetContactSettingByte(NULL, __INTERNAL_NAME, "lastSaveCompleted", 0); + g_bIncompletedSave=!DBGetContactSettingByte(NULL, MODNAME, "lastSaveCompleted", 0); if(g_bIncompletedSave) { @@ -911,16 +911,16 @@ static int PluginInit(WPARAM wparam,LPARAM lparam) for (hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { - if(DBGetContactSettingByte(hContact, __INTERNAL_NAME, "wasInLastSession", 0)) + if(DBGetContactSettingByte(hContact, MODNAME, "wasInLastSession", 0)) session_list_recovered[i++]=(DWORD)hContact; } } if (!session_list_recovered[0]) g_bIncompletedSave=FALSE; - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "lastSaveCompleted", 0); + DBWriteContactSettingByte(NULL, MODNAME, "lastSaveCompleted", 0); - if (!DBGetContactSettingByte(NULL, __INTERNAL_NAME, "lastempty", 1)||g_bIncompletedSave) isLastTRUE=TRUE; + if (!DBGetContactSettingByte(NULL, MODNAME, "lastempty", 1)||g_bIncompletedSave) isLastTRUE=TRUE; - startup=DBGetContactSettingByte(NULL, __INTERNAL_NAME, "StartupMode", 3); + startup=DBGetContactSettingByte(NULL, MODNAME, "StartupMode", 3); if (startup==1||(startup==3&&isLastTRUE==TRUE)) { @@ -958,7 +958,7 @@ static int PluginInit(WPARAM wparam,LPARAM lparam) Hotkey_Register(&hkd); // Icons - Icon_Register(hinstance, __INTERNAL_NAME, iconList, SIZEOF(iconList)); + Icon_Register(hinstance, MODNAME, iconList, SIZEOF(iconList)); // Main menu CLISTMENUITEM cl = { sizeof(cl) }; diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp index e2a2ac8f05..24834c7047 100644 --- a/plugins/Sessions/Src/Options.cpp +++ b/plugins/Sessions/Src/Options.cpp @@ -178,19 +178,19 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) hIcon=(bChecked=IsMarkedUserDefSession(opses_count))?hMarked:hNotMarked; - SetDlgItemInt(hdlg, IDC_TRACK,ses_limit=DBGetContactSettingByte(0, __INTERNAL_NAME, "TrackCount", 10), FALSE); + SetDlgItemInt(hdlg, IDC_TRACK,ses_limit=DBGetContactSettingByte(0, MODNAME, "TrackCount", 10), FALSE); SendDlgItemMessage(hdlg, IDC_SPIN1, UDM_SETRANGE, 0, MAKELONG(10, 1)); SendDlgItemMessage(hdlg, IDC_SPIN1, UDM_SETPOS, 0, GetDlgItemInt(hdlg, IDC_TRACK, NULL, FALSE)); SendDlgItemMessage(hdlg, IDC_OPCLIST, LB_RESETCONTENT, 0, 0); - SetDlgItemInt(hdlg, IDC_STARTDELAY, DBGetContactSettingWord(NULL, __INTERNAL_NAME, "StartupModeDelay", 1500), FALSE); - startupmode = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "StartupMode", 3); - exitmode = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "ShutdownMode", 2); + SetDlgItemInt(hdlg, IDC_STARTDELAY, DBGetContactSettingWord(NULL, MODNAME, "StartupModeDelay", 1500), FALSE); + startupmode = DBGetContactSettingByte(NULL, MODNAME, "StartupMode", 3); + exitmode = DBGetContactSettingByte(NULL, MODNAME, "ShutdownMode", 2); - g_bExclHidden = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "ExclHidden", 0); - g_bWarnOnHidden = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "WarnOnHidden", 0); - g_bOtherWarnings = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "OtherWarnings", 1); - g_bCrashRecovery = DBGetContactSettingByte(NULL, __INTERNAL_NAME, "CrashRecovery", 0); + g_bExclHidden = DBGetContactSettingByte(NULL, MODNAME, "ExclHidden", 0); + g_bWarnOnHidden = DBGetContactSettingByte(NULL, MODNAME, "WarnOnHidden", 0); + g_bOtherWarnings = DBGetContactSettingByte(NULL, MODNAME, "OtherWarnings", 1); + g_bCrashRecovery = DBGetContactSettingByte(NULL, MODNAME, "CrashRecovery", 0); CheckDlgButton(hdlg,IDC_EXCLHIDDEN,g_bExclHidden?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hdlg,IDC_LASTHIDDENWARN,g_bWarnOnHidden?BST_CHECKED:BST_UNCHECKED); @@ -262,26 +262,26 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) case PSN_APPLY: { int iDelay=GetDlgItemInt(hdlg, IDC_STARTDELAY,NULL, FALSE); - DBWriteContactSettingWord(0, __INTERNAL_NAME, "StartupModeDelay", (WORD)iDelay); + DBWriteContactSettingWord(0, MODNAME, "StartupModeDelay", (WORD)iDelay); - DBWriteContactSettingByte(0, __INTERNAL_NAME, "TrackCount", (BYTE)(ses_limit=GetDlgItemInt(hdlg, IDC_TRACK,NULL, FALSE))); - if(IsDlgButtonChecked(hdlg, IDC_REXSAVE)) DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "ShutdownMode", 2); - else if(IsDlgButtonChecked(hdlg, IDC_REXDSAVE)) DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "ShutdownMode", 0); - else if(IsDlgButtonChecked(hdlg, IDC_REXASK)) DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "ShutdownMode", 1); + DBWriteContactSettingByte(0, MODNAME, "TrackCount", (BYTE)(ses_limit=GetDlgItemInt(hdlg, IDC_TRACK,NULL, FALSE))); + if(IsDlgButtonChecked(hdlg, IDC_REXSAVE)) DBWriteContactSettingByte(NULL, MODNAME, "ShutdownMode", 2); + else if(IsDlgButtonChecked(hdlg, IDC_REXDSAVE)) DBWriteContactSettingByte(NULL, MODNAME, "ShutdownMode", 0); + else if(IsDlgButtonChecked(hdlg, IDC_REXASK)) DBWriteContactSettingByte(NULL, MODNAME, "ShutdownMode", 1); if(IsDlgButtonChecked(hdlg, IDC_STARTDIALOG)) { if (!IsDlgButtonChecked(hdlg, IDC_CHECKLAST)) - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "StartupMode", 1); - else DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "StartupMode", 3); + DBWriteContactSettingByte(NULL, MODNAME, "StartupMode", 1); + else DBWriteContactSettingByte(NULL, MODNAME, "StartupMode", 3); } - else if(IsDlgButtonChecked(hdlg, IDC_RLOADLAST)) DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "StartupMode", 2); - else if(IsDlgButtonChecked(hdlg, IDC_RNOTHING)) DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "StartupMode", 0); + else if(IsDlgButtonChecked(hdlg, IDC_RLOADLAST)) DBWriteContactSettingByte(NULL, MODNAME, "StartupMode", 2); + else if(IsDlgButtonChecked(hdlg, IDC_RNOTHING)) DBWriteContactSettingByte(NULL, MODNAME, "StartupMode", 0); - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "ExclHidden", (BYTE)(IsDlgButtonChecked(hdlg, IDC_EXCLHIDDEN) ? (g_bExclHidden = 1) : (g_bExclHidden = 0))); - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "WarnOnHidden", (BYTE)(IsDlgButtonChecked(hdlg, IDC_LASTHIDDENWARN) ? (g_bWarnOnHidden = 1) : (g_bWarnOnHidden = 0))); - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "OtherWarnings", (BYTE)(IsDlgButtonChecked(hdlg, IDC_WARNINGS) ? (g_bOtherWarnings = 1) : (g_bOtherWarnings = 0))); - DBWriteContactSettingByte(NULL, __INTERNAL_NAME, "CrashRecovery", (BYTE)(IsDlgButtonChecked(hdlg, IDC_CRASHRECOVERY) ? (g_bCrashRecovery = 1) : (g_bCrashRecovery = 0))); + DBWriteContactSettingByte(NULL, MODNAME, "ExclHidden", (BYTE)(IsDlgButtonChecked(hdlg, IDC_EXCLHIDDEN) ? (g_bExclHidden = 1) : (g_bExclHidden = 0))); + DBWriteContactSettingByte(NULL, MODNAME, "WarnOnHidden", (BYTE)(IsDlgButtonChecked(hdlg, IDC_LASTHIDDENWARN) ? (g_bWarnOnHidden = 1) : (g_bWarnOnHidden = 0))); + DBWriteContactSettingByte(NULL, MODNAME, "OtherWarnings", (BYTE)(IsDlgButtonChecked(hdlg, IDC_WARNINGS) ? (g_bOtherWarnings = 1) : (g_bOtherWarnings = 0))); + DBWriteContactSettingByte(NULL, MODNAME, "CrashRecovery", (BYTE)(IsDlgButtonChecked(hdlg, IDC_CRASHRECOVERY) ? (g_bCrashRecovery = 1) : (g_bCrashRecovery = 0))); return 1; } @@ -526,7 +526,7 @@ int OptionsInit(WPARAM wparam,LPARAM lparam) odp.position = 955000000; odp.hInstance = hinstance; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); - odp.pszTitle = __INTERNAL_NAME; + odp.pszTitle = MODNAME; odp.pfnDlgProc = OptionsProc; odp.pszGroup = LPGEN("Message Sessions"); odp.flags = ODPF_BOLDGROUPS; diff --git a/plugins/Sessions/Src/Sessions.h b/plugins/Sessions/Src/Sessions.h index f775892dea..7ad107b01d 100644 --- a/plugins/Sessions/Src/Sessions.h +++ b/plugins/Sessions/Src/Sessions.h @@ -21,31 +21,29 @@ along with this program. If not, see . #define _WIN32_WINNT 0x0501 -#define MIRANDA_VER 0x0A00 - #include #include -#include "newpluginapi.h" -#include "m_utils.h" -#include "m_system.h" -#include "m_options.h" -#include "m_clc.h" -#include "m_database.h" -#include "m_langpack.h" -#include "m_icolib.h" -#include "m_message.h" -#include "m_clist.h" -#include "m_hotkeys.h" -#include "win2k.h" - -#include "m_toptoolbar.h" -#include "m_sessions.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include "Utils.h" #include "Version.h" #include "Resource.h" +#define MODNAME "Sessions" + extern IconItem iconList[]; #define MIIM_STRING 0x00000040 @@ -73,14 +71,3 @@ extern BOOL g_bIncompletedSave; #define TIMERID_LOAD 12 #define TIMERID_SHOW 11 #define TIMERID_REBUILDAFTER 14 - -#define SESSIONS_NAME "sessions" - - -#define SESSIONS_VERSION_URL "http://miranda.radicaled.ru/public/updater/sessions.txt" - -#define SESSIONS_UPDATE_URL "http://miranda.radicaled.ru/public/sessions/"SESSIONS_NAME".zip" - -#define SESSIONS_UPDATE_URL "http://miranda.radicaled.ru/public/sessions/"SESSIONS_NAME".zip" - -#define SESSIONS_VERSION_PREFIX "Sessions " diff --git a/plugins/Sessions/Src/Utils.cpp b/plugins/Sessions/Src/Utils.cpp index dada08333d..fcd2898b77 100644 --- a/plugins/Sessions/Src/Utils.cpp +++ b/plugins/Sessions/Src/Utils.cpp @@ -29,7 +29,7 @@ void AddSessionMark(HANDLE hContact,int mode,char bit) if(mode==0) { DBVARIANT dbv; - if (!DBGetContactSettingString(hContact, __INTERNAL_NAME, "LastSessionsMarks", &dbv) && dbv.pszVal) + if (!DBGetContactSettingString(hContact, MODNAME, "LastSessionsMarks", &dbv) && dbv.pszVal) { temp_1[0]=dbv.pszVal[0]; for (i=0;i +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include \r\n" + "#include \r\n" "\0" END @@ -89,52 +89,6 @@ BEGIN CONTROL "Crash Recovery mode",IDC_CRASHRECOVERY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,173,162,122,17 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_OPTIONS, DIALOG - BEGIN - LEFTMARGIN, 3 - RIGHTMARGIN, 298 - VERTGUIDE, 9 - VERTGUIDE, 116 - VERTGUIDE, 119 - VERTGUIDE, 161 - VERTGUIDE, 170 - VERTGUIDE, 173 - VERTGUIDE, 285 - TOPMARGIN, 6 - BOTTOMMARGIN, 243 - HORZGUIDE, 96 - HORZGUIDE, 225 - END -END -#endif // APSTUDIO_INVOKED - -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Russian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -#ifdef _WIN32 -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -#pragma code_page(1251) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_WLCMDIALOG DIALOGEX 0, 0, 169, 80 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Restore Session" @@ -179,6 +133,23 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN + IDD_OPTIONS, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 298 + VERTGUIDE, 9 + VERTGUIDE, 116 + VERTGUIDE, 119 + VERTGUIDE, 161 + VERTGUIDE, 170 + VERTGUIDE, 173 + VERTGUIDE, 285 + TOPMARGIN, 6 + BOTTOMMARGIN, 243 + HORZGUIDE, 96 + HORZGUIDE, 225 + END + IDD_WLCMDIALOG, DIALOG BEGIN LEFTMARGIN, 7 @@ -219,7 +190,7 @@ IDD_SESSION_CHECKED ICON "checked.ico" IDD_SESSION_UNCHECKED ICON "unchecked.ico" -#endif // Russian resources +#endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Sessions/res/Version.rc b/plugins/Sessions/res/Version.rc index d741488c4f..5bfbab4754 100644 --- a/plugins/Sessions/res/Version.rc +++ b/plugins/Sessions/res/Version.rc @@ -7,10 +7,6 @@ #include "afxres.h" #include "..\src\version.h" -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#endif //_WIN32 - VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING PRODUCTVERSION __FILEVERSION_STRING -- cgit v1.2.3