From 1fe21b7686d727d9037b748a408ee08fc48d4137 Mon Sep 17 00:00:00 2001
From: Mike Crowe <quboid42 at users.sourceforge.net>
Date: Tue, 30 May 2006 19:47:01 +0000
Subject: [PATCH] Use the firely logo on the about page.

---
 win32/FireflyShell/AboutPage.cpp   |  11 +++++++++
 win32/FireflyShell/AboutPage.h     |   2 ++
 win32/FireflyShell/FireflyShell.rc |  36 +++++++++++++++++++++--------
 win32/FireflyShell/res/logo.bmp    | Bin 0 -> 38678 bytes
 win32/FireflyShell/resource.h      |   6 +++--
 5 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 win32/FireflyShell/res/logo.bmp

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 0000000000000000000000000000000000000000..876b4338039655db73db0449bec298da61da9bbd
GIT binary patch
literal 38678
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

literal 0
HcmV?d00001

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