From 03d0c0377d6a953d4f447bc298495fbd5b01a5d4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 27 Jun 2018 13:57:10 +0300 Subject: [PATCH] Improve installer on Windows. Added option for removing settings. --HG-- branch : develop --- dist/win/inno/valentina.iss | 105 ++++++++++++++++++++++++++++++------ 1 file changed, 89 insertions(+), 16 deletions(-) diff --git a/dist/win/inno/valentina.iss b/dist/win/inno/valentina.iss index ca204a04a..b16709c68 100644 --- a/dist/win/inno/valentina.iss +++ b/dist/win/inno/valentina.iss @@ -1,10 +1,10 @@ -; Script generated by the Inno Script Studio Wizard. +; Script generated by the Inno Script Studio Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Valentina" #define MyAppVersion GetFileVersion('valentina\valentina.exe') #define MyAppPublisher "Roman Telezhynskyi" -#define MyAppURL "http://www.valentina-project.org/" +#define MyAppURL "http://valentinaproject.bitbucket.io/" #define MyAppExeName "valentina.exe" #define MyAppCopyright "(C) 2013-2018 Valentina project" #define MyDateTimeString GetDateTimeString('yyyymmddhhnnss', '', ''); @@ -42,6 +42,8 @@ AppComments=Patternmaking program AppContact={#MyAppURL} AppCopyright={#MyAppCopyright} ChangesAssociations=yes +DisableDirPage=auto +DisableProgramGroupPage=auto ;MinVersion=6.1 ;SignTool=MySign ;Uncomment the previous string for code signing @@ -84,6 +86,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip Name: "fileassoc1"; Description: "{cm:CreateFileAssocVal}"; GroupDescription: "{cm:FileAssoc}" Name: "fileassoc2"; Description: "{cm:CreateFileAssocVit}"; GroupDescription: "{cm:FileAssoc}" Name: "fileassoc3"; Description: "{cm:CreateFileAssocVst}"; GroupDescription: "{cm:FileAssoc}" +Name: "deletesettings"; Description: "{cm:RemoveAnyExistingSettings}"; GroupDescription: "{cm:ManageSettings}"; Flags: unchecked [Types] Name: "full_english"; Description: "System language"; Languages: english; @@ -214,17 +217,26 @@ Source: ".\valentina\platforms\*"; DestDir: "{app}\platforms"; Flags: recursesub Source: ".\valentina\printsupport\*"; DestDir: "{app}\printsupport"; Flags: recursesubdirs createallsubdirs Source: ".\valentina\tables\*"; DestDir: "{app}\tables"; Flags: ignoreversion recursesubdirs createallsubdirs Source: ".\valentina\labels\*"; DestDir: "{app}\labels"; Flags: ignoreversion recursesubdirs createallsubdirs +; Since qt 5.10 +Source: ".\valentina\styles\*"; DestDir: "{app}\styles"; Flags: recursesubdirs createallsubdirs Source: ".\valentina\*.exe"; DestDir: "{app}"; Flags: ignoreversion Source: ".\valentina\*.dll"; DestDir: "{app}" Source: ".\valentina\*.txt"; DestDir: "{app}"; Flags: ignoreversion Source: ".\valentina\*.rcc"; DestDir: "{app}"; Flags: ignoreversion -Source: ".\valentina\*.ico"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\valentina\*.ico"; DestDir: "{app}"; Flags: ignoreversion Source: ".\valentina\*.ini"; DestDir: "{app}"; Flags: ignoreversion +; Only for test versions +;Source: ".\valentina\VERSION"; DestDir: "{app}"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; DLL used to check if the target program is running at install time [InstallDelete] Type: filesandordirs; Name: "{app}\translations" +Type: files; Name: "{userappdata}\ValentinaTeam\*.ini"; Tasks: deletesettings + +[UninstallDelete] +Type: files; Name: "{userappdata}\ValentinaTeam\*.ini" +Type: filesandordirs; Name: "{userappdata}\ValentinaTeam" [Icons] Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" @@ -255,19 +267,80 @@ Root: "HKCR"; Subkey: "Valentina.StandardMeasurements\DefaultIcon"; ValueType: s Root: "HKCR"; Subkey: "Valentina.StandardMeasurements\shell\open\command"; ValueType: string; ValueData: """{app}\tape.exe"" ""%1"""; Tasks: fileassoc3 [CustomMessages] -FileAssoc=Create file associations -CreateFileAssocVal=*.val (Pattern file) -CreateFileAssocVit=*.vit (Individual measurement file) -CreateFileAssocVst=*.vst (Standard measurement file) -WarnRemoveOld= is installed at the moment. Remove old version? -WarnSameVersionExit= is already installed. This installer will exit. -WarnRunningOnUnInstall1= is currently running. -WarnRunningOnUnInstall2=Please close it and then click on ''Retry'' to proceed. -WarnCancelInstall=The installation was canceled. -WarnCancelUninstall=The uninstallation process was canceled. -WarnOverwrite= is already installed. Overwrite existing installation? -SetupIsRunningWarning = Valentina setup is already running! -DeinstIsRunningWarning = Valentina uninstall is already running! +FileAssoc = Undefined //just in case (should be equal to English) +english.FileAssoc = Create file associations +russian.FileAssoc = Создание ассоциаций файлов +ukrainian.FileAssoc = Створити асоціації файлів + +CreateFileAssocVal = Undefined //just in case (should be equal to English) +english.CreateFileAssocVal = *.val (Pattern file) +russian.CreateFileAssocVal = *.val (Файл выкройки) +ukrainian.CreateFileAssocVal = *.val (Файл викрійки) + +CreateFileAssocVit = Undefined //just in case (should be equal to English) +english.CreateFileAssocVit = *.vit (Individual measurement file) +russian.CreateFileAssocVit = *.vit (Файл индивидуальных мерок) +ukrainian.CreateFileAssocVit = *.vit (Файл індивідуальних мірок) + +CreateFileAssocVst = Undefined //just in case (should be equal to English) +english.CreateFileAssocVst = *.vst (Multisize measurement file) +russian.CreateFileAssocVst = *.vst (Мультиразмерный файл мерок) +ukrainian.CreateFileAssocVst = *.vst (Мультирозмірний файл мірок) + +WarnRemoveOld = Undefined //just in case (should be equal to English) +english.WarnRemoveOld = is installed at the moment. Remove old version? +russian.WarnRemoveOld = установлена на данный момент. Удалить старую версию? +ukrainian.WarnRemoveOld = встановлено на даний момент. Видалити стару версію? + +WarnSameVersionExit = Undefined //just in case (should be equal to English) +english.WarnSameVersionExit = is already installed. This installer will exit. +russian.WarnSameVersionExit = уже установлено. Установщик завершит свою работу. +ukrainian.WarnSameVersionExit = вже встановлено. Інсталятор завершить свою роботу. + +WarnRunningOnUnInstall1 = Undefined //just in case (should be equal to English) +english.WarnRunningOnUnInstall1 = is currently running. +russian.WarnRunningOnUnInstall1 = в настоящее время работает. +ukrainian.WarnRunningOnUnInstall1 = в даний час працює. + +WarnRunningOnUnInstall2 = Undefined //just in case (should be equal to English) +english.WarnRunningOnUnInstall2 = Please close it and then click on ''Retry'' to proceed. +russian.WarnRunningOnUnInstall2 = Закройте его и нажмите ''Повторить'', чтобы продолжить. +ukrainian.WarnRunningOnUnInstall2 = Закрийте його та натисніть ''Повторити'', щоб продовжити. + +WarnCancelInstall = Undefined //just in case (should be equal to English) +english.WarnCancelInstall = The installation was canceled. +russian.WarnCancelInstall = Установка была отменена. +ukrainian.WarnCancelInstall = Установка була скасована. + +WarnCancelUninstall = Undefined //just in case (should be equal to English) +english.WarnCancelUninstall = The uninstallation process was canceled. +russian.WarnCancelUninstall = Процесс удаления был отменен. +ukrainian.WarnCancelUninstall = Процес деінсталяції скасовано. + +WarnOverwrite = Undefined //just in case (should be equal to English) +english.WarnOverwrite= is already installed. Overwrite existing installation? +russian.WarnOverwrite= уже установлено. Перезаписать существующую установку? +ukrainian.WarnOverwrite= вже встановлено. Перезаписати існуючу установку? + +SetupIsRunningWarning = Undefined //just in case (should be equal to English) +english.SetupIsRunningWarning = Valentina setup is already running! +russian.SetupIsRunningWarning = Установка Valentina уже запущена! +ukrainian.SetupIsRunningWarning = Встановлення Valentina вже працює! + +DeinstIsRunningWarning = Undefined //just in case (should be equal to English) +english.DeinstIsRunningWarning = Valentina uninstall is already running! +russian.DeinstIsRunningWarning = Удаление Valentina уже запущено! +ukrainian.DeinstIsRunningWarning = Видалення Valentina вже працює! + +RemoveAnyExistingSettings = Undefined //just in case (should be equal to English) +english.RemoveAnyExistingSettings = Remove any existing settings +russian.RemoveAnyExistingSettings = Удалить все существующие настройки +ukrainian.RemoveAnyExistingSettings = Видалити всі існуючі налаштування + +ManageSettings = Undefined //just in case (should be equal to English) +english.ManageSettings = Manage settings +russian.ManageSettings = Управление настройками +ukrainian.ManageSettings = Керування налаштуваннями [Code] const