From 30ab6ceb71842f003f649b3d62b89af010cf40d1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Jun 2012 17:00:14 +0000 Subject: - direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call; - obsolete structure SKINSOUNDDESC removed - dynamically translated hot keys; - checked correct LPGEN'ing of the sounds creation; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/bitmap_funcs.cpp | 2 +- plugins/Popup/src/main.cpp | 2 +- plugins/Popup/src/notifications.cpp | 2 +- plugins/Popup/src/opt_adv.cpp | 2 +- plugins/Popup/src/opt_gen.cpp | 4 ++-- plugins/Popup/src/opt_skins.cpp | 2 +- plugins/Popup/src/popup_wnd2.cpp | 4 ++-- plugins/Popup/src/skin.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/Popup/src') diff --git a/plugins/Popup/src/bitmap_funcs.cpp b/plugins/Popup/src/bitmap_funcs.cpp index 22f60786fb..80931ee40d 100644 --- a/plugins/Popup/src/bitmap_funcs.cpp +++ b/plugins/Popup/src/bitmap_funcs.cpp @@ -921,7 +921,7 @@ bool MyBitmap::loadFromFile_default(const char *fn, const char *fnAlpha) MyBitmap alpha; if (fnAlpha && alpha.loadFromFile(fnAlpha) && (alpha.getWidth() == width) && - (alpha.getHeight() == height) ) + (alpha.getHeight() == height)) { for (int i = 0; i < width*height; i++) bits[i] = (bits[i] & 0x00ffffff) | ( (alpha.bits[i] & 0x000000ff) << 24 ); diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index a239965695..0a9beb7382 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -390,7 +390,7 @@ static int ModulesLoaded(WPARAM wParam,LPARAM lParam) _T("You always can download them at\r\n") _T("http://addons.miranda-im.org/\r\n") _T("\r\n") - _T("Do you want to visit Miranda IM homepage now?\r\n") ); + _T("Do you want to visit Miranda IM homepage now?\r\n")); if (MessageBox(NULL, msg, _T("Popup Plus Error"), MB_YESNO|MB_ICONSTOP) == IDYES) ShellExecute(NULL, _T("open"), _T("http://addons.miranda-im.org/"), NULL, NULL, SW_SHOWNORMAL); return 0; diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp index c693405bdc..97be02af44 100644 --- a/plugins/Popup/src/notifications.cpp +++ b/plugins/Popup/src/notifications.cpp @@ -246,7 +246,7 @@ HANDLE FindTreeData(LPTSTR group, LPTSTR name, BYTE typ) for(int i = 0; i < gTreeData.getCount(); i++) { if ( gTreeData[i]->typ == typ && (!group || (_tcscmp(gTreeData[i]->pszTreeRoot, group) == 0)) && - (!name || (_tcscmp(gTreeData[i]->pszDescription, name) == 0)) ) + (!name || (_tcscmp(gTreeData[i]->pszDescription, name) == 0))) { return gTreeData[i]; } diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp index ff804b78f3..2bd5ab39b9 100644 --- a/plugins/Popup/src/opt_adv.cpp +++ b/plugins/Popup/src/opt_adv.cpp @@ -134,7 +134,7 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM SetWindowLongPtr(GetDlgItem(hwnd, IDC_AVT_SIZE_SLIDE), GWLP_WNDPROC, (LONG_PTR)AvatarTrackBarWndProc); SendDlgItemMessage(hwnd, IDC_AVT_SIZE_SLIDE, TBM_SETRANGE,FALSE, - MAKELONG(SETTING_AVTSIZE_MIN, SETTING_AVTSIZE_MAX) ); + MAKELONG(SETTING_AVTSIZE_MIN, SETTING_AVTSIZE_MAX)); SendDlgItemMessage(hwnd, IDC_AVT_SIZE_SLIDE, TBM_SETPOS, TRUE, max(PopUpOptions.avatarSize, SETTING_AVTSIZE_MIN)); SetDlgItemInt(hwnd, IDC_AVT_SIZE, PopUpOptions.avatarSize, FALSE); diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp index 37d6d97d0b..667ddc7c0f 100644 --- a/plugins/Popup/src/opt_gen.cpp +++ b/plugins/Popup/src/opt_gen.cpp @@ -163,14 +163,14 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM CheckDlgButton(hwnd, IDC_USEMINIMUMWIDTH, PopUpOptions.UseMinimumWidth); SendDlgItemMessage(hwnd, IDC_MINIMUMWIDTH_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG( SETTING_MAXIMUMWIDTH_MAX, - SETTING_MINIMUMWIDTH_MIN) ); + SETTING_MINIMUMWIDTH_MIN)); SetDlgItemInt(hwnd, IDC_MINIMUMWIDTH, PopUpOptions.MinimumWidth, FALSE); //Maximum Width PopUpOptions.UseMaximumWidth = PopUpOptions.DynamicResize ? PopUpOptions.UseMaximumWidth : TRUE; CheckDlgButton(hwnd, IDC_USEMAXIMUMWIDTH, PopUpOptions.UseMaximumWidth); SendDlgItemMessage(hwnd, IDC_MAXIMUMWIDTH_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG( SETTING_MAXIMUMWIDTH_MAX, - SETTING_MINIMUMWIDTH_MIN) ); + SETTING_MINIMUMWIDTH_MIN)); SetDlgItemInt(hwnd, IDC_MAXIMUMWIDTH, PopUpOptions.MaximumWidth, FALSE); //And finally let's enable/disable them. EnableWindow(GetDlgItem(hwnd, IDC_USEMINIMUMWIDTH), PopUpOptions.DynamicResize); diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp index 89a413e747..1dc18f43cc 100644 --- a/plugins/Popup/src/opt_skins.cpp +++ b/plugins/Popup/src/opt_skins.cpp @@ -478,7 +478,7 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR IDC_SKINLIST, LB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETCURSEL,(WPARAM)0,(LPARAM)0), - (LPARAM)0) ); + (LPARAM)0)); const PopupSkin *skin = 0; if (skin = skins.getSkin(PopUpOptions.SkinPack)) { mir_free(PopUpOptions.SkinPack); diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index 93fc5f428f..963e4e4a95 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -1750,7 +1750,7 @@ lbl_stack_fix_end: ; end of stack fix hack { do { - if ( !(ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) ) + if ( !(ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) { HMODULE hModule = GetModuleHandleA(ffd.cFileName); if (((char *)PluginWindowProc > (char *)hModule) && @@ -1760,7 +1760,7 @@ lbl_stack_fix_end: ; end of stack fix hack lstrcpynA(szBadModule, ffd.cFileName, sizeof(szBadModule)); } } - } while ( FindNextFileA(hFind, &ffd) ); + } while ( FindNextFileA(hFind, &ffd)); FindClose(hFind); } } diff --git a/plugins/Popup/src/skin.cpp b/plugins/Popup/src/skin.cpp index 6cd3f7df14..509d98c908 100644 --- a/plugins/Popup/src/skin.cpp +++ b/plugins/Popup/src/skin.cpp @@ -1408,7 +1408,7 @@ const PopupSkin *Skins::getSkin(LPCTSTR name) _T("for newer version of Popup Plus. And will not\r\n") _T("display properly.\r\n") _T("\r\n") - _T("Please choose another skin.") ), + _T("Please choose another skin.")), _T(MODULNAME_LONG), MB_ICONSTOP|MB_OK); return any->skin; -- cgit v1.2.3