diff --git a/WatchfulEye/res/watchful-eye.ico b/WatchfulEye/res/watchful-eye.ico new file mode 100644 index 0000000..1b7b147 Binary files /dev/null and b/WatchfulEye/res/watchful-eye.ico differ diff --git a/WatchfulEye/resource.rc b/WatchfulEye/resource.rc index 5a7b819..dcc131a 100644 --- a/WatchfulEye/resource.rc +++ b/WatchfulEye/resource.rc @@ -124,6 +124,16 @@ BEGIN END END + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICONMAIN ICON "res\\watchful-eye.ico" + #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/WatchfulEye/src/Application.cpp b/WatchfulEye/src/Application.cpp index 14716ac..f67320f 100644 --- a/WatchfulEye/src/Application.cpp +++ b/WatchfulEye/src/Application.cpp @@ -63,7 +63,6 @@ namespace watchfuleye { app = reinterpret_cast(lParam); SetWindowText(dlg, app->m_appName.c_str()); - SendMessage(dlg, WM_SETICON, ICON_BIG, reinterpret_cast(LoadIcon(NULL, MAKEINTRESOURCE(IDI_APPLICATION)))); // Spawn in the lower right corner of the virtual screen (might be problematic in some cases) int cornerX = GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN); @@ -75,11 +74,11 @@ namespace watchfuleye { // Set up UI LOGFONT lFont = {}; strcpy(lFont.lfFaceName, "Consolas"); - lFont.lfHeight = 45; + lFont.lfHeight = 35; HFONT upperFont = CreateFontIndirect(&lFont); SendMessage(GetDlgItem(dlg, IDC_STATICLOWER), WM_SETFONT, reinterpret_cast(upperFont), NULL); - lFont.lfHeight = 200; + lFont.lfHeight = 180; lFont.lfWeight = FW_BOLD; timeFont = CreateFontIndirect(&lFont); @@ -227,7 +226,7 @@ namespace watchfuleye { iconData.hWnd = m_mainDlg; iconData.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP; iconData.uCallbackMessage = WM_TRAYICON; - iconData.hIcon = LoadIcon(NULL, MAKEINTRESOURCE(IDI_APPLICATION)); + iconData.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICONMAIN)); strcpy(iconData.szTip, m_appName.c_str()); Shell_NotifyIcon(NIM_ADD, &iconData); } diff --git a/WatchfulEye/src/main.cpp b/WatchfulEye/src/main.cpp index 8fbd1da..a538c83 100644 --- a/WatchfulEye/src/main.cpp +++ b/WatchfulEye/src/main.cpp @@ -11,8 +11,10 @@ processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") #define APPNAME "Watchful Eye" -#define MAX_MINUTES 1 -#define DRIVE_TO_DETECT "E:" +// ======== Configuration ======== +#define MAX_MINUTES 15 +#define DRIVE_TO_DETECT "D:" +// =============================== int main(int argc, char* argv[]) { { diff --git a/WatchfulEye/src/resource.h b/WatchfulEye/src/resource.h index 1c5bc4b..aaaee1b 100644 --- a/WatchfulEye/src/resource.h +++ b/WatchfulEye/src/resource.h @@ -3,13 +3,14 @@ // Used by C:\Users\Grayson\Documents\Visual Studio 18\Solutions\watchful-eye\WatchfulEye\resource.rc // #define IDD_DIALOGMAIN 101 +#define IDI_ICONMAIN 103 #define IDC_STATICLOWER 1000 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 103 +#define _APS_NEXT_RESOURCE_VALUE 104 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101