From 95cc1e966d6f6fd6b0532f0de3d8970aba114408 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 15 Jun 2012 21:08:25 +0000 Subject: new icons for non-loadable plugins git-svn-id: http://svn.miranda-ng.org/main/trunk@440 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/miranda.cpp | 2 +- src/modules/plugins/pluginopts.cpp | 27 +++++++---- src/modules/skin/skinicons.cpp | 92 +++++++++++++++++++------------------ src/res/icon_loaded_gray.ico | Bin 0 -> 2550 bytes src/res/icon_notloaded_gray.ico | Bin 0 -> 2550 bytes src/resource.h | 4 +- src/resource.rc | 78 ++++++++++++++++--------------- 7 files changed, 110 insertions(+), 93 deletions(-) create mode 100644 src/res/icon_loaded_gray.ico create mode 100644 src/res/icon_notloaded_gray.ico (limited to 'src') diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp index 3a3ce614a3..fcb367dcbd 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.cpp @@ -88,7 +88,7 @@ static DWORD MsgWaitForMultipleObjectsExWorkaround(DWORD nCount, const HANDLE *p DWORD dwMsecs, DWORD dwWakeMask, DWORD dwFlags); HANDLE hOkToExitEvent, hModulesLoadedEvent; -static HANDLE hShutdownEvent, hPreShutdownEvent; +HANDLE hShutdownEvent, hPreShutdownEvent; static HANDLE hWaitObjects[MAXIMUM_WAIT_OBJECTS-1]; static char *pszWaitServices[MAXIMUM_WAIT_OBJECTS-1]; static int waitObjectCount = 0; diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp index dc1cfb9e24..b7f5842541 100644 --- a/src/modules/plugins/pluginopts.cpp +++ b/src/modules/plugins/pluginopts.cpp @@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "plugins.h" +extern HANDLE hShutdownEvent, hPreShutdownEvent; static HANDLE hevLoadModule, hevUnloadModule; ///////////////////////////////////////////////////////////////////////////////////////// @@ -58,6 +59,8 @@ static BOOL dialogListPlugins(WIN32_FIND_DATA* fd, TCHAR* path, WPARAM, LPARAM l return TRUE; int isdb = pi.pluginInfo->replacesDefaultModule == DEFMOD_DB; + int isclist = pi.pluginInfo->replacesDefaultModule == DEFMOD_CLISTALL; + PluginListItemData* dat = (PluginListItemData*)mir_alloc( sizeof( PluginListItemData )); dat->hInst = hInst; _tcsncpy(dat->fileName, fd->cFileName, SIZEOF(dat->fileName)); @@ -76,6 +79,8 @@ static BOOL dialogListPlugins(WIN32_FIND_DATA* fd, TCHAR* path, WPARAM, LPARAM l it.iItem = iRow; it.iSubItem = 1; it.iImage = ( hInst != NULL ) ? 2 : 3; + if (isdb || isclist) + it.iImage += 2; ListView_SetItem( hwndList, &it ); ListView_SetItemText(hwndList, iRow, 2, fd->cFileName); @@ -181,6 +186,9 @@ static int UnloadPluginDynamically(PluginListItemData* dat) CallHookSubscribers(hevUnloadModule, (WPARAM)pPlug->bpi.InfoEx, 0); + CallPluginEventHook(pPlug->bpi.hInst, hPreShutdownEvent, 0, 0); + CallPluginEventHook(pPlug->bpi.hInst, hShutdownEvent, 0, 0); + dat->hInst = NULL; Plugin_Uninit(pPlug, true); return TRUE; @@ -194,20 +202,21 @@ static LRESULT CALLBACK PluginListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LP ListView_SubItemHitTest(hwnd, &hi); if ( hi.iSubItem == 1 ) { LVITEM lvi; - lvi.mask = LVIF_PARAM; + lvi.mask = LVIF_IMAGE | LVIF_PARAM; + lvi.stateMask = -1; lvi.iItem = hi.iItem; if ( ListView_GetItem( hwnd, &lvi )) { lvi.iSubItem = 1; lvi.mask = LVIF_IMAGE; PluginListItemData* dat = ( PluginListItemData* )lvi.lParam; - if (dat->hInst == NULL) { + if (lvi.iImage == 3) { if ( LoadPluginDynamically(dat)) { lvi.iImage = 2; ListView_SetItem(hwnd, &lvi); } } - else { + else if (lvi.iImage == 2) { if ( UnloadPluginDynamically(dat)) { lvi.iImage = 3; ListView_SetItem(hwnd, &lvi); @@ -228,11 +237,13 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar SetWindowLongPtr(hwndList, GWLP_WNDPROC, (LONG_PTR)PluginListWndProc); HIMAGELIST hIml = ImageList_Create(16, 16, ILC_MASK | (IsWinVerXPPlus()? ILC_COLOR32 : ILC_COLOR16), 4, 0); - ImageList_AddIcon_IconLibLoaded( hIml, SKINICON_OTHER_UNICODE ); - ImageList_AddIcon_IconLibLoaded( hIml, SKINICON_OTHER_ANSI ); - ImageList_AddIcon_IconLibLoaded( hIml, SKINICON_OTHER_LOADED ); - ImageList_AddIcon_IconLibLoaded( hIml, SKINICON_OTHER_NOTLOADED ); - ListView_SetImageList( hwndList, hIml, LVSIL_SMALL ); + ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_UNICODE); + ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_ANSI); + ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_LOADED); + ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_NOTLOADED); + ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_LOADEDGRAY); + ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_NOTLOADEDGRAY); + ListView_SetImageList(hwndList, hIml, LVSIL_SMALL); LVCOLUMN col; col.mask = LVCF_TEXT | LVCF_WIDTH; diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index 31100a41bd..a291309d93 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -34,51 +34,53 @@ struct StandardIconDescription static const struct StandardIconDescription mainIcons[] = { - { SKINICON_OTHER_MIRANDA, LPGEN("Miranda IM"), -IDI_MIRANDA }, - { SKINICON_EVENT_MESSAGE, LPGEN("Message"), -IDI_RECVMSG }, - { SKINICON_EVENT_URL, LPGEN("URL"), -IDI_URL }, - { SKINICON_EVENT_FILE, LPGEN("File"), -IDI_FILE }, - { SKINICON_OTHER_USERONLINE, LPGEN("User Online"), -IDI_USERONLINE }, - { SKINICON_OTHER_GROUPOPEN, LPGEN("Group (Open)"), -IDI_GROUPOPEN }, - { SKINICON_OTHER_GROUPSHUT, LPGEN("Group (Closed)"), -IDI_GROUPSHUT }, - { SKINICON_OTHER_CONNECTING, LPGEN("Connecting"), -IDI_LOAD }, - { SKINICON_OTHER_ADDCONTACT, LPGEN("Add Contact"), -IDI_ADDCONTACT }, - { SKINICON_OTHER_USERDETAILS, LPGEN("User Details"), -IDI_USERDETAILS }, - { SKINICON_OTHER_HISTORY, LPGEN("History"), -IDI_HISTORY }, - { SKINICON_OTHER_DOWNARROW, LPGEN("Down Arrow"), -IDI_DOWNARROW }, - { SKINICON_OTHER_FINDUSER, LPGEN("Find User"), -IDI_FINDUSER }, - { SKINICON_OTHER_OPTIONS, LPGEN("Options"), -IDI_OPTIONS }, - { SKINICON_OTHER_SENDEMAIL, LPGEN("Send E-mail"), -IDI_SENDEMAIL }, - { SKINICON_OTHER_DELETE, LPGEN("Delete"), -IDI_DELETE }, - { SKINICON_OTHER_RENAME, LPGEN("Rename"), -IDI_RENAME }, - { SKINICON_OTHER_SMS, LPGEN("SMS"), -IDI_SMS }, - { SKINICON_OTHER_SEARCHALL, LPGEN("Search All"), -IDI_SEARCHALL }, - { SKINICON_OTHER_TICK, LPGEN("Tick"), -IDI_TICK }, - { SKINICON_OTHER_NOTICK, LPGEN("No Tick"), -IDI_NOTICK }, - { SKINICON_OTHER_HELP, LPGEN("Help"), -IDI_HELP }, - { SKINICON_OTHER_MIRANDAWEB, LPGEN("Miranda Website"), -IDI_MIRANDAWEBSITE }, - { SKINICON_OTHER_TYPING, LPGEN("Typing"), -IDI_TYPING }, - { SKINICON_OTHER_SMALLDOT, LPGEN("Small Dot"), -IDI_SMALLDOT }, - { SKINICON_OTHER_FILLEDBLOB, LPGEN("Filled Blob"), -IDI_FILLEDBLOB }, - { SKINICON_OTHER_EMPTYBLOB, LPGEN("Empty Blob"), -IDI_EMPTYBLOB }, - { SKINICON_OTHER_UNICODE, LPGEN("Unicode plugin"), -IDI_UNICODE }, - { SKINICON_OTHER_ANSI, LPGEN("ANSI plugin"), -IDI_ANSI }, - { SKINICON_OTHER_LOADED, LPGEN("Running plugin"), -IDI_LOADED }, - { SKINICON_OTHER_NOTLOADED, LPGEN("Unloaded plugin"), -IDI_NOTLOADED }, - { SKINICON_OTHER_UNDO, LPGEN("Undo"), -IDI_UNDO }, - { SKINICON_OTHER_WINDOW, LPGEN("Window"), -IDI_WINDOW }, - { SKINICON_OTHER_WINDOWS, LPGEN("System"), -IDI_WINDOWS }, - { SKINICON_OTHER_ACCMGR, LPGEN("Accounts"), -IDI_ACCMGR }, - { SKINICON_OTHER_SHOWHIDE, LPGEN("ShowHide"), -IDI_SHOWHIDE }, - { SKINICON_OTHER_EXIT, LPGEN("Exit"), -IDI_EXIT }, - { SKINICON_OTHER_MAINMENU, LPGEN("Main Menu"), -IDI_MIRANDA }, - { SKINICON_OTHER_STATUS, LPGEN("Status"), -IDI_ONLINE }, - { SKINICON_CHAT_JOIN, LPGEN("Join chat"), -IDI_JOINCHAT }, - { SKINICON_CHAT_LEAVE, LPGEN("Leave chat"), -IDI_LEAVECHAT }, - { SKINICON_OTHER_GROUP, LPGEN("Move to Group"), -IDI_MOVETOGROUP }, - { SKINICON_OTHER_ON, LPGEN("On"), -IDI_ON }, - { SKINICON_OTHER_OFF, LPGEN("Off"), -IDI_OFF }, - { SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, "Status Icons" }, + { SKINICON_OTHER_MIRANDA, LPGEN("Miranda IM"), -IDI_MIRANDA }, + { SKINICON_EVENT_MESSAGE, LPGEN("Message"), -IDI_RECVMSG }, + { SKINICON_EVENT_URL, LPGEN("URL"), -IDI_URL }, + { SKINICON_EVENT_FILE, LPGEN("File"), -IDI_FILE }, + { SKINICON_OTHER_USERONLINE, LPGEN("User Online"), -IDI_USERONLINE }, + { SKINICON_OTHER_GROUPOPEN, LPGEN("Group (Open)"), -IDI_GROUPOPEN }, + { SKINICON_OTHER_GROUPSHUT, LPGEN("Group (Closed)"), -IDI_GROUPSHUT }, + { SKINICON_OTHER_CONNECTING, LPGEN("Connecting"), -IDI_LOAD }, + { SKINICON_OTHER_ADDCONTACT, LPGEN("Add Contact"), -IDI_ADDCONTACT }, + { SKINICON_OTHER_USERDETAILS, LPGEN("User Details"), -IDI_USERDETAILS }, + { SKINICON_OTHER_HISTORY, LPGEN("History"), -IDI_HISTORY }, + { SKINICON_OTHER_DOWNARROW, LPGEN("Down Arrow"), -IDI_DOWNARROW }, + { SKINICON_OTHER_FINDUSER, LPGEN("Find User"), -IDI_FINDUSER }, + { SKINICON_OTHER_OPTIONS, LPGEN("Options"), -IDI_OPTIONS }, + { SKINICON_OTHER_SENDEMAIL, LPGEN("Send E-mail"), -IDI_SENDEMAIL }, + { SKINICON_OTHER_DELETE, LPGEN("Delete"), -IDI_DELETE }, + { SKINICON_OTHER_RENAME, LPGEN("Rename"), -IDI_RENAME }, + { SKINICON_OTHER_SMS, LPGEN("SMS"), -IDI_SMS }, + { SKINICON_OTHER_SEARCHALL, LPGEN("Search All"), -IDI_SEARCHALL }, + { SKINICON_OTHER_TICK, LPGEN("Tick"), -IDI_TICK }, + { SKINICON_OTHER_NOTICK, LPGEN("No Tick"), -IDI_NOTICK }, + { SKINICON_OTHER_HELP, LPGEN("Help"), -IDI_HELP }, + { SKINICON_OTHER_MIRANDAWEB, LPGEN("Miranda Website"), -IDI_MIRANDAWEBSITE }, + { SKINICON_OTHER_TYPING, LPGEN("Typing"), -IDI_TYPING }, + { SKINICON_OTHER_SMALLDOT, LPGEN("Small Dot"), -IDI_SMALLDOT }, + { SKINICON_OTHER_FILLEDBLOB, LPGEN("Filled Blob"), -IDI_FILLEDBLOB }, + { SKINICON_OTHER_EMPTYBLOB, LPGEN("Empty Blob"), -IDI_EMPTYBLOB }, + { SKINICON_OTHER_UNICODE, LPGEN("Unicode plugin"), -IDI_UNICODE }, + { SKINICON_OTHER_ANSI, LPGEN("ANSI plugin"), -IDI_ANSI }, + { SKINICON_OTHER_LOADED, LPGEN("Running plugin"), -IDI_LOADED }, + { SKINICON_OTHER_NOTLOADED, LPGEN("Unloaded plugin"), -IDI_NOTLOADED }, + { SKINICON_OTHER_UNDO, LPGEN("Undo"), -IDI_UNDO }, + { SKINICON_OTHER_WINDOW, LPGEN("Window"), -IDI_WINDOW }, + { SKINICON_OTHER_WINDOWS, LPGEN("System"), -IDI_WINDOWS }, + { SKINICON_OTHER_ACCMGR, LPGEN("Accounts"), -IDI_ACCMGR }, + { SKINICON_OTHER_SHOWHIDE, LPGEN("ShowHide"), -IDI_SHOWHIDE }, + { SKINICON_OTHER_EXIT, LPGEN("Exit"), -IDI_EXIT }, + { SKINICON_OTHER_MAINMENU, LPGEN("Main Menu"), -IDI_MIRANDA }, + { SKINICON_OTHER_STATUS, LPGEN("Status"), -IDI_ONLINE }, + { SKINICON_CHAT_JOIN, LPGEN("Join chat"), -IDI_JOINCHAT }, + { SKINICON_CHAT_LEAVE, LPGEN("Leave chat"), -IDI_LEAVECHAT }, + { SKINICON_OTHER_GROUP, LPGEN("Move to Group"), -IDI_MOVETOGROUP }, + { SKINICON_OTHER_ON, LPGEN("On"), -IDI_ON }, + { SKINICON_OTHER_OFF, LPGEN("Off"), -IDI_OFF }, + { SKINICON_OTHER_LOADEDGRAY, LPGEN("Running core plugin"), -IDI_LOADED_GRAY }, + { SKINICON_OTHER_NOTLOADEDGRAY, LPGEN("Non-loadable plugin"), -IDI_NOTLOADED_GRAY }, + { SKINICON_OTHER_STATUS_LOCKED, LPGEN("Locked status"), -IDI_STATUS_LOCKED, 0, "Status Icons" }, }; HANDLE hMainIcons[SIZEOF(mainIcons)]; diff --git a/src/res/icon_loaded_gray.ico b/src/res/icon_loaded_gray.ico new file mode 100644 index 0000000000..15d7b1ab06 Binary files /dev/null and b/src/res/icon_loaded_gray.ico differ diff --git a/src/res/icon_notloaded_gray.ico b/src/res/icon_notloaded_gray.ico new file mode 100644 index 0000000000..c638d114cd Binary files /dev/null and b/src/res/icon_notloaded_gray.ico differ diff --git a/src/resource.h b/src/resource.h index 412428440c..b431120306 100644 --- a/src/resource.h +++ b/src/resource.h @@ -18,6 +18,8 @@ #define IDD_OPT_ICOLIB 110 #define IDD_ICOLIB_IMPORT 111 #define IDD_MODERNOPT_FONTS 112 +#define IDI_LOADED_GRAY 113 +#define IDI_NOTLOADED_GRAY 114 #define IDD_ADDED 115 #define IDD_URLSEND 119 #define IDD_URLRECV 120 @@ -517,7 +519,7 @@ #define POPUP_DELETEGROUP 40053 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 323 diff --git a/src/resource.rc b/src/resource.rc index 83b8f3bdc8..c7b75c7e25 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -113,7 +113,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "&Yes", IDYES, 58, 38, 65, 14 DEFPUSHBUTTON "&No", IDNO, 172, 38, 65, 14 - CONTROL "Hide from list only, in order to keep their history and ignore/visibility settings", IDC_HIDE, + CONTROL "Hide from list only, in order to keep their history and ignore/visibility settings", IDC_HIDE, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP, 7, 65, 270, 9 LTEXT "Use Options->Ignore (expert mode) to unhide contacts.", IDC_STATIC, 20, 78, 257, 8 CONTROL "Are you sure you want to delete %s?", IDC_TOPLINE, "Static", SS_SIMPLE | SS_NOPREFIX | WS_GROUP, 7, 7, 270, 8 @@ -175,7 +175,7 @@ BEGIN PUSHBUTTON "Add to list", IDC_ADD, 354, 225, 68, 14, WS_DISABLED CONTROL "", IDC_STATUSBAR, "msctls_statusbar32", WS_TABSTOP | 0x100, 0, 244, 427, 10 CONTROL "Custom", IDC_BYCUSTOM, "Button", BS_AUTORADIOBUTTON, 11, 190, 89, 10 - CONTROL "Find/Add Contacts\nHere you can add contacts to your contact list", IDC_HEADERBAR, + CONTROL "Find/Add Contacts\nHere you can add contacts to your contact list", IDC_HEADERBAR, "MHeaderbarCtrl", 0x0, 0, 0, 427, 25 END @@ -186,7 +186,7 @@ CAPTION "Options" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_KEYWORD_FILTER, 336, 6, 88, 79, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "Options\nConfigure your Miranda Instant Messenger options", IDC_HEADERBAR, + CONTROL "Options\nConfigure your Miranda Instant Messenger options", IDC_HEADERBAR, "MHeaderbarCtrl", 0x0, 0, 0, 428, 25 DEFPUSHBUTTON "OK", IDOK, 265, 283, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 319, 283, 50, 14 @@ -204,7 +204,7 @@ CAPTION "Options" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_KEYWORD_FILTER, 336, 37, 88, 79, CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - CONTROL "Options\nConfigure your Miranda Instant Messenger options", IDC_HEADERBAR, + CONTROL "Options\nConfigure your Miranda Instant Messenger options", IDC_HEADERBAR, "MHeaderbarCtrl", 0x0, 0, 0, 325, 25 DEFPUSHBUTTON "OK", IDOK, 158, 283, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 212, 283, 50, 14 @@ -242,7 +242,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "%s: User Details" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "%s\nView personal user details and more", IDC_HEADERBAR, + CONTROL "%s\nView personal user details and more", IDC_HEADERBAR, "MHeaderbarCtrl", 0x0, 0, 0, 318, 25 CONTROL "", IDC_PAGETREE, "SysTreeView32", TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_NOTOOLTIPS | TVS_TRACKSELECT | TVS_FULLROWSELECT | TVS_NONEVENHEIGHT | WS_HSCROLL | WS_TABSTOP, 3, 30, 76, 176, WS_EX_STATICEDGE CONTROL "Tab1", IDC_TABS, "SysTabControl32", TCS_HOTTRACK | TCS_MULTILINE | WS_TABSTOP, 85, 29, 228, 158 @@ -421,7 +421,7 @@ BEGIN CONTROL "", IDC_NEWVALUE, "Static", SS_SIMPLE | SS_NOPREFIX | WS_GROUP, 12, 51, 170, 8 LTEXT "", IDC_SECURITYINFO, 5, 60, 177, 8 LTEXT "Do you want to allow this change?", IDC_STATIC, 5, 71, 177, 8 - CONTROL "&Allow all further changes to this section", IDC_WARNNOMORE, + CONTROL "&Allow all further changes to this section", IDC_WARNNOMORE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 80, 169, 10 DEFPUSHBUTTON "&Yes", IDYES, 5, 94, 50, 14 PUSHBUTTON "&No", IDNO, 59, 94, 50, 14 @@ -454,7 +454,7 @@ BEGIN CONTROL "Tree1", IDC_FILTER, "SysTreeView32", TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP, 14, 13, 160, 81 CONTROL "Received bytes", IDC_DUMPRECV, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 181, 13, 122, 10 CONTROL "Sent bytes", IDC_DUMPSENT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 181, 26, 122, 10 - CONTROL "Additional data due to proxy communication", IDC_DUMPPROXY, + CONTROL "Additional data due to proxy communication", IDC_DUMPPROXY, "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 181, 39, 122, 18 CONTROL "Text dumps where available", IDC_TEXTDUMPS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 181, 69, 122, 10 CONTROL "Auto-detect text", IDC_AUTODETECTTEXT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 181, 83, 122, 10 @@ -470,7 +470,7 @@ BEGIN EDITTEXT IDC_RUNATSTART, 14, 200, 203, 12, ES_AUTOHSCROLL PUSHBUTTON "...", IDC_RUNATSTARTBROWSE, 220, 200, 15, 12 PUSHBUTTON "Run now", IDC_RUNNOW, 241, 200, 60, 12 - CONTROL "Show this dialog box when Miranda IM starts", IDC_SHOWTHISDLGATSTART, + CONTROL "Show this dialog box when Miranda IM starts", IDC_SHOWTHISDLGATSTART, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 226, 294, 10 PUSHBUTTON "Save as default", IDC_SAVE, 6, 241, 79, 14 DEFPUSHBUTTON "Ok", IDOK, 173, 241, 54, 14 @@ -554,7 +554,7 @@ BEGIN CONTROL "", IDC_ALLFILESPROGRESS, "msctls_progress32", PBS_SMOOTH | NOT WS_VISIBLE | WS_DISABLED, 25, 16, 190, 12 CONTROL "", IDC_STATUS, "Static", SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP, 25, 17, 190, 10 ICON "", IDC_FILEICON, 25, 15, 16, 14, SS_CENTERIMAGE | SS_REALSIZEIMAGE - CONTROL "Transfer completed, open file(s).", IDC_TRANSFERCOMPLETED, + CONTROL "Transfer completed, open file(s).", IDC_TRANSFERCOMPLETED, "Hyperlink", NOT WS_VISIBLE | WS_TABSTOP, 42, 17, 173, 10 LTEXT "No data transferred", IDC_ALLTRANSFERRED, 25, 29, 226, 14, SS_NOPREFIX | SS_CENTERIMAGE RTEXT "", IDC_ALLSPEED, 25, 29, 226, 14, SS_NOPREFIX | SS_CENTERIMAGE @@ -736,11 +736,11 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Status Messages", IDC_STATIC, 4, 5, 255, 142 COMBOBOX IDC_STATUS, 12, 19, 240, 97, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Do not reply to requests for this message", IDC_DONTREPLY, + CONTROL "Do not reply to requests for this message", IDC_DONTREPLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 37, 227, 10 - CONTROL "Do not pop up dialog asking for new message", IDC_NODIALOG, + CONTROL "Do not pop up dialog asking for new message", IDC_NODIALOG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 24, 50, 227, 10 - CONTROL "By default, use the same message as last time", IDC_USEPREVIOUS, + CONTROL "By default, use the same message as last time", IDC_USEPREVIOUS, "Button", BS_AUTORADIOBUTTON, 23, 65, 227, 10 CONTROL "By default, use this message:", IDC_USESPECIFIC, "Button", BS_AUTORADIOBUTTON, 23, 78, 227, 10 EDITTEXT IDC_MSG, 33, 91, 219, 38, ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL @@ -783,7 +783,7 @@ BEGIN LTEXT "Port:", IDC_STATIC23, 177, 58, 35, 8, WS_DISABLED EDITTEXT IDC_PROXYPORT, 213, 56, 35, 12, ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED LTEXT "(often %d)", IDC_STOFTENPORT, 258, 57, 48, 8, WS_DISABLED - CONTROL "Use Custom Login (Domain login picked up automatically)", IDC_PROXYAUTH, + CONTROL "Use Custom Login (Domain login picked up automatically)", IDC_PROXYAUTH, "Button", BS_3STATE | WS_DISABLED | WS_TABSTOP, 20, 80, 286, 10 LTEXT "Username:", IDC_STATIC31, 32, 94, 47, 8, WS_DISABLED EDITTEXT IDC_PROXYUSER, 80, 92, 86, 12, ES_AUTOHSCROLL | WS_DISABLED @@ -812,25 +812,25 @@ BEGIN EDITTEXT IDC_FILEDIR, 92, 13, 190, 12, ES_AUTOHSCROLL PUSHBUTTON "...", IDC_FILEDIRBROWSE, 287, 14, 15, 11 LTEXT "Variables Allowed: %userid%, %nick%, %proto%, %miranda_path%, %userprofile%", IDC_STATIC, 8, 27, 294, 11, WS_DISABLED - CONTROL "Auto-accept incoming files from people on my contact list", IDC_AUTOACCEPT, + CONTROL "Auto-accept incoming files from people on my contact list", IDC_AUTOACCEPT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 39, 294, 10 CONTROL "Minimize the file transfer window", IDC_AUTOMIN, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 52, 285, 10 - CONTROL "Close window when transfer completes", IDC_AUTOCLOSE, + CONTROL "Close window when transfer completes", IDC_AUTOCLOSE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 65, 294, 10 - CONTROL "Clear completed transfers on window closing", IDC_AUTOCLEAR, + CONTROL "Clear completed transfers on window closing", IDC_AUTOCLEAR, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 76, 294, 10 GROUPBOX "Virus scanner", IDC_VIRUSSCANNERGROUP, 0, 90, 313, 93 LTEXT "Scan files:", IDC_STATIC, 8, 102, 43, 9, SS_CENTERIMAGE CONTROL "Never, do not use virus scanning", IDC_NOSCANNER, "Button", BS_AUTORADIOBUTTON, 52, 102, 250, 10 - CONTROL "When all files have been downloaded", IDC_SCANAFTERDL, + CONTROL "When all files have been downloaded", IDC_SCANAFTERDL, "Button", BS_AUTORADIOBUTTON, 52, 114, 250, 10 - CONTROL "As each file finishes downloading", IDC_SCANDURINGDL, + CONTROL "As each file finishes downloading", IDC_SCANDURINGDL, "Button", BS_AUTORADIOBUTTON, 52, 126, 250, 10 LTEXT "Command line:", IDC_ST_CMDLINE, 7, 142, 62, 8 COMBOBOX IDC_SCANCMDLINE, 70, 141, 213, 71, CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...", IDC_SCANCMDLINEBROWSE, 287, 142, 15, 11 LTEXT "%f will be replaced by the file or folder name to be scanned", IDC_ST_CMDLINEHELP, 70, 155, 232, 8 - CONTROL "Warn me before opening a file that has not been scanned", IDC_WARNBEFOREOPENING, + CONTROL "Warn me before opening a file that has not been scanned", IDC_WARNBEFOREOPENING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 168, 294, 10 GROUPBOX "If incoming files already exist", IDC_STATIC, 0, 187, 313, 41 CONTROL "Ask me", IDC_ASK, "Button", BS_AUTORADIOBUTTON, 8, 200, 73, 10 @@ -845,28 +845,28 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_BORDER EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Become idle if the following is left unattended:", IDC_IDLESHORT, + CONTROL "Become idle if the following is left unattended:", IDC_IDLESHORT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 18, 259, 9 CONTROL "Windows", IDC_IDLEONWINDOWS, "Button", BS_AUTORADIOBUTTON, 45, 31, 104, 9 CONTROL "Miranda", IDC_IDLEONMIRANDA, "Button", BS_AUTORADIOBUTTON, 45, 43, 103, 9 EDITTEXT IDC_IDLE1STTIME, 59, 59, 27, 14, ES_AUTOHSCROLL | ES_NUMBER CONTROL "Spin2", IDC_IDLESPIN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK, 71, 55, 12, 23 - CONTROL "Become idle if the screen saver is active", IDC_SCREENSAVER, + CONTROL "Become idle if the screen saver is active", IDC_SCREENSAVER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 83, 265, 9 - CONTROL "Become idle if the computer is locked (2000/XP+ only)", IDC_LOCKED, + CONTROL "Become idle if the computer is locked (2000/XP+ only)", IDC_LOCKED, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 105, 265, 9 - CONTROL "Become idle if a terminal session is disconnected", IDC_IDLETERMINAL, + CONTROL "Become idle if a terminal session is disconnected", IDC_IDLETERMINAL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 116, 265, 10 - CONTROL "Do not let protocols report any idle information", IDC_IDLEPRIVATE, + CONTROL "Do not let protocols report any idle information", IDC_IDLEPRIVATE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 131, 251, 9 LTEXT "minute(s)", IDC_STATIC, 91, 61, 76, 9 RTEXT "for", IDC_STATIC, 12, 59, 41, 9 COMBOBOX IDC_AASTATUS, 161, 146, 64, 50, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Change my status mode to:", IDC_AASHORTIDLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 147, 132, 11 - CONTROL "Do not set status back to online when returning from idle", IDC_IDLESTATUSLOCK, + CONTROL "Do not set status back to online when returning from idle", IDC_IDLESTATUSLOCK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 35, 164, 254, 10 GROUPBOX "Idle Options", IDC_STATIC, 3, 3, 304, 182 - CONTROL "Become idle if application full screen", IDC_FULLSCREEN, + CONTROL "Become idle if application full screen", IDC_FULLSCREEN, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 25, 94, 265, 9 END @@ -1050,7 +1050,7 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Update Notification Options", IDC_STATIC, 2, 0, 265, 94 - CONTROL "Automatically check for new versions of Miranda IM", IDC_ENABLEUPDATES, + CONTROL "Automatically check for new versions of Miranda IM", IDC_ENABLEUPDATES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 11, 13, 237, 10 LTEXT "Check for updates for the following:", IDC_STATIC, 12, 32, 230, 8 CONTROL "Stable releases", IDC_ENABLESTABLE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 25, 46, 230, 10 @@ -1092,7 +1092,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI CAPTION "Accounts" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Accounts\nConfigure your IM accounts", IDC_HEADERBAR, + CONTROL "Accounts\nConfigure your IM accounts", IDC_HEADERBAR, "MHeaderbarCtrl", 0x0, 0, 0, 350, 25 LISTBOX IDC_ACCLIST, 7, 32, 130, 187, LBS_SORT | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "Account information:", IDC_TXT_ACCOUNT, 142, 32, 201, 8 @@ -1142,7 +1142,7 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Enable keyword search in options dialog", IDC_ENABLE_KEYWORDFILTERING, + CONTROL "Enable keyword search in options dialog", IDC_ENABLE_KEYWORDFILTERING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 4, 243, 10 LTEXT "If this option is checked it allows you to search for option pages that contain the search string or plugin name.", IDC_STATIC, 4, 20, 243, 49, NOT WS_GROUP END @@ -1226,11 +1226,11 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_STATUS, 2, 54, 16, 97, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - CONTROL "Do not reply to requests for this message", IDC_DONTREPLY, + CONTROL "Do not reply to requests for this message", IDC_DONTREPLY, "Button", BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP, 0, 33, 10, 10 - CONTROL "Do not pop up dialog asking for new message", IDC_NODIALOG, + CONTROL "Do not pop up dialog asking for new message", IDC_NODIALOG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 105, 93, 264, 10 - CONTROL "By default, use the same message as last time", IDC_USEPREVIOUS, + CONTROL "By default, use the same message as last time", IDC_USEPREVIOUS, "Button", BS_AUTORADIOBUTTON, 105, 13, 227, 10 CONTROL "By default, use this message:", IDC_USESPECIFIC, "Button", BS_AUTORADIOBUTTON, 105, 26, 227, 10 EDITTEXT IDC_MSG, 125, 39, 244, 38, ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL @@ -1244,24 +1244,24 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CONTROL "Become idle if computer is left unattended for:", IDC_IDLESHORT, + CONTROL "Become idle if computer is left unattended for:", IDC_IDLESHORT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 13, 171, 9 CONTROL "Windows", IDC_IDLEONWINDOWS, "Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE, 325, 25, 26, 9 CONTROL "Miranda", IDC_IDLEONMIRANDA, "Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE, 287, 37, 15, 9 EDITTEXT IDC_IDLE1STTIME, 181, 11, 27, 12, ES_AUTOHSCROLL | ES_NUMBER CONTROL "", IDC_IDLESPIN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK, 193, 7, 11, 23 - CONTROL "Become idle if the screen saver is active", IDC_SCREENSAVER, + CONTROL "Become idle if the screen saver is active", IDC_SCREENSAVER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 25, 268, 9 - CONTROL "Become idle if the computer is locked (2000/XP+ only)", IDC_LOCKED, + CONTROL "Become idle if the computer is locked (2000/XP+ only)", IDC_LOCKED, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 37, 249, 9 - CONTROL "Become idle if a terminal session is disconnected", IDC_IDLETERMINAL, + CONTROL "Become idle if a terminal session is disconnected", IDC_IDLETERMINAL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 49, 265, 10 - CONTROL "Do not let protocols report any idle information", IDC_IDLEPRIVATE, + CONTROL "Do not let protocols report any idle information", IDC_IDLEPRIVATE, "Button", BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP, 303, 13, 22, 9 LTEXT "minute(s)", IDC_STATIC, 213, 13, 76, 9, SS_CENTERIMAGE COMBOBOX IDC_AASTATUS, 325, 46, 23, 50, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP CONTROL "Change my status mode to:", IDC_AASHORTIDLE, "Button", BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP, 334, 11, 23, 11 - CONTROL "Do not set status back to online when returning from idle", IDC_IDLESTATUSLOCK, + CONTROL "Do not set status back to online when returning from idle", IDC_IDLESTATUSLOCK, "Button", BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP, 299, 24, 16, 10 LTEXT "Idle (auto-away):", IDC_TXT_TITLE1, 0, 0, 246, 8 END @@ -1914,7 +1914,9 @@ IDI_TICK ICON "res/check_on.ico" IDI_UNICODE ICON "res/icon_unicode.ico" IDI_ANSI ICON "res/icon_ansi.ico" IDI_LOADED ICON "res/icon_loaded.ico" +IDI_LOADED_GRAY ICON "res/icon_loaded_gray.ico" IDI_NOTLOADED ICON "res/icon_notloaded.ico" +IDI_NOTLOADED_GRAY ICON "res/icon_notloaded_gray.ico" IDI_BLANK ICON "res/_blank.ico" IDI_UNDO ICON "res/icon_undo.ico" IDI_WINDOW ICON "res/icon_window.ico" -- cgit v1.2.3