Commit Graph

56 Commits

Author SHA1 Message Date
Eike Ziller
49db3a450a Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/remotelinux/remotelinuxdebugsupport.cpp
	src/plugins/texteditor/basetexteditor.cpp

Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
2014-09-03 16:08:02 +02:00
Tim Jenssen
82bb8ce3ed QmlDesigner: fix that we have too many updateActiveQtVersion() connections
Change-Id: I3d9a9ba76d0da4def215541ccff02afc26e5e5f1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-22 11:49:14 +02:00
Eike Ziller
d9d0aba1c4 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
2014-08-15 16:14:34 +02:00
Thomas Hartmann
9e710d23e8 QmlDesigner.DocumentManager: Do not scatter items in layouts
Items in layouts do not need to be positioned.

Change-Id: I2bf0c83be48bd9aad11aab74e56e8a27f962214a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:45:01 +02:00
hjk
bf5e43be94 TextEditor: Merge ITextEditor and BaseTextEditor
Adjust all callers, de-export BaseTextEditorAnimator

Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-25 13:45:55 +02:00
Marco Bubke
36dc3fb01c QmlDesigner: Remove call to SubComponentManager::update
It has no model attached so is doing nothing and called later again.

Change-Id: Ide36ba5640ff18e29d5be2ad5911ed448f37c92b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-15 13:29:37 +02:00
Orgad Shaneh
6f5c2ea5b0 QmlDesigner: Pass const values by references
Change-Id: I468b2bebec64680289b24044b0b4e3d5d734f604
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-22 14:15:19 +02:00
Marco Bubke
dd6fb08bab QmlDesigner: Share contextHelpId
Moved the code to AbstractView::contextHelpId so it can be shared.

Change-Id: I0a95b5ee079cbc26c87d53587f7766f1c333a245
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-14 14:34:55 +02:00
Marco Bubke
5794ad016d QmlDesigner: Make DesignDocument::view const
Change-Id: I0d1b8fb55fbd08d556b0daa2d4a7d12bc81c4c13
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-14 14:34:50 +02:00
Marco Bubke
9820894fb2 QmlDesigner: Refactoring ModelNode::setId
Add ModelNode::setIdWithoutRefactoring for changes without rewriter
interaction and change the rewriter to use it.
Rename ModelNode::setId to ModelNode::setIdWithRefactoring and add the
refactoring capabilities.

Change-Id: Ia5fba19bd2eeb034d525e92f39d30954e83fa747
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-29 13:24:29 +02:00
Marco Bubke
f5404e835d QmlDesigner: ModelNode allDirectSubModelNodes to directSubModelNodes
Change-Id: I14e303b00807e6acad5a76af8804a2232b7b6e9f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-24 16:23:36 +02:00
Marco Bubke
94d1308076 QmlDesigner: Exchange pathToQt with Kit
Change-Id: If21d3c55ec62d22c3bdb623ecd21def276ef383d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-09 15:05:18 +02:00
hjk
7ed339248a QmlDesigner: Consolidate exception handling code
And translate the message box title.

Change-Id: I9d805c10940e5e3dbaa17323a913a4a55fc61a2d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 12:37:00 +01:00
hjk
3b84a6dc88 Use ICore::dialogParent for message boxes without parent so far
Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-12 12:06:10 +01:00
Thomas Hartmann
8d6e3d22a9 QmlDesigner.DesignDocument: Fixing getActiveQtVersion()
The function currentProject() returns the current project based
on the current project node.
If the current document was newly created by a wizard, this did not work.
We use SessionManager::projectForFile() as a fallback.

For Qt Creator 3.2 we plan to unify this functionality with die Qml
code model.

Change-Id: I296224671a0b496fbf6fd0d8e62e74c28b4f9abb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-05 19:54:16 +01:00
Thomas Hartmann
53e687eca6 QmlDesigner.CopyAndPaste: fix pasting into item without children
Pasting "into" an item that did not have any children did not work.

The method hasNodeListProperty() only return true if the item
already has children.

