Commit Graph

85 Commits

Author SHA1 Message Date
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
2011-02-22 11:23:53 +01:00
hjk
af8daf9d30 actionmanager: rename Command::CA_NonConfigureable to CA_NonConfigurable 2011-02-09 16:29:02 +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
con
773343f396 Delay widget creation of options pages till their category is shown
Also add the alternative way: IOptionsPageProvider, which states
a category, and is asked for a list of options pages for that
category when it is shown.

Task-number: QTCREATORBUG-3131
2010-12-06 11:18:58 +01:00
Friedemann Kleint
d2e8819f9a Set some object names for easier debugging. 2010-12-03 17:31:01 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup.
Clean icore.h.
2010-11-02 16:53:56 +01:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
2010-09-14 15:23:11 +02:00
hjk
ff0ac20a42 coreplugin: use Core::Id is some places 2010-09-10 17:22:28 +02:00
Jarek Kobus
351beb8697 Change the shortcut for ui form preview
Reviewed-by: dt <qtc-committer@nokia.com>
Task-number: QTCREATORBUG-1911
2010-08-25 11:57:02 +02:00
Friedemann Kleint
86bdf5af13 Designer: Add 'Switch Source/Form' action.
Task-number: QTCREATORBUG-1666
Acked-by: aportale <alessandro.portale@trolltech.com>
2010-08-10 16:07:06 +02:00
con
ede2a7c975 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
2010-06-30 14:25:09 +02:00
Friedemann Kleint
17b5354e2c Designer: Initially disable form preview.
Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Task-number: QTCREATORBUG-1762
2010-06-29 09:29:18 +02:00
Friedemann Kleint
7380c15f24 Qt Designer/Design mode: Do not switch to Edit mode when running
an application that produces output. Add a placeholder for the
output pane.

Reviewed-by: con
Task-number: QTCREATORBUG-1750
2010-06-28 11:20:07 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context
A mostly mechanical change.

Reviewed-By: con
2010-06-25 12:58:07 +02:00
kh1
1b6ad08795 Move help manager into core.
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
2010-06-11 13:11:37 +02:00
Friedemann Kleint
3330d15964 Qt Designer integration: Fix Help button in stylesheet editor.
Wire QDesignerIntegration's help signal to help manager.

Task-number: QTCREATORBUG-1505
Reviewed-by: kh <qtc-committer@nokia.com>
2010-05-28 15:58:55 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules.
Reviewed-by: ossi
2010-05-14 15:53:56 +02:00
Friedemann Kleint
3d6560a10b Move the Debugger/Designer view menus to Window menu.
Move actions into FancyMainWindow. Register them in
DebuggerUISwitcher and FormEditorW. Manually hide
Debugger actions for Non-Debug modes (as they belong
to the language context).
Acked-by: con
2010-04-20 16:46:35 +02:00
Friedemann Kleint
f0a64720c8 Designer: Fix accidental widget deletion by pressing Delete in PropEditor. 2010-04-20 10:13:17 +02:00
dt
5f2ae2af47 Less includes 2010-04-07 13:51:07 +02:00
Friedemann Kleint
8d384fc6ad Fix QSettings keys of FancyMainWindow in QtCreator.ini.
Do not use localized Window Titles. Use objectName
or default to dockWidget<n>".

Task-number: QTCREATORBUG-1059
2010-04-06 11:23:11 +02:00
Thorbjørn Lindeijer
c444fc2adc Fixed saving in Designer mode
Designer should still have editor manager context.

Reviewed-by: con
2010-03-23 15:35:22 +01:00
Thorbjørn Lindeijer
26d819277e Fixed Design Mode context handling
Some Qt Designer actions stayed visible and/or active while editing
source files or when using the QML Designer even though they shouldn't.
Fixed that by applying some manual context handling in the DesignMode.

Reviewed-by: con
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
2010-03-23 09:18:07 +01:00
Daniel Molkentin
bc37a9ab7d Escape & in Button 2010-03-18 12:44:02 +01:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
Friedemann Kleint
2edcc7ef33 Design mode: Give IEditor a 'preferred mode'.
... and switch to it in EditorManager::activateEditor.
There no longer is a need for special currentEditorChanged()
handling in the editor that use a special mode.

