10:43 a.m.
Author: mladen.turk(a)jboss.com
Date: 2008-04-07 11:43:50 -0400 (Mon, 07 Apr 2008)
New Revision: 1530
Added:
trunk/build/install/installer/res/jbrhorg.png
trunk/build/install/installer/res/splash.htm
Modified:
trunk/build/install/installer/main.c
trunk/build/install/installer/sinstall.rc
Log:
Add splash option
Modified: trunk/build/install/installer/main.c
===================================================================
--- trunk/build/install/installer/main.c 2008-04-07 14:27:14 UTC (rev 1529)
+++ trunk/build/install/installer/main.c 2008-04-07 15:43:50 UTC (rev 1530)
@@ -846,6 +846,32 @@
}
static BOOL
+ShowSplash(LPCSTR szPage, DWORD dwTimeout)
+{
+ HANDLE hHtml;
+ CHAR sBuf[MAX_PATH] = { 0 };
+ CHAR *retVal;
+ BOOL rv = FALSE;
+
+ hHtml = DHTMLDialogInit(GetModuleHandle(NULL), szPage);
+ if (IS_INVALID_HANDLE(hHtml))
+ return FALSE;
+
+ sprintf(sBuf, "%s", GetProgramName());
+ DHTMLDialogRun(NULL, hHtml,
+ "JBoss",
+ DEF_WWIDTH, DEF_WHEIGHT, 1, dwTimeout,
+ sBuf);
+ retVal = DHTMLDialogResult(hHtml);
+ if (retVal && !strncmp(retVal, "OK", 2)) {
+ rv = TRUE;
+ }
+ DHTMLDialogClose(hHtml);
+
+ return rv;
+}
+
+static BOOL
RunCustomPage(
LPCSTR szHtmlPage,
LPCSTR szHtmlTitle,
@@ -1204,7 +1230,11 @@
x_free(szHtmlResult);
goto cleanup;
}
+ if (bShowSplash) {
+ ShowSplash("/HTML_SPLASH", dwSplTimeout);
+ }
+
/* Standard Install */
if (bShowLicense && !AcceptLicensePage(szEulaPage)) {
r = EPERM;
Added: trunk/build/install/installer/res/jbrhorg.png
===================================================================
(Binary files differ)
Property changes on: trunk/build/install/installer/res/jbrhorg.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/build/install/installer/res/splash.htm
===================================================================
--- trunk/build/install/installer/res/splash.htm (rev 0)
+++ trunk/build/install/installer/res/splash.htm 2008-04-07 15:43:50 UTC (rev 1530)
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HEAD lang="en">
+ <META http-equiv="Content-Type" content="text/html;
charset=windows-1252">
+ <META http-equiv="MSThemeCompatible" content="Yes">
+ <TITLE>JBoss</TITLE>
+ <STYLE type="text/css">
+ BODY, TABLE, TR, TD, UL, OL, LI, P {
+ font-family: MS Shell Dlg;
+ font-size: 10px;
+ font-style: normal;
+ text-decoration: none;
+ background-color: ButtonFace;
+ color: ButtonText;
+ }
+ INPUT {
+ font-family: MS Shell Dlg;
+ font-size: 10px;
+ }
+ TH {
+ font-family: MS Shell Dlg;
+ font-size: 10px;
+ font-style: normal;
+ text-decoration: none;
+ text-align: left;
+ line-height: 22px;
+ background-color: ActiveCaption;
+ color: CaptionText;
+ }
+ H1 {
+ font-family: Serife, Verdana, Helvetica, Arial, Tahoma;
+ font-size: 24px;
+ }
+ H2 {
+ font-family: Serife, Verdana, Helvetica, Arial, Tahoma;
+ font-size: 20px;
+ }
+ H3 {
+ font-family: Serife, Verdana, Helvetica, Arial, Tahoma;
+ font-size: 18px;
+ }
+ H4 {
+ font-family: Serife, Verdana, Helvetica, Arial, Tahoma;
+ font-size: 13px;
+ }
+ A {
+ color: blue;
+ }
+ IFRAME {
+ border-left:0px;
+ border-right:0px;
+ border-top:1px solid;
+ border-top-color: ActiveBorder;
+ border-bottom:1px solid;
+ border-bottom-color: ActiveBorder;
+ }
+ .hide {
+ display: none;
+ visibility: hidden;
+ }
+ .show {
+ display: block;
+ visibility: visible;
+ }
+ </STYLE>
+ <SCRIPT language="JScript">
+
+ function pageOnLoad()
+ {
+ window.returnValue = null;
+ setTimeout("onTimeout()", 10000);
+ return true;
+ }
+
+ function onTimeout()
+ {
+ window.returnValue = "TIMEOUT";
+ window.close();
+ }
+ </SCRIPT>
+</HEAD>
+<BODY scroll="no" topmargin="0" leftmargin="0"
rightmargin="0" bottommargin="0"
+ marginwidth="0" marginheight="0" onload="pageOnLoad();
return true;">
+<DIV style="position:absolute; top:0px; left:0px; width=505px; height:360px;
border:0px solid;">
+<IMG src="PNG/IMG_JBOSPLASH" border="0" onclick="onTimeout();
return true;"/>
+</DIV>
+</DIV>
+</BODY>
+</HTML>
Modified: trunk/build/install/installer/sinstall.rc
===================================================================
--- trunk/build/install/installer/sinstall.rc 2008-04-07 14:27:14 UTC (rev 1529)
+++ trunk/build/install/installer/sinstall.rc 2008-04-07 15:43:50 UTC (rev 1530)
@@ -52,10 +52,12 @@
IMG_REDHAT32 PNG "res/redhat32.png"
IMG_REDHAT16 PNG "res/redhat16.png"
IMG_JBOSSTOP PNG "res/jbosstop.png"
+IMG_JBOSPLASH PNG "res/jbrhorg.png"
HTML_LGPLMAIN HTML "res/lgplmain.htm"
HTML_LGPL HTML "res/lgpl.htm"
HTML_EULAMAIN HTML "res/eulamain.htm"
HTML_EULA HTML "res/eula.htm"
+HTML_SPLASH HTML "res/splash.htm"
IDD_ABOUTBOX DIALOGEX 0, 0, 337, 187
STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU