diff --git a/Olop.iss b/Olop.iss new file mode 100755 index 0000000..dceaf2b --- /dev/null +++ b/Olop.iss @@ -0,0 +1,86 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Olop" +#define MyAppVersion "0.1.1-alpha" +#define MyAppPublisher "Olop" +#define MyAppURL "http://olop.rf.gd/" +#define MyAppExeName "Olop.exe" +#define MyAppAssocName "Application Olop" +#define MyAppAssocExt ".app" +#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt + +[Setup] +; 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={{A9680914-62A0-4D7B-AF97-D32696B42BA5} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName=C:/{#MyAppName} +ChangesAssociations=yes +DisableProgramGroupPage=yes +; Uncomment the following line to run in non administrative install mode (install for current user only.) +;PrivilegesRequired=lowest +PrivilegesRequiredOverridesAllowed=dialog +OutputDir=Z:\Qt C++\OlopInstaller +OutputBaseFilename=Olop +SetupIconFile=Z:\Qt C++\Olop\assets\olop.ico +Compression=lzma +SolidCompression=yes +WizardStyle=modern + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.isl" +Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" +Name: "bulgarian"; MessagesFile: "compiler:Languages\Bulgarian.isl" +Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl" +Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl" +Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl" +Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl" +Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" +Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" +Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" +Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl" +Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" +Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" +Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" +Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" +Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" +Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl" +Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" +Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" +Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" +Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "Z:\Qt C++\build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Release\release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion +Source: "Z:\Qt C++\build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Release\release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Registry] +Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue +Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey +Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0" +Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1""" +Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".myp"; ValueData: "" + +[Icons] +Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent + diff --git a/Olop.pro.user b/Olop.pro.user index 1f5679b..1efda1c 100755 --- a/Olop.pro.user +++ b/Olop.pro.user @@ -1,283 +1,270 @@ - - - - - - EnvironmentId - {3c724d3c-040c-4040-8958-87da5954e999} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - false - true - false - 0 - true - true - 0 - 8 - true - false - 1 - true - true - true - *.md, *.MD, Makefile - false - true - true - - - - ProjectExplorer.Project.PluginSettings - - - true - false - true - true - true - true - - - 0 - true - - true - true - Builtin.DefaultTidyAndClazy - 2 - false - - - - true - - - false - true - - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop Qt 6.5.1 GCC 64bit - Desktop Qt 6.5.1 GCC 64bit - qt.qt6.651.gcc_64_kit - 0 - 0 - 0 - - 0 - /home/superatraction/Documents/Qt C++/build-Olop-Desktop_Qt_6_5_1_GCC_64bit-Debug - /home/superatraction/Documents/Qt C++/build-Olop-Desktop_Qt_6_5_1_GCC_64bit-Debug - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - - true - "%{buildDir}/Olop" "%{ActiveProject:Path}/Olop" - cp - %{buildDir} - ProjectExplorer.ProcessStep - - 3 - Compiler - Compiler - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Nettoyer - Nettoyer - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - /home/superatraction/Documents/Qt C++/build-Olop-Desktop_Qt_6_5_1_GCC_64bit-Release - /home/superatraction/Documents/Qt C++/build-Olop-Desktop_Qt_6_5_1_GCC_64bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - - true - /home/superatraction/Documents/Qt C++/build-Olop-Desktop_Qt_6_5_1_GCC_64bit-Release/Olop - /home/superatraction/Documents/Qt C++/OLOP_APPDIR/Olop - ProjectExplorer.CopyFileStep - - 3 - Compiler - Compiler - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Nettoyer - Nettoyer - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - - - 0 - /home/superatraction/Documents/Qt C++/build-Olop-Desktop_Qt_6_5_1_GCC_64bit-Profile - /home/superatraction/Documents/Qt C++/build-Olop-Desktop_Qt_6_5_1_GCC_64bit-Profile - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Compiler - Compiler - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Nettoyer - Nettoyer - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Déploiement - Déploiement - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - true - - 2 - - false - Qt4ProjectManager.Qt4RunConfiguration:/home/superatraction/Documents/Qt C++/Olop/Olop.pro - /home/superatraction/Documents/Qt C++/Olop/Olop.pro - 0 - false - true - 1 - false - false - /home/superatraction/Documents/Qt C++/build-Olop-Desktop_Qt_6_5_1_GCC_64bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - + + + + + + EnvironmentId + {9008bdb3-b2ff-4e3c-88b9-8eeecc6a23bf} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + false + true + false + 0 + true + true + 0 + 8 + true + false + 1 + true + true + true + *.md, *.MD, Makefile + false + true + true + + + + ProjectExplorer.Project.PluginSettings + + + true + false + true + true + true + true + + + 0 + true + + true + true + Builtin.DefaultTidyAndClazy + 1 + + + + true + + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop Qt 6.5.1 MSVC2019 64bit + Desktop Qt 6.5.1 MSVC2019 64bit + qt.qt6.651.win64_msvc2019_64_kit + 1 + 0 + 0 + + 0 + Z:\Qt C++\build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Debug + Z:/Qt C++/build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Compiler + Compiler + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Nettoyer + Nettoyer + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + Z:\Qt C++\build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Release + Z:/Qt C++/build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + + true + "%{buildDir}\release\Olop.exe" + C:\Qt\6.5.1\msvc2019_64\bin\windeployqt.exe + %{buildDir}\release + ProjectExplorer.ProcessStep + + 3 + Compiler + Compiler + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Nettoyer + Nettoyer + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + Z:\Qt C++\build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Profile + Z:/Qt C++/build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Compiler + Compiler + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Nettoyer + Nettoyer + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Déploiement + Déploiement + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + true + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:Z:/Qt C++/Olop/Olop.pro + Z:/Qt C++/Olop/Olop.pro + false + true + true + false + true + Z:/Qt C++/build-Olop-Desktop_Qt_6_5_1_MSVC2019_64bit-Release + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/olop.cpp b/olop.cpp old mode 100644 new mode 100755 index 18f94e2..53bfbf2 --- a/olop.cpp +++ b/olop.cpp @@ -625,14 +625,24 @@ QByteArray NETWORK::Download(const QUrl Url) { bool FILES::unZip(const QString &file, const QString &dest) { #ifdef Q_OS_WIN QString program = "7z.exe"; + QStringList arguments; + arguments << "x" << file << "-o" + dest; #elif defined(Q_OS_LINUX) QString program = "/usr/bin/unzip"; + QStringList arguments; + arguments << file << "-d" << dest; #else - -- + // Gérer les autres systèmes d'exploitation + return false; #endif QProcess unzip; - unzip.start(program, QStringList() << file << "-d" << dest); + unzip.start(program, arguments); unzip.waitForFinished(); + + // Affichez la sortie pour le dépannage + qDebug() << "Standard Output:" << unzip.readAllStandardOutput(); + qDebug() << "Standard Error:" << unzip.readAllStandardError(); + return (unzip.exitCode() == 0); }