Commit Graph

191 Commits

Author SHA1 Message Date
Leandro Melo
9e56781b5b Proj. explorer: Adjust order of load/unload signals
This tries to fix inconsistencies concerning the order of some signals
and the corresponding state of the sessions. In particular, it now emittes
aboutToLoadSession *after* aboutToUnloadSession. Also, retrieving the
active session name gives the correct result when updating project files.
In addition, there's a new parameter to aboutToLoadSession which describes
the session being loaded.

Change-Id: Iab5fb21080a7ee9bbf9f4d8958499cbc5549e81e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-11-11 12:59:54 +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
Leandro Melo
4528b19b40 Proj. explorer: Remove dead code
Change-Id: I5375eeac89b92d2d3938feadd7e9017aae3749e5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-11-10 15:47:57 +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
Jarek Kobus
2244911826 Implement Code Style schemes
Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-09-23 10:23:15 +02:00
hjk
e684960523 core: remove usages of Core::ICore::instance()->modeManager()
The function is still there but should be remove in my opinion.

Change-Id: I739fe942e74f459faccb80b5bcb8a5721c6bb9bf
Reviewed-on: http://codereview.qt.nokia.com/4200
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 15:23:45 +02:00
Daniel Teske
4e41308a0f Better error feedback on Open project
Task-Nr: QTCREATORBUG-5996
Task-Nr: QTCREATORBUG-5995

Change-Id: I4184a1c652cbfc93a788a8f9b67d936401e197b9
Reviewed-on: http://codereview.qt.nokia.com/4197
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-05 15:10:01 +02:00
Daniel Molkentin
22d6dfa45a Welcome Screen: Fix regressions
- last session / current session semantics is back
- Manage Sessions... button is back

This commit changes the behaviour of currentSession()
to return the session name and not the full path.
SessionNodeImpl as the other user has been adjusted
accordingly.

Change-Id: I1dcfbef2fb4dacf3e3906871d816483c2bfb76da
Reviewed-on: http://codereview.qt.nokia.com/1461
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-12 11:24:31 +02:00
Christian Kamm
779fafcbfe Make C++ code style configurable.
Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b
Done-with: Jarek Kobus
Task-number: QTCREATORBUG-2670
Task-number: QTCREATORBUG-4310
Task-number: QTCREATORBUG-2763
Task-number: QTCREATORBUG-3623
Task-number: QTCREATORBUG-567
Reviewed-on: http://codereview.qt.nokia.com/74
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-24 12:45:07 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Tobias Hunger
f068084083 Do not override mouse cursor needlessly
Task-number: QTCREATORBUG-3822
2011-05-04 11:15:11 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
2011-04-18 14:10:14 +02:00
Friedemann Kleint
fcdc8177b1 Documentation: Add ProjectExplorer plugin..
Reformat existing documentation to qdoc.
2011-04-14 12:58:14 +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
dt
c6e0499026 Sessions: Store expand/collapsed state of project tree
Task-Nr: QTCREATORBUG-3161
And related to
Task-Nr: QTCREATORBUG-1796
2011-03-25 16:50:21 +01:00
dt
919acf5786 ProjectExplorer: Move dependencies update a little further up
Task-Nr: QTCREATORBUG-4168
2011-03-21 18:28:55 +01:00
dt
9901dbd1d6 SessionManager: emit sessionLoaded after actually changing activeSession
Also make use of that signal for the welcome page
Task-Nr: QTCREATORBUG-4034
2011-03-11 13:12:37 +01:00
Leandro Melo
ea313f3ec8 Text editor: Introduce per project settings
With some refactorings to make the code look better.

Reviewed-by: con
2011-02-21 17:22:24 +01:00
dt
3278d6c77c Session Manager: Simplfy code 2011-01-19 15:47:00 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
mae
4226538ac3 Fix QML to UTF-8, unless changed in editor
Task-id: QTCREATORBUG-3424
2010-12-20 18:11:44 +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
dt
cc75d11a62 Session Manager: Set corrrect window title after unloading last project
Task-Nr: QTCREATORBUG-3337
2010-12-09 19:53:49 +01:00
con
af99e09b05 Window title didn't show nice name for e.g. diff views.
Use the editor's displayName for the window title.
Also there were missing change signal emissions in setDisplayName
implementations.
Moves the actual handling of the window title from Session to
EditorManager (so it now is also done for the hypothetical case of no
project explorer plugin).

Task-number: QTCREATORBUG-3207
2010-11-30 13:18:34 +01:00
Friedemann Kleint
4293ee40ec ProjectExplorer: Remove internal classes from exported headers. 2010-11-01 11:18:27 +01:00
con
a96267ea12 Remove some stone old compat code + use methods for user resource path.
Reviewed-by: dt
2010-10-25 17:21:29 +02:00
Tobias Hunger
72eaca26db Session: Do not save temporary editors
Do not save temporary editors in the session. Chances are high
that files opened in those editors are not around when the
session is reopened.

Task-number: QTCREATORBUG-2422
2010-10-08 14:30:28 +02:00
dt
7df826eb02 Startup: Do not switch away from the welcome mode 2010-09-17 15:32:41 +02:00
dt
109d8eaa92 Session Manager: Default Mode for new Sessions is Edit 2010-09-17 13:04:44 +02:00
dt
af4ebe4996 Session Manager: Remove double connect 2010-09-17 13:04:43 +02:00
dt
776e299568 Session Manager: Remove unused variable 2010-09-17 13:04:43 +02:00
dt
11574611e6 Session Manager: Easier code flow 2010-09-17 13:04:43 +02:00
dt
4c108128b2 Session Manager: mark sessionNameToFileName as const
Just some API cleanup
2010-09-17 13:04:43 +02:00
Tobias Hunger
0402a3ff7f Inform about projects in a session that failed to load
Inform the user about projects that failed to load as part
of a session.

Reviewed-by: dt
2010-09-15 17:40:36 +02:00
Tobias Hunger
3b007ef92a Keep projects that failed to load in a session
Do not throw projects that failed to load out of the session.
Remember the project file names and append them to the session
again when saving.

Reviewed-by: dt
2010-09-15 17:40:35 +02:00
Daniel Molkentin
460cbadc82 Refactor: add userResourcePath() accessor to ICore.
Access to the users private resource path (derived from the
settings path) has been used in quite some places, so it's
worth moving it to the core interface centrally.

Reviewed-By: Thorbjorn Lindeijer
2010-08-25 19:12:53 +02:00
mae
7f0ab1a925 Fix project-specific default file encoding
The project specific default file encoding would always be
locked to the default encoding when the project is loaded
the first time. This is unexpected and confuses users who
like to change the default encoding in the options dialog but
have never discovered (nor need) the project specific encoding.

The commit solves this by introducing a new value "Default" to
the project specific encoding combo box, which happens to
be the default.

Task-number: QTCREATORBUG-1996

Matthias
2010-08-06 11:56:06 +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
618f03e402 SessionFile does not need to be a IFile
Remove useless inheritage
2010-05-10 13:00:15 +02:00
Daniel Molkentin
ee8caa5b7c Modify behaviour of sessions on the welcomescreen and tweak the session manager
- List sessions by recent use instead of alphabetically
- Tweak the session manager. It is now a persistent dialog with only a close button
- Implement session renaming in the session manager
- Cleanups

Task-Number: QTCREATORBUG-1168
2010-04-21 16:08:24 +02:00
con
62e57edf4c Remove the window modified indicator feature from non-Mac again.
It creates too much headache with widgets calling setWindowTitle
themselves and Qt spilling out warnings about missing "[*]".

Reviewed-by: Thorbjørn Lindeijer
2010-04-21 14:12:58 +02:00
con
7d9398b768 Fixup for non-Mac windowModified property handling.
Reviewed-by: Friedemann Kleint
2010-04-16 11:07:04 +02:00
dt
58497e46a6 Fix restoring of default sessions
They appeared to be always empty.

Task-Nr: QTCREATORBUG-977
2010-03-29 15:17:19 +02:00
dt
a3f827b1b8 Remove isApplication() and simplfy startup project logic 2010-03-25 17:36:39 +01:00
con
d6061a23e1 Refactor the externally modified file handling
Reviewed-by: dt
2010-03-22 16:01:55 +01:00
dt
272e76409d Make default virgin session check more robust.
Task-Nr: QTCREATORBUG-572
2010-03-18 13:42:26 +01:00
Friedemann Kleint
f5814de278 Fix assert in session.cpp dependent on timer. 2010-03-10 17:29:53 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00