Commit Graph

72811 Commits

Author SHA1 Message Date
Leandro Melo
4accb027a6 Removed xml from the mime type list of plain text editor. 2010-05-14 10:12:26 +02:00
Leandro Melo
77ac9d5f08 Added a "central" method to check for item datas customizations. 2010-05-14 10:12:25 +02:00
Leandro Melo
06fc31d4c0 Indenter is now a separate class which can be reused through composition. Added it to the generic editor. 2010-05-14 10:12:25 +02:00
Leandro Melo
7400557f8c Fix in Utils::unCommentSelection to consider initial whites spaces when there's no selection and single line comment style. 2010-05-14 10:12:24 +02:00
Leandro Melo
e7ddd2b80b Changed < for <= in Utils::unCommentSelection to catch cases where there are no characters (only a line end, for example) after the comment start mark.
Ex.:
/*
void f();*/
2010-05-14 10:12:24 +02:00
Leandro Melo
4d26f334e2 Small change to the behaviour of the highlighter that should help it working with broken files. 2010-05-14 10:12:23 +02:00
Leandro Melo
4420275415 Need to get the highest priority, not the lowest; Minor changes. 2010-05-14 10:12:23 +02:00
Leandro Melo
6290aa8359 Started mechanism to scan directory, find definition files, and register mime types. 2010-05-14 10:12:22 +02:00
Leandro Melo
cafba7db58 Integrating highlighter formats with Creator's font settings. 2010-05-14 10:12:22 +02:00
Leandro Melo
4c6662b5ae Updated highlighter includes (header from TextEditor moved) and pluginspec. 2010-05-14 10:12:21 +02:00
Leandro Melo
65ca06e0f0 Generalized Utils::unCommentSelection; Started implementing editor details (configuration by highlight definition, actions). 2010-05-14 10:12:21 +02:00
Leandro Melo
c8441462c9 Renaming... 2010-05-14 10:12:20 +02:00
Leandro Melo
f6cc172d06 Initial code for the generic highlighter. 2010-05-14 10:12:20 +02:00
ck
65124a6b5f Debugger: Set DISPLAY variable for GDB over SSH. 2010-05-14 10:01:27 +02:00
ck
cd7c2ca12c Maemo: Fix config name change getting lost in settings widget. 2010-05-14 08:48:27 +02:00
Kai Koehne
924da63d7d QuickDesigner: Fully implement versioning support in metatype system
Store qml versions in the metatype system. Instead of just assuming
e.g. "4, 6" or "4, 7" as default, support passing "-1, -1" as versioning
wildcard.

When inspecting the qml meta type system, versions are now stored also
for types that have no qml name / version. The version of the referenting
type is then taken, e.g. there are now entries for "Qt/Object", 4, 7 and
"Qt/Object", 1, 0 (from QmlProject, 1, 0).

Furthermore, some unused methods were removed, and the logic changed insofar
as that a type can have only one direct super type.

Reviewed-by: Thomas Hartmann
Reviewed-by: Marco Bubke
2010-05-12 21:26:20 +02:00
Kai Koehne
6be9d180be QuickDesigner: Fix Drag&Drop with items from different directories
Replace all non-valid characters in the item library entry name with
underscores. E.g. "subdir/X" will become "subdir_X", which is a valid name.

Reviewed-by: Thomas Hartmann
2010-05-12 17:47:35 +02:00
Kai Koehne
095f2060ca QuickDesigner: Fix compiler warning
Reviewed-by: Thomas Hartmann
2010-05-12 17:47:35 +02:00
Kai Koehne
a68fffd067 QuickDesigner: Update ItemLibrary when imported directories change
ItemLibraryInfo has now a signal "entriesChanged()", which the ItemLibrary
connects to. To allow this, ItemLibraryInfo was moved from a stack-based to
a heap-based class.

Reviewed-by: Thomas Hartmann
2010-05-12 17:47:35 +02:00
Kai Koehne
15f2c63459 QuickDesigner: Clean up ItemLibraryInfo class
Remove dependencies to QMetaInfo & unify method names.

Reviewed-by: Thomas Hartmann
2010-05-12 17:47:35 +02:00
con
cd987901c8 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 2010-05-12 17:25:50 +02:00
con
1fd12ab63b Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
2010-05-12 17:25:40 +02:00
ck
ba3b881ffc Maemo: Set DISPLAY variable before running remote executable. 2010-05-12 17:21:38 +02:00
Thorbjørn Lindeijer
1b6e383420 Add a space between the "entries" suffix and the number
The string should probably be changed, but that would break
translations.

Reviewed-by: Friedemann Kleint
2010-05-12 17:13:23 +02:00
Thorbjørn Lindeijer
b295e82924 Fixed disabling tabs in options dialog when category matches search
When the category title matches with the search keyword, we shouldn't
disable any of the tabs in this category. For example the only page in
the Locator category was disabled, because the page itself did not have
'Locator' as keyword.

