diff --git a/LICENSE b/LICENSE index 1864213..28a63e0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016, Jeremy Plsek +Copyright (c) 2019, Jeremy Plsek All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/win-installer/.gitignore b/win-installer/.gitignore index 72fd9b9..94d87a5 100644 --- a/win-installer/.gitignore +++ b/win-installer/.gitignore @@ -1,2 +1,2 @@ *.exe -puush-qt/packages/puushqt/data \ No newline at end of file +puush-qt/packages/root/data diff --git a/win-installer/README.md b/win-installer/README.md index b6330e2..f6ea913 100644 --- a/win-installer/README.md +++ b/win-installer/README.md @@ -1,22 +1,14 @@ From Qt's maintenance tools, install the Qt Installer Framework. From its bin folder, copy `binarycreator.exe` and `installerbase.exe` to this folder. -Create a release executlable of puush-qt. +Create a release executable of puush-qt. Create the folder `puush-qt/packages/puushqt/data`. -Copy the executlable and dll to `puush-qt/packages/puushqt/data`. +Copy the executable and dll to `puush-qt/packages/puushqt/data`. -I have no idea if there is an automatic way to detect qml application shared libraries, so this is how to manually set up the data directory. +Run `windeployqt.exe` with --qmldir option set and pointing to the executable you copied. -Go to Qt's bin folder, and copy all the dll's to the same folder. -From the Qt's qml folder, copy Qt, QtQuick, and QtQuick.2 to the same folder. -Delete all .qml files (keeping the .qmlc files). -`puush-qt.exe` should now start. -While it's running, make sure the settings window works. -Assuming it works (and while it's still running), try to delete ALL dll's (including subdirectories) in the folder EXCEPT d3d, libEGL, and libGLESv2 (graphical fallback libraries). Windows will not allow you to delete the dll's that are in use. -Now the hard part. -To make the installer have less bloat, look through each subdirectory, and delete folders and qml files that are not needed. To check if they are not needed, restart `puush-qt.exe` and see if the settings window still works. Check the previous installers to see what may be necessary and removed. +Double check the running puush-qt from within the data directory works (and double check the qml loads when checking the puush-qt's settings window). - -Finally, once the data folder looks good, update the version and release information in the config and meta folders. +Update the version and release information in the config and meta folders. Run `build.bat` to create the `puush-qt-installer.exe`. \ No newline at end of file diff --git a/win-installer/puush-qt/config/config.xml b/win-installer/puush-qt/config/config.xml index fedf2da..e84a0cc 100644 --- a/win-installer/puush-qt/config/config.xml +++ b/win-installer/puush-qt/config/config.xml @@ -1,9 +1,14 @@ puush-qt - 0.2 + 0.2.4 puush-qt Installer puush-qt + https://github.com/jplsek/puush-qt + puush-qt.png + puush-qt.png + puush-qt.png + @TargetDir@/puush-qt.exe puush-qt @ApplicationsDir@/puush-qt diff --git a/win-installer/puush-qt/packages/puushqt/meta/finishform.ui b/win-installer/puush-qt/packages/puushqt/meta/finishform.ui deleted file mode 100644 index 4b109ab..0000000 --- a/win-installer/puush-qt/packages/puushqt/meta/finishform.ui +++ /dev/null @@ -1,36 +0,0 @@ - - - FinishForm - - - - - - Open puush-qt - - - true - - - false - - - - - - - - - diff --git a/win-installer/puush-qt/packages/puushqt/meta/installscript.qs b/win-installer/puush-qt/packages/puushqt/meta/installscript.qs deleted file mode 100644 index 24ccb25..0000000 --- a/win-installer/puush-qt/packages/puushqt/meta/installscript.qs +++ /dev/null @@ -1,44 +0,0 @@ -function Component() -{ - installer.installationFinished.connect(this, Component.prototype.installationFinishedPageIsShown); - installer.finishButtonClicked.connect(this, Component.prototype.installationFinished); -} - -Component.prototype.createOperations = function() -{ - component.createOperations(); -} - -Component.prototype.installationFinishedPageIsShown = function() -{ - try { - if (installer.isInstaller() && installer.status == QInstaller.Success) { - installer.addWizardPageItem( component, "FinishForm", QInstaller.InstallationFinished ); - } - } catch(e) { - console.log(e); - } -} - -Component.prototype.installationFinished = function() -{ - try { - if (installer.isInstaller() && installer.status == QInstaller.Success) { - var openCheckBoxChecked = component.userInterface("FinishForm").openCheckBox.checked; - if (openCheckBoxChecked) { - QDesktopServices.openUrl("file:///" + installer.value("TargetDir") + "/puush-qt.exe"); - } - - // the addOperation returns true, but does not do anything. However, running it in createOperations does work. - // So I'm gonna keep this disabled for now unless someone figures it out, because this can be set up in puush-qt - // itself (eventually), or done by the user manually. - //var startupCheckBoxChecked = component.userInterface("FinishForm").startupCheckBox.checked; - //if (startupCheckBoxChecked) { - // component.addOperation("CreateShortcut", "@TargetDir@/puush-qt.exe", "@UserStartMenuProgramsPath@/Startup/puush-qt.lnk"); - //} - } - } catch(e) { - console.log(e); - } -} - diff --git a/win-installer/puush-qt/packages/puushqt/meta/license.txt b/win-installer/puush-qt/packages/root/meta/license.txt similarity index 97% rename from win-installer/puush-qt/packages/puushqt/meta/license.txt rename to win-installer/puush-qt/packages/root/meta/license.txt index 1864213..28a63e0 100644 --- a/win-installer/puush-qt/packages/puushqt/meta/license.txt +++ b/win-installer/puush-qt/packages/root/meta/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2016, Jeremy Plsek +Copyright (c) 2019, Jeremy Plsek All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/win-installer/puush-qt/packages/puushqt/meta/package.xml b/win-installer/puush-qt/packages/root/meta/package.xml similarity index 55% rename from win-installer/puush-qt/packages/puushqt/meta/package.xml rename to win-installer/puush-qt/packages/root/meta/package.xml index a13d2d8..3b5532f 100644 --- a/win-installer/puush-qt/packages/puushqt/meta/package.xml +++ b/win-installer/puush-qt/packages/root/meta/package.xml @@ -1,16 +1,12 @@ puush-qt application - The puush-qt executable. - 0.1 - 2017-04-28 + A GUI frontend for puush on Windows. This will create a system tray icon and contains similar options to the original puush application before moving to ShareX. + 0.2.4 + 2019-03-03 https://github.com/jplsek/puush-qt - - - finishform.ui - true \ No newline at end of file diff --git a/win-installer/puush-qt/packages/puushqt/meta/puush-qt.png b/win-installer/puush-qt/packages/root/meta/puush-qt.png similarity index 100% rename from win-installer/puush-qt/packages/puushqt/meta/puush-qt.png rename to win-installer/puush-qt/packages/root/meta/puush-qt.png diff --git a/win-installer/puush-qt/packages/puushqt/meta/puush_qt.ico b/win-installer/puush-qt/packages/root/meta/puush_qt.ico similarity index 100% rename from win-installer/puush-qt/packages/puushqt/meta/puush_qt.ico rename to win-installer/puush-qt/packages/root/meta/puush_qt.ico