Commit Graph

69 Commits

Author SHA1 Message Date
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
con
770fc594f0 Don't ask for reload if external tool claims to change current document
Take it as an expected file change.
2011-02-18 17:15:37 +01:00
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
abd4a7b931 Recent files should remember the editor type as well.
Task-number: QTCREATORBUG-1785
2010-12-09 11:38:12 +01:00
con
5c99316624 Remove dead code. 2010-12-06 10:48:10 +01:00
con
0662a8009a Handle read only files correctly when saving all modified files
We use the editor manager's way to save modified files now, so the
normal logic for read only files is applied, including the "cancel/save
as/open vcs/make writable" dialog.
Also fixes that it wasn't handled as a "cancel" if the user chooses to
cancel this dialog.

Task-number: QTCREATORBUG-3109
2010-12-01 13:10:46 +01:00
con
be3bb25068 Only show save as button for files that allow it. 2010-12-01 13:10:46 +01:00
con
964236c816 Move some API around and make some IFile based instead of IEditor.
promptReadOnlyFile: EditorManager-->FileManager
fileFilters: EditorManager-->MimeDataBase
saveFile & saveFileAs --> IFile based
2010-12-01 13:10:46 +01:00
con
14a71bc770 Support symbolic links in the file manager.
We didn't watch the symbolic link itself before, only the final link
target. We are watching the symbolic link and the final link target now.
Ugly hack: We need to work around QTBUG-15522. The inotify and kqueue
based file system watcher engines (Linux + Mac) don't report changes to
symbolic links. The workaround is to use the polling engine *only for
the links themselves*. The only way to force the use of the polling
engine is by using the auto test hook in QFileSystemWatcher.
2010-11-30 13:10:03 +01:00
con
1b6d99661f Remove some unused / useless api. 2010-11-25 17:09:00 +01:00
con
ac9c3232f3 Avoid recursion and possibly endless recursion at removing file watches
Was introduced by the fix for QTCREATORBUG-965

Task-number: QTCREATORBUG-3116
Reviewed-by: dt
2010-11-18 15:46:38 +01:00
Friedemann Kleint
724f67b311 Open File: Make it open in project directory if one is set.
Reviewed-by: dt
Task-number: QTCREATORBUG-2947
2010-11-01 14:29:25 +01:00
con
3a82e22982 Opening recent files wasn't opening with right encoding (Windows)
Confusion between native and internal path representation (i.e.
backslashes). File names should always be "portable" internally.

Reviewed-by: Robert Loehning
2010-10-20 12:10:02 +02:00
Tobias Hunger
0421b9d0dc Filemanager: Ignore editory with temporary files
When switching to a editor containing a temporary file do not
update the filemanager, even when sync to editor is enabled.

Task-number: QTCREATORBUG-2605
Reviewed-by: Thorbjorn Lindeijer
2010-10-05 15:07:35 +02:00
Leandro Melo
bcb3bb0fba Allow the user to save as files with different extensions.
There is still an open issue in this fix since the new extension might be of a different mime type (and our editors are attached to it currently).
More details documented in the code.

Task-number: QTCREATORBUG-2094
Reviewed-by: Thorbjorn Lindeijer
2010-09-07 12:32:34 +02:00
con
081743a064 Some api documentation adaptions. 2010-07-15 16:42:31 +02:00
mae
1787a8549a Use current file path for getOpenFileNames 2010-07-13 15:27:28 +02:00
mae
4caba7d66d Revert "Use current file path (not dir path) for open file"
This reverts commit 38abb7285c.
2010-07-13 14:37:48 +02:00
mae
38abb7285c Use current file path (not dir path) for open file
This makes it possible to open a pro-file with the locator,
then doing Ctrl+O Enter to load the project.
2010-07-07 11:13:42 +02:00
con
ede2a7c975 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
2010-06-30 14:25:09 +02:00
Friedemann Kleint
a945f8b5fd ProjectManager: Make Open Project dialog open in default folder
Move open project dialog handling into ProjectExplorer and make it
use its list of project file patterns. Same in Checkout wizards.

Task-number: QTCREATORBUG-1759
Reviewed-by: dt
2010-06-28 14:34:30 +02:00
hjk
db9e6104cd Core::Context: missed one connect() 2010-06-25 13:13:48 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0'
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
2010-06-08 10:39:45 +02:00
dt
d19ca58bf0 Fix crash with removing files in symlinked directories
Reviewed-By: thorbjorn

Task-Nr: QTCREATORBUG-965
2010-06-02 11:58:25 +02:00
dt
9bc9fe73e1 File renaming
Reviewed-By: con
Reviewed-By: Friedemann Kleint

We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.

Note: Only the qt4projectmanager knows how to rename files.

Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.

Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
2010-05-12 14:14:44 +02:00
dt
48ee824733 Fix crash
Nowadays we don't use QString::null for special cases, thus the
filemanager can allow that.

Task-Nr: QTCREATORBUG-1072
2010-04-12 17:27:03 +02:00
con
ef46c31d35 Fixes: External permission changes are not recognized
Task-number: QTCREATORBUG-1077
2010-04-08 16:08:14 +02:00
con
4f4bbe9828 Change contextChanged signal to also notify about additional contexts. 2010-03-26 12:17:13 +01:00
con
f5e0dc409d Fixes: Notification about externally modified files on Windows.
Reviewed-by: dt
Reviewed-by: Friedemann Kleint
2010-03-23 16:46:15 +01:00
con
d6061a23e1 Refactor the externally modified file handling
Reviewed-by: dt
2010-03-22 16:01:55 +01:00
con
639338b3c6 Fixes: Save as... didn't put the new file to the watches. 2010-03-22 12:44:41 +01:00
con
afe939ef23 A bit more efficient adding/removing of file watchers.
Each call of addPath(s) removePath(s) potentially is locking and
unlocking a mutex, so do it for all paths at once.
2010-03-05 16:03:30 +01:00
dt
b59442e072 Fix FileManager after recent commit
Temporary files should not be watched also fix a few corner cases where
the fixedname of IFile change without the file name changing.
(Oh the fun of symlinks.)

It's more consistent now, though I haven't gone through all the
implications of IFile's who's fixedName change
2010-03-05 15:51:30 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
0239a3822c Reduce file watchers.
Do not add file watchers on editors with temporary files (VCS
diff/commit. etc). Add a flag to FileManager::addFile() specifying
if one wants a watcher.
Acked-by: con <qtc-committer@nokia.com>
2010-02-26 17:20:32 +01:00
dt
75545a2bf0 Fix FileManager to correctly handle multiple IFile's for the same file
And port the Qt4ProjectManager to use that API for synchronization
between editors and the .pro file tree.

Reviewed-By: con
2010-02-17 16:51:02 +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
3ab0a28cca Less use of slow methods. 2009-12-09 15:31:01 +01:00
Friedemann Kleint
4827ba9dfb Wizards: Default to home path if empty or invalid 2009-11-26 18:22:30 +01:00
Friedemann Kleint
3e34a9ae7a Project Wizards: Introduce notion of project directory, polish.
- Introduce project directory and "use" flag to file manager, use that
  in new item dialog
- Add configuration under Project settings, rename it to "General"
- Make wizards create project names as "untitled1.."
- Remove modules page from Qt application wizards (parametrizable)
- Give Utils::ProjectIntroPage a "Set as default location" toggle.
- Introduce wizard dialog base classes for handling that.
- Introduce notion of "last visited directory to file manager" for
  open and non-project wizards, route open through file manager.
- Clean out QmlAppWizard

Task-number: QTCREATORBUG-333
Rubber-stamped-by: con <qtc-committer@nokia.com>
2009-11-26 18:03:26 +01:00
Friedemann Kleint
6de52c401b FileManager: Introduce FileManagerPrivate, cleanup
Task-number:  QTCREATORBUG-333
2009-11-25 10:09:45 +01:00
Friedemann Kleint
74a3828f19 Purge out include files in exported headers 2009-10-01 16:38:08 +02:00
Oswald Buddenhagen
5a482ace9a no contractions, please. and loosers are losers. :D 2009-09-29 12:18:43 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Henrik Abelsson
0a94100508 Add option to select behavior on externally changed files.
Merge-request: 840
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
2009-07-13 15:00:39 +02:00
dt
4637d56284 Don't ask to reload the file, if the user uses git/undo or git/revert.
Simply do it.

Task-Nr: 254558
2009-06-18 14:30:04 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00