feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,319 Commits 108 Branches 368 Tags
c9c9937b58791d33b6f8b9f8ec34d8b47a5ee12c
Commit Graph

99 Commits

Author SHA1 Message Date
Friedemann Kleint
2892f13b8c CorePlugin: Compile with QT_NO_CAST_FROM_ASCII. 
- Wrap literals in QLatin1String()/QLatin1Char().
- Extract some string constants avoiding repeated
  QString construction.
- Fix repeated invocation of Container.end() in loops.

Change-Id: If737735507aaf82e53063adda53f54c46418f42f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-22 14:47:29 +01:00
Eike Ziller
1899a3838f Provide "Open with" context menu in qrc editor. 
Task-number: QTCREATORBUG-4224

Change-Id: If2b13fa8b58779058d483d532c2c9649f7fa8dfd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-12-13 10:09:58 +01:00
Eike Ziller
7ee895b6dd "Open with" actions can also remember their file name. 
Change-Id: Id32e2149c6c5d23722c2c6fd125ad2e56dda0c24
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-12-09 13:11:05 +01:00
Eike Ziller
3998a0cbde Move "Open with" menu logic to FileManager. 
Better place than ProjectExplorer since it will then be available
elsewhere too.

Change-Id: I0508f121918105a562d2499ac6b31d19d733abad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-12-09 13:10:51 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
hjk
82f5573626 more Id type fixes 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:57:09 +01:00
wongk
00ce839d03 If user cancels save file prompt, cancel entire action. 
Task-Number: QTCREATORBUG-6440
Change-Id: I8807de53b1a05a0abd57c140dab5ba8df441efd5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 14:17:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Fawzi Mohamed
17c88cb2e7 filemanager: fix regression when trying to save read-only file 
When saving a read-only file, a dialog should appear with
Make Writable / Save As / Cancel should open.
Avoids relying on permission error to detect read-only files as
qfsfileengine_unix.cpp treats errno == EACCESS as a QFile::OpenError.

Change-Id: Icdffdc4617c8ef2b58d58aeedbb2b454d0da9465
Task-Number: QTCREATORBUG-5066
Reviewed-on: http://codereview.qt.nokia.com/2442
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-01 18:51:41 +02:00
con
49ea170692 Add menu item to clear the recent projects/files menus. 
Task-number: QTCREATORBUG-5136

Change-Id: I27d5c86832277be9525d95fd1e38a3b86f620974
Reviewed-on: http://codereview.qt.nokia.com/496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-20 12:41:10 +02:00
Oswald Buddenhagen
9ac137fb06 add auto-saving of modified editors 
Task-number: QTCREATORBUG-2847
 2011-05-12 20:10:03 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
dt_
21798a49c9 Readd filewatches to QFileSystemWatcher 
That is needed since after a delete/replace we otherwise stop watching.
 2011-04-28 14:29:05 +02:00
dt_
cae5bef0ec Revert "FileWatcher: Use Utils::FileSystemWatcher in Core::FileManager." 
This reverts commit 4a0985093c.
 2011-04-28 14:29:05 +02:00
dt_
060778ddf4 Handle internally triggered deletes more gracefull 
If the user has enabled "Reload unmodified" then on remove the
unmodified editors are closed. Otherwise the user is asked as before.
Also modify the message to indicate if the change was triggred
externally.
 2011-04-27 15:58:54 +02:00
Oswald Buddenhagen
9e6448d38d improve file change notification suppression in saveFile() 
for one, entirely stop monitoring the own IFile.
second, expect changes on the filename - in case other IFiles use it as
well.
these two ensure that nothing weird happens, especially if we show a dialog
and thus enter an event loop.
 2011-04-18 15:12:44 +02:00
Oswald Buddenhagen
2dd1f0d83d make m_changedFiles a set - for simplicity (and performance). 2011-04-18 14:30:43 +02:00
Oswald Buddenhagen
011b391126 rename misnamed variable 2011-04-18 14:14:21 +02:00
Oswald Buddenhagen
dc13acd5de minor optimization: QList::removeOne() returns a bool 2011-04-18 14:14:20 +02:00
Oswald Buddenhagen
fae7dc9584 add errorString output argument to IFile::reload() & IEditor::open() 
add/unify read error handling in all affected classes
 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
f1f9904d35 add errorString output argument to IFile::save() 
this centralizes error reporting (in fact, in most cases it adds any in
the first place).

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
e35fe2a770 file manager: introduce saveFile() and remove blockFileChange() & unblockFileChange() 
this replaces the ever-repeating idiom block/save/unblock with a single
call.
 2011-04-18 14:10:12 +02:00
Oswald Buddenhagen
9beb7afbe8 GUI style fixes: spaces before ellipses and excess ellipses 2011-04-18 14:10:11 +02:00
con
5b02bf94a8 Merge remote branch 'origin/2.2' 
Conflicts:
	qtcreator.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2011-04-18 13:57:07 +02:00
Friedemann Kleint
4a0985093c FileWatcher: Use Utils::FileSystemWatcher in Core::FileManager. 
for everything except links on UNIX, further reducing shutdown time.
 2011-04-15 16:40:08 +02:00
Oswald Buddenhagen
1f06972f1e don't ignore file changes while reload dialog is up 
we cannot clear the list of modified files after possibly entering the main
loop again, as that might discard new notifications which we have not
processed yet.

Reviewed-by: dt
 2011-04-14 21:08:55 +02:00
Friedemann Kleint
c12c9f54d5 Core: Create link file watcher on demand. 
As deletion of a QFileSystemWatcher is expensive on Linux
and has an impact on shutdown.
 2011-04-14 16:57:40 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
0e89104b45 API Documentation: Fix warnings. 2011-03-28 14:58:12 +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