Commit Graph

78 Commits

Author SHA1 Message Date
Alessandro Portale
0b53638a75 Revert "Welcome: Store examples search text in settings"
This reverts commit 894ade6f1e2767a8866642a4ea278659730c26d8

Storing the search text was not thought well through. It causes bad user experience.

Also, the real solution for showing filtered Example sets in the chooser is coming here: https://codereview.qt-project.org/#change,82906

Change-Id: Ibb51bf5c0fa08fdeb8530a19d823ba97a3c167d1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-08 11:51:38 +02:00
Alessandro Portale
57f11f40d6 Welcome: Store examples search text in settings
in QtCreator.ini under "WelcomePage/ExamplesSearchString".
The installer pre-set that setting, and in that way pre-
select a set of examples.

Change-Id: I8ac5a38ad0bd3f33875ef1997ccbf0352410dcc3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-02 14:03:32 +02:00
Kai Koehne
c996d801f7 Fix crash if no qt version is registered
Change-Id: Ib3b4b2379999061b04923b98044ed83743cd6423
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-04-01 17:06:46 +02:00
Eike Ziller
29b0c1022c WelcomePage: Support additional (non-qt) example sets
Added with setting "Help/InstalledExamples" which is a string list, each
string is a triple of (display name, manifest parse path, examples
path), joined with '|'.
If a documentationPath for a Qt version is already added through the
InstalledExamples setting, we do not show an extra combo box item for
it. That makes it possible for an installer to register a single example
set for the same Qt version in different variants (e.g. iOS, Android
x86, Android arm)

Change-Id: I42dd8f9ca9cb6cee247e3dc8ce9d014e56852e79
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-31 12:30:11 +02:00
Kai Koehne
d035dbb184 Examples: Remove loading of *.xml files from Qt demos/examples dir
Not sure what this code path did originally, but since at least
Qt 4.8.0 examples, demos manifest files are only in doc.

Change-Id: I6edf1f712fc06d290edf0fe978a6635966084e60
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:37 +01:00
Kai Koehne
41b57bfd0e Remove Qt 4 fallback for examples browser
Remove fallback file, and rather use the examples-manifest.xml,
demos-manifest.xml files that are part of Qt 4.8.0 or newer.

Change-Id: I6291bd01b75b891a5ddab7fb01cdfc29ed8bec34
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:29 +01:00
Kai Koehne
0d23d2d41b Move management of 'selected' Qt version to ExamplesListModel
Change-Id: Ia4c73a0e9985e968265d7698e3a0a3cc58dc7aaa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:25 +01:00
Kai Koehne
dc72ebd273 Unify selection of 'valid' Qt versions for welcome page
Change-Id: I79ba4ac9f132a535efd9d362790b8e1d2b62d900
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-13 14:19:22 +01:00
Kai Koehne
542444c926 Move QtVersionsModel declaration into header
Change-Id: Ic61139ef5e8819bb0ae2ba67cfff6b5adc55c14d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-07 10:44:59 +01:00
Thomas Hartmann
1ff3a8287d WelcomPage: Fix intitial filtering by Qt version
When having multiple Qt versions with examples registered in Creator,
the welcome mode showed all of them initially.

The reason was that m_uniqueQtId was initialized with noQtVersionsId
instead of uniqueQtVersionIdSetting().

The function uniqueQtVersionIdSetting() gets the correct Qt version from
the settings as shown in the combobox.

Task-number: QTCREATORBUG-10790

Change-Id: I9f435f6372f8b0c0495daf6c6efcf4bcc5e70455
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-10 11:54:11 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Orgad Shaneh
4442a92729 Braces cleanup
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-14 08:13:52 +01:00
Thomas Hartmann
fe47725ae6 WelcomePage: bug fix for example view
We have to wait for all of the QtVersionManager and HelpManager to
be initialized, and some data actually being requested from the
examples model, before showing any examples.

