feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,084 Commits 108 Branches 368 Tags
e32cf192f7ba34dda96b61507b440c6a17b51a0c
Commit Graph

47 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
1eb2f2bd94 Could not replace globally with empty string. 
Task-number: QTCREATORBUG-2941
 2010-12-01 13:25:08 +01:00
con
3c94a89801 Open files from search result list with right encoding, even on Windows. 
Didn't work if a project specific encoding was set.

Task-number: QTCREATORBUG-65
Reviewed-by: Robert Loehning
 2010-10-19 12:39:56 +02:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching 
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
 2010-09-14 15:23:11 +02:00
dt
faba06b553 Search Dialog: Make canceling possible 
Task-Nr: QTCREATORBUG-2243
 2010-09-02 16:13:46 +02:00
con
2bda8675e5 C++ symbols find filter for advanced find. 
Required refactoring of the search result window to show real trees of
search results.

The backend is the backend from the Locator filter, which is a bit
outdated now.
 2010-07-23 16:34:22 +02:00
con
94a7fd0b99 Make "Use regular expressions" a general option for find filters. 
This was the main goal of the new generalized Find::FindFlags
 2010-07-15 16:42:32 +02:00
con
a8316c4681 Use the Find::FindFlags also for the search dialog. 2010-07-15 16:42:32 +02:00
con
9c47c42232 Add multiple search results to the tree at once. 
Task-number: QTCREATORBUG-1690
 2010-06-25 12:23:03 +02:00
con
f232cd4ead Fixes: Multi-file regexp replace didn't replace placeholders e.g. \1 2010-06-11 11:07:48 +02:00
Bill King
55edbe1c5b Fix parameters hidden by local variables. 2010-06-11 13:35:22 +10:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00
Robert Loehning
d205ccc86a Fixed adding of new file patterns to combo box in advanced find dialog 
Task-Nr: QTCREATORBUG-1329
 2010-05-03 22:20:30 +02:00
Thorbjørn Lindeijer
41ab8fbbf1 Moved TextEditDocumentLayout and related classes to their own file 
The Parentheses, TextBlockUserData and TextEditDocumentLayout classes
and their member function implementations were spread around the
BaseTextEditor class. Moving them to their own file to make the code a
bit better organized.

Reviewed-by: mae
 2010-04-26 14:42:11 +02:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues. 
QString: Use QChar where appropriate.
 2010-02-01 12:43:56 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3' 
Trailing whitespace removal re-applied manually.
 2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace 
doing it in 1.3 as well to avoid possible later conflicts
 2010-01-29 21:33:57 +01:00
con
1a12895f45 Avoid compile warning 2010-01-11 14:13:11 +01:00
con
1a95f6f205 Implement string based search & replace in multiple files. 
This uses the same UI as "Rename Symbol".
Moves the actual rename implementation to a static method in
BaseFileFind and uses it for rename symbol and search & replace.
Moves the signal notification for the code model from VCSManager to
the more general FileManager.
Note that as for rename symbol, there's no undo yet.

Task-number: QTCREATORBUG-73
 2009-12-21 11:08:52 +01:00
con
90c03d3209 Add functionality to show progress for the application in task bar/dock. 
Move the API to the progress manager.
Added a first Mac implementation, other
platforms are pending.
 2009-11-27 17:08:21 +01:00
con
9c0ed539cc Prevent global replace before search is done. 
Also fix focusing issues of the replace line edit.

Reviewed-by: Roberto Raggi
 2009-11-04 18:44:19 +01:00
con
ddb7842761 Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3 
Conflicts:
	src/plugins/cpptools/cppfindreferences.cpp
	src/plugins/cpptools/cpptoolsplugin.cpp
	src/plugins/texteditor/basefilefind.cpp
 2009-10-05 17:26:13 +02:00
con
44e2704bc1 Refactor search result window for use of many items and checked state. 2009-10-05 16:01:50 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
 2009-10-05 11:06:05 +02:00
Friedemann Kleint
74a3828f19 Purge out include files in exported headers 2009-10-01 16:38:08 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
5b2abd8510 Searching in files takes open editors into account now. 
Task-number: 258468
 2009-08-05 13:29:16 +02:00
con
db8507c4a0 Extract the styled painting of the find bar to utils widget. 2009-07-15 12:39:31 +02:00
mae
75b95cfc1c Since we open the search result pane after a search anyway, we can make 
the progress indicator CloseOnSuccess.
 2009-07-13 18:47:11 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Jens Bache-Wiig
6e8bc0cf58 Fixes: Improved sidebar looks and layout 
Details:
-Centered all the text labels.
-Added shadow on title text.
-Made progressbar go all the way and placed the button on top.
-Added some spacing between warning and error icons.
-Improved cosmetics on progress bar itself.
 2009-06-04 15:19:57 +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
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
592560b578 Fixes: rempve unnneded icore.h #include 
Task:     180315
    RevBy:
    Details:
 2009-01-21 18:30:45 +01:00
hjk
897c05f57c replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance() 2009-01-20 15:31:33 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
con
281c462d24 Fixes: - ProgressManagerInterface --> ProgressManager 
Details:  - Conform to conventions.
 2009-01-13 15:44:26 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
Oswald Buddenhagen
ce497d2085 improve accels in find-in-files dialog. 2008-12-03 22:03:07 +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
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00