Commit Graph

1907 Commits

Author SHA1 Message Date
Eike Ziller
5b268822cf Merge remote-tracking branch 'origin/2.8' 2013-05-28 18:30:11 +02:00
Eike Ziller
8d894aee02 Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/analyzerbase/analyzerbase.qbs
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qt4projectmanager/qt4projectmanager.qbs

Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
2013-05-28 18:28:00 +02:00
Friedemann Kleint
a62afa55ab Display compiler in "About Qt Creator".
In order to determine the build environment for Qt Designer and
other plugins.

Change-Id: I10ca98481097b9425c080a08fabd08e710b6d5c2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-28 17:08:34 +02:00
Eike Ziller
aee00cfad7 ProgressManager: Give individual tasks same range in summary bar
The total range was sum of individual ranges so far, so e.g. parsing/
2).

Change-Id: Ia9133376be3219c12101435ba2e2ae27c32df6f8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-28 17:02:43 +02:00
Eike Ziller
2d3a7d432b Avoid having current editor that is not in a view.
Was triggering soft assert when opening a session with multiple files
open, and then closing the first one.

Change-Id: I23a503904222b0126dc36d8b2dcc64021393b45c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-28 16:25:41 +02:00
Christian Kandeler
24e81241a5 Remove duplicate module dependencies from qbs files.
These cause a warning now.

Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-27 17:59:12 +02:00
Eike Ziller
d08ad0038d Merge remote-tracking branch 'origin/2.8' 2013-05-27 17:21:01 +02:00
Eike Ziller
45f8e241ba Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
2013-05-27 17:17:40 +02:00
Eike Ziller
2345fa35a7 Fix build.
Change-Id: I8b7c423cd77e0f0aba89dcf1a397248a0edc0cf1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-27 15:18:30 +02:00
hjk
73f63bf8f0 Editors: Provide a base implementation for {save,restore}State
Change-Id: Iedfc0d59ecfe257ad5823cff39977bce82ada3a5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 14:40:42 +02:00
hjk
daad8e238e Editors: Provide a base implementation for duplicate{,Supported}
Helps avoiding trivial re-implementations.

Change-Id: Iaa2e6b92503a2b9553432568c2047c28899c7ea6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 14:27:16 +02:00
Eike Ziller
8e50dc182c Remember progress details pinned state and default to "pinned".
Making the default "pinned" will hopefully make people realize earlier
that the progress information has moved to the new location.

Change-Id: I5dbb3cae3680f724369b1a025cf38c5317a29fd0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 14:23:43 +02:00
hjk
c0d3e51960 Core: Use Id as values in ActionContainer
Less noise, less cycles.

Change-Id: I5c924362bc3cce37f9fc63fe18479083b6a6acbf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 11:24:46 +02:00
Joerg Bornemann
3eba7e44e5 rename ProductModule into Export
This fixes a bunch of warning when building with the updated qbs
version.

Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-05-27 09:59:53 +02:00
hjk
cfc8ce8c1b Remove changeEvent(QEvent::LanguageChange) implementation
This was implemented only for a small set of widgets. It's unlikely that
we will ever have or even want a dynamic language selection, until then
this code is only dead freight.

Change-Id: I1bff4e1e89057786c0e5cb57225a508c5d390d9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 08:58:51 +02:00
Eike Ziller
1c34b266fb Merge remote-tracking branch 'origin/2.8' 2013-05-24 16:22:08 +02:00
Orgad Shaneh
05ef32f242 Remove Nokia leftovers
Mostly internal mimetypes

Change-Id: Ia84206f1334c1f83474cbc307e848719bb98adbc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:29:23 +02:00
Leena Miettinen
26c412deac Doc: fix function signatures in code documentation
QDoc cannot find functions if the signature in the \fn command
is not identical to the declaration, including 'const' qualifiers.

Removed the \fn where the documentation comes immediately before the
function, as qdoc does not need it in that case.

