Commit Graph

55 Commits

Author SHA1 Message Date
Marco Bubke
1da6acf6c4 QmlDesigner: Fix entires for component combobox
Task-number: QTCREATORBUG-10383
Change-Id: Ifa539401c75c82bd3afdec3143f9f17e69a2e36b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-16 19:51:41 +02:00
Marco Bubke
22b526ff89 QmlDesigner: Fix crash for component source drop
Task-number: QTCREATORBUG-10372
Change-Id: I0b56bf4998dbbdeb690622078d61c672d012ed5a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-16 13:15:03 +02: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
Marco Bubke
5920203a48 QmlDesigner: Use internalId instead of ModelNode in ComponentView
Change-Id: I63e81291bf909bff95d9f11f62fd79f321589ebd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 16:24:59 +02:00
Marco Bubke
0dd5f68152 QmlDesigner: Rename actualState in currentState
Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:37:29 +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
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
Thomas Hartmann
bb1a76c0a4 QmlDesigner.Model: Adding SignalHandlerProperty
SignalHandlerProperty allows editing convenient editing of signal
handlers like onMousePress in the model.
The interface is analogous to BindingProperty.

Since mos views do not care about SignalHandlerProperties and
they should not be mixed up with BindingProperties they are different
types.

I also added the signalHandlerPropertiesChanged() notifier to AbstractView.

Change-Id: I68bc7d2c5d3b991944e8f8d698212a1dfef218bf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-02 14:32:09 +02:00
Thomas Hartmann
368b3acbdb QmlDesigner.AbstractView: remove widget()
We use now widgetInfo() instead.

Change-Id: Icaea8f012b380368b6479fa81d370236ea5a6781
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 54431a090c)
2013-03-25 13:40:11 +01:00
Marco Bubke
36f51f7902 QmlDesigner: Fix signature of auxiliaryDataChanged
Change-Id: I4075e62cb15c91be3561ac29df814d0f0f255b8e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit b2a39399e9)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-03-25 13:35:21 +01:00
Thomas Hartmann
d204ee0b43 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>
(cherry picked from commit ee4bf638ca)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-03-25 13:35:11 +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
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Marco Bubke
8d9710c074 Refactoring document handling
The document handling in the qml designer was complicated source
code, which was initially intended for a non creator application.
To integrate new views it has to be changed and cleaned up. This
is the first major step in that direction.

Change-Id: Ie26f0aad7a03946d18bdb4c0759b246c5439d922
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-01-23 14:53:28 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 14:55:08 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55: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
Marco Bubke
765ba3b4b9 QmlDesigner: Prevent item hoping for reparenting
Because of the asynchronous nature of the formeditor the item can be between
to states. This looks like the item is hoping around. To prevent this a token
is sent to the instances and back. For the time frame the painting is disabled.

Change-Id: If7e937cba8171248464ad350bb14438c020b25f9
Reviewed-on: http://codereview.qt.nokia.com/1189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-07-06 18:19:28 +02:00
Marco Bubke
2d4b5fcb65 QmlDesigner: Fix slowness for many items
The information change notifier provided no hint which infotmation changed.
So the property editor has updated the anchors for all information changes.
Now there is a hint and the update is only happen for a anchor change.

Change-Id: I3b6d7546f43bce4c08757662e7af32604a8db56f
Reviewed-on: http://codereview.qt.nokia.com/811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-28 13:47:56 +02:00
Thomas Hartmann
5d87d4c49b QmlDesigner.model: renaming in NodeSourceType
Change-Id: I958b99967da8ed81542de08b64334c88d688f755
Reviewed-on: http://codereview.qt.nokia.com/828
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-06-28 13:36:11 +02:00
Thomas Hartmann
386974c943 QmlDesigner.documentController: adding instance()
Also exposing changeCurrentModelTo() as public API.

Change-Id: I7c9ed3679ef5859b1349f1d1fe3088e78bccc7ad
Reviewed-on: http://codereview.qt.nokia.com/787
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-27 17:47:14 +02:00
Thomas Hartmann
8102f3f6d2 QmlDesigner.componentView: fix for captions
Change-Id: I0ea2441d2989b8e395955b5e19ad45d341d12379
Reviewed-on: http://codereview.qt.nokia.com/716
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-24 16:22:49 +02:00
Thomas Hartmann
cb63aea838 QmlDesigner.componentView: code cleanup
Explicit braces to avoid ambiguous ‘else’.

