Commit Graph

170 Commits

Author SHA1 Message Date
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
mae
d2bb23e62f Make creator auto-save the session state when something changed
Currently the 10second auto-save timer is started when an editor
is opened or close, or when a bookmark or breakpoint is set or
removed.

The change ensures that users do not lose their session state
should creator crash (e.g. when a laptop runs out of battery)

Task-number: QTCREATORBUG-188
Reviewed-by: con
2010-03-03 15:57:10 +01:00
con
8c6fc0c454 Don't begin global paths with '/' on windows.
Doing it creates huge delays, because it resolves to a network path.
Also rename FolderNode::setFolderName to FolderNode::setDisplayName,
because that's the name of the property.

Task-number: QTCREATORBUG-695
2010-02-24 15:06:48 +01:00
con
6062ff2e8f Fixes: "Save as" does not update window title 2010-02-03 17:44:38 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Tobias Hunger
592e494d1a Fix typos
Reviewed-by: thorbjorn
2010-01-11 10:26:13 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
dt
ae633c1956 Add BuildConfiguration classes
Each project has it's own BuildConfiguarion * classes, they'll get a
decent type safe interface and the setValue/value stuff will be removed.
2009-11-30 15:24:31 +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
Friedemann Kleint
ad294f8467 Project explorer: Make public headers compile with NO_CAST_FROM_ASCII
.. and purge unneeded includes.
2009-09-29 11:39:55 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
hjk
b104b43fa0 sessionmanager: replace signal sessionUnloaded() by aboutToUnloadSession()
sessionUnloaded was sometimes emitted when the session manager was in
an unsafe state (between delete m_file and  m_file = new ...) leading
to crashes when slots connected to the signal accessed the sessionmanager
again. This patch moves the signal emission before  delete m_file.

Reviewed-by: dt
2009-08-13 17:10:53 +02:00
dt
dbe5a6f34b Rework the project settings.
This has still a few missing things, but this enough to start getting
some feedback. Missing are non qt projects, a solution for the
runconfiguration, a missing black line between the treeview on top and
the project settings at the bottom. Some flickering with removing/adding
widgets to the QScrollArea and not showing the expanded widget if the
Details button is right at the bottom.
2009-08-06 15:31:32 +02:00
Thorbjørn Lindeijer
6a5205f39c Micro-optimization for sorting sessions
Reviewed-by: dt
2009-07-23 11:06:07 +02:00
dt
9d58ea3e7c Sort the session list alphabetically.
Task-Nr: 257986
2009-07-21 13:17:58 +02:00
dt
69d04bc069 Simply look at the filesystem to get the list of sessions.
Instead of maintaining a list of sessions in our settings, simply list
all the files that we find.
Note: This will probably ressurect a few lost sessions for some people.

Task-Nr: 255140
2009-06-18 11:36: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
Thorbjørn Lindeijer
7907e447b0 Don't try to show an empty filename in the window title 2009-06-12 13:00:13 +02:00
mae
eca3b98c56 Use editor manager standard closing facilities for session switching 2009-06-03 17:20:28 +02:00
Joel Nordell
69a99f0a40 add current editor filename (and, on macosx, proxy icon) to titlebar 2009-05-21 14:11:13 -05:00
Oswald Buddenhagen
3270c4828f typo & language fixes 2009-05-11 14:10:22 +02:00
hjk
c1e0a788ff debugger: don't dead-lock when switching sessions while debugging 2009-04-01 16:50:21 +02:00