Commit Graph

2367 Commits

Author SHA1 Message Date
Eike Ziller
ddf1de387b DocumentModel: automatically use id from entry's document if that exists
Avoids some manual assignment and is in line with what we do for the
file path and display name.

Change-Id: I4e98af08b44978493987e63962d26f8595c6990b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-20 14:33:53 +02:00
Eike Ziller
01d86d8c4e Move copyFilePath/Name context actions to editor manager
Synchronizing the context menus on the open documents pane and the
editor tool bar.

Change-Id: I29f614d483a425dec58fc1247b691fd433c4acc0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-20 14:33:30 +02:00
Eike Ziller
8a31388f40 EditorManager: Close documents instead of editors where appropriate
This is the first step in actually making "closeEditor(s)" close editors
instead of documents.

Change-Id: I02761e0cef950b8fc093f65a90df04a9a7550681
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-18 15:36:01 +02:00
Eike Ziller
18af5ceff7 EditorManager: closeOtherEditors --> closeOtherDocuments
Change-Id: Id8b225ed7ba6ea88669db06943d862793aa2671d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-18 14:14:18 +02:00
Eike Ziller
0a3a3be432 EditorManager: Another naming correction
closeEditor(Entry) -> closeDocument(Entry)

Change-Id: I996cc8a22b670f97dc47470116003c537e7f32b0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-18 14:14:14 +02:00
Eike Ziller
746a0ba208 EditorManager: saveEditor -> saveDocument
Change-Id: I1691b7231080320ff48efbbd7f870658a977ad0d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-18 14:14:10 +02:00
Eike Ziller
4c6e02ed99 Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2014-08-15 16:15:04 +02:00
Eike Ziller
d9d0aba1c4 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
2014-08-15 16:14:34 +02:00
Christian Stenger
f56dd2e49b Core: Fix crash when closing separate window
Change-Id: I1c9c0644a7ed91b59e86137f80b1f0f534febd47
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-15 15:33:38 +02:00
Orgad Shaneh
7489007bdb DiffEditorDocument: Assign mimetype
It helps when savingAs vcs diffs for the first time.

Change-Id: I53b1c2c89641ee6b8106fb574c050ead60aa8da4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-14 16:01:49 +02:00
Christian Kandeler
0a9089810f Core: Fix qbs build.
Change-Id: I2372ffc07a101110c9c3016c7d18b9d182312954
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-13 16:48:47 +02:00
Eike Ziller
49a8cf44da Editors: Set window title for external editor windows
Change-Id: I54ed77c0f1b2122ae8833109d8dcac7d8eec7ac4
Task-number: QTCREATORBUG-9612
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-13 15:47:58 +02:00
Eike Ziller
2a9a014c9d Editors: Extract class for external windows
It will take over more responsibility in a later patch.

Change-Id: I89ef61791ccbba3e42de2862d5d887099634bce4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-13 09:12:07 +02:00
Daniel Teske
7d5d9b4d0f FindToolBar: Add support for "lightcolored" panels
The labels need to be polished so that they get the right palette,
and the icon needs to be switched from light to dark.

Change-Id: I3e37947e741c3d92f3c1ac3bb02e631aa7803f59
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-12 14:14:22 +02:00
Daniel Teske
60db018f00 EnvironmentWidget: Make view searchable
Change-Id: Ife939c5abc015529eaa1ee5c06e0cca468e163a1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-12 11:42:19 +02:00
Daniel Teske
0d5763425a TreeViewFind -> ItemViewFind
The code changes to enable this is minimal.

Change-Id: Ia5571adcc724e89eb5c68a5f91e38b9cf274516d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-11 14:49:52 +02:00
Oswald Buddenhagen
f3a61e8bf7 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
2014-08-05 14:24:23 +02:00
Daniel Teske
ac00146a94 Core::Constants: Rename close icon constants to reflect file name
Change-Id: Ic88d9a87a9eb08e597a0aa5652ac061b54d86d1e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-01 17:05:31 +02:00
Daniel Teske
56d29d1d23 Core::Constants: Add constant for darkclose.png
Change-Id: I77560b1a3744abad0a41f84cb386b3f688381b9b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-01 16:55:14 +02:00
Daniel Teske
d178a3e7fc ManhattenStyle: Set correct palette for "lightcolored" labels
Change-Id: I2a652dd8552d3ec4622c854690c92c8d48e1c9ba
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-08-01 15:10:02 +02:00
Alessandro Portale
3e9272727b Core: Fix compiler warning in ProgressBar
m_cancelRect is a QRect (not a QRectF)

