diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-06 18:00:00 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-13 11:03:25 +0100 |
commit | 54614b03b87d139ef335adc4d2b61072d6baef18 (patch) | |
tree | b8b2459fac8fc44790e902b6bb6eba7f58b90f66 /dist/installer | |
parent | 36e1c03ae6bfe2966b66b5c7e84a2c83c377422b (diff) |
show LaunchQtCreatorCheckBox at the standalone installer
Some code was there but the ui file and the showing code was missing.
Change-Id: I9a865ff7a10995d3b129e0b18c2f250bca852f9e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'dist/installer')
3 files changed, 47 insertions, 0 deletions
diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs index 0f096b8477..1b46304147 100644 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs @@ -31,6 +31,7 @@ function Component() { component.loaded.connect(this, Component.prototype.loaded); + installer.installationFinished.connect(this, Component.prototype.installationFinishedPageIsShown); installer.finishButtonClicked.connect(this, Component.prototype.installationFinished); installer.setDefaultPageVisible(QInstaller.ComponentSelection, false); } @@ -173,6 +174,17 @@ Component.prototype.createOperations = function() } } +Component.prototype.installationFinishedPageIsShown = function() +{ + try { + if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success) { + installer.addWizardPageItem( component, "LaunchQtCreatorCheckBoxForm", QInstaller.InstallationFinished ); + } + } catch(e) { + print(e); + } +} + Component.prototype.installationFinished = function() { try { diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui new file mode 100644 index 0000000000..4d6060c67a --- /dev/null +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>LaunchQtCreatorCheckBoxForm</class> + <widget class="QWidget" name="LaunchQtCreatorCheckBoxForm"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>112</width> + <height>17</height> + </rect> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QCheckBox" name="launchQtCreatorCheckBox"> + <property name="text"> + <string>Launch Qt Creator</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="tristate"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in index 0e21746d4e..e9d378cd70 100644 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in @@ -14,5 +14,6 @@ <AutoDependOn>org.qtproject.qtcreator</AutoDependOn> <UserInterfaces> <UserInterface>associatecommonfiletypesform.ui</UserInterface> + <UserInterface>launchqtcreatorcheckboxform.ui</UserInterface> </UserInterfaces> </Package> |