diff --git a/win32/FireflyShell/AboutPage.cpp b/win32/FireflyShell/AboutPage.cpp index b2aa89c9..df32acc7 100644 --- a/win32/FireflyShell/AboutPage.cpp +++ b/win32/FireflyShell/AboutPage.cpp @@ -132,4 +132,15 @@ LRESULT CAboutPage::OnCopy(WORD, WORD, HWND, BOOL &) CloseClipboard(); } return 0; +} + +LRESULT CAboutPage::OnCtlColorStatic(HDC hdc, HWND hwnd) +{ + if (GetDlgItem(IDC_LOGO) == hwnd) + { + HBRUSH brush = (HBRUSH)::GetStockObject(WHITE_BRUSH); + return (LRESULT)brush; + } + else + return 0; } \ No newline at end of file diff --git a/win32/FireflyShell/AboutPage.h b/win32/FireflyShell/AboutPage.h index 6938ee2f..85c78960 100644 --- a/win32/FireflyShell/AboutPage.h +++ b/win32/FireflyShell/AboutPage.h @@ -52,6 +52,7 @@ private: MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) COMMAND_ID_HANDLER(IDC_WEBSITE, OnWebsite) COMMAND_ID_HANDLER(IDC_COPY, OnCopy) + MSG_WM_CTLCOLORSTATIC(OnCtlColorStatic) CHAIN_MSG_MAP(base) END_MSG_MAP() @@ -62,6 +63,7 @@ private: LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnWebsite(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/); LRESULT OnCopy(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/); + LRESULT OnCtlColorStatic(HDC, HWND); void FillVersionList(); void AddEntry(const TCHAR *path, const TCHAR *fallback_description); diff --git a/win32/FireflyShell/FireflyShell.rc b/win32/FireflyShell/FireflyShell.rc index c8a692d8..50e91a51 100644 --- a/win32/FireflyShell/FireflyShell.rc +++ b/win32/FireflyShell/FireflyShell.rc @@ -63,18 +63,17 @@ IDI_SHELL_STOPPED ICON "res\\shellstopped.ico" // Dialog // -IDD_PAGE_ABOUT DIALOGEX 0, 0, 300, 223 +IDD_PAGE_ABOUT DIALOGEX 0, 0, 300, 228 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,139,18,21,20 - CTEXT "Firefly Media Server",IDC_STATIC,7,41,287,11 - LTEXT "For help, tips and troubleshooting advice visit the Firefly Media Server website.",IDC_STATIC,12,79,197,23 - PUSHBUTTON "Visit &Website...",IDC_WEBSITE,218,82,70,14 - GROUPBOX "Version information",IDC_STATIC,6,114,288,102 - CONTROL "",IDC_VERSIONLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,126,276,63 - PUSHBUTTON "&Copy to Clipboard",IDC_COPY,218,194,70,14 + LTEXT "For help, tips and troubleshooting advice visit the Firefly Media Server website.",IDC_STATIC,12,92,197,23 + PUSHBUTTON "Visit &Website...",IDC_WEBSITE,218,95,70,14 + GROUPBOX "Version information",IDC_STATIC,6,125,288,96 + CONTROL "",IDC_VERSIONLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,137,276,63 + PUSHBUTTON "&Copy to Clipboard",IDC_COPY,218,203,70,14 + CONTROL 208,IDC_LOGO,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN | WS_BORDER,6,7,288,73 END IDD_PAGE_BASIC DIALOGEX 0, 0, 300, 230 @@ -142,7 +141,7 @@ BEGIN VERTGUIDE, 218 VERTGUIDE, 288 TOPMARGIN, 7 - BOTTOMMARGIN, 216 + BOTTOMMARGIN, 221 END IDD_PAGE_BASIC, DIALOG @@ -338,6 +337,25 @@ END ///////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// +// English (U.K.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_LOGO BITMAP "res\\logo.bmp" +#endif // English (U.K.) resources +///////////////////////////////////////////////////////////////////////////// + + #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/win32/FireflyShell/res/logo.bmp b/win32/FireflyShell/res/logo.bmp new file mode 100644 index 00000000..876b4338 Binary files /dev/null and b/win32/FireflyShell/res/logo.bmp differ diff --git a/win32/FireflyShell/resource.h b/win32/FireflyShell/resource.h index 4cc29734..f72f4296 100644 --- a/win32/FireflyShell/resource.h +++ b/win32/FireflyShell/resource.h @@ -26,6 +26,7 @@ #define IDD_PAGE_LOG 203 #define IDD_PAGE_ABOUT 204 #define IDI_SHELL_STOPPED 207 +#define IDB_LOGO 208 #define IDC_SERVERNAME 1000 #define IDC_PATH 1001 #define IDC_BROWSE 1002 @@ -48,15 +49,16 @@ #define IDC_VERSIONLIST 1015 #define IDC_COPY 1016 #define IDC_REFRESH 1018 +#define IDC_LOGO 1019 #define ID_SHELLNOTIFY 4242 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 208 +#define _APS_NEXT_RESOURCE_VALUE 209 #define _APS_NEXT_COMMAND_VALUE 32773 -#define _APS_NEXT_CONTROL_VALUE 1019 +#define _APS_NEXT_CONTROL_VALUE 1020 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif