Commit Graph

62 Commits

Author SHA1 Message Date
Tobias Hunger
a8e8910130 IWizard->IWizardFactory
Start at splitting up the wizard functionality a bit. Currently
it is a factory but also contains a lot of logic that is invoked by
the real wizard dialogs.

This change renames/moves a couple of things only.

Change-Id: I1fa114ee3ee262f7c0690841f361bbf09e674725
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:42:03 +02:00
hjk
3462c5ef42 IEditor: Make duplicatesSupported a value member
Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-21 14:29:00 +02:00
Kai Koehne
2074b5571c Fix typo in PREFERED_PROJECT_MODE
Replace PREFERED_PROJECT_NODE with PREFERRED_PROJECT_NODE.

This changes public API. The constant text does not seem to be stored
on disk anywhere, though ...

Change-Id: Id5393e597ed491b59075ff3687aaa4738fb3870c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-19 11:14:23 +01:00
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Eike Ziller
5dd8d7cd9c Editors: Move id() from editor to document.
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-05 16:27:52 +01:00
hjk
6c6f47f86c Core: Make IEditor::id a value member and adjust users
Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-25 10:36:25 +01:00
Tobias Hunger
075e978a8e IWizard and derived classses: Fix WS issues
No change otherwise.

Change-Id: If23c9d56e48e9878c8424fc5863b70e9e4ff12f8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-13 16:22:08 +01:00
Tobias Hunger
424b9a0036 IWizard and derived classes: Code cleanups
There should be no functional changes, just removal of unnecessary
code. This includes:

* Removal of unused QObject *parent = 0 parameters to constructors
* Removal of unnecessary explicits
* Removal of unnecessary virtuals
* Removal of unnecessary constructors/destructors

Some explicits were added though where those were missing.

Change-Id: Iab570349ea950dad0a2d01af17bc6175f70832f1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-13 16:21:29 +01:00
Tobias Hunger
8c1c284789 Qbs/qmake: Fix dependencies of plugins
... based on output from dependencyinfo.py script

Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 13:23:26 +01:00
Eike Ziller
0ec2a02fd4 TextEditors: Avoid multiple highlighting runs when changing font setting
And remove some unnecessary code in Python editor

Change-Id: I86cde74c244a16d1b36b0ac0e841ef8110ba832f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-24 08:00:45 +01:00
Eike Ziller
3fa6b6737c TextEditors: Move font settings to document
Change-Id: I325764cbaa9684fa2758b0ea6c6ea58de142cb73
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-24 08:00:07 +01:00
Eike Ziller
3ad3876611 TextEditors: Move indenter to document.
Change-Id: I8bdf7134562d007aa16cc63a34f5a15a708577ae
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-15 15:02:25 +01:00
Eike Ziller
355f104d0e BaseTextEditor: Remove some unnecessary indirections through widget
Change-Id: I4f71448d6788a4e553b1495b72263a004e65d8c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-14 09:05:06 +01:00
Eike Ziller
2251958375 TextEditors: Avoid changing document after construction.
Also when duplicating editors, we don't want to change the document
after construction. Actually at some places (e.g. CppEditorSupport
creation) we don't handle document changes correctly, and we are only
lucky that things still (more or less?) work. Get rid of
BaseTextEditorWidget::duplicateFrom and use copy-constructor style instead.

Change-Id: I7f688b7fcc51d1bb5e222bb333f0d28479b597a6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-01-10 14:38:36 +01:00
Eike Ziller
f9ce335a6d Editors: Remove useless parent widget argument from create/duplicate
It was never called with a sensible value anyhow, and only complicates things.

Change-Id: I005848700b6c00114d91495670d4a0e15a2d2e64
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-08 11:46:11 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
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
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Eike Ziller
1adab4c4cc Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument()
Doesn't really make sense to have the additional IDocument *editorDocument()
method.

Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-18 11:34:34 +01:00
Eike Ziller
d80fb696ab Give TextEditorActionHandler an explicit parent and unify usage.
The action handler implicitly passed ownership to ICore, which is non-
to the action handler. We now consistently create the action handler in
the editor factory, give ownership to the editor factory, and don't hold
a reference to it.

Change-Id: I4372f8de966e3ceff87c06c5528c6b54522c1d57
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-12-12 09:59:55 +01:00
Eike Ziller
3d1b70c58e Remove the need to register editors in the action handler
The action handler already knows which editors to handle through the
context. It only needs to receive signals for updating the actions from
the current editor. So there is no need to tell the action handler about
every individual editor. This also removes some noise from the text
editor implementations.

Change-Id: I76dc5b1559cc8cf54ff313e6cdba4e789a3108aa
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-12-12 09:59:27 +01:00
Nikolai Kosjar
b8dbac0b9c Rename "[Mm]ethod(s)" to "[Ff]unction(s)"
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 15:56:12 +02:00
Christian Kandeler
f1da03c73b qbs project files: Make use of new qbsSearchPaths property.
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-09 18:08:56 +02:00
Eike Ziller
56c3d8ffab Unify wizards with TOC and cancel button.
QTBUG-28385 is biting us over and over (QWizard doesn't have close
button nor cancel button on Mac in Qt 5), and actually there's no reason
for us having a wizard without the features from Utils::Wizard.

Task-number: QTCREATORBUG-10346
Task-number: QTBUG-28385
Change-Id: I80c0d82fe6738496c2ac03c31a1c2757ade8e266
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 14:31:14 +02:00
hjk
49d0789e64 Cleanup IWizard interface and users
Added 639 lines, removed 1391.

Change-Id: I15ec7dd056d4f7ad79c6dd6a4181007ad14f6a43
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-24 09:57:32 +02:00
hjk
ca15d0aa95 Apply static pattern to TextEditorSetting
Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-20 10:28:22 +02:00
hjk
65cc8ae4c2 Core: Clean up FileIconProvider interface
Change-Id: I98c3c8796cb887f5bb3c5184854562ff36727836
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-13 14:06:16 +02:00
Tobias Hunger
6a352130bc PythonEditor: Remove dead code
Change-Id: I78da9f381ba8081a681f46c045b436e143416206
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-12 16:03:29 +02:00
hjk
aadb6f16af SessionManager: Apply 'static' pattern
Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 12:28:12 +02:00
hjk
a37589d431 Apply 'static' pattern to MimeDatabase
Also adjust and streamline using and surrounding code.

Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-03 11:41:45 +02:00
Christian Stenger
5bcce3d131 Compile fix
Change-Id: I081f816a14d2a823dac87ba064be2b2c00ecd319
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-29 14:20:50 +02:00
jkobus
33a7952745 Implement syntax highlighting in diff editor
All Qt Creator's main highlighters are used in the first place,
for other mimetypes generic highlighter is used as a fallback.

Task-number: QTCREATORBUG-9580

Change-Id: I863b9085520e5bdda142ce88f2074afeacee0531
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-29 08:54:04 +02:00
Tobias Hunger
4da06735dc Python: Do not export symbols
Nothing depends on this plugin, so these exports are not needed.

Change-Id: I7a6c1c6fd1dd355c904d2dcb6d3f0522cf30adcd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-26 16:26:03 +02:00
jkobus
e8801167aa Add common interface for text formats inside syntax highlighter
Change-Id: I87f64446161a57aea0896f68e4eafacef791969b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-26 13:39:40 +02:00
Christian Kandeler
0dab64b6cf Qbs project files: Use groups wherever applicable.
Provides better structuring of source files.

Change-Id: Ic2d0094312bb7c8da01a1f38270564407fdbefce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-21 17:30:36 +02:00
Tobias Hunger
95859289b8 KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-21 16:55:16 +02:00
hjk
b772001c82 EditorFactory: Replace some virtual functions with data members
Change-Id: I014cb57460c4e3a36bf7403960908b5ffec867ff
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-02 10:21:15 +02:00
Eike Ziller
624d9e2c4c Move IEditor::isTemporary to IDocument
It's a property of the document implementation, not of the specific
editor instance working on it.

Change-Id: I5c3dd054e21b646e2d94b891916a096d045923f8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 16:43:54 +02:00
Eike Ziller
cc7c3c9623 Add QTCREATOR_COMPAT_VERSION
Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.

Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 15:14:10 +02:00
Friedemann Kleint
f696b8d9ac Fix missing translations in Python Editor.
Add misssing macros, fix capitalization.

Task-number: QTCREATORBUG-9541

Change-Id: I9e3c3d0f527e444f2f27e5656576bb09d256badc
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-14 09:54:25 +02:00
Orgad Shaneh
029fd5a572 Streamline mimetypes.xml files
Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-07 16:23:19 +02:00
Joerg Bornemann
67399fc02a fix qbs build
Change-Id: Ifb851fe09179b4822c53f528c793209226396c33
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-05 16:34:23 +02:00
Eike Ziller
d2571548f8 Remove unneeded IEditorFactor::open re-implementations.
Change-Id: I261bc1ee09a2c22155e4874a4429a868d837c256
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-31 13:53:09 +02:00
Orgad Shaneh
df5fb89800 PythonEditor: Remove pluginspec.in
Missed in 9617005e1d

Change-Id: Ibd8eba395e138a448d7316aa64b70ff89ae60900
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-29 11:20:19 +02:00
hjk
4e75fc8c54 TextEditor: Simplify Utils::CommentDefinition structure
Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4f
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-27 08:35:46 +02:00
hjk
dfc0ee6456 Editors: No need to re-implement functions identical to base
Change-Id: Ibdd3147cc2a64407802fa237b7943d2e96c9003b
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-27 08:25:47 +02:00
Orgad Shaneh
9617005e1d Cleanup PythonEditor and Todo project files
pluginspec.in and dependencies.pri are included by qtcreatorplugin.pri

Change-Id: I05a0ffba320e470216f2272ad39390d04b7f54e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-23 11:16:13 +02:00
Tobias Hunger
24ee641543 Fix dependency information according to output of dependency checker
Change-Id: Ic1259f04f4120b6e495ebb3672f7f360c71cba7f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-22 16:41:39 +02:00
Joerg Bornemann
da817a7c7d unify _LIBRARY defines
The _LIBRARY defines for plugins should consist of the plugin name
plus the suffix _LIBRARY to make it possible to generate those
automatically.

Change-Id: Icafc9bce876d77521b47d815c94e7df6da061a51
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-07 18:13:48 +02:00
Joerg Bornemann
7a2d93dea2 fix qbs build
Change-Id: I4b6236d2ddfa8e3baad463fcdf2ee66fe16f63e7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-06 17:15:39 +02:00