Commit Graph

15 Commits

Author SHA1 Message Date
Tobias Hunger
7db9c37b2d JsonWizard: Allow the summary page to change to the file list
Change the JsonWizard interface:
* generateFileList now does no longer change the state of the JsonWizard
* commitToFileList added which is used to commit the wizard to a final
  list of files.
* Trigger generateFileList when version control is changed in the
  SummaryPage
* Commit to the file list once the SummaryPage is done

Change-Id: Ieb7b7abbf428d96596526c01946ecf0852f65744
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-10 16:29:03 +01:00
Tobias Hunger
b360e73f6a JsonWizard: Use up-to-date file information
This avoids a new project being opened if you are trying to add a new
subproject to some existing project.

Change-Id: Ic5a2f4b0dedbfd6994c59e4944fc32b11d648871
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-03 09:44:20 +01:00
Tobias Hunger
7dde68996e JsonWizard: Force minimum size to something sensible
Change-Id: I8d6b6b1519dc711710ad4d28148d3e86291bae58
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-30 16:47:18 +01:00
Tobias Hunger
e8d02209e8 JsonWizard: Add a way to check for existence of a variable
Change-Id: Ia1368334156c33ca270b5cc7d946efcdb7b635a8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-30 16:46:39 +01:00
Tobias Hunger
187d1f69fd JsonWizard: Make bool values easier to work with in string expandsion
Return an empty string for "false".

Change-Id: I54506fb3db5857786c0448b0c76114ad237ef555
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-30 13:44:50 +01:00
hjk
cd53defc5d Restore JsonWizard expander functionality
Task-number: QTCREATORBUG-13229
Change-Id: I91fd996cdbf5f3e71bdf817e9c5beebbb007681b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-23 12:43:57 +02:00
hjk
ef563d8085 MacroExpander: Fall back to global expander
... and use that all over the place.

Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-16 16:32:58 +02:00
Tobias Hunger
89602419c4 JsonWizard: Make sure to open files as the last thing
Make sure to open files only after last touches were applied by
the wizard.

Change-Id: I0da8b49ebe58b0516fa44ef7b0472cce20a5936f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 16:23:01 +02:00
Tobias Hunger
10016fd656 JsonWizard: Fix a error message
Change-Id: I3d5f31a30cbe3b5b16e0c589575b539403fd9864
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-15 18:36:33 +02:00
Eike Ziller
9c7019f0b2 License update.
Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-15 15:19:55 +02:00
Orgad Shaneh
c884f3e0ef ProjectExplorer: Remove redundant namespace qualifications
Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-14 16:22:02 +02:00
Tobias Hunger
b1cc98f79b JsonWizard: Support formatting of sources after creating contents
Change-Id: Ia0fbae6a1d1b2f3dd00c578a8d1ac60e0482fba9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 15:14:45 +02:00
Tobias Hunger
f51fcacacb JsonWizard: Add File- and Summary pages
These reuse the existing pages we use for other wizards.

Change-Id: Ic505204e0988a6b44d112da35748f81d9f8e2c1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 10:56:17 +02:00
Christian Stenger
ce005981ab ProjectExplorer: Fix compile with MSVC2010
Task-number: QTCREATORBUG-13082
Change-Id: I669504be2241d0101dabd0c2ce0b1f29c87218f3
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-23 07:44:37 +02:00
Tobias Hunger
3491b1f22a Add JsonWizard
This is a generalization of the customwizard (using Json for its
configuration files since that is so easy to handle in Qt 5 and
since it is incompatible with the customwizard anyway).

It allows to define an arbitrary number of pages and generators to
generate the actual files.

Change-Id: I45a01cf7fb906701b627fa1471a898cad472f679
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-19 16:54:50 +02:00