Change-Id: I00d20df1673758b22d056b8dd64a52c760aabf18
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-05 16:06:35 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Marco Bubke
f97df3e970 QmlDesigner: Add RewriterTransaction tracing framework
Change-Id: I6c152e128e0a1b1d4450bbba81e47d072aac3038
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-01-06 14:42:22 +01:00
Orgad Shaneh
4442a92729 Braces cleanup
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-14 08:13:52 +01:00
Marco Bubke
0374d83e83 QmlDesigner: Move views in ViewManager in a data class
To prevent the export of all the view and to reduce compile times we
move the views in the ViewManager in a data class.

Change-Id: Ib568101433268abc1aedd502e5877d2f07076fa5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-06 16:29:50 +01:00
Marco Bubke
defcfadd17 QmlDesigner: Add master to component view
Change-Id: I236f78b73b8eea2b780e64d833fdedcfa7d246d1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-02 11:53:15 +02:00
hjk
0ed9b97a1f QtVersionManager et al: Code cosmetics
Apply static 'pattern' for QtVersionManager, de-noise using code.

Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:54:16 +02:00
Thomas Hartmann
c4babe8c43 QmlDesigner: crash fix
The assert is wrong. We check the currentModel from QmlDesignerPlugin::hideDesigner()
and it can be null in case of a .ui/.qbs file.

Change-Id: Ifffa168f81bade757cc8d800150e4411c09915e7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-29 14:34:56 +02:00
Thomas Hartmann
eeb0dc2d03 QmlDesigner: signal was renamed
Change-Id: Iddb2066372cdb9f1b80b8ab53ab88c69273634c1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:08:27 +02:00
Thomas Hartmann
13033734a1 QmlDesigner: Fix crumble bar for infile components
CrumbleBarInfo contains the ModelNode to properly identify the node.
We cannot use the id, because no every component has an id.

If the crumble bar only contains one item it is hidden.

Change-Id: I4d421eaad8962aa9043567e1f27957b1aa089766
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 17:51:26 +02:00
Marco Bubke
7f66d8fe03 QmlDesigner: Raise exception for a invalid parent property
Change-Id: I0272b0aefc0598ad524aa1d9e6b434ef2dcd79a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-12 16:19:11 +02:00
Thomas Hartmann
934291077c QmlDesigner: remove DesignDocument::changeToExternalSubComponent()
This function did nothing but call EditorManager::openEditor(), so we can
call it directly instead. It was not used consistently anyway.

Change-Id: I639ef346164be9260e887faac5dc6651ccfd92c5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 16:40:32 +02:00
Thomas Hartmann
b108f72bc7 QmlDesigner: remove DesignDocument::goIntoSelectedComponent()
This function is highly confusing as a member of DesignDocument
and the logic can be implemented directly in the ShortcutManager.

Change-Id: Id722dcb71b542b4780614c9f895f06150ccb67ca
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 16:40:25 +02:00
Thomas Hartmann
1175759f1c QmlDesigner: Do not use ModelNodeOperations outside of DesignerActions
The ModelNodeOperations are an implementation detail of our
DesignerActions and should not be used in other places.

Change-Id: I495bfd043a6b1dd89952b0e7d2318e429678640b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 15:57:49 +02:00
Thomas Hartmann
0ea0c2f876 QmlDesigner.DesignDocument: simplifying the TextModifers
The TextModifers for the sub component and the document
are now assigned to the model. This simplfifies the code.

The member variables to the TextModifers are only kept for ownership.
The DesignDocument still owns the two TextModifers.

Change-Id: Idc84a2ba718666ce54683a67635a93352784dddd
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-01 13:20:02 +02:00
Marco Bubke
8143031599 QmlDesigner: Remove QmlModelView
And use NodeInstanceView directly. There is still more cleanup required
for the view handling.

Change-Id: I62417644ceefb25fb9f3bb93a894b71ae0929cb0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:21:20 +02:00
Marco Bubke
4b3e3aaa71 QmlDesigner: Remove operator from properties
To improve the readability of the source methods should be used.