QmlDesigner receives an additional setting specifying the
desired edit mode. QmlJSEditor detects whether QmlDesigner
is present by checking the registered mimetypes of the
Design mode and retrieves the settings via keys.

Remove some obsolete code and clean up includes
on qmldesignerconstants.h

Reviewed-by: con
2010-03-16 16:51:45 +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
Friedemann Kleint
7828bb811c DesignMode/Qt Designer clean-up Part V: Renaming
Re-introduce FormWindowEditor as IEditor used for
Designer. Use SharedTools::WidgetHost directly
for embedding into FormEditorStack, doing the
geometry-changed handling in there as well.
2010-03-10 10:21:52 +01:00
Friedemann Kleint
c7e3e6adf3 Design mode/Qt Designer clean-up, part III: Resources.
Move resource code to new ResourceHandler class and
instantiate it on the form window.
2010-03-09 17:01:51 +01:00
Friedemann Kleint
1c78e200c2 Design mode/Qt Designer: clean-up Part II: Fix undo.
Re-introduce FormEditorFile that delegates dirty handling to the form
window. Change DesignerXmlEditable to be an IEditor that embeds
TextEditable so that the PlainTextEditor can work with it, but delegates
relevant functionality to FormEditorFile.
Centralize all form window creation code that was scattered around
in FormEditorW::createEditor() and have that return a struct Editor
data, which is passed to FormEditorStack.
Update the text editor only on open/createNew/switch away from design
mode.
2010-03-09 15:48:01 +01:00
Friedemann Kleint
1b86bc50c1 Design mode/Qt Designer: Clean up the widget part of it.
- Remove shared subwindow reparenting from EditorWidget, make EditorWidget
  inherit FancyMainWindow. and use just once instance of it instead of
  per-editor ones.
- Embedded FormEditorStack into EditorWidget as a centralwidget.
- Changed FormWindowEditor's base class from IEditor to SharedTools::FormWindowHost
  (Widget) to be embedded into FormEditorStack (no need to be an IEditor),
  Remove Designer::Internal::FormWindowHost which had little functionality.
- Add Design Mode widget to FormEditorW which has FakeToolBar and EditorWidget
  (single instance) in a vertical layout.
- Removed ProxyAction class handling dock view toggle actions of several EditorWidgets
  (no longer necessary since there is just once instance). Moved "View menu" to bottom.
- Started to make FakeToolBar work as a single instance listening on changing
  xml editors
- Include-file/slot connection clean-up.
2010-03-09 10:26:20 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Robert Loehning
588b4eff59 Removed obsolete ifdefs.
Reviewed-by: dt
2010-03-02 19:53:31 +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
Friedemann Kleint
866b8fa5c3 Designer: Fix menu label. 2010-02-16 11:50:33 +01:00
con
a24738ffab Fixes: Diff editors don't get correct name.
They were no longer showing e.g. the file name of the diffed file.
Also separate editor id and editor context a bit.
2010-01-11 16:54:30 +01:00
Tobias Hunger
592e494d1a Fix typos
Reviewed-by: thorbjorn
2010-01-11 10:26:13 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers
Reviewed-by: thorbjorn
2010-01-11 10:26:12 +01:00
Jarek Kobus
b5099480fc Designer shortcuts fixes, TaskWindow's copy action fixed
Reverted the commit 59ecb9cf8 which could break wrongly written code
(or the cases like designer).
Fix one of such case (copy action in task window).
Fix synchronization of designer shortcuts by connecting to the
keySequenceChanged() signal of their Command representation.

Reviewed-by: con
Task-number: QTCREATORBUG-471
2010-01-08 13:13:56 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Roberto Raggi
19d5521f5f Fixed #include directives. 2009-12-02 17:07:10 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
Daniel Molkentin
d110b43786 Designer: Fix accelerator.
(cherry picked from commit 649214c4db)
2009-10-02 14:13:09 +02:00