Commit Graph

1907 Commits

Author SHA1 Message Date
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Eike Ziller
07c0a8348c Progress summary: Forward click to "current" progress details.
It was annoying that it wasn't possible to click on the summary progress
bar to e.g. open the compile output or issues pane, even when you had
only a build running.

This change forwards the click to either the progress that currently
shows a details widget in the status bar (like the build errors/warnings
from the build progress), or to the last progress that was started.

Change-Id: I4b50dd4b43bdc12fac329d33e158fa759bee4d28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 14:32:55 +02:00
Eike Ziller
7017e95531 Progressbar: Fix uninitialized variable
Which lead to progress indicators sometimes not having a cancel button.

Change-Id: Idd470411c02686b6975c1e7efd79ac802eb37037
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:47:33 +02:00
Eike Ziller
8685ff8a28 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
2013-07-03 16:55:27 +02:00
Lincoln Ramsay
f500c4c987 Call refresh before checking the splitter sizes.
If we don't do this, we miss the "current" size when an output pane
has just been shown (it comes out as 0) and we resize it to the
minimum size.

Task-number: QTCREATORBUG-8877
Change-Id: I8b1cc19d116dde6edcf8770bb36d1598dfdce195
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 13:10:01 +02:00
Eike Ziller
c531970b57 Add EditorModel::openDocumentCount and use it.
As is, EditorModel::rowCount() could also be used, but this will most
probably change later. So we simply add a method that is independent
from all the "model" methods.

Change-Id: I39a2338d765ed6a269bf8977b816a5eda371afdf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 12:17:30 +02:00
Eike Ziller
4a596c8eee Remove script manager and script debugger engine.
Doesn't really serve a purpose any more.

Change-Id: I8c3bc11bf7b05a15eafd2a22456a40b270cefadf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-01 12:01:11 +02:00
Eike Ziller
2f8f083b40 Unify pattern used for privates and constructors
In the 'managers' from ICore

Change-Id: Iab98c9e0947b759843a62e3777ba46be3b304b06
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 11:52:35 +02:00
Eike Ziller
c9128b7fdd Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
2013-06-27 14:24:57 +02:00
Joerg Bornemann
5a3c4cc8ef qbs files: fix OS X checks
Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-26 16:46:18 +02:00
Eike Ziller
cabef7580e Fix possible crash when looking for version control for directory
Task-number: QTCREATORBUG-9656

Change-Id: If8babdb942830bd11fe360a311c57b75312248be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2013-06-26 14:17:27 +02:00
Eike Ziller
84b8c1f721 Adapt the escape key logic for external windows.
Change-Id: I294ba18e8ca91060e5d0ef8f81885642e045a975
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-25 14:58:37 +02:00
Eike Ziller
a88599aee2 Fix escape key for "About Qt Creator"
Change-Id: I15c49541a6914c8db58784935de43f0b046895b0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-25 13:40:38 +02:00
Eike Ziller
e8469a2bab Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
2013-06-25 10:14:14 +02:00
Nikolai Kosjar
10ff6769ac Core: Let IDocument also report failed file reload operations
Change-Id: I8fa02f2398f59306c49481316fdedf50a1c4e32f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 11:13:29 +02:00
Eike Ziller
553e33979a Fix external file change notification in case of multiple windows.
The notification was only done when the main window was activated which
leads to funny results with external editor windows.

Change-Id: I657ef7e429256f9c098b1fc744d40ffbc2bb5260
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-21 16:22:37 +02:00
Daniel Teske
cdecaa5a80 SettingsDialog: Update size of category view on showing/hiding scrollbar
On a german locale the category view has a horizontal scrollbar. This is
because the initial sizeHint is calculated while the vertical scrollbar
is not visible. This patch ensures that the sizeHint is updated if the
scrollbar is shown.

Change-Id: Ic97c0c3650f765dbf6d8f84f2c168630c65ee89f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-21 11:07:18 +02:00
Joerg Bornemann
cd37aef6cf update qbs files
Use the new contains function and the targetOS list.

Change-Id: I38b995eb9328e449befad85792512c45670cc8c9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 15:31:39 +02:00
Daniel Teske
916ae49b6a FancyToolButton: remove forceVisible
It's never used

Change-Id: Ia2e7ab19685066daf29b5209cb7ea2a7485dfcf2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-20 13:17:50 +02:00
Daniel Teske
198d125a1c FancyToolButton::paintEvent remmove unused variables
Change-Id: I5eb7fa9d1efc06292ee22e9db195204e37f3aa4b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-20 11:30:38 +02:00
Leena Miettinen
41411165ba Doc: use standard wording in \brief commands
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."

Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-20 11:22:47 +02:00
Orgad Shaneh
5c900d205d Revert "DocumentManager: Support expect/unexpect directory changes"
Doesn't work

This reverts commit f6ec8c3342.

Change-Id: I84ecb956bd8ad2358228e11630e95ac03c903c21
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-19 11:05:23 +02:00
jkobus
f5a2c1469a Add a DiffShowEditor showing an additional info
Task-number: QTCREATORBUG-9489

Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-19 09:11:42 +02:00
Eike Ziller
f3451e92a1 Fix that sometimes documents are opened in wrong split
Task-number: QTCREATORBUG-6433

Change-Id: If1626c1a2c406af48a8d7c630c353e138a37aa2e
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-18 16:01:31 +02:00
Orgad Shaneh
dbb6bcf5b0 VcsManager: Hide unconfigured VCS message after VCS is configured
Still requires changing editor to refresh...

