feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,720 Commits 108 Branches 368 Tags
3cc491f45a80fce397c9440397f1190968dcbadf
Commit Graph

57 Commits

Author SHA1 Message Date
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
Kai Koehne
f7fecfa07c Core: Move Q_DECLARE_METATYPE for IEditor to ieditor.h 
Fixes a gcc warning about different visibility of struct in files.

Reviewed-by: con
 2010-12-06 13:28:31 +01:00
Kai Koehne
85fac8d4af QuickDesigner: Fix crash on exit 
Make sure that the sidebar items are deleted before the core
(e.g. ICore::instance()) is deleted.

Task-number: QTCREATORBUG-3269
Reviewed-by: Thomas Hartmann
 2010-12-06 11:24:37 +01:00
Thomas Hartmann
71d98970cf QmlDesigner: adding a distinguished context for the form editor 
Since Actions like copy/paste and delete interfiere
with controls like LineEdit, I added a special context
for the form editor. Now copy/paste/delete on the Qml items
are only registered for the form editor context and copying the contens
of a LineEdit will not lead to copy an item instead, anymore.

Reviewed-by: Kai Koehne
 2010-11-17 12:59:28 +01: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
dt
bde1ebaaea Remove EditorManager::ensureEditorManagerVisible() 
The function always switched to Edit Mode, which was the cause for
several bugs. Since openEditor() already does switch to the right mode,
the function is not really needed.

The following actions now respect the prefered mode of the editor:
"f file"-locator
The Open Documents list
Editor history navigation
 2010-09-06 13:56:53 +02:00
Thorbjørn Lindeijer
830686f29d Enable opaque resize for the splitters in the QML Design mode 2010-06-25 14:40:01 +02:00
Lasse Holmstedt
7ba6fc8834 Fixed localization issues with SideBar 
When changing the language, the sidebar items would break because
their localized window titles were used for storing the settings. Now,
id's are used.

Reviewed-by: con
 2010-04-29 13:50:21 +02:00
Lasse Holmstedt
aeb8871094 Added menu entries for hiding and showing left/right bauhaus sidebars 2010-04-26 14:27:49 +02:00
Lasse Holmstedt
3be86bb828 Added Window->Views menu entry for restoring Qt Quick Designer layout 2010-04-26 14:27:49 +02:00
Lasse Holmstedt
fd549343fc unified left & right sidebars in bauhaus 
SideBar was patched to give it extra functionality:
 - closeWhenEmpty: when all sidebar widgets are closed, the whole
   sidebar will disappear, too.
 - unavailableItems: a list of non-openable windowTitles can be given
   to the sidebar.

Reviewed-by: con
 2010-04-26 14:27:48 +02:00
Lasse Holmstedt
6cbf520599 Added functionality to hide all sidebars in bauhaus 
Alt+0 does this now, the command is overridden.

Reviewed-by: kkoehne
 2010-04-26 14:27:48 +02:00
Lasse Holmstedt
21aebed4a5 Styled output panes for qt quick designer 2010-04-23 09:58:29 +02:00
Kai Koehne
db2fcdb416 QmlDesigner: Fix crash on exit 
QtCreator crashed on exit when the library/navigator/sidebar wasn't
visible in the Design mode. This is caused by a double deletion: The
widgets have the DesignModeWidget as the default parent + the side bar
items try to delete them on exit.

Fixed by removing default parent.

Task-number: QTCREATORBUG-1197
Reviewed-by: Christiaan Janssen
 2010-04-16 17:12:22 +02:00
Lasse Holmstedt
65a30b06af Some more fixes to exception handling in bauhaus 
Reviewed-by: thomas hartmann
 2010-04-12 12:30:30 +02:00
Lasse Holmstedt
b05773923f Fixed missing text/design mode sync warnings 
Task-number: BAUHAUS-565
Reviewed-by:erikv
 2010-04-12 11:37:03 +02:00
Thomas Hartmann
60b8598676 QmlDesigner: cleanup of DesignModeWidget 2010-04-08 15:02:18 +02:00
dt
5f2ae2af47 Less includes 2010-04-07 13:51:07 +02:00
Kai Koehne
e3231a1741 QmlDesigner: Fix 'could not parse style sheet' runtime warning 
Reviewed-by: Thomas Hartmann
 2010-04-06 15:31:20 +02:00
Kai Koehne
34b84d8c06 QmlDesigner: Fix crash on loadup 
Make DesignModeWidget::showEditor reentrant save by explicitly checking
the current status.

The crash happens only reproducably when debugging creator inside
creator (gdb-7.0-ubuntu!).

Reviewed-by: Lasse Holmstedt
 2010-04-06 10:51:19 +02:00
Lasse Holmstedt
0befb98c20 Fixed crash when opening ui files in design mode 
QML Designer now listens to contextChanged signal instead of
modeChanged and checks that the context is same as that of qmldesigner.

Reviewed-by: con
 2010-03-26 12:39:26 +01:00
Thomas Hartmann
e94e6249ac QmlDesigner: avoid warnings (connections) 2010-03-25 16:55:23 +01:00
Thomas Hartmann
699d8b6f63 QmlDesigner: fix color of label in File System explorer 2010-03-25 15:01:47 +01:00
Thomas Hartmann
2f79b60fd7 QmlDesigner: fix warnings 2010-03-24 17:25:00 +01:00
Thomas Hartmann
7bb8f29c9c QmlDesigner: all views instanciated once and shared now 2010-03-23 14:01:25 +01:00
Lasse Holmstedt
1ce34736f7 Fixed toolbar for splitted editors 2010-03-15 16:03:00 +01:00
Lasse Holmstedt
64b6b8c43e Renaming designmodetoolbar -> editortoolbar pt.1 2010-03-10 12:48:17 +01:00
Lasse Holmstedt
3124db009f Refactored toolbar interface 2010-03-10 12:26:19 +01:00
Lasse Holmstedt
a6a049852b Editor toolbar integration 2010-03-10 12:26:19 +01:00
Lasse Holmstedt
a4cfad693c refactored faketoolbar into core -> designmodetoolbar 
Reviewed-by: kkoehne
 2010-03-10 12:26:18 +01:00
Lasse Holmstedt
736963a422 Context Help support for Bauhaus 
Task-number: BAUHAUS-451
Reviewed-by: kkoehne
 2010-03-08 09:48:31 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Lasse Holmstedt
079897f295 fixed crash when changing b/w edit/design mode while QML Designer is loading 2010-03-01 13:11:05 +01:00
Kai Koehne
7a4213107f QmlDesigner: Replace misleading default label in Design mode 
People will only see the default widget while Bauhaus initializes
 2010-02-28 14:35:15 +01:00
Lasse Holmstedt
df7a19de9e Design mode integration 
Moved Qt Designer to open from Design Mode. Also, Design mode is now global,
and created in coreplugin. Other plugins can register themselves to it.
 2010-02-26 11:17:02 +01:00
Thorbjørn Lindeijer
453dc44889 A bit less indirection 2010-02-10 12:18:22 +01:00
Friedemann Kleint
28d72550d3 Removed static QIcon instances. 
thus fixing the exit warning:
"~QX11PixmapData(): QPixmap objects must be destroyed..."

Acked-by: con
 2010-02-10 10:47:34 +01:00
Christiaan Janssen
6a67f00e06 QmlDesigner: Fixed minor issues 2010-02-09 10:44:38 +01:00