Commit Graph

18 Commits

Author SHA1 Message Date
con d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con 04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
con 773343f396 Delay widget creation of options pages till their category is shown
Also add the alternative way: IOptionsPageProvider, which states
a category, and is asked for a list of options pages for that
category when it is shown.

Task-number: QTCREATORBUG-3131
2010-12-06 11:18:58 +01:00
kh1 55fe83c291 Make it possible to return editor mode if the last help page was closed. 2010-09-21 17:01:36 +02:00
kh1 dc3f33890c Make use of the custom value settings functionality. 2010-08-02 16:32:18 +02:00
kh1 de040e80fc Initial support for showing help in external window.
Task-number: QTCREATORBUG-1473
2010-07-23 16:37:29 +02:00
Thorbjørn Lindeijer 50ccecee2e Some initialization and removed redundant member variables
Reviewed-by: kh1
2010-06-02 14:53:44 +02:00
Thorbjørn Lindeijer 2d21060bc9 Added icons to options dialog categories
Some categories do not have icons yet, unfortunately.
2010-03-26 17:47:31 +01:00
kh1 6ac6be5db2 Rewrite of the whole help modul initialization.
We now do as much as possible lazy initialisation, e.g only start the
full text search indexer if we really access the search widget. Also
moved the QFutur progress into the search widget. Changed all ctors to
be called without an argument, since we share the help engines from
help manager all over the place. Make use of the fact that we only need
to call setupData on the gui engine if we access the help mode, otherwise
all data is fetched thru the core engine whichs setupData is really fast.
2010-03-23 18:13:12 +01:00
kh1 3cd98b3387 Make use of the core engine in the general settings page.
Reviewed-by: ck
2010-03-16 15:54:38 +01:00
hjk 9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Friedemann Kleint 65e11062bb Polish the settings dialog.
Add a title label to the pages. Use QGroupBoxes throughout.
Extend SavedAction to work with checkable QGroupBoxes. Polish UI files,
use common layout for VCS plugins. Performance: Apply only visited
settings pages. Add search keywords.

Task-number: QTCREATOR-26
2009-11-24 15:05:02 +01:00
hjk 93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
kh e4b0bd28cb Implement import - export of help bookmarks.
Task-number: 254695
2009-07-08 15:03:40 +02:00
kh a175a5f6ee Implement home page settings and help startup options. 2009-06-26 16:50:50 +02:00
kh 0b1bc40b65 It is now possible to configure the help viewer font.
Task-number: 253365
2009-06-25 17:16:16 +02:00