Change-Id: I301f5957284ffe66c94067adc64763878ef1b37f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-08-01 12:14:02 +02:00
Tobias Hunger
f130c3c7e5 FeatureSet: Add some helper methods
I used to reimplement these a couple of times already.

Change-Id: I265cf50bf976638b4ac5406ae4010cf33c20354c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-30 16:45:00 +02:00
Tobias Hunger
1da1eec513 IFeatureProvider: Add register method for IFeatureProviders to IWizardFactory
and avoid putting those objects into the object pool.

Change-Id: I46c5ed93a9e80532b3cbd7dba2e52b28b1595aa3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-07-30 13:50:03 +02:00
Christian Stenger
50540c34d3 Core: remove deleted files from qbs file
These files have been removed with c3093cfff7.

Change-Id: I96b1c188bda8ff55a1cd4fba69c19f076be2efdb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-30 10:25:02 +02:00
Alessandro Portale
421d5120f1 Core: High-Dpi progress bar
Also tweaking the ProgressBar painting code. The cancel cross was
slightly messed up lately, since line drawing changed in Qt5. The
progress bar is one pixel taller and the cancel button mouse area is
slightly larger.

Change-Id: Id55c21f45529332dc6abfc03b53f149e8349a9a0
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-29 09:10:15 +02:00
Alessandro Portale
da41de929e Core: Improved layout of the progress toggle button
Horizontally centered. Vertically less unbalanced. And now also it also
works nicely in High-Dpi mode.

Change-Id: Ie02794fcda251c054f4f0a24b1f14f8f5a8e8847
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-29 08:49:37 +02:00
Alessandro Portale
2bc8bcd363 Build fix for Windows
Change-Id: I81abfab977d2ea9fd36dcf5e48346744742208cf
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-24 23:44:00 +02:00
Alessandro Portale
9dfdbdacc4 Utils: StyleHelper::dpiSpecificPixmap > ::dpiSpecificImageFile
Letting that helper function return a file name is more flexible than
returning a QPixmap.

Change-Id: I4634e4e795eec029608c8e65c1a0e8afff870a91
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-24 23:10:34 +02:00
Alessandro Portale
38f206b1d1 Core: Refresh the panel buttons
This patch recreates the exiting panel button graphics in
the qtcreatoricons.svg file. We can now create @2x versions.

The border-image borders are corrected to 3 pixels. The panel
manage button has now centered arrows.

The addidtion of the @2x versions will be done in another commit.

Change-Id: I287e1c902f187deefc65524fdd6056067ab017de
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-24 17:25:55 +02:00
Robert Loehning
dd1197aa7f Editors: Compile fix for MSVC2010
Change-Id: I1a4c254b9de701fdfa5d0912d3228494b9ccd627
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-24 14:00:22 +02:00
Alessandro Portale
5df28e57b9 Core: Add a thin border around the "locked" icon
The dark lock needs to be visible on dark and on light background.
Since the border is a transparent white, it will only appear
on dark background.

Change-Id: I991056e23b4b72974fb67a4e8738af5d90bc0842
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-24 12:02:07 +02:00
Robert Loehning
d153da9a92 Compile fix
Change-Id: Ibbac41a0813bf28f4c721ddd25d872669669ac67
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-24 08:52:22 +02:00
Eike Ziller
04ad136022 Editors: Create a EditorArea class
That manages its own context. Only the first step in supporting/fixing
things like window titles, and getting rid of the editor manager
placeholder.

Change-Id: I90e681d8470728f9fab4a04dd4d1e91d37c993f3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-24 08:36:29 +02:00
Eike Ziller
cec2319e9a Find: Fix that pressing escape when tool bar is disabled did nothing
Change-Id: Ic8f3c897aa77bff2d1bb393186634418ff0d8d80
Task-number: QTCREATORBUG-12710
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-23 15:50:34 +02:00
Alessandro Portale
7f4e31ab69 Core: Algorithms for StyleAnimator
aportale's first one!

