feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,166 Commits 108 Branches 368 Tags
adaed6952b7e90c9f6a1434094d8cce3ccd9e6b6
Commit Graph

51 Commits

Author SHA1 Message Date
hjk
adaed6952b texteditorplugin: use Find::SearchResultWindow::instance 2011-01-05 09:56:00 +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
Leandro Melo
1175705bfc Snippets: Make it easier for plugins to add snippets groups 
Groups are no longer enum values but identified from snippet providers.
 2010-12-08 17:22:13 +01:00
hjk
ff0ac20a42 coreplugin: use Core::Id is some places 2010-09-10 17:22:28 +02:00
Leandro Melo
f7532a02d0 Do not force a specific editor for a file created from a wizard. 
The wizards already provide a default suffix for file creation.
But since the user is still free to specify something else it's better to leave it to Creator to decide which one is the proper editor.
After all, this reflects how the file will be treated by Creator (including the next time it's opened).

Task-number: QTCREATORBUG-2006
 2010-09-08 16:39:26 +02:00
con
214e0bf35b Add a instance() method to the search result window singleton. 2010-07-12 16:17:31 +02:00
Kai Koehne
5439ce976e Add new Outline sidebar pane 
Adds a generic Outline pane to the sidebar. The CppEditor & QmlJSEditor
plugins will implement the IOutlineWidget/IOutlineWidgetFactory interface to
provide views specific to C++/Qml/JS documents.

Reviewed-by: con
 2010-07-08 14:02:51 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
Leandro Melo
125aaf8615 Settings page for the generic highlighter. 2010-05-27 09:54:59 +02:00
Leandro Melo
55b26868e6 Generic highlighter is now part of the text editor plugin. 2010-05-20 14:10:34 +02:00
Daniel Molkentin
bf95a99c51 New texts for the wizard types in the new dialog 
Reviewed-by: Leena Miettinen
 2010-05-12 14:16:49 +02:00
Thorbjørn Lindeijer
712c7e212e Make TextEditorPlugin internal again 
The TextEditorSettings class already provides the appropriate signal.
 2010-04-20 09:09:09 +02:00
con
8ccc726eb5 Revert "Adapt default shortcut for completion on Mac." 
This reverts commit 497e514148.

I'm proved wrong by other mac installations.
 2010-03-18 12:18:57 +01:00
con
497e514148 Adapt default shortcut for completion on Mac. 
Since Leopard our default shortcut for completion collides
with the one for Spotlight (Ctrl+Space).
Cmd+Space is taken for Mac's keyboard layout settings,
so going for Opt+Space...
 2010-03-17 17:55:40 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
hjk
c31055b54c texteditor: add missing parts to previous commit 2010-02-12 14:24:46 +01:00
con
d4be77b48f Reorder the "new" wizard categories. 2010-01-15 11:07:50 +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
mae
a21ebf5475 zoom the search results as well (regression fix) 2009-11-30 19:14:48 +01:00
Friedemann Kleint
0e554fac91 Wizards: Sort 
Introduce new QString id() const-API and sort wizards by
[untranslated] category and id. Introduce respective constants.
Rubber-stamped-by: con <qtc-committer@nokia.com>
 2009-11-27 10:33:24 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Thorbjørn Lindeijer
c1198e5ab9 Added importing of customized color schemes from the ini file 
So people's customized color schemes don't get lost, but get converted
to the new format instead.
 2009-07-15 15:08:35 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED 
There were both variants, with and without extra semicolon.
 2009-07-13 17:35:17 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Roberto Raggi
132258753a More work on `Quick Fix'. 2009-06-09 13:52:52 +02:00
Roberto Raggi
df99d5447f Initial work on "Quick Fix". 2009-06-08 14:32:42 +02:00
Oswald Buddenhagen
d2a8449bea ifdef Q_?S_* cleanup 
- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
 2009-06-03 20:54:59 +02:00
con
592b0d7c64 Add a "current file" find filter. 
Which nicely adds the occurrances to the search output window for
navigation.
 2009-05-29 17:03:10 +02:00
mae
224a3870d7 Push "Find in files" to the end of the find filters. 2009-05-28 16:51:21 +02:00
Daniel Molkentin
83d451be32 Make strings consistant, part. descriptions in the 'New' wizard. 2009-05-25 13:45:12 +02:00
Thorbjørn Lindeijer
29a620fa97 Made font of search results match text editor font 
Before it would use Courier on all platforms, which didn't always look
nice. Now it uses the configured text editor font.

The file paths are now also normal size, at least personally I don't see
why they should use a larger font.
 2009-04-08 15:13:17 +02:00
hjk
285fa4a5b3 fakevim: remove "fakevim" option from text editor settings as it has a 
page of its own now
 2009-03-30 15:39:13 +02:00
Thorbjørn Lindeijer
0a48bd8731 Unduplicated the code that initializes editor settings 
This stuff was all over the place, a relic from before the editor
settings were unified. Now the initialization is only done in
TextEditorSettings.

Fixes the .pro file editor and the generic project files editor, which
before only used the font settings.
 2009-03-17 18:25:45 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
292d4bc3d5 Fixes: fakevim: provide an option in the text editor settings 2009-01-23 19:13:00 +01:00
hjk
592560b578 Fixes: rempve unnneded icore.h #include 
Task:     180315
    RevBy:
    Details:
 2009-01-21 18:30:45 +01:00
Thorbjørn Lindeijer
6adecf3767 Avoid going through ICore when it's not necessary 
Many singletons have their own instance() method, in which case there is
no need to use ICore::instance() to get access to them.
 2009-01-21 15:55:33 +01:00
hjk
897c05f57c replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance() 2009-01-20 15:31:33 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +01:00
hjk
cc5ff1ec74 Remove #include <extensionsystem/pluginmanager.h> from icore.h, a 
forward declaration is sufficient.
 2009-01-19 12:39:20 +01:00
con
fbfcc9a484 Fixes: - ICommand --> Command 
Details:  - Naming convention
 2009-01-14 13:18:25 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
con
c9889120c3 Fixes: - Rename ActionManagerInterface --> ActionManager 
Details:  - To make it conform to naming convention.
 2009-01-13 15:44:25 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
4a552ead9f use QTC_ASSERT instead of Q_ASSERT 2008-12-09 15:25:01 +01:00
hjk
cf11b69643 more code cosmetics 2008-12-02 16:19:05 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00