summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner: Use hasInstanceParentMarco Bubke2014-07-221-1/+1
| | | | | Change-Id: I17756d1ba4bb6ca12673a5b2fc9b38e433edc19f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Change updateTransform to directUpdatesMarco Bubke2014-07-021-1/+1
| | | | | | | | directUpdates is much clearer description of what is the intent of this new mechanism. Change-Id: I196b00b924027f92b62490377b270a85f9da1d1d Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Update the parent too for bypass manipulationMarco Bubke2014-07-021-3/+0
| | | | | | Task-number: QTCREATORBUG-12570 Change-Id: I038bfb233c0a8a734ae82b1b31fca8f5aa8c9763 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Direct update of the positionMarco Bubke2014-06-231-0/+11
| | | | | | | | This is maybe harmful shortcut in 99.99% of the cases it should work better. Change-Id: Ia162666862498ac331c9f5381cb12753d34758c1 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Refactor anchor linesMarco Bubke2014-04-241-30/+30
| | | | | Change-Id: I594b8255e1515f1307eb6c669e26f0a4045484ed Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | QmlDesigner: Add RewriterTransaction tracing frameworkMarco Bubke2014-01-061-2/+2
|/ | | | | Change-Id: I6c152e128e0a1b1d4450bbba81e47d072aac3038 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Use defaultNodeAbstractPropertyMarco Bubke2013-08-051-1/+1
| | | | | Change-Id: Ifa16795d6cca1256b86b69ab9f7da3e0644aec48 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Rename actualState in currentStateMarco Bubke2013-07-311-1/+1
| | | | | Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Rename hasDefaultProperty to hasDefaultPropertyNameMarco Bubke2013-07-311-1/+1
| | | | | | | | hasDefaultProperty sounded like the property existed in the model not in the meta info system. Change-Id: Iaa670f10b9d6d6038fbc3a4224250ed821407af4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Move setPostion and setSize to QmlItemNodeMarco Bubke2013-07-251-13/+3
| | | | | Change-Id: I7a6e3705807651a81b1408ce4dfaea2cdda731df Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Rename canReparent to instanceCanReparentMarco Bubke2013-07-251-1/+1
| | | | | Change-Id: I6b2eac40c68a01053133d623690e6ff4c2d02060 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Change defaultProperty in defaultPropertyNameMarco Bubke2013-07-251-1/+1
| | | | | Change-Id: Ic00fb37878c552e8b0bb9137a2985e9af3ca7ddc Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Use is valid functons instead of create a invalid nodeMarco Bubke2013-07-241-5/+5
| | | | | Change-Id: I5f7cdcede593cdce2c577315ccead95e8841870e Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Fix snapping for the group boxMarco Bubke2013-06-171-33/+18
| | | | | | | | The transformation values are now saved in the scene space. This can have be drawbacks in some special cases but makes the code more maintainable. Change-Id: I616d5db0998b8654e8af98aa67d563bc5b5d59da Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Add container item support in node instancesMarco Bubke2013-05-301-5/+9
| | | | | Change-Id: I30e0d11346b8c63188d052b46656e7ede179e55d Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Change isPositioner in isLayoutable to catch layouts tooMarco Bubke2013-05-151-3/+3
| | | | | Change-Id: Ic6b68a57095dc94df62278666c4c3cb150eb374e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Support anchoring at snappingMarco Bubke2013-05-141-11/+16
| | | | | Change-Id: I3ec504e931ee63761538acb4666a3c8ce1a592e5 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Clean headers in QML-Designer.Friedemann Kleint2013-04-301-5/+0
| | | | | | | | | 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>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-27/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/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>
* | Add whitespace after control keywordsOrgad Shaneh2012-11-281-2/+2
| | | | | | | | | | | | | | | | find -name \*.cpp -o -name \*.h | \ xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g' Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390 Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner: prepare the Model for QtQuick 2.0Thomas Hartmann2012-09-251-2/+2
|/ | | | | | | | We have to also check for the correct QtQuick 2.0 in a few places. For Positioner I added a helper function. Change-Id: Ie692f16d8d9433a0248854a3bc48b846138eff04 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* rename QtDebug to QDebughjk2012-08-061-1/+1
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner: crash fixThomas Hartmann2011-10-131-1/+1
| | | | | | | instanceParent() can be invalid. Change-Id: I804879491544500e20426a25515b1997022a102c Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner: Fix positioner handlingMarco Bubke2011-07-201-1/+12
| | | | | | | Change-Id: I519bbbfee939d4568a0de5bbe5c01912a08c6fb1 Reviewed-on: http://codereview.qt.nokia.com/1848 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner: Fix wrong position for reparentingMarco Bubke2011-07-071-1/+1
| | | | | | | | | Task-number: QTCREATORBUG-3962 Change-Id: Id583e257aa1c1645cb53a8ae32f83717df9b0617 Reviewed-on: http://codereview.qt.nokia.com/926 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner: Prevent item hoping for reparentingMarco Bubke2011-07-061-16/+42
| | | | | | | | | | | 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>
* QmlDesigner: Fix wrong position for reparentingThomas Hartmann2011-06-301-7/+18
| | | | | | | | | Change-Id: Ie9d9a739e559d5cfc06849ff3e5c086e9ab2224c DoneBy: Marco Bubke Task-number: QTCREATORBUG-3962 Reviewed-on: http://codereview.qt.nokia.com/958 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.FormEditor: Fix formatingMarco Bubke2011-06-281-1/+1
| | | | | | | Change-Id: Ie2de47f2ce5f5ca27902493d50c029d766da7240 Reviewed-on: http://codereview.qt.nokia.com/810 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* QmlDesigner.formEditor: fixes memory leakThomas Hartmann2010-11-011-3/+3
| | | | | | | Also fixes the memory leak in resize code. cleanup Reviewed-by: Marco Bubke
* QmlDesigner.formEditor: fix memory leakThomas Hartmann2010-10-261-0/+2
| | | | Reviewed-by: Marco Bubke
* QmlDesigner.FormEditor: Test if a qml item is valid to prevent crashesMarco Bubke2010-09-241-16/+41
|
* QmlDesigner: use one node instance viewThomas Hartmann2010-09-241-0/+2
| | | | | | Bauhaus now uses only one single instance view. Done by Marco Bubke
* QmlDesigner.formEditor: use defaultProperty if availableThomas Hartmann2010-09-131-1/+4
|
* Don't overwrite bindingsMarco Bubke2010-06-101-26/+51
|
* If you move a new item on the formeditor the item is always in the baseMarco Bubke2010-05-311-23/+28
| | | | | | | | | | state The position is now setted int the base state if you drop a item on the formeditor and move it around. Task-Number: BAUHAUS-644 Reviewed-by: kkoehne
* Long live the king!hjk2010-03-051-1/+1
|
View Lorry Controller Status