Change-Id: Ic1a48b41b229ba47f7ab737a883277a6547e30ce
Reviewed-on: http://codereview.qt.nokia.com/521
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-20 16:46:54 +02:00
Thomas Hartmann
f38b0e7bd8 QmlDesigner.componentView: cleaning up
There was some dead code I removed.
I also refactored the node removal and made it more robust.

Change-Id: I3bd566011302968c1d798689fcca3b4a3880b306
Reviewed-on: http://codereview.qt.nokia.com/417
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-09 11:35:36 +02:00
Thomas Hartmann
0793a8dfb8 QmlDesigner.componentView: update and bug fixing
I implemented nodeReparented() (bugfix)
I use ModelNode::ComponentSource instead of childNode.type() == "QtQuick.Component"
to catch "implicit" components.

Change-Id: Ie5bd48afbb5a5b10c3544406b1229aafc5dabed5
Reviewed-on: http://codereview.qt.nokia.com/416
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-09 10:54:31 +02:00
Thomas Hartmann
7939c270bd QmlDesigner.model: refactoring for nodeSource
I changed customParserSource into nodeSource and use it also for
components. This means we do not use auxiliaryData anymore with some magic
__component_data identifier.
To distinguish between CustumParserSource and ComponentSource I introduced
the enum NodeSourceType.
Also in this patch I added auxiliaryData in the creation of a node. This was useful
for prototyping and will help with prototyping/testing in the future.

Change-Id: I2152c26c0c767f869f7dce7209abf43f594fd2ad
Reviewed-on: http://codereview.qt.nokia.com/399
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-06-08 17:53:11 +02:00
Thomas Hartmann
f950b8d7c7 QmlDesigner: reactivating subcomponent editing
This includes refactoring the DesignDocumentController.
In the ComponentTextMoifier I use replaced because it is not blocked by
beginEditBlock() of the text cursor.

I use the same pattern now for ComponentView like for all the other
views.
The view is created and controlled by DesignModeWidget because we
have only a single instance.

Change-Id: I7809b96f52f4d275f0231f3961c3c4bc2618ce89
Reviewed-on: http://codereview.qt.nokia.com/96
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-05-24 18:50:25 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Thomas Hartmann
faa59b754f QmlDesigner.Model: add support for custom parser types
This patch enables us to create objects with custom parsers
like ListModel and XmlListModel.
2011-05-06 13:28:19 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Marco Bubke
e3376b6d8d QmlDesigner: Change importAdded and importRemoved in importsChanged 2011-02-10 15:58:03 +01:00
Marco Bubke
14a5d57572 QmlDesigner: Add notifier for state change 2011-02-02 21:52:15 +01:00
Marco Bubke
7ab575a9d9 QmlDesigner: Refactor custom notifications
The custom notification code leads to hard readable code.
2011-02-01 15:55:07 +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
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Marco Bubke
1312a04221 QmlDesigner: Add component complete feature
This notifies the views if the instance has be really instanced.
2010-12-09 16:35:28 +01:00
Marco Bubke
562d0c5fbd QmlDesigner: Refactor states editor
Reviewed-By: Thomas Hartmann
2010-12-08 17:28:50 +01:00
Kai Koehne
c29e52b331 QmlDesigner: Fix compile warning 2010-10-06 10:17:50 +02:00
Thomas Hartmann
f2ada23d26 QmlDesigner: using Qt 4.7 again
We need to support the N900

Reviewed-by: Kai Koehne
2010-10-06 09:47:13 +02:00
Thomas Hartmann
9a49ad003a QmlDesigner: using QtQuick 1.0 instead of Qt 4.7
huge renaming from Qt to QtQuick
propertyeditor qml files moved from Qt to QtQuick
auotests fixed
files used in tests fixed

autotests pass

Task-number: QTCREATORBUG-2556

Reviewed-by: Kai Koehne
2010-10-01 13:21:09 +02:00
Thomas Hartmann
bae48751f6 QmlDesigner: use one node instance view
Bauhaus now uses only one single instance view.

Done by Marco Bubke
2010-09-24 09:10:40 +02:00
Marco Bubke
35263628d1 Add script function to the model
This is needed to suppert inline script function of Qml in the designer
2010-06-10 17:41:22 +02:00
Marco Bubke
299f2be2f4 Let the designer start nodes which have invalid meta info
This is only a workaround!
2010-04-08 20:45:29 +02:00
Kai Koehne
ad9036da0c QmlDesigner: Add more stuff to the list of strings to be translated 2010-04-08 12:32:13 +02:00