From 7e85e0e79856fccd9e56c5db5f1d5060f0ee5fc7 Mon Sep 17 00:00:00 2001 From: jwansek Date: Mon, 22 Dec 2025 16:15:25 +0000 Subject: Various QoL changes and improvements over the old version - Switched to using pyinstaller for compiling over cx_Freeze - Simplified the installation and application opening process so it doesn't have to find itself - Made some updates to [tkFileBrowser](https://github.com/jwansek/tkFileBrowser/) (which originated from this project) and merged the changes back in - Reloaded the image on window scaling, photosensitive epilepsy beware, these numbers might need tweaking --- setup.iss | 68 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 35 deletions(-) (limited to 'setup.iss') diff --git a/setup.iss b/setup.iss index 1ad324c..8b7cf7e 100644 --- a/setup.iss +++ b/setup.iss @@ -1,62 +1,60 @@ -#define MyAppName "EEHPH Photo Viewer v2" -#define MyAppVersion "2.2.6" -#define MyAppPublisher "AE Computer Vision" -#define MyAppURL "https://aecomputervision.blogspot.co.uk/" +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; Non-commercial use only + +#define MyAppName "EEHPH Photo Viewer" +#define MyAppVersion "2.3.1" +#define MyAppPublisher "Eden Attenborough" +#define MyAppURL "https://boymoder.blog" #define MyAppExeName "EEHPH2.exe" [Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. +; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{0AF01912-BAF0-42B8-822C-B17BDE553B36} +AppId={{4B1E380E-E2B1-4B06-874A-94FB98F1138B} AppName={#MyAppName} AppVersion={#MyAppVersion} -AppVerName={#MyAppName} +;AppVerName={#MyAppName} {#MyAppVersion} AppPublisher={#MyAppPublisher} AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} -DefaultDirName={pf}\{#MyAppName} +DefaultDirName={autopf}\EEHPH2 +UninstallDisplayIcon={app}\{#MyAppExeName} +; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run +; on anything but x64 and Windows 11 on Arm. +ArchitecturesAllowed=x64compatible +; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the +; install be done in "64-bit mode" on x64 or Windows 11 on Arm, +; meaning it should use the native 64-bit Program Files directory and +; the 64-bit view of the registry. +ArchitecturesInstallIn64BitMode=x64compatible +ChangesAssociations=yes DisableProgramGroupPage=yes -LicenseFile=C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\LICENSE.txt -OutputDir=C:\Users\Edward\Documents\workingdir\eehph2\inno +LicenseFile=D:\Nextcloud\Personal\Projects\eehph2\LICENSE.txt +; Uncomment the following line to run in non administrative install mode (install for current user only). +;PrivilegesRequired=lowest +OutputDir=D:\Nextcloud\Personal\Projects\eehph2\installer OutputBaseFilename=EEHPH2_installer -Compression=lzma +SetupIconFile=D:\Nextcloud\Personal\Projects\eehph2\Assets\icon.ico SolidCompression=yes -UninstallDisplayIcon=C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\Assets\icon.ico -WizardSmallImageFile=C:\Users\Edward\Documents\workingdir\eehph2\Assets\setupimg.bmp +WizardStyle=modern dynamic [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" [Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\EEHPH2.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\EEHPH2_app.py"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\on_install_setup.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\cleanup.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\python36.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\tcl86t.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\tk86t.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\VCRUNTIME140.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\Assets\*"; DestDir: "{app}\Assets"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\tcl\*"; DestDir: "{app}\tcl"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\tk\*"; DestDir: "{app}\tk"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "D:\Nextcloud\Personal\Projects\eehph2\dist\EEHPH2\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion +Source: "D:\Nextcloud\Personal\Projects\eehph2\dist\EEHPH2\_internal\*"; DestDir: "{app}\_internal\"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] -Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon +Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon [Run] -Filename: "{app}\on_install_setup.exe"; Parameters: """{app}\" Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent -[UninstallRun] -Filename: "{app}\cleanup.exe"; - - -- cgit v1.2.3