Change-Id: I86ba1f36576dde19b9deb4c5686e865e7aa53a82
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-23 14:50:57 +02:00
Alessandro Portale
4b76d50a11 Core: calling QImage::constBits() instead of QImage::bits()
the non-const QImage::bits() performs shared-data checks. With
QImage::constBits() we can skip those for sure in cases where we only
want to read.

Change-Id: Ic5f328b54eb2d9930ad31b4df8d9b636dc005982
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-23 11:14:37 +02:00
Alessandro Portale
17ce7d4ad5 Replace set[Plain]Text(QString()) with clear()
...where applicable. Shorter, faster, more semantic.

Change-Id: Ifb1cf200f489f62a79e12c761e98a846992744dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-23 10:57:49 +02:00
Eike Ziller
ff60b856ec EditorManager: Clean up public interface
By moving internally used methods to EditorManagerPrivate

Change-Id: I046ce92b8baffe4bcd2ea0529557a3ae69f74338
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-22 17:28:30 +02:00
Eike Ziller
0374a9782e Merge remote-tracking branch 'origin/3.2' into HEAD
Change-Id: I257bb9310bb3bde493aff4cd43091ec63fcb5203
2014-07-22 16:11:40 +02:00
Orgad Shaneh
f51553b228 Core: Enable context menu for document-less editors
Change-Id: I92edf53230d34cb222dcc82391b8046e09c7599d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-22 15:09:48 +02:00
Eike Ziller
4b82817391 EditorManager: Do not be a widget.
There is no reason for the editor manager itself to be a widget. This
makes even less sense in the presence of multiple windows.

Change-Id: I384f8945fdd5632d64643e473e6637e05abbce7e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-22 13:45:10 +02:00
Eike Ziller
cd602c9f6e Core: Avoid segmentation fault when executing plugin unit tests
Change-Id: I80e4b73c36602542106aa3abbb1e3b147be58e6f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-22 11:19:41 +02:00
Alessandro Portale
d905aa818b Core: Toolbar icons improvements
Change the type of OutputPaneManager::m_maximizeIcon and
::m_minimizeIcon from QPixmap to QIcon to have the automatic @2x
loading.

Small retouches of the graphics: arrowup and arrowdown got the same
color and shadow like the other toolbar icons. The line width of
button_close got adjusted.

Change-Id: Ia985ae23b8c9f301fecee64e8283c6e556e6e0c2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-21 10:46:58 +02:00
Eike Ziller
a4cb16adb1 EditorManager: Remove useless method
Change-Id: I87c2d861d88e783bd41f200a76853477d05cce0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-07-21 10:01:30 +02:00
Tobias Hunger
8f1ca2216a IWizardFactory: Add a feature for all running plugins
Get rid of IFeatureProviders that are only telling the wizard factory
that a plugin was loaded.

Change-Id: Id12c669974a6ab98036f070e1adcae35b34ca376
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-21 09:52:13 +02:00
Eike Ziller
c571ecbd51 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/git/changeselectiondialog.cpp
	src/plugins/git/changeselectiondialog.h
	src/plugins/git/gerrit/gerritplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/git/gitclient.h
	src/plugins/git/gitsettings.cpp
	src/plugins/git/gitsettings.h
	src/plugins/git/mergetool.cpp

Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791
2014-07-18 14:04:51 +02:00
Eike Ziller
7dfb7df471 OS X: Add action for closing external windows
E.g. editor windows and help windows. There is no automatic system
shortcut for this on OS X.

Change-Id: I27f1208cde0a6f4b1a6952a7988d00a8481a08a4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-18 11:41:17 +02:00
Eike Ziller
292cf6c9e8 Algorithms for DocumentModel
Change-Id: I9065951548a85190c991339f93cf57be2e1617da
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-18 11:40:59 +02:00
Christian Kandeler
50f0336c44 Core: Fix qbs build.
Change-Id: Idcefac332e3504fee704bb2dc3328bf50c7bd0f2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-18 10:54:14 +02:00
Eike Ziller
ae2da9a350 EditorManager: Add window actions (fullscreen etc) to editor windows
Change-Id: I478db8c994cc3126d8d518e3d574e9adfa600ad1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-18 08:55:54 +02:00