From c97b20dc06e8d7c848e7ec20590243ffd5f011c4 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Thu, 15 Aug 2013 16:07:05 +0000 Subject: cosmetics git-svn-id: http://svn.miranda-ng.org/main/trunk@5704 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WhoUsesMyFiles/res/resource.rc | 81 +++++++++----------------- plugins/WhoUsesMyFiles/src/resource.h | 5 +- plugins/WhoUsesMyFiles/src/wumfplug.cpp | 12 ++-- plugins/WhoUsesMyFiles/wumf_10.vcxproj | 5 ++ plugins/WhoUsesMyFiles/wumf_10.vcxproj.filters | 11 ++++ 5 files changed, 53 insertions(+), 61 deletions(-) (limited to 'plugins/WhoUsesMyFiles') diff --git a/plugins/WhoUsesMyFiles/res/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc index 7a46fc8465..69da8a4e36 100644 --- a/plugins/WhoUsesMyFiles/res/resource.rc +++ b/plugins/WhoUsesMyFiles/res/resource.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "..\src\resource.h" @@ -13,13 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) -#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -27,20 +25,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // IDD_CONNLIST DIALOGEX 0, 0, 330, 230 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - WS_THICKFRAME +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_NOPARENTNOTIFY CAPTION "WUMF: Current connections" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,276,212,50,14 - CONTROL "List1",IDC_CONNLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SORTASCENDING | WS_TABSTOP,4,4,322, - 200,WS_EX_CLIENTEDGE + CONTROL "List1",IDC_CONNLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_TABSTOP,4,4,322,200,WS_EX_CLIENTEDGE END IDD_OPTIONS DIALOGEX 0, 0, 330, 246 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTEXTHELP | WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -48,50 +43,30 @@ BEGIN EDITTEXT IDC_DELAY_SEC,17,23,20,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Popup Delay (seconds)",IDC_TX_DELAY_SEC,39,25,94,8 CONTROL "",IDC_COLOR_BACK,"ColourPicker",WS_TABSTOP,187,24,39,12 - LTEXT "Background color",IDC_STATIC,231,26,76,8,SS_CENTERIMAGE | - NOT WS_GROUP + LTEXT "Background color",IDC_STATIC,231,26,76,8,SS_CENTERIMAGE | NOT WS_GROUP CONTROL "",IDC_COLOR_TEXT,"ColourPicker",WS_TABSTOP,187,39,39,12 - LTEXT "Text color",IDC_STATIC,231,42,76,8,SS_CENTERIMAGE | NOT - WS_GROUP + LTEXT "Text color",IDC_STATIC,231,42,76,8,SS_CENTERIMAGE | NOT WS_GROUP PUSHBUTTON "Previe&w",IDC_PREVIEW,270,231,50,15 - CONTROL "Show infinitely",IDC_DELAY_INF,"Button", - BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,50,61,10 - CONTROL "Default Popup delay",IDC_DELAY_DEF,"Button", - BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,61,81,10 - CONTROL "Choose delay time",IDC_DELAY_SET,"Button", - BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,39,73,10 + CONTROL "Show infinitely",IDC_DELAY_INF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,50,61,10 + CONTROL "Default Popup delay",IDC_DELAY_DEF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,61,81,10 + CONTROL "Choose delay time",IDC_DELAY_SET,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,39,73,10 GROUPBOX "Popup color settings",IDC_STATIC,167,9,153,93,WS_GROUP - CONTROL "Use windows colors",IDC_COLOR_WIN,"Button", - BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,63,79,10 - CONTROL "Use default Popup colors",IDC_COLOR_DEF,"Button", - BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,74,97,10 - CONTROL "Choose colors",IDC_COLOR_SET,"Button", - BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,52,61,10 - GROUPBOX "File access filter && logging settings",IDC_STATIC,9, - 106,311,101 - CTEXT "Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher", - IDC_DELAY_NOTE,14,73,143,26,SS_SUNKEN | WS_DISABLED | - NOT WS_GROUP + CONTROL "Use windows colors",IDC_COLOR_WIN,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,63,79,10 + CONTROL "Use default Popup colors",IDC_COLOR_DEF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,74,97,10 + CONTROL "Choose colors",IDC_COLOR_SET,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,52,61,10 + GROUPBOX "File access filter && logging settings",IDC_STATIC,9,106,311,101 EDITTEXT IDC_FILE,83,123,210,12,ES_AUTOHSCROLL,WS_EX_ACCEPTFILES PUSHBUTTON "...",IDC_SEL_FILE,299,123,14,12 - CONTROL "Log into text file",IDC_LOG_INTO_FILE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,14,123,64,12 - CONTROL "Log folders access",IDC_LOG_FOLDER,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,14,143,140,12 - CONTROL "Alerts on folders access",IDC_ALERT_FOLDER,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,165,143,147,12 - CONTROL "Log files and folders in UNC format",IDC_LOG_UNC,"Button", - BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,163,140,12 + CONTROL "Log into text file",IDC_LOG_INTO_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,123,64,12 + CONTROL "Log folders access",IDC_LOG_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,143,140,12 + CONTROL "Alerts on folders access",IDC_ALERT_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,143,147,12 + CONTROL "Log files and folders in UNC format",IDC_LOG_UNC,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,163,140,12 CONTROL "Alert files && folders in UNC format",IDC_ALERT_UNC, - "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,165, - 163,147Alerts ,12 - CONTROL "Log computer name with username",IDC_LOG_COMP,"Button", - BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,183,140,10 + "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,165,163,147,12 + CONTROL "Log computer name with username",IDC_LOG_COMP,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,183,140,10 CONTROL "Alert computer name with username",IDC_ALERT_COMP, - "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,165, - 183,147,10 - LTEXT "Disabled options will be available in the next version", - IDC_STATIC,83,194,199,9 + "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,165,183,147,10 + LTEXT "Disabled options will be available in the next version",IDC_STATIC,83,194,199,9 PUSHBUTTON "Show current connections",IDC_CONN,162,231,104,15 END @@ -102,7 +77,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_CONNLIST, DIALOG BEGIN @@ -153,10 +128,10 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_POPUP ICON "popup.ico" -IDI_NOPOPUP ICON "popup_no.ico" -IDI_DRIVE ICON "drive.ico" -#endif // English (U.S.) resources +IDI_POPUP ICON "popup.ico" +IDI_NOPOPUP ICON "popup_no.ico" +IDI_DRIVE ICON "drive.ico" +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/WhoUsesMyFiles/src/resource.h b/plugins/WhoUsesMyFiles/src/resource.h index 6e4cd69615..31191a9918 100644 --- a/plugins/WhoUsesMyFiles/src/resource.h +++ b/plugins/WhoUsesMyFiles/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by resource.rc +// Microsoft Visual C++ generated include file. +// Used by ..\res\resource.rc // #define IDD_OPTIONS 101 #define IDI_POPUP 102 @@ -20,7 +20,6 @@ #define IDC_DELAY_SET 1049 #define IDC_DELAY_INF 1050 #define IDC_DELAY_DEF 1051 -#define IDC_DELAY_NOTE 1052 #define IDC_TX_DELAY_SEC 1053 #define IDC_LOG_INTO_FILE 1054 #define IDC_LOG_FOLDER 1055 diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp index f11324e484..36801522fc 100644 --- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp +++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp @@ -27,7 +27,10 @@ void LoadOptions() dbv.type = DBVT_TCHAR; ZeroMemory(&WumfOptions, sizeof(WumfOptions)); if (db_get(NULL, MODULENAME, OPT_FILE, &dbv) == 0) + { _tcsncpy(WumfOptions.LogFile, dbv.ptszVal, 255); + db_free(&dbv); + } else WumfOptions.LogFile[0] = '\0'; @@ -44,7 +47,7 @@ void LoadOptions() WumfOptions.DelayInf = db_get_b(NULL, MODULENAME, DELAY_INF, FALSE); WumfOptions.DelaySet = db_get_b(NULL, MODULENAME, DELAY_SET, FALSE); WumfOptions.DelaySec = db_get_b(NULL, MODULENAME, DELAY_SEC, 0); - if (!ServiceExists(MS_POPUP_ADDPOPUP)) { + if (!ServiceExists(MS_POPUP_ADDPOPUPT)) { WumfOptions.DelayDef = TRUE; WumfOptions.DelaySet = FALSE; WumfOptions.DelayInf = FALSE; @@ -62,7 +65,7 @@ void ExecuteMenu(HWND hWnd) { HMENU hMenu = CreatePopupMenu(); if (!hMenu) { - msg(TranslateT("Error crerating menu")); + msg(TranslateT("Error creating menu")); return; } AppendMenu(hMenu, MF_STRING, IDM_ABOUT, _T("About\0")); @@ -208,7 +211,7 @@ void ThreadProc(LPVOID) hDlg = NULL; } -static INT_PTR WumfShowConnections(WPARAM wParam,LPARAM lParam) +static INT_PTR WumfShowConnections(WPARAM,LPARAM) { mir_forkthread(ThreadProc, NULL); CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hWumfBut, TTBST_RELEASED); @@ -252,7 +255,6 @@ void DisableDelayOptions(HWND hwndDlg) EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY_DEF), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY_SEC), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_TX_DELAY_SEC), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY_NOTE), TRUE); } void ChooseFile(HWND hDlg) @@ -302,7 +304,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara SendDlgItemMessage(hwndDlg,IDC_COLOR_BACK,CPM_SETCOLOUR,0,WumfOptions.ColorBack); SendDlgItemMessage(hwndDlg,IDC_COLOR_TEXT,CPM_SETCOLOUR,0,WumfOptions.ColorText); } - if ( !ServiceExists(MS_POPUP_ADDPOPUP)) { + if ( !ServiceExists(MS_POPUP_ADDPOPUPT)) { DisableDelayOptions(hwndDlg); break; } diff --git a/plugins/WhoUsesMyFiles/wumf_10.vcxproj b/plugins/WhoUsesMyFiles/wumf_10.vcxproj index 46412e9ffd..efc6cfc6b9 100644 --- a/plugins/WhoUsesMyFiles/wumf_10.vcxproj +++ b/plugins/WhoUsesMyFiles/wumf_10.vcxproj @@ -195,6 +195,11 @@ + + + + + diff --git a/plugins/WhoUsesMyFiles/wumf_10.vcxproj.filters b/plugins/WhoUsesMyFiles/wumf_10.vcxproj.filters index 18a9a28b71..1584893c5a 100644 --- a/plugins/WhoUsesMyFiles/wumf_10.vcxproj.filters +++ b/plugins/WhoUsesMyFiles/wumf_10.vcxproj.filters @@ -47,4 +47,15 @@ Source Files + + + Resource Files + + + Resource Files + + + Resource Files + + \ No newline at end of file -- cgit v1.2.3