From aaa4c8b761a2fce3dd72151d7b17a9bcda998999 Mon Sep 17 00:00:00 2001 From: "Fernando Benavides (on Windows)" Date: Fri, 7 May 2010 15:39:47 +0200 Subject: [PATCH 1/3] removed unnecessary document --- documents/windows-installer/.gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 documents/windows-installer/.gitignore diff --git a/documents/windows-installer/.gitignore b/documents/windows-installer/.gitignore deleted file mode 100644 index adb36c8..0000000 --- a/documents/windows-installer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.exe \ No newline at end of file From 8a80939ee07ada06da4cf1e7e43f2c9ac84d2cc5 Mon Sep 17 00:00:00 2001 From: "Fernando Benavides (on Windows)" Date: Fri, 7 May 2010 17:21:55 +0200 Subject: [PATCH 2/3] Updated version of Windows Installer --- documents/windows-installer/hpage.iss | 27 +++++++++++++-------------- src/HPage/GUI/FreeTextWindow.hs | 4 +++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/documents/windows-installer/hpage.iss b/documents/windows-installer/hpage.iss index 06e3452..ad85f30 100644 --- a/documents/windows-installer/hpage.iss +++ b/documents/windows-installer/hpage.iss @@ -17,32 +17,31 @@ DisableDirPage=yes DefaultGroupName=λPage AllowNoIcons=yes LicenseFile=C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\LICENSE -OutputDir=C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\documents\windows-installer -OutputBaseFilename=setup +OutputDir=C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\dist\build +OutputBaseFilename=hpage-0.8.5 SetupIconFile=C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\res\images\icon\hpage.ico Compression=lzma SolidCompression=yes [Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" +Name: english; MessagesFile: compiler:Default.isl [Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked -Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 +Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked +Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked; OnlyBelowVersion: 0,6.1 [Files] -Source: "C:\Program Files\Haskell\bin\hpage.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Program Files\Haskell\hpage-0.8.5\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\Program Files\Haskell\bin\hpage.exe; DestDir: {app}; Flags: ignoreversion +Source: C:\Program Files\Haskell\hpage-0.8.5\*; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] -Name: "{group}\λPage"; Filename: "{app}\hpage.exe" -Name: "{group}\{cm:ProgramOnTheWeb,λPage}"; Filename: "http://haskell.hpage.com/" -Name: "{group}\{cm:UninstallProgram,λPage}"; Filename: "{uninstallexe}" -Name: "{commondesktop}\λPage"; Filename: "{app}\hpage.exe"; Tasks: desktopicon -Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\λPage"; Filename: "{app}\hpage.exe"; Tasks: quicklaunchicon +Name: {group}\λPage; Filename: {app}\hpage.exe; IconFilename: C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\res\images\icon\hpage.ico +Name: {group}\{cm:ProgramOnTheWeb,λPage}; Filename: http://haskell.hpage.com/ +Name: {group}\{cm:UninstallProgram,λPage}; Filename: {uninstallexe} +Name: {commondesktop}\λPage; Filename: {app}\hpage.exe; Tasks: desktopicon; IconFilename: C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\res\images\icon\hpage.ico +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\λPage; Filename: {app}\hpage.exe; Tasks: quicklaunchicon; IconFilename: C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\res\images\icon\hpage.ico [Run] -Filename: "{app}\hpage.exe"; Description: "{cm:LaunchProgram,λPage}"; Flags: nowait postinstall skipifsilent - +Filename: {app}\hpage.exe; Description: {cm:LaunchProgram,λPage}; Flags: nowait postinstall skipifsilent diff --git a/src/HPage/GUI/FreeTextWindow.hs b/src/HPage/GUI/FreeTextWindow.hs index 708560a..f4a8c96 100644 --- a/src/HPage/GUI/FreeTextWindow.hs +++ b/src/HPage/GUI/FreeTextWindow.hs @@ -98,7 +98,9 @@ gui args = win <- frame [text := "\955Page", visible := False] - imageFile ("icon" "hpage.tif") >>= topLevelWindowSetIconFromFile win + + iconFile <- imageFile $ "icon" "hpage" <.> "ico" + iconCreateFromFile iconFile sizeNull >>= topLevelWindowSetIcon win set win [on closing := HPS.stop model >> propagateEvent] From ad7ce2140b9b5aef274e4aeacfe9e0b2cbaf39eb Mon Sep 17 00:00:00 2001 From: "Fernando Benavides (on Windows)" Date: Fri, 7 May 2010 17:52:47 +0200 Subject: [PATCH 3/3] Updated version of Windows Installer --- documents/windows-installer/hpage.iss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documents/windows-installer/hpage.iss b/documents/windows-installer/hpage.iss index ad85f30..e997d9b 100644 --- a/documents/windows-installer/hpage.iss +++ b/documents/windows-installer/hpage.iss @@ -36,11 +36,11 @@ Source: C:\Program Files\Haskell\hpage-0.8.5\*; DestDir: {app}; Flags: ignorever ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] -Name: {group}\λPage; Filename: {app}\hpage.exe; IconFilename: C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\res\images\icon\hpage.ico +Name: {group}\λPage; Filename: {app}\hpage.exe; IconFilename: {app}\res\images\icon\hpage.ico Name: {group}\{cm:ProgramOnTheWeb,λPage}; Filename: http://haskell.hpage.com/ Name: {group}\{cm:UninstallProgram,λPage}; Filename: {uninstallexe} -Name: {commondesktop}\λPage; Filename: {app}\hpage.exe; Tasks: desktopicon; IconFilename: C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\res\images\icon\hpage.ico -Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\λPage; Filename: {app}\hpage.exe; Tasks: quicklaunchicon; IconFilename: C:\Documents and Settings\elbrujohalcon\Projects\haskell\hpage\res\images\icon\hpage.ico +Name: {commondesktop}\λPage; Filename: {app}\hpage.exe; Tasks: desktopicon; IconFilename: {app}\res\images\icon\hpage.ico +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\λPage; Filename: {app}\hpage.exe; Tasks: quicklaunchicon; IconFilename: {app}\res\images\icon\hpage.ico [Run] Filename: {app}\hpage.exe; Description: {cm:LaunchProgram,λPage}; Flags: nowait postinstall skipifsilent