Task-number: QTBUG-33924

Change-Id: I189710374f4af8d7d9cbe4731fa3faafd0623ffb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-15 16:30:34 +02:00
Thomas Hartmann
3ed4293d7c WelcomePage: fixes QTC_ASSERT
We have to wait for the QtVersionManager until all Qt versions
are loaded.

Change-Id: Ia6f823660d0252fb8e8ee1b8cfaec32e26ebc0bd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-10 16:36:47 +02:00
hjk
0ed9b97a1f QtVersionManager et al: Code cosmetics
Apply static 'pattern' for QtVersionManager, de-noise using code.

Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:54:16 +02:00
Tobias Hunger
95859289b8 KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-21 16:55:16 +02:00
Thomas Hartmann
8178e1ae5b WelcomePage: fixes for the filter combobox for examples
"All Versions" did not work correctly and just contributed to
confusion. So it is removed. Since we need a sensible default
setting we now search for the Qt with the highest version that has
examples and demos.

Task-number: QTCREATORBUG-9531
Change-Id: I495252a99753ebe511b598c61a79bbb0cd293e40
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-06-17 16:32:40 +02:00
Kai Koehne
5c824a0dd6 Welcome screen: Show real name of kit in examples combo box
Show the display name of the kit, instead of computing a generic
one out of the Qt version.

Change-Id: I9d3700bdd64a686f1761c073a47b57153c2ca10b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-11 13:49:11 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
Thomas Hartmann
3aa424ca64 WelcomePage: Show demos in the examples view
Change-Id: Idc466b7e058375c0e393eb9f9dd2cc8f58abb2af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-02 13:17:36 +02:00
Friedemann Kleint
075a069d1c Clean headers in QtSupport.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Iac7e32b861d60c4c386f64f065d05a1856e396cf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-27 14:33:40 +01:00
Thomas Hartmann
1d14e7e439 Welcompage: allow highlighting of demos and examples
With this patch the attribute isHighlighted="true" in
the manifest.xml allows highlighting demos and examples.

The highlighted demos and examples appear first in the list
and have a blue highlight.

Task-number: QTCREATORBUG-8459
Change-Id: Ieeb888630235e07b1ae1398c5ccdc3d7e8d15dff
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-02-04 14:13:04 +01:00
Thomas Hartmann
a6c8628c12 WelcomePage: add combox to filer Qt versions
Task-number: QTCREATORBUG-8377

Change-Id: I6693d4ed9cf3791e4cd791463a1b00a23dc4ffff
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-02-04 14:08:37 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
hjk
96788d2990 Cleanup and simplify ExamplesListModel implementation.
Change-Id: Ie93eefa638560c91aaf83e6878466d97393bde72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-20 16:09:51 +01:00
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
2012-12-18 17:42:04 +01:00
Eike Ziller
4510d1ef84 Update examples when default kit changes.
Otherwise one had to close and reopen Qt Creator.

Change-Id: If59d5e01665082e0a69e02c686809f92d86180bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-12-18 16:05:42 +01:00
Eike Ziller
a8a33b9a3b Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
2012-12-14 08:20:49 +01:00
Eike Ziller
4d5c95e156 More diagnostic messages when debugging examples model.
And less messages when not debugging.

Change-Id: Ib30dfe061c399aeeb3523544232b394e12ccb1b6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-12-12 14:19:23 +01:00
Eike Ziller
990ddf2c71 Do not show examples that do not have a projectPath associated.
Tutorials are handled differently, these can still only have
documentation or video.

Task-number: QTBUG-28396
Change-Id: Ief79756c44633b1d105357b385595a1267f730f4
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-12-12 13:37:23 +01:00
Eike Ziller
146ea4b240 Filter out more invalid examples from the example browser.
Task-number: QTBUG-28393

