From aea1b16dddcbb510428b20f3b58982d8b1a44907 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Tue, 30 May 2006 13:41:16 +0000 Subject: [PATCH] Reformat dialog boxes a bit so that things fit better. --- win32/FireflyShell/ConfigPage.cpp | 3 +- win32/FireflyShell/FireflyShell.rc | 108 ++++++++++++++++++----------- 2 files changed, 69 insertions(+), 42 deletions(-) diff --git a/win32/FireflyShell/ConfigPage.cpp b/win32/FireflyShell/ConfigPage.cpp index 299c248f..ec264c37 100644 --- a/win32/FireflyShell/ConfigPage.cpp +++ b/win32/FireflyShell/ConfigPage.cpp @@ -48,8 +48,7 @@ void CConfigPage::EnableControls() const bool enable_password = (m_protect_checkbox.GetCheck() != 0) && enable; GetDlgItem(IDC_PASSWORD).EnableWindow(enable_password); - GetDlgItem(IDC_PASSWORD_PROMPT).EnableWindow(enable_password); - + //GetDlgItem(IDC_PASSWORD_PROMPT).EnableWindow(enable_password); } int CConfigPage::OnApply() diff --git a/win32/FireflyShell/FireflyShell.rc b/win32/FireflyShell/FireflyShell.rc index d4505182..c8a692d8 100644 --- a/win32/FireflyShell/FireflyShell.rc +++ b/win32/FireflyShell/FireflyShell.rc @@ -63,66 +63,65 @@ IDI_SHELL_STOPPED ICON "res\\shellstopped.ico" // Dialog // -IDD_PAGE_ABOUT DIALOGEX 0, 0, 221, 223 +IDD_PAGE_ABOUT DIALOGEX 0, 0, 300, 223 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,93,18,20,20 - CTEXT "Firefly Media Server",IDC_STATIC,7,41,207,11 - LTEXT "For help, tips and troubleshooting advice visit the Firefly Media Server website.",IDC_STATIC,12,79,119,23 - PUSHBUTTON "Visit &Website...",IDC_WEBSITE,139,82,70,14 - GROUPBOX "Version information",IDC_STATIC,7,114,207,102 - CONTROL "",IDC_VERSIONLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,126,197,63 - PUSHBUTTON "&Copy to Clipboard",IDC_COPY,139,194,70,14 + 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 END -IDD_PAGE_BASIC DIALOGEX 0, 0, 222, 230 +IDD_PAGE_BASIC DIALOGEX 0, 0, 300, 230 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Library" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Library &Name",IDC_STATIC,7,24,72,8 - EDITTEXT IDC_SERVERNAME,61,21,152,14,ES_AUTOHSCROLL - LTEXT "Media &Location",IDC_STATIC,7,60,48,8 - EDITTEXT IDC_PATH,61,57,152,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_BROWSE,163,76,50,14 - GROUPBOX "Security",IDC_STATIC,7,113,206,113 + LTEXT "Library &Name",IDC_STATIC,12,24,54,8 + EDITTEXT IDC_SERVERNAME,67,21,227,14,ES_AUTOHSCROLL + LTEXT "Media &Location",IDC_STATIC,12,61,48,8 + 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,18,128,187,10 - LTEXT "Password:",IDC_PASSWORD_PROMPT,18,157,34,8 - EDITTEXT IDC_PASSWORD,61,156,148,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,188,39,SS_NOPREFIX + "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 END -IDD_PAGE_LOG DIALOGEX 0, 0, 222, 220 +IDD_PAGE_LOG DIALOGEX 0, 0, 300, 220 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,210,189,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL - PUSHBUTTON "&Refresh",IDC_REFRESH,166,200,50,14 + 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, 222, 220 +IDD_PAGE_ADVANCED DIALOGEX 0, 0, 300, 220 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,210,82 - LTEXT "Current state of the server goes here",IDC_SERVERSTATE,12,24,200,25 - PUSHBUTTON "&Stop Server",IDC_STOPSERVICE,160,49,50,14 - PUSHBUTTON "&Start Server",IDC_STARTSERVICE,160,49,50,14 + GROUPBOX "Server Status",IDC_STATIC,6,7,288,82 + 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, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,73,196,10 - GROUPBOX "Advanced",IDC_STATIC,6,93,210,61 - LTEXT "Server port number",IDC_STATIC,12,108,122,11 - EDITTEXT IDC_SERVERPORT,155,106,42,14,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_PORTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,197,106,11,14 - LTEXT "You may need to change this if another program is already using this port.",IDC_STATIC,12,129,196,23 - GROUPBOX "Web administration",IDC_STATIC,6,159,210,54 - LTEXT "Firefly Media Server also provides a web administration interface.",IDC_STATIC,12,177,140,20 - PUSHBUTTON "&Open",IDC_WEBADMIN,160,194,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,63,276,10 + 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 + 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 + PUSHBUTTON "&Open",IDC_WEBADMIN,238,177,50,14 END @@ -136,23 +135,52 @@ GUIDELINES DESIGNINFO BEGIN IDD_PAGE_ABOUT, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 214 + LEFTMARGIN, 6 + RIGHTMARGIN, 294 VERTGUIDE, 12 VERTGUIDE, 131 - VERTGUIDE, 139 - VERTGUIDE, 209 + VERTGUIDE, 218 + VERTGUIDE, 288 + TOPMARGIN, 7 + BOTTOMMARGIN, 216 + END + + IDD_PAGE_BASIC, DIALOG + BEGIN + LEFTMARGIN, 6 + RIGHTMARGIN, 294 + VERTGUIDE, 12 + VERTGUIDE, 66 + VERTGUIDE, 131 + VERTGUIDE, 218 + VERTGUIDE, 288 TOPMARGIN, 7 BOTTOMMARGIN, 216 END IDD_PAGE_LOG, DIALOG BEGIN + LEFTMARGIN, 6 + RIGHTMARGIN, 294 VERTGUIDE, 6 + VERTGUIDE, 12 VERTGUIDE, 216 + VERTGUIDE, 288 HORZGUIDE, 6 HORZGUIDE, 214 END + + IDD_PAGE_ADVANCED, DIALOG + BEGIN + LEFTMARGIN, 6 + RIGHTMARGIN, 294 + VERTGUIDE, 12 + VERTGUIDE, 105 + VERTGUIDE, 218 + VERTGUIDE, 288 + TOPMARGIN, 7 + BOTTOMMARGIN, 216 + END END #endif // APSTUDIO_INVOKED