Change-Id: I839e448369a03dc42b3649baed033daa20c4d49a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 11:12:52 +02:00
Marco Bubke
599b72a24a QmlDesigner: Use is valid functons instead of create a invalid node
Change-Id: I5f7cdcede593cdce2c577315ccead95e8841870e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-24 16:25:52 +02:00
Thomas Hartmann
ecb0470c30 QmlDesigner.DesignDocument: code cleanup
Change-Id: Ib71117cb5726662b4212f99a7c4136005273ae66
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:17:36 +02:00
Thomas Hartmann
3768e32f89 QmlDesigner.DesignDocument: getting rid of the magical StackedWidget
This StackedWidget is a leftover from the stand alone version.
In the context of Qt Creator this makes no sense anymore.

Change-Id: I6660dd4b43bdc12fa3329d333158fa759bee4d88
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:14:34 +02:00
Thomas Hartmann
a37fbaefa6 QmlDesigner: DesignDocument removing m_currentModel
We remove m_currentModel and replace it by currentModel().
If m_inFileComponentModel is nil the current model is the document
model, otherwise the current model is the inFileComponentModel.

No need to keep m_currentModel around explicitly.

Change-Id: I590e02dc03c2319cbf713b880cf43d740d64e942
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 13:57:25 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Thomas Hartmann
0d92b468b7 QmlDesigner.DesignDocument: removing code called twice
This is already called in changeToSubComponentAndPushOnCrumblePath()

Change-Id: Ia101144cc33407b0c6268cf7c3717502211654c6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-09 10:41:55 +02:00
Marco Bubke
f382197a5c QmlDesigner: Fix crash for in file component change
Change-Id: I666dd0ca2b7e50584ae2ad5577ec2f4c685fb209
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-19 12:43:38 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-05 09:43:14 +02:00
Friedemann Kleint
ffbbf64e29 Clean headers in QML-Designer.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 14:09:58 +02:00
Friedemann Kleint
fdfb3cafcd Fix Krazy warnings about includes/header guards in QML designer.
Change-Id: I9adb43b9c9f2b2c97693ebb09ebef795d0206d1c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-12 12:57:45 +01:00
Thomas Hartmann
ee4bf638ca QmlDesigner: Type of the propertyname is now PropertyName
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-05 12:34:39 +01:00
Marco Bubke
e263417b91 QmlDesigner: Fix crash for creating a new project in the design mode
There is a hot fix, which is using a timer. This patch is using the
improved approach of testing if a document exists in the new project.

Change-Id: I16ac049c2cc4c0a21ab82fc854c8a062df037f55
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-02-20 17:37:37 +01:00
Marco Bubke
b3c63795bf QmlDesigner: Cleanup design document
Change-Id: Iba5a1ba44ec8dc9619eb8fcc93f8498c1d1f2f7f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-12 12:53:29 +01:00
Marco Bubke
109669452f QmlDesigner: Use ScopedPointer instead of raw pointer
Change-Id: I2fb52fdb01c287fa1a4090b639f26521a3aabc6d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-12 12:00:53 +01:00
Thomas Hartmann
a17f96d42a QmlDesigner: Fix crumble bar
Change-Id: I8eefba1b5b9839b28be5dbae379366714f40ed27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-06 13:14:43 +01:00
Thomas Hartmann
a574edb312 QmlDesigner.DesignDocument: fixes delete and cut
For deleting Items we need a QmlModelView to delete
dangling property changes.
In the past we "missused" the FormEditorView.
For now VewManager will expose the form editor as
a QmlModelView.

I also cleaned some includes and removed debugs.

Task-number: QTCREATORBUG-8650
Change-Id: I22ca7c5f741324532e81918571be39babd12d2e4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-02-05 16:08:25 +01:00
Marco Bubke
b0c9b26375 QmlDesigner: Rename function
Change-Id: I5f7ce747e112f2757a1d016b8a1cd9fb1d4f5827
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-05 15:19:37 +01:00