Change-Id: I50a1b88c1711f0577843da81c095ebb7ca576077
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-05 15:52:06 +01:00
Eike Ziller
d719eebfdc Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
2012-11-30 17:02:35 +01:00
Orgad Shaneh
a44aa55502 Add whitespace after control keywords
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-28 20:20:46 +01:00
hjk
3748dc1cdc QtSupport: Fix crash when inserting from an empty list of examples.
Change-Id: I4dbc796577d77e9bca4e8e76e2f68ada3dd440c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-27 17:56:06 +01:00
Eike Ziller
110c31b1da Resolve demos and examples also relative to qt install paths.
Qt5 has the manifest files in QT_INSTALL_DOCS but the actual examples in
QT_INSTALL_EXAMPLES/DEMOS, which can be completely independent.
The patch tries to resolves files relative to the manifest, and if that
fails, relative to the install paths.

Change-Id: I7d449e1edab01f18680a5ffe6edcb508e7b194f6
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-27 17:54:47 +01:00
Eike Ziller
fbe6834a16 Hide non-existing examples.
Can be force enabled with environment variable.

Change-Id: I262df587cf5a906a9e90850405c9db699c3727ab
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-27 17:54:36 +01:00
hjk
6cae330ec7 QtSupport: style
Change-Id: Iabf3c96fc6d6b17282ec2ad43f32f76b04ac2ef0
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-27 09:00:34 +01:00
Christiaan Janssen
a990796070 Creator Examples: prioritize default Qt version when searching examples
Change-Id: Id287332535494dd51609178d429d58749b0c28d6
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-22 14:40:57 +01:00
Christiaan Janssen
53c0fd6449 Creator Examples: search for manifest files in qt5 submodules
Change-Id: Ifd7b838f1471ea08f942d350ed649b0b174e96c5
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-22 13:18:31 +01:00
Christiaan Janssen
3e0aae6872 Creator Examples: providing custom examples-manifest.xml
The user can prevent the default loading of examples and
provide a custom example manifest file through the
environment variable QTC_EXAMPLE_FILE

Change-Id: Id458d321e2c8815312e338e458a5283ac64b5c95
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-21 15:11:48 +01:00
Eike Ziller
1ac3850c6f Also allow Qt5 to provide example manifests.
Change-Id: I71630c7ea8d413949f57797b90672cc3d9b8778f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-22 15:19:07 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Friedemann Kleint
455b677f8e tr()-fixes for 2.6
- 'profile' -> 'target'.
- 'qt version' -> 'Qt version'. Fix occurrences in comments as
  well to make grepping easier.
- Placeholders.

Change-Id: I451eae2f0571bccf1e75cf0def425a09fa80855b
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 16:14:42 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Orgad Shaneh
eff2789348 QtSupport: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I509e2280932477eed8ede5c9cf5d07305bb9ebdb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-05 16:24:41 +02:00
thohartm
ca8cd6b806 WelcomePage: add delay to filter
Setting the filter is now delayed to allow proper typing.

Change-Id: I9faa2b9810766b2a51bf02d4a14222a9f0a81693
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-05-22 17:06:26 +02:00
thohartm
871a25ff57 WelcomePage: fix search filter
We reduce load on the view by using beginResetModel()
and endResetModel() while filtering.

Change-Id: Id3caacc78cdba1c81d915dc1cbb40ada5bfda522
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-05-22 17:06:18 +02:00
Tobias Hunger
aa722e6a60 WelcomePage: Tag broken examples.
Tag examples without an existing .pro-file as "broken". That makes
it possible to search for those plugins in the examples page.

Change-Id: I211e7a53b395fa98fee6222a21ab5116718224c8
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-03-27 19:44:35 +02:00
Tobias Hunger
82e0f27fd1 WelcomePage: Do not list examples that do not exist
Do not list examples that point to non-existing project files.

Change-Id: I6b7fdff3831a5a1845cf8c8d8429287abb1f86ab
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-03-27 18:47:14 +02:00