Reviewed-by: con
2010-05-12 17:13:23 +02:00
con
acea722d75 Add a hook for the build system to specify a version description.
E.g. to show Qt Creator 1.3.85 (2.0.0-rc1)
2010-05-12 17:07:59 +02:00
dt
cf57bda96f Maemo does support shadow building 2010-05-12 16:50:37 +02:00
ck
64d65fb698 Maemo: Fix corner case in end-of-remote-process detection. 2010-05-12 16:46:08 +02:00
Friedemann Kleint
a8e464abd9 Compile windows. 2010-05-12 16:15:19 +02:00
dt
65d77509da Oh well symbian doesn't support dots in dirs 2010-05-12 15:52:04 +02:00
Thorbjørn Lindeijer
51bfaa4c83 Fixed handling of selection dragging in resource editor
When dragging the mouse to select an item that is not currently visible,
the ResourceView was not making the selected item visible. This was due
to an unnecessary reimplementation the protected currentChanged slot.

Reviewed-by: owolff
2010-05-12 15:35:12 +02:00
Thomas Hartmann
9ab420d1d7 QmlDesigner.propertyEditor: add missing emit 2010-05-12 15:32:48 +02:00
Thomas Hartmann
196350e336 QmlDesigner.propertyEditor: crash fix for gradient editing 2010-05-12 15:32:48 +02:00
hjk
4243b56229 fakevim: ~ uses 'exclusive' motion 2010-05-12 14:43:41 +02:00
Lasse Holmstedt
425f4b7467 Fixed crash when using -noload to disable multiple plugins
The noload behavior is also changed: it now always shows the plugins in
About Plugins... menu, even though -noload was used. When using -noload,
the enabled state of the plugin is not saved, so if the command line
arg is removed, the plugin will be loaded normally.

Reviewed-by: con
2010-05-12 14:38:52 +02:00
Lasse Holmstedt
bc00f859c5 Fixed crash when using -noload to disable multiple plugins
The noload behavior is also changed: it now always shows the plugins in
About Plugins... menu, even though -noload was used. When using -noload,
the enabled state of the plugin is not saved, so if the command line
arg is removed, the plugin will be loaded normally.

Reviewed-by: con
2010-05-12 14:37:20 +02:00
Daniel Molkentin
bf95a99c51 New texts for the wizard types in the new dialog
Reviewed-by: Leena Miettinen
2010-05-12 14:16:49 +02:00
dt
9bc9fe73e1 File renaming
Reviewed-By: con
Reviewed-By: Friedemann Kleint

We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.

Note: Only the qt4projectmanager knows how to rename files.

Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.

Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
2010-05-12 14:14:44 +02:00
Christian Kamm
28ec223314 QmlJS: Fix completion for grouped property bindings.
Task-number: QTCREATORBUG-1388
Reviewed-by: Roberto Raggi
2010-05-12 14:11:23 +02:00
Robert Loehning
f88b9d5ab7 Avoid warning about failing connection. 2010-05-12 14:05:58 +02:00
hjk
e65e011706 debugger: let the user specify a working directory when starting a local
application
2010-05-12 11:48:00 +02:00
hjk
84f4193019 fakevim: rework range passing 2010-05-12 11:18:18 +02:00
Friedemann Kleint
b6fb8bbae9 Pluginmanager: Make startup profiling API accessible.A
Add verbosity option showing timestamps for PluginManager::addObject.
2010-05-12 11:12:54 +02:00
Christian Kamm
259007f5e6 QmlJS: Fix potential crash when a document doesn't have a type env yet.
Reviewed-by: Roberto Raggi
2010-05-11 15:28:18 +02:00
Jens Bache-Wiig
04c786326e Optimize welcome mode startup a bit
The scaled pixmap has been reduced in size to speed up the
plugin loading and refresh times. Stylesheet has been
slightly optimized as well.
2010-05-11 15:16:54 +02:00
Thorbjørn Lindeijer
7767786cc8 Disable bracket matching when automatic insertion is disabled
When automatic insertion of brackets is disabled in the completion
settings, it is reasonable to expect the automatic matching of brackets
is also disabled.

Task-number: QTCREATORBUG-454
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2010-05-11 15:11:12 +02:00
Thorbjørn Lindeijer
e53b5bc9a1 Fixed completion settings to also apply to the QML code completion
By moving the completion settings into the TextEditor plugin, so that
both the CppTools and the QmlJSEditor plugins can access the settings.

The user-interface to edit the settings is still in the CppTools plugin,
since we're in string freeze at the moment. It should be moved to the
TextEditor plugin later.

For now the QML completion only supports the case-sensitivity and
partial completion options, since there is no automatic insertion of
brackets.

Task-number: QTCREATORBUG-1327
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2010-05-11 15:11:12 +02:00
hjk
a13530eba0 fakevim: rework support for marks 2010-05-11 14:27:00 +02:00
hjk
cb8c40d7e9 fakevim: consolidate Key_Return and Key_Backspace handling 2010-05-11 14:26:59 +02:00
hjk
034ee0a947 fakevim: add option to show positions of marks in the main text editor 2010-05-11 14:26:59 +02:00