Commit Graph

29 Commits

Author SHA1 Message Date
Tobias Hunger
38cce7eb83 Update License according to agreement with Free Qt Foundation
* Update all files in share folder

Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-19 16:05:29 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Marco Bubke
f3c6200513 Welcome: Keep sidebar and headers static on scrolling
Task-number: QTCREATORBUG-12872
Change-Id: I8ab9a88203fcce60fa9f9cdf06369eb0c572a0bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-02 12:08:03 +02:00
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
Eike Ziller
90f8de5c8a Examples: Move example combo box to the left
That makes it more visible, which is especially important when we show
example sets that do not come from a Qt version there.

Change-Id: Ib99955e70abb95053d9e8cd718ab599153e6eaaf
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-31 12:30:30 +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
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
Jens Bache-Wiig
1193cfa092 Cache loaded items
This is a somewhat different solution for improving the
performance of the welcome screen. It has the added benefit
of caching loaded items while still retaining a decent
performance.

Change-Id: I9927a90f1b7de5bb06c43b16dc80cb2afec3f8ad
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-17 16:23:35 +01:00
Ulf Hermann
e2ce74f5a6 WelcomeScreen: Scroll the example grid view with the main scroll view
By tying the scroll offsets and visible areas of the two scrollable
elements together we avoid excessive loading times for the examples.

Change-Id: I6522ef3e6c0454e5bb05bef143953d8d1850ffdc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-12-03 09:47:12 +01:00
Ulf Hermann
50b61dbe4e WelcomePage: Fix scrolling logic
We only need one scrollable element in the WelcomePage. By passing
the height properties of inner elements to the outermost one we can
avoid multiple vertical scrollbars next to each other. Since this
removes the QScrollArea around the welcome page it fixes
QTCREATORBUG-10796

Task-number: QTCREATORBUG-10796

Change-Id: I08b0409e21f16be6c3e0e5a58f2665320d0a14fe
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-19 11:36:34 +01:00
Thomas Hartmann
0ae420d0ec WelcomePage: redesign of welcome page
Change-Id: Iec777d4fcf86f1807e17a5be777698b64ce15555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-08 11:13:23 +02:00
Jens Bache-Wiig
cf56178df1 Port welcome screen to Qt Quick 2
This ports the welcome screen to use QtQuick 2.0.
I have disabled the plugin on Qt4 builds.

Change-Id: Ia921d0747c8f7d4441c88fc9fb77b822496091f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-16 13:31:59 +02:00
Kai Koehne
dcaa9ff140 Make Qt version combo box on welcome screen wider
Expand the width from 140 to 200 px to make sure that usual names do
fit.

Change-Id: I311ba32a7f300e96ec6b6d183d1078467a71e26a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-11 14:36:28 +02:00
Thomas Hartmann
ba78b73f41 Welcomepage: fix combobox for Qt 4
Somehow AbstractItemModel is not registered in Qt 4.
So we cannot use the qtVersionModel as a property.

Change-Id: Iac822998cb660d317e2b750dde9f3207c66f5feb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-04 17:51:40 +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
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
Thomas Hartmann
71a0daa11c Welcomepage: Do not limit the vertical size of the example browser
I kept the limitation to 3024 pixels to keep the patch small
and avoid accidents/regressions.

Task-number: QTCREATORBUG-8411
Change-Id: I1e2fc453500358d67bdb62732adcdc8e7fa17e1b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-12 11:35:27 +01: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
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
Thomas Hartmann
1b50cdce5c WelcomePage: turning widgets into a proper plugin
Change-Id: Ifffaa8f848777f6961b49dff048672b194570fff
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-15 12:56:34 +01:00
Thomas Hartmann
e19505b71e WelcomePage: remove semi transparent rectangle in views
Requested by Virva Auvinen (Designer)

Change-Id: Iab7f2d3382a6cadd3f186583d9da51689cd6a0e8
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
2012-02-07 17:04:07 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Thomas Hartmann
3807b0fae5 WelcomePage: optimizing GridView
Instead of placing the "complete" GridView to a ScrollArea we now add
a ScrollBar to the GridView. This means that only visible delegates are
instanciated and the GridView gets alot faster.

Change-Id: I63b8593b260acd4d3a786a99c7dd58507c12e221
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-12-08 11:23:23 +01:00
Thomas Hartmann
2fc8c10b8f new design of the welcomepage
Design done by: Virva Auvinen

Change-Id: I94ca75f50d3924088bc7d9be6cc884975480bcac
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-23 13:57:13 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Thomas Hartmann
f50247187d WelcomePage: polishing the welcome page
Major visual upgrade and refactoring.
I also added dummydata and a qmlproject file.

Change-Id: I5ebc6dfb4718a37bb20766669272b85bc9316316
Reviewed-on: http://codereview.qt-project.org/5708
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-28 12:53:46 +02:00