Commit Graph

114 Commits

Author SHA1 Message Date
Tobias Hunger
5173c2dc01 s/target/buildtarget/ in projectnodes
This is in preparation of the addition of "targets" in the sense
of "platforms to develop for" into the codebase.

Reviewed-by: dt
2010-02-02 12:59:29 +01:00
Tobias Hunger
788b294a30 Make project use toMap/fromMap to save state
* That is what everybody else is using now.

Reviewed-by: dt
2010-02-01 12:23:14 +01:00
Tobias Hunger
4ee223d45d Add a id() method to projects
* This makes it easier to distinguish projects in the
   userfileaccessor
2010-02-01 12:23:14 +01:00
Tobias Hunger
f923a561c3 Make use of ProjectConfiguration in RunConfigurations
Reviewed-by: dt
2010-02-01 12:23:13 +01:00
Kai Koehne
bafe4468aa Add support for JavaScriptFiles and ImageFiles elements to .qmlproject 2010-01-29 12:15:47 +01:00
Kai Koehne
269506c99c Add new JavaScriptFiles & ImageFiles element to .qmlproject file format 2010-01-29 12:15:47 +01:00
Kai Koehne
f3cf0c36cb Adjust .qmlproject files generated by wizards to new format 2010-01-29 12:15:47 +01:00
Kai Koehne
5c16f706c6 Replace .qmlproject default editor with the .qml one
Extend logic for mimetype matching in QmlJsEditor: Also
handle sub-mimetypes like x-application-qmlproject, which
extends x-application-qml.
2010-01-29 12:14:42 +01:00
Kai Koehne
10dc30fa13 Add support for 'paths' property in QmlFiles element 2010-01-29 12:13:12 +01:00
Kai Koehne
01c22d803b Also watch sub-directories for changes 2010-01-29 12:13:12 +01:00
Kai Koehne
2181a93a1b Let QmlProjectItem return always absolute paths
We're converting the path to absolute ones in QmlProject anyway ...
2010-01-29 12:13:11 +01:00
Kai Koehne
20801bee30 Update project tree if .qmlproject file / included directories change 2010-01-29 12:13:11 +01:00
Kai Koehne
32ac14c27a Wire up new project file format in Project Manager
Old format is still available as a fallback.
2010-01-29 12:13:11 +01:00
Kai Koehne
47155f8518 New qml based .qmproject file format 2010-01-29 12:13:11 +01:00
Kai Koehne
c5bc134732 Remove unused dummy method 2010-01-27 13:32:14 +01:00
Friedemann Kleint
001602c2a4 Foldernavigationwidget: Use QFileSystemModel instead of QDirModel.
hoping for better performance. On this occasion, add context menu
containing "Open" and "Choose folder" enabling drive changes on
Windows. Purge remains of QDirModel elsewhere.
Task-number: QTCREATORBUG-62
2010-01-26 10:33:39 +01:00
Roberto Raggi
c943d8e4f1 Renamed classes and files to use the QmlJS prefix. 2010-01-18 16:59:20 +01:00
Erik Verbruggen
96e31c2a0f Started merging the JS and QML editor plug-ins. 2010-01-15 17:20:19 +01:00
Erik Verbruggen
8e11f81d96 Gotten rid of dulplicate files, and fixed includes. 2010-01-15 13:39:54 +01:00
con
d4be77b48f Reorder the "new" wizard categories. 2010-01-15 11:07:50 +01:00
Kai Koehne
33ec15b9ab Prevent symbol clashes for qml classes
Fix namespace usage such that all classes in shared/qml live in the
Qml namespace, and classes in QmlDesigner plugin in the QmlDesigner
namespace.

This should prevent any symbol clashes until we can finally get rid
of the file dublicates (e.g. QmlDocument).
2010-01-14 16:32:22 +01:00
Kai Koehne
f196700ee3 Fix compilation with msvc 2010-01-13 08:43:35 +01:00
Bea Lam
c9da13eb21 Use the QmlProject configuration to set the debug server port. 2010-01-13 11:45:51 +10:00
Kai Koehne
7f7e9d8640 Make QmlProject & QmlRunConfiguration exported classes
Will be used in QmLInspector plugin.
2010-01-12 16:57:33 +01:00
Kai Koehne
2e36b9a34a Make sure that the qmlviewer from the binary package is always used
The custom creator-qml installer comes with a qmlviewer installed
in creator/bin. Make sure that this qmlviewer is used to run .qmlproject
files, even though there might be other qmlviewer binaries in the
PATH.
2010-01-12 13:59:35 +01:00
Bea Lam
7fa633259b Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 2010-01-12 10:53:20 +10:00
Bea Lam
5a1f825cff Fix bug where the qmlinspector tries to connect to the debug
server before it has started.
2010-01-12 10:50:37 +10:00
con
a24738ffab Fixes: Diff editors don't get correct name.
They were no longer showing e.g. the file name of the diffed file.
Also separate editor id and editor context a bit.
2010-01-11 16:54:30 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers
Reviewed-by: thorbjorn
2010-01-11 10:26:12 +01:00
Kai Koehne
9b353b7a2f Fix default "hello world" qml file to not use anchors
Some things like reparenting do not work right now in the Design mode
for anchored items, and we are missing a way to inform the user.
Using absolute positions for positioning therefore avoids confusion
for first time users.
2010-01-08 11:27:23 +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
Kai Koehne
818a7b226b New QmlDesigner plugin & Design mode
This adds a new "Design" mode that can be used to manipulate qml files
in a visual way. It will only get build if you have the declarativeui
module in Qt.

This is a squashed import from the Bauhaus project. Share & enjoy :)
2010-01-07 12:14:35 +01:00
Daniel Molkentin
39e4b11277 Fix GCC warnings. 2010-01-04 15:34:38 +01:00
Tobias Hunger
929045908f Add copyright headers to QML related files.
Reviewed-by: Erik Verbruggen
2010-01-04 11:33:05 +01:00
Bea Lam
200a03ed20 Fix QmlInspector to work properly now that QmlProjectManager
no longer uses LocalAppRunConfiguration. QmlInspector now uses
the qmlviewer started by QmlProjectManager instead of starting
its own, and clicking the Start Debug button within a QML
project will switch to QML Inspect mode and start the inspector.
2009-12-18 15:32:36 +10:00
Kai Koehne
7900ec6da2 Enable starting a qmlproject via Debug
This will right now wait for a qmldebugger connection.
2009-12-17 09:54:16 +01:00
Friedemann Kleint
895a3e21f3 Compile Windows. 2009-12-17 08:46:22 +01:00
Kai Koehne
80963107c6 Fix various crashes for QmlProject
QmlProject used LocalApplicationRunCOnfiguration, but didn't provide
e.g. an associated BuildConfiguration. Fix this by implementing it's
own QmlRunControlFactory, QmlRunControl.
2009-12-16 16:40:58 +01:00
con
7081a3d415 Merge remote branch 'origin/1.3'
Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp
2009-12-14 11:47:39 +01:00
dt
0e29cca4cb Adding files for generic project get the right directory now.
For folder nodes.

Task-number: QTCREATORBUG-374
Reviewed-by: Thorbjorn
2009-12-09 14:45:16 +01:00
Erik Verbruggen
a8dbba5f6f Moved files common to the QML editor and Bauhaus into a separate library. 2009-12-02 18:00:01 +01:00
dt
a312206306 Move most of the BuildConfiguration specific functions
Note: I didn't fix all the connects and there are a few missing things.
This compiles, more work is coming.
2009-11-30 15:24:31 +01:00
Friedemann Kleint
0e554fac91 Wizards: Sort
Introduce new QString id() const-API and sort wizards by
[untranslated] category and id. Introduce respective constants.
Rubber-stamped-by: con <qtc-committer@nokia.com>
2009-11-27 10:33:24 +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
Alessandro Portale
20b209858b Improved line wrapping of plugin license texts.
The paragraphs are now long lines that get wrapped by the text browser.

Reviewed-by: TrustMe

	modified:   src/plugins/bineditor/BinEditor.pluginspec
	modified:   src/plugins/bookmarks/Bookmarks.pluginspec
	modified:   src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	modified:   src/plugins/coreplugin/Core.pluginspec
	modified:   src/plugins/cpaster/CodePaster.pluginspec
	modified:   src/plugins/cppeditor/CppEditor.pluginspec
	modified:   src/plugins/cpptools/CppTools.pluginspec
	modified:   src/plugins/cvs/CVS.pluginspec
	modified:   src/plugins/debugger/Debugger.pluginspec
	modified:   src/plugins/designer/Designer.pluginspec
	modified:   src/plugins/fakevim/FakeVim.pluginspec
	modified:   src/plugins/find/Find.pluginspec
	modified:   src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	modified:   src/plugins/git/ScmGit.pluginspec
	modified:   src/plugins/helloworld/HelloWorld.pluginspec
	modified:   src/plugins/help/Help.pluginspec
	modified:   src/plugins/locator/Locator.pluginspec
	modified:   src/plugins/mercurial/Mercurial.pluginspec
	modified:   src/plugins/perforce/Perforce.pluginspec
	modified:   src/plugins/projectexplorer/ProjectExplorer.pluginspec
	modified:   src/plugins/qmleditor/QmlEditor.pluginspec
	modified:   src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	modified:   src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	modified:   src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	modified:   src/plugins/regexp/RegExp.pluginspec
	modified:   src/plugins/resourceeditor/ResourceEditor.pluginspec
	modified:   src/plugins/snippets/Snippets.pluginspec
	modified:   src/plugins/subversion/Subversion.pluginspec
	modified:   src/plugins/texteditor/TextEditor.pluginspec
	modified:   src/plugins/vcsbase/VCSBase.pluginspec
	modified:   src/plugins/welcome/Welcome.pluginspec
2009-11-20 14:32:42 +01:00
dt
0d162be22f Make BuildSteps one instance per BuildConfiguration
Enables users to change which buildsteps get run per buildconfiguration.
Some further tweaks are probably necessary. This is a rather big
change, though it should work. :)
2009-11-19 16:36:48 +01:00
dt
10a0647ddf Remove QSharedPointer<> for RunConfiguration 2009-11-19 16:35:18 +01:00
Kai Koehne
925c686d85 Listening Qml syntax errors in Tasks window 2009-11-11 10:12:51 +01:00
Kai Koehne
5e637f3831 Fix dependencies for QmlProjectManager 2009-11-10 10:32:20 +01:00
con
fa34847571 Merge commit 'origin/1.3'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
2009-11-03 18:08:01 +01:00