Change-Id: Ia8524bfcbdbc0f6b6cff02ff373d6edab129b38a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-17 10:43:30 +02:00
Eike Ziller
afe1d5ee65 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/coreplugin/documentmanager.cpp

Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
2013-06-14 16:21:04 +02:00
Eike Ziller
60f7f00e41 Provide ICore::documentationPath()
Change-Id: I74e4ad7650296e897edc3313904168a720c8d360
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-13 16:21:11 +02:00
Eike Ziller
ffba68bf32 Fix width of mode selector
Task-number: QTCREATORBUG-9509

Change-Id: Ifec0b6ca777e3e9ed351db7d413339cedcdaecce
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-12 17:16:31 +02:00
Orgad Shaneh
17106e69c4 Suggest configuring VCS if it is unconfigured
Change-Id: I6ef3c615070f055e688c94d6901d8c9a861b9928
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 13:34:04 +02:00
Orgad Shaneh
808f4492c5 VCS: Add a property to Command to indicate expected repo changes
Change-Id: Ia6c929ae64008dcb37695a5358c44096a893e0c4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 10:37:36 +02:00
Eike Ziller
7e5b462377 Don't resize (external) editor windows when changing editor
Change-Id: I0b46e2403e67e29151c7b02e7371eaf4569f7168
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-10 10:30:39 +02:00
Orgad Shaneh
f6ec8c3342 DocumentManager: Support expect/unexpect directory changes
Change-Id: I68b69fa00dd6cc189ecfcdb9dfad09c41531883f
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-10 10:12:05 +02:00
Christian Kandeler
482969186d Core: Fix build.
Change-Id: Id11aadb251a91bc579979dab971ea45960aabb86
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 18:00:29 +02:00
Eike Ziller
1b3bb5cb7e Consistently give qbs groups a name.
These nicely show up in the project tree in Qt Creator then.

Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-06 13:40:51 +02:00
Eike Ziller
a503f8bee0 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/extensionsystem/pluginmanager.cpp
	src/plugins/coreplugin/documentmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: Ibc2adc40bad6f10df94c50d66e78dc3f4bcb84c0
2013-06-05 14:19:43 +02:00
Orgad Shaneh
277fa49d28 Fix compilation
Change-Id: I269013c06dd540309b95cf1411bbc3571df2c5b5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-05 10:10:46 +02:00
Orgad Shaneh
81fc8ff210 Doc: Remove \fn lines adjacent to functions
They are unneeded, some of them are unmaintained

Change-Id: I0ad87e152d8e2328b486b2f904f7cf9613004afe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-05 10:07:14 +02:00
Friedemann Kleint
506b4ca9a8 tr()-Fixes.
Change-Id: Ie4645f3a3c82d18099dd154293d242ab07b1e5fc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-05 09:45:29 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-05 09:43:14 +02:00
Tobias Hunger
d96535bd23 VCS: Clear directory cache when availability of VCSes changes
We could have gotten new VCSes or existing ones might have gone,
so clear the cache of which VCS manages which directory.

Change-Id: I87a1b9c894e2867773ea4df221e463adb14f4ee9
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-04 10:38:14 +02:00
Eike Ziller
ce4edd7930 Editors: "Split New Window" --> "Open in New Window"
Change-Id: Icbf27edc8b3d7bd73504b449491f70056220c99f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-03 15:38:17 +02:00
Eike Ziller
9ff6490dfc Save mode visibility in a separate property.
Instead of using the actual visibility state of the widget, which might
have screwed things up if for some reason the widget itself was not
visible the moment settings are saved.

Change-Id: I7ae89259dc925f799bca413b537b65e9e689e1b7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-03 12:35:36 +02:00
Eike Ziller
2125525e77 Move openEditorAt from BaseTextEditorWidget to EditorManager
More sensible place, gotoLine is a method in IEditor anyhow.

Change-Id: I420a6bf17060c16e6f1a4f45e0bef89379fb6bf8
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-03 09:33:06 +02:00
Eike Ziller
97ce8e4098 Remove IEditorFactor::open implementation with a warning
Looks very much like the current IDocumentFactory / IEditorFactory
set up does not make much sense. Should be cleaned up in a follow-up
commit.

Change-Id: I000b68fe6b6d75add713866818711545b41dfe23
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-03 09:32:51 +02:00
Eike Ziller
97915bbcea Make 'open in other split' a flag instead of another method.
Change-Id: I1acafd85ec7a87ba2ac61240f30c329d56461118
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-03 09:32:22 +02:00
Orgad Shaneh
7b5b5b13b4 Ignore unconfigured VCS
Change-Id: I4a63734793debfcb37283257bb7cbf4b1153197f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-31 14:41:55 +02:00
Eike Ziller
7d986f0486 Cycle through extra editor windows when cycling through splits
Change-Id: I1bd5654d62b11456c35cc5bf1099e41fb3559bc7
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-31 12:27:12 +02:00
Eike Ziller
0a95b28147 Merge remote-tracking branch 'origin/2.8' 2013-05-30 13:48:27 +02:00
hjk
8390a32131 Settings: Simplify some user code
This is still way too much boiler plate code for the task at hand.

Change-Id: Ia03bff3d6947ea6372e3f5d0217c116728742b74
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-29 09:40:17 +02:00
Friedemann Kleint
0b225af84c Fix warnings about uninitialized variables in readonlyfilesdialog.cpp.
readonlyfilesdialog.cpp:316:29: warning: 'type' may be used
uninitialized in this function.
readonlyfilesdialog.cpp:283:60: warning: 'result' may be used
uninitialized in this function.

Change-Id: Ib2456e64d981c5afcd3ba70cc7ef0427e98b9b4e
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-29 09:21:22 +02:00