feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
46,723 Commits 108 Branches 368 Tags
ff9a49f99f652f0217a118e32447d45c9d89e30a
Commit Graph

144 Commits

Author SHA1 Message Date
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
Marco Bubke
f185097b4c QmlDesigner: Fix toolbar 
Toolbar was not registered, so it did not work (close button, etc).

Change-Id: I4ad243602ac09f5a76752855d80d5732180233cf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-12 11:57:33 +01:00
Marco Bubke
afcd5c8424 QmlDesigner: Remove superfluous connect 
Actually it was connected originally to a empty slot.

Change-Id: I314938110e28c5601f4a6e46c6982053d864e776
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-05 15:11:40 +01:00
Thomas Hartmann
9a05a0e7dc QmlDesigner: compile fix 
Change-Id: I1010276ef8cc0ad6affd068d9d036ef6bc36de72
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-05 15:11:26 +01:00
Marco Bubke
7456fa239a QmlDesigner: Refactor designmode widget 
Change-Id: I5a84408333afb8e6043f76eb0b9f028d8d78e2f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-05 15:00:11 +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
Orgad Shaneh
025ff8f922 QmlDesigner: Translate some strings 
Change-Id: Id2c045cf0947ce38698f82f43536f25252aa4160
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-12-06 11:11:30 +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
83e573f2ec use new id comparison operators to reduce line noise and save cycles 
Change-Id: I2e7d81a4efb75877901d29964df4f71314e951b4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-06 10:37:43 +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
Eike Ziller
e3c354d8f2 Make PluginManager mostly static. 
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-19 16:11:40 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface 
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-11 13:51:14 +02:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2df4cb21fe Core::ModeManager: make some functions static 
Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-27 14:52:24 +01: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
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
hjk
f80db703bb use Core::Id for ids in INavigationWidgetFactory 
Change-Id: Ic793e01edf6a4d2fe61baadb3aa5bef817436d35
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-10 15:46:13 +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
hjk
29279ab8c7 more style fixes of string literal access 
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-02 18:20:19 +01:00
Eike Ziller
ba23e21d87 Don't show Design mode if "designer" plugins are disabled/not present. 
Change-Id: Iee0a01491075e1e82c17211b5e119bd5e167763b
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-10-19 17:09:42 +02:00
Thomas Hartmann
94f95b4bcd QmlDesigner: code cleanup 
Change-Id: Id2ce92b7b1f6bc190c0ac4899c951b8f3cff9535
Reviewed-on: http://codereview.qt-project.org/5225
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-20 14:02:25 +02:00
Thomas Hartmann
5adf7992e8 QmlDesigner: adding crumblePath 
Change-Id: Ic0d68b145398a161194d2a469e9a2f15fe0901d5
Reviewed-on: http://codereview.qt-project.org/4996
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:55:28 +02:00
Thomas Hartmann
b14bd3a589 QmlDesigner.designModeWidget: exposing DesignModeWidget 
This allows calling cut copy and paste and component managment
from the outside.

Change-Id: Ie784b243f522409e9e778ef0700ac9c2f64e43cd
Reviewed-on: http://codereview.qt-project.org/4994
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:55:18 +02:00
Thomas Hartmann
5e87539d14 QmlDesigner: enable F2 to go into a component 
Change-Id: I23b298b184a9a17e19206db6086fce073b12a592
Reviewed-on: http://codereview.qt.nokia.com/1876
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 13:39:15 +02:00
Thomas Hartmann
219ef23c3d QmlDesigner.documentController: bugfix 
We need to reset the componentView if a document changes.

Change-Id: I4eb14a34a41dd80d96c4350f7e596b6be47970dd
Reviewed-on: http://codereview.qt.nokia.com/1409
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-11 16:13:17 +02:00
Thomas Hartmann
dfa7995b17 QmlDesigner.designModeWidget: fix 
Using a QWeakPointer for m_textEditor, since the texteditor might be
deleted if the document was closed.
Moving the NavigationHistory handling upwards.

Change-Id: Ib5c14d6cd139490379cc2bf76d5440720c5664bc
Reviewed-on: http://codereview.qt.nokia.com/526
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-20 17:48:03 +02:00
Thomas Hartmann
8e7814b035 QmlDesigner.desigModeWidget: add navigator to toolbar 
Now we have a navigation history in the DesignMode.
The check (m_textEditor && editor) is there to keep the history clean.


Change-Id: I26bbefe45b51c53379bfecbe1cdc02a64df76012d
Reviewed-on: http://codereview.qt.nokia.com/519
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-20 16:35:38 +02:00
Thomas Hartmann
bfc68f150a QmlDesigner.documentController: fix text design synchronisation 
The synchronisation of selection between text and designmode was broken.
This fixes a regression.

Change-Id: I4d3fd2f9716398a16e01ce3d389d099bfad1f66b
Reviewed-on: http://codereview.qt.nokia.com/401
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 17:26:08 +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
Thomas Hartmann
cbc511213b QmlDesigner.propertyEditor: remove AllPropertiesBox 
This class is not needed anymore and is just confusing.

Change-Id: I6ee3d4090b13d2682ff2f7b3d82ebfe1410a1344
Reviewed-on: http://codereview.qt.nokia.com/37
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-05-20 15:04:45 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Thomas Hartmann
662d362e55 QmlDesigner.designModeWidget: adding a context for the navigator 
Adding a context for the navigator + some cleanup
 2011-05-06 13:14:43 +02:00
Thomas Hartmann
3cc491f45a QmlDesigner.navigator: add tool buttons for sliding/reparenting 
This patch adds for tool buttons that allow
sliding and reparenting in the navigator.
 2011-05-06 13:14:42 +02:00
Friedemann Kleint
e8cb9ecfdd Compile fix MSVC / Qt 4.8 (QStringBuilder ambiguities). 2011-04-20 13:50:25 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling 
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:14 +02:00
Thomas Hartmann
12a810bb68 QmlDesigner.nodeInstances: show warning if qml pupped crashes 
If the qml puppetcrahes 3 times in a row we show a warning.

Reviewed-by: Marco Bubke
 2011-04-15 12:37:17 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Kai Koehne
b7c3e821c9 QuickDesigner: Jump to right column for QML syntax errors 
column count for errors start with 1.

Task-number: QTCREATORBUG-4347
Reviewed-by: Thomas Hartmann
 2011-04-06 13:21:06 +02: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
Thomas Hartmann
b32873d3e6 QmlDesigner.designModeWidget: fix style of error tooltip 
DocumentWarningWidget is now derived from Utils::FakeToolTip and follows
the Qt Creator styling.
 2010-12-16 12:59:23 +01:00
Thomas Hartmann
4ff4cffe0d QMlDesigner.itemLibrary: adds an import manager/filter 
We create a special sidebar item for the item library that contains a
ToolButton.

The ToolButton manages the imports for components.
 2010-12-14 16:52:47 +01:00
Thomas Hartmann
7df5ce2d7a QmlDesigner.itemLibrary: turn the item library into a full view. 
This is more consistent with the whole architecture and allows
the item library to listen to imports.
 2010-12-10 17:58:00 +01:00
Marco Bubke
562d0c5fbd QmlDesigner: Refactor states editor 
Reviewed-By: Thomas Hartmann
 2010-12-08 17:28:50 +01:00