Change-Id: If6a2a2e2d58b394905c803787d2a93489049e4ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-23 16:30:35 +02:00
Eike Ziller
3e25f61e74 Fix crash when closing extra editor windows.
Change-Id: If1aaceabedc76bb82e90eecb2a83f07c5d114d02
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-23 10:34:33 +02:00
Eike Ziller
d017495a9f Fix positioning of open editors popup
Make it position over the editor root view of the active window (of
the current editor view if the active window doesn't have editor views)
instead of always over the main window.
For this to work we should not make the editor manager parentless in the
editor manager placeholder.

Change-Id: I55d38340939a37960ec619b89f2e768bbfab7f24
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-23 10:07:20 +02:00
Eike Ziller
c31c5612ab Allow nested IContexts and use it to give extra editor windows a context
The extra editor windows need to have editor manager context, otherwise
shortcuts (like ctrl+tab) do not work in them if e.g. projects mode is
active. Doing this via add/removeAdditionalContexts would be non-trivial
and error prone, so adding a context to the extra window is more
convenient. Since editors themselves already define a context, we need
to allow nesting of contexts.

Change-Id: I244eca53ebd665fd4d8fe7531e8ff701ed0b40b2
Reviewed-by: David Schulz <david.schulz@digia.com>
(cherry picked from commit deff0eb3c7)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-21 15:07:14 +02:00
Eike Ziller
2bfcb47d63 Add an action to show/hide the mode bar on the far left.
Change-Id: If7a74eed7fc77b1d0fd5e4045671b3767fe2d7a2
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
(cherry picked from commit bde0627e59)
2013-05-21 15:07:03 +02:00
Eike Ziller
838c0ad956 Make a few more shortcuts/actions raise the main window.
Also make registerShortcut set an application shortcut.
That is necessary when the user opened a separate editor window.

Change-Id: I366044b7acba51daca46a15a302a24b5b8e99cc1
Reviewed-by: David Schulz <david.schulz@digia.com>
(cherry picked from commit 5c8f46d25d)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-21 15:06:38 +02:00
Joerg Bornemann
f5ab5f3a46 fix build for namespaced Qt
Change-Id: Idd25bbea2c5adafbf893a10e107d4a8bfc2d221f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-21 14:26:00 +02:00
Leena Miettinen
bc9bb4b93c UI text: fix VCS related strings
Fix capitalization and punctuation and a typo.

Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-05-16 14:33:32 +02:00
Eike Ziller
65ce453c4e Add split in new window action for editor views.
A few details are still to be done:
- extra windows are not restored yet
- window title of extra windows should show information about current
  editor
- the "raise main window" hack for Linux doesn't work with Qt 5

But it should already now be quite usable.

Change-Id: I638583ee4b2abe32e95c261bdf31b4a10b472748
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-08 13:07:05 +02:00
Eike Ziller
d1cb5dade0 Do not keep the central editor view around even when split.
The view of the top level splitter was kept around for the global editor
history, which lead to unnecessarily complicated code (e.g. flagging the
root splitter as "root" and adding logic to keep the view around for
it).
Instead we just keep a global editor history.

Change-Id: I6558ca0eae681ebacbe6a6fbbc5c103f0b061a6b
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-08 13:06:36 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
Eike Ziller
00885ca9a5 Remove code duplication in open editors window
Change-Id: I9007e1171fa6d519df8cf62978bbd2936d901876
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-02 12:29:54 +02:00
Eike Ziller
bb37f111a7 Fix wrong unsplit icons when splitting without open documents
When doing splits while no document is open, the wrong unsplit icons
where set on the individual editor views (the ones next to the split
menu button and the close editor button).
This also happened when restoring sessions with splits.

Task-number: QTCREATORBUG-9121
Change-Id: I793670518eddee3e57fef5a4ac4a266edb450b14
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-02 12:17:28 +02:00
Eike Ziller
a25d66a944 EditorManager: Get rid of weird logic when finding next view
Removes another algorithm that was starting from the root and took the
whole tree into account.
Instead, make findNextView a method of EditorView, and avoid any
explicit usage of a single root splitter.

Change-Id: I343030521472741a8dfd7134ed16d9beeb10d10a
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 13:44:56 +02:00
Eike Ziller
21ce4e59a4 EditorManager: Replace another root-to-leaf search by leaf-to-root.
For finding the "parent" SplitterOrView it's much easier to go up the
parent hierarchy than doing a depth-first search from the root.

Change-Id: I4c8e195dae2d1f834fb89ab3c213bad5a0fa7d2a
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 13:32:28 +02:00
David Schulz
19bfd1bcd4 Editor: Fix crash on switching sessions.
Task-number: QTCREATORBUG-9220

Change-Id: I0671eaa1e9785ee0327bc8cbd4519c5d696ea0ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-30 11:51:18 +02:00
Eike Ziller
21e7a6ecca Let EditorView handle mouse click (setting current view) itself
Moves the handling from SplitterOrView to EditorView.

Change-Id: I187093ff4570709bac111c4cb4cf901c971a1973
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-25 17:51:12 +02:00
Eike Ziller
e4082646e6 Use EditorView instead of SplitterOrView where we mean it
API like findNextView were returning SplitterOrView, which is a bit
cumbersome and not necessary. Return EditorView directly instead.
Also make EditorManager::currentView an EditorView, since it couldn't be
anything else anyhow.

Change-Id: I6e8741d8bf7a98e46dd583ab929d01a9b8f89338
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-25 17:51:05 +02:00
Eike Ziller
6dbe374b50 Editor manager: Invert logic for finding view for editor
Instead of traversing the split hierarchy down from the root, including
all the branching etc, traverse the hierarchy up from the editor.
Faster in all cases, and works automatically when we introduce multiple
"roots" later

Change-Id: I50eb0fac683fb249c7ff4a63ba9fecea8d652873
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-25 17:50:47 +02:00
Eike Ziller
456a56bc16 Remove unused methods from EditorManager and related classes
Change-Id: If8b9e6cf07e39ea473b80de13c4be9dce6c2ce2e
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-25 17:50:32 +02:00
Eike Ziller
33c0570cc7 Make editor views know their SplitterOrView
That gets rid of a whole lot recursive searching for
SplitterOrView *findView(EditorView *)

Change-Id: I4cba09d1e88ba99072a6585b17bce83ef4cad2aa
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-25 17:50:11 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
2013-04-23 11:13:25 +02:00
Eike Ziller
dbef8d21af Fix "open link in other split"
I.e. ctrl+alt+click in the code editor.

Broke with 6a4310a44a

Change-Id: I63e8f61f8d6f082773eaf70e427d706000b4d01d
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-23 08:00:07 +02:00
Gabriel de Dietrich
79428126e4 Set NoRole menu role on toggle fullscreen action
Again, since the default menu role is TextHeuristicRole, and when we
enter fullscreen the text is set to "Exit Full Screen", the Mac QPA
menu item syncing will assign this to be the quit menu item.

This would cause two problems. First, pressing Cmd-Q in fullscreen would leave
fullscreen mode instead of quitting the app. Second, that would make the quit
menu item to be hidden when leaving fullscreen, since the toggle fullscreen
action text would change back to "Enter Full Screen", and the make a round
trip to the menu item heuristic logic.

Task-number: QTBUG-30654
Change-Id: I7524c54c3bd77cce891c57292825f02e163fd7fa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 16:23:22 +02:00
Morten Johan Sørvig
3779147ffc Add 2x icons for retina displays.
This change updates the mode selector/fancyactionbar
in Qt Creator with new high-resolution icons.

Set Qt::AA_UseHighDpiImages on Qt 5.1 and higher to
make QIcon generate high-dpi pixmaps. Add "@2x" mode
images.

Update StyleHelper::drawIconWithShadow to handle high-dpi
pixmaps. The shadow-drawing algorithm is kept in device
pixels.

Change-Id: I411b7a24e534a2d75a1bbdc4d10219dcbea26bed
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-04-19 10:37:29 +02:00
Eike Ziller
55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD
Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
2013-04-18 12:54:37 +02:00
Eike Ziller
6a4310a44a EditorManager: Remove code duplication.
Change-Id: I366852f788c1d28351e9f853b16d180886892c55
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-18 12:13:31 +02:00
Eike Ziller
bf3d142418 EditorView: Do painting where it belongs.
Change-Id: I38cbf6d884f3034321776b135270acb5c8482321
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-18 11:29:41 +02:00
Fawzi Mohamed
1a1791abba consoleprocess: use empty string as default terminal
Using empty string as default terminal avoids storing a path to
QtCreator resources (which becomes invalid if creator is deleted)
on mac.

Change-Id: I9d5fe9bce38387d82de451652df6be9ec5eb5960
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-18 10:10:48 +02:00
hjk
d3c7220cbc Mime: Use string comparisons instead of regexps for simple globbing
Change-Id: Ia894f3663f43088cdb2d8cb685bcebecaded8146
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-17 17:13:35 +02:00
Orgad Shaneh
e4714f80c4 Settings: Add a filter for mime types
Change-Id: I05213ca74cf3838c923ce6117ffdde28546d465f
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-17 09:06:39 +02:00
Friedemann Kleint
d1bf51161d tr()-Fixes for ReadOnlyFilesDialog.
Fix contexts, remove exclamation mark.

Change-Id: Icfd698e10d7e9e8c949919a102c7a482f007f91a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-15 15:03:57 +02:00
Eike Ziller
920e7ca1f1 Show build and search progress detail also in status bar.
A widget specifically layouted for the status bar can now be registered
with the progress information. The newest one is made visible next to
the summary progress bar. If a newer one vanishes, the older becomes
visible again.

Change-Id: Iedf0e88a542ea442ae86fa51c792c68fbc6eef3c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-10 14:21:25 +02:00