From 055d4460e17344248c7364afc5d19deeda39d644 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 1 Jan 2014 12:32:05 +0000 Subject: copyright update for year 2014 git-svn-id: http://svn.miranda-ng.org/main/trunk@7438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ModernOpt/src/commonheaders.h | 5 +++-- plugins/ModernOpt/src/modernopt.cpp | 6 +++--- plugins/ModernOpt/src/modernopt.h | 7 ++++--- plugins/ModernOpt/src/mopt_home.cpp | 9 +++++---- plugins/ModernOpt/src/mopt_ignore.cpp | 7 ++++--- plugins/ModernOpt/src/mopt_selector.cpp | 21 +++++++++++---------- plugins/ModernOpt/src/stdafx.cpp | 2 +- 7 files changed, 31 insertions(+), 26 deletions(-) (limited to 'plugins/ModernOpt') diff --git a/plugins/ModernOpt/src/commonheaders.h b/plugins/ModernOpt/src/commonheaders.h index 2e01b9f39e..f86a02b766 100644 --- a/plugins/ModernOpt/src/commonheaders.h +++ b/plugins/ModernOpt/src/commonheaders.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp index 67cdccbfcd..d1382fb30b 100644 --- a/plugins/ModernOpt/src/modernopt.cpp +++ b/plugins/ModernOpt/src/modernopt.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-07 Miranda ICQ/IM project, Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -693,4 +694,3 @@ void UnloadModernOptsModule() hwndModernOpt = 0; } } - diff --git a/plugins/ModernOpt/src/modernopt.h b/plugins/ModernOpt/src/modernopt.h index 2d4f8f8791..d8df528c8f 100644 --- a/plugins/ModernOpt/src/modernopt.h +++ b/plugins/ModernOpt/src/modernopt.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-07 Miranda ICQ/IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/ModernOpt/src/mopt_home.cpp b/plugins/ModernOpt/src/mopt_home.cpp index df3c08d022..6b79726693 100644 --- a/plugins/ModernOpt/src/mopt_home.cpp +++ b/plugins/ModernOpt/src/mopt_home.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-07 Miranda ICQ/IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -43,7 +44,7 @@ INT_PTR CALLBACK ModernOptHome_DlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L MDescButton_SetTitle(hwndCtrl, TranslateTS(g_ModernOptPages[i].lpzTitle)); MDescButton_SetDescription(hwndCtrl, TranslateTS(g_ModernOptPages[i].lpzDescription)); DestroyIcon(hIcon); - } + } else ShowWindow(hwndCtrl, SW_HIDE); } } diff --git a/plugins/ModernOpt/src/mopt_ignore.cpp b/plugins/ModernOpt/src/mopt_ignore.cpp index 249ad5ae61..19d6df1a7b 100644 --- a/plugins/ModernOpt/src/mopt_ignore.cpp +++ b/plugins/ModernOpt/src/mopt_ignore.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-07 Miranda ICQ/IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp index 515e23f8f6..7ac405b294 100644 --- a/plugins/ModernOpt/src/mopt_selector.cpp +++ b/plugins/ModernOpt/src/mopt_selector.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-07 Miranda ICQ/IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -154,14 +155,14 @@ static void BuildSkinList(HWND hwndList, TCHAR *szExt, int nExtLength = -1, bool SetCurrentDirectory(ffd.cFileName); BuildSkinList(hwndList, szExt, nExtLength, false); SetCurrentDirectory(_T("..")); - } + } else { if (CheckExt(ffd.cFileName, szExt, nExtLength)) { TSkinListItem *dat = new TSkinListItem(ffd.cFileName); DWORD dwItem = SendMessage(hwndList, LB_ADDSTRING, 0, (LPARAM)ffd.cFileName); SendMessage(hwndList, LB_SETITEMDATA, dwItem, (LPARAM)dat); } } - } + } while (FindNextFile(h, &ffd)); FindClose(h); } @@ -294,7 +295,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara FillRect(lps->hDC, &lps->rcItem, GetSysColorBrush(COLOR_HIGHLIGHT)); clBack = GetSysColor(COLOR_HIGHLIGHT); clLine1 = GetSysColor(COLOR_HIGHLIGHTTEXT); - } + } else { FillRect(lps->hDC, &lps->rcItem, GetSysColorBrush(COLOR_WINDOW)); clBack = GetSysColor(COLOR_WINDOW); @@ -318,7 +319,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara DrawIconEx(lps->hDC, lps->rcItem.left, (lps->rcItem.top+lps->rcItem.bottom-cyIcon)/2, LoadSkinnedIcon(SKINICON_OTHER_EMPTYBLOB), cxIcon, cyIcon, 0, NULL, DI_NORMAL); - } + } else { DrawIconEx(lps->hDC, lps->rcItem.left, (lps->rcItem.top+lps->rcItem.bottom-cyIcon)/2, LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT), @@ -334,7 +335,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara SetTextColor(lps->hDC, clLine2); DrawText(lps->hDC, dat->path, -1, &lps->rcItem, DT_LEFT|DT_NOPREFIX|DT_SINGLELINE|DT_PATH_ELLIPSIS|DT_BOTTOM); - } + } else if (lps->CtlID == IDC_PREVIEW1) { int idx = SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETCURSEL, 0, 0); @@ -343,7 +344,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara TSkinListItem *dat = (TSkinListItem *)SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETITEMDATA, idx, 0); CreatePreview(sd, dat->filename, lps); //sttPreviewSkin(obj, dat->filename, lps); - } + } else CreatePreview(sd, NULL, lps); } @@ -351,7 +352,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara HDC hdc = CreateCompatibleDC(lps->hDC); SelectObject(hdc, sd->hbmpPreview); BitBlt(lps->hDC, - lps->rcItem.left, lps->rcItem.top, + lps->rcItem.left, lps->rcItem.top, lps->rcItem.right - lps->rcItem.left, lps->rcItem.bottom - lps->rcItem.top, hdc, 0, 0, SRCCOPY); DeleteDC(hdc); diff --git a/plugins/ModernOpt/src/stdafx.cpp b/plugins/ModernOpt/src/stdafx.cpp index e7e41dae3c..0edf9e36e6 100644 --- a/plugins/ModernOpt/src/stdafx.cpp +++ b/plugins/ModernOpt/src/stdafx.cpp @@ -1,5 +1,5 @@ /* -Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org) +Copyright (C) 2012-14 Miranda NG project (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License -- cgit v1.2.3