Commit Graph

141 Commits

Author SHA1 Message Date
hjk
5806009d29 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
2010-06-02 09:57:23 +02:00
Thorbjørn Lindeijer
76020b6152 Make sure bookmarks survive a document reload
While reloading a text document, the bookmarks got lost since their
associated QTextBlocks were deleted.

This patch makes sure that before reloading, the bookmarks are removed
non-persistently in the same way as when closing a document, and that
they are restored after the document was reloaded.

Currently, no effort is made to update the location of the bookmarks
based on the way the file changed.

Task-number: QTCREATORBUG-1281
Reviewed-by: dt
2010-05-28 15:44:59 +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
Thorbjørn Lindeijer
8e9a70addf Renamed TextEditDocumentLayout to BaseTextDocumentLayout 2010-04-26 14:42:11 +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
mae
4d8cb88b5a Introduce default file encoding (for new files and new projects)
Task-number: QTCREATORBUG-365
Reviewed-by: dt
2010-04-13 19:14:23 +02:00
con
ef46c31d35 Fixes: External permission changes are not recognized
Task-number: QTCREATORBUG-1077
2010-04-08 16:08:14 +02:00
Christian Kamm
80fa321609 Clean the BaseTextDocument filename.
Previously, it could contain multiple directory separators, . or ..

This makes using the filename safe for hashes like the ones used in the
C++ and Qml code models.

Reviewed-by: Roberto Raggi
Reviewed-by: mae
2010-04-01 15:21:30 +02:00
con
d6061a23e1 Refactor the externally modified file handling
Reviewed-by: dt
2010-03-22 16:01:55 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Roopesh Chander
9822fb65df cleanWhitespace() checkes whether it has to change indentation or not. handle that. 2010-02-08 16:59:10 +01:00
Roopesh Chander
fde766016a enable auto-determination of spaces/tabs for cleaning whitespace as well 2010-02-08 16:59:10 +01:00
hjk
3251309ada texteditor: remove traces of TEXTEDITOR_STANDALONE 2010-02-04 10:38:11 +01:00
mae
c91c416135 Fix whitespace cleaning of changed blocks after undo
QTCREATORBUG-456
2009-12-14 14:26:49 +01: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
mae
aac47dcbad fix revision handling in base text editor.
After recent qt changes, the initial revision after a QTextDocument::setPlainText()
is not 0.
2009-09-24 15:09:15 +02:00
mae
99435d5f0e Make "Edit/Advanced/Clean_Whitespace work on the current
selection (if there is one)
2009-09-09 16:37:09 +02:00
mae
16e7f0c16f be more conservative when reindenting code: only change the
actual whitespace when the indentation column changes.

Complete whitespace cleanup can still be done either automatically
on save (when configured) or when explicitely called with the
"Clean Whitespace" action from Edit/Advanced.
2009-09-09 16:16:46 +02:00
Thorbjørn Lindeijer
0bbc945154 setPlainText and setHtml already disable undo/redo 2009-08-26 17:57:26 +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
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
con
01cc5b485b Remove unnecessary code. 2009-05-15 12:01:41 +02:00
con
7619ef2497 Remove unused definitions. 2009-05-13 11:36:04 +02:00
mae
9b82d98ede some work on the save-modified-files logic. We no longer rely
on QFileInfo to tell us that a file is not writable, but accept
that the attempt to save a file might actually fail (:-) ). This
solves the NT network domain issue without the insane slowness.

The stuff needs more work. We do not have any UI for failing save
operations when closing creator (other than it doesn't close). Bad.
2009-05-08 17:59:01 +02:00
Roberto Raggi
12e27549b0 Introduced IFile::checkPermission() and use it to reduce the number of calls to isWritable().
Done with: mae
2009-05-08 15:50:15 +02:00
Simon Hausmann
87f74b4eea Fix permissions of basetextdocument.cpp to not be executable 2009-04-18 01:03:32 +02:00
kh
b1ea36bc47 Fix build with namespaced Qt
Reviewed-by: Thorbjorn Lindeijer
2009-04-15 17:36:38 +02:00
Thorbjørn Lindeijer
500b5e20b5 No need to open file ReadWrite for just reading its contents
Pointed out by Mathias Gumz.
2009-04-15 16:10:46 +02:00
Thorbjørn Lindeijer
c3a3ab9664 Small tweaks to NTFS writable check fix 2009-04-14 12:34:26 +02:00
Mathias Gumz
1898c4dbff bugfix for windows: trying to open files stored on network drives relied on QFileInfo::isWritable() without using the real filesystem checks 2009-04-14 12:34:26 +02:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Adam Majer
18952c98b9 Add explicit option to clean indentation
It is desirable to have removal of trailing whitespace as a separate
option to "tab cleanup". Clean Whitespace option without Clean
Indentation option will now only remove trailing whitespace on file save
and on Clean Whitespace requests. Clean Indentation option is set to
true by default to maintain backward compatibility.

Signed-off-by: Adam Majer <adamm@zombino.com>
2009-01-26 14:32:04 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
mae
1931304da1 add explicit "Clean Whitespace" advanced action 2008-12-09 17:43:31 +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
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00