diff --git a/win32/FireflyShell/AboutPage.cpp b/win32/FireflyShell/AboutPage.cpp
index df32acc7..b38fc052 100644
--- a/win32/FireflyShell/AboutPage.cpp
+++ b/win32/FireflyShell/AboutPage.cpp
@@ -22,7 +22,14 @@
LRESULT CAboutPage::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
{
- // Do this before we try and use the controls.
+ m_firefly_link.SubclassWindow(GetDlgItem(IDC_FIREFLYLINK));
+ m_firefly_link.SetHyperLink(_T("http://www.fireflymediaserver.org"));
+
+ m_roku_link.SetHyperLink(_T("http://www.rokulabs.com"));
+ m_roku_link.SubclassWindow(GetDlgItem(IDC_ROKULINK));
+
+
+ // Do this before we try and use the controls.
DoDataExchange(false);
FillVersionList();
diff --git a/win32/FireflyShell/AboutPage.h b/win32/FireflyShell/AboutPage.h
index 85c78960..58cf7aa2 100644
--- a/win32/FireflyShell/AboutPage.h
+++ b/win32/FireflyShell/AboutPage.h
@@ -34,6 +34,9 @@ class CAboutPage :
};
int m_column_widths[SUBITEM_COUNT];
+
+ CHyperLink m_roku_link;
+ CHyperLink m_firefly_link;
// String version of information ready to write to the clipboard
CString m_versions;
diff --git a/win32/FireflyShell/FireflyShell.rc b/win32/FireflyShell/FireflyShell.rc
index 50e91a51..326506ef 100644
--- a/win32/FireflyShell/FireflyShell.rc
+++ b/win32/FireflyShell/FireflyShell.rc
@@ -68,16 +68,24 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- 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
+ LTEXT "For help, tips and troubleshooting advice visit the ",
+ IDC_STATIC,12,92,156,9,NOT WS_GROUP
+ GROUPBOX "Version information",IDC_STATIC,6,121,288,100
+ CONTROL "",IDC_VERSIONLIST,"SysListView32",LVS_REPORT |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,132,276,68
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
+ CONTROL 208,IDC_LOGO,"Static",SS_BITMAP | SS_CENTERIMAGE |
+ SS_SUNKEN | WS_BORDER,6,7,288,73
+ LTEXT "Firefly Media Server website",IDC_FIREFLYLINK,167,92,90,
+ 9,NOT WS_GROUP
+ LTEXT "For information on Firefly compatible music players, visit",
+ IDC_STATIC,12,106,172,9,NOT WS_GROUP
+ LTEXT "Roku's website",IDC_ROKULINK,186,106,52,9,NOT WS_GROUP
END
IDD_PAGE_BASIC DIALOGEX 0, 0, 300, 230
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Library"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
@@ -87,28 +95,34 @@ BEGIN
EDITTEXT IDC_PATH,66,57,222,14,ES_AUTOHSCROLL
PUSHBUTTON "&Browse...",IDC_BROWSE,238,76,50,14
GROUPBOX "Security",IDC_STATIC,7,113,287,103
- CONTROL "&Protect Firefly media library with a password",IDC_PROTECT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,135,154,10
+ CONTROL "&Protect Firefly media library with a password",
+ IDC_PROTECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,135,
+ 154,10
EDITTEXT IDC_PASSWORD,174,132,114,14,ES_PASSWORD | ES_AUTOHSCROLL
- LTEXT "Explanatory text about passwords go here. Why you'd want a password and what are the implications 'n' stuff.",IDC_STATIC,18,180,270,26,SS_NOPREFIX
+ LTEXT "Explanatory text about passwords go here. Why you'd want a password and what are the implications 'n' stuff.",
+ IDC_STATIC,18,180,270,26,SS_NOPREFIX
END
IDD_PAGE_LOG DIALOGEX 0, 0, 300, 220
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Log"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- EDITTEXT IDC_LOG,6,6,288,189,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+ EDITTEXT IDC_LOG,6,6,288,189,ES_MULTILINE | ES_AUTOHSCROLL |
+ ES_READONLY | WS_VSCROLL | WS_HSCROLL
PUSHBUTTON "&Refresh",IDC_REFRESH,244,200,50,14
END
IDD_PAGE_ADVANCED DIALOGEX 0, 0, 300, 220
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
CAPTION "Server"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
GROUPBOX "Server Status",IDC_STATIC,6,7,288,82
- LTEXT "Current state of the server goes here",IDC_SERVERSTATE,12,28,206,25
+ LTEXT "Current state of the server goes here",IDC_SERVERSTATE,
+ 12,28,206,25
PUSHBUTTON "&Stop Server",IDC_STOPSERVICE,238,28,50,14
PUSHBUTTON "&Start Server",IDC_STARTSERVICE,238,28,50,14
CONTROL "&Start Firefly when Windows starts",IDC_AUTOSTART,
@@ -116,10 +130,14 @@ BEGIN
GROUPBOX "Advanced",IDC_STATIC,6,93,288,61
LTEXT "Server port number",IDC_STATIC,12,108,99,11
EDITTEXT IDC_SERVERPORT,105,105,42,14,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "",IDC_PORTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,146,105,11,14
- LTEXT "You may need to change this if another program is already using this port.",IDC_STATIC,12,129,276,23
+ CONTROL "",IDC_PORTSPIN,"msctls_updown32",UDS_SETBUDDYINT |
+ UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
+ UDS_NOTHOUSANDS | UDS_HOTTRACK,146,105,11,14
+ LTEXT "You may need to change this if another program is already using this port.",
+ IDC_STATIC,12,129,276,23
GROUPBOX "Web administration",IDC_STATIC,6,159,288,54
- LTEXT "Firefly Media Server also provides a web administration interface.",IDC_STATIC,12,177,206,20
+ LTEXT "Firefly Media Server also provides a web administration interface.",
+ IDC_STATIC,12,177,206,20
PUSHBUTTON "&Open",IDC_WEBADMIN,238,177,50,14
END
diff --git a/win32/FireflyShell/FireflyShell.vcproj b/win32/FireflyShell/FireflyShell.vcproj
index f7c7b20d..8668dc7f 100644
--- a/win32/FireflyShell/FireflyShell.vcproj
+++ b/win32/FireflyShell/FireflyShell.vcproj
@@ -205,14 +205,29 @@
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+
+
+
+
+
+
+
+
+
diff --git a/win32/FireflyShell/resource.h b/win32/FireflyShell/resource.h
index f72f4296..90f810b5 100644
--- a/win32/FireflyShell/resource.h
+++ b/win32/FireflyShell/resource.h
@@ -50,6 +50,9 @@
#define IDC_COPY 1016
#define IDC_REFRESH 1018
#define IDC_LOGO 1019
+#define IDC_FIREFLYLINK 1020
+#define IDC_FIREFLYLINK2 1021
+#define IDC_ROKULINK 1021
#define ID_SHELLNOTIFY 4242
// Next default values for new objects
@@ -58,7 +61,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 209
#define _APS_NEXT_COMMAND_VALUE 32773
-#define _APS_NEXT_CONTROL_VALUE 1020
+#define _APS_NEXT_CONTROL_VALUE 1022
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif