Commit Graph

1269 Commits

Author SHA1 Message Date
Orgad Shaneh
8ec4451069 Git: Disallow quotes for branch name
At least on Windows it fails.

Change-Id: I2e119bf47b468a9f881184ad26fa9fbd10f16124
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:14:31 +02:00
Orgad Shaneh
41ea3ffea8 Git: Fix comment indentation in BranchAddDialog
Change-Id: Ia1cd72b598555681e62444f6843a746049c5c04d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-15 10:08:18 +02:00
Orgad Shaneh
20b836f59c DiffEditor: Simplify makePatch
Store indices in controller and avoid passing them around.

Change-Id: I49c80cb6cf6734a18f80ad5c7c441973d246708f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-09-09 08:40:05 +02:00
Orgad Shaneh
ee2023ef65 Git: Deduplicate diff editor creation sequence
Change-Id: I9d0751726f0acb340f9b19be62c6bbe23ec460f7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-09-08 15:09:02 +02:00
Christian Kandeler
847f10e9cc Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 10:33:25 +02:00
Kai Koehne
e2584f69d4 Replace QLatin1String("x") with QLatin1Char('x') where possible
Change-Id: I2f90c8ae7b5e968b9de882833f8661ab540a9232
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-04 14:50:00 +02:00
Eike Ziller
7224ccb2e7 Editors: Automatically add editor/document id to context and use that
instead of manually adding a context everywhere.

Change-Id: I4336015a6d19349171a255e949da89b0013d6700
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 16:48:13 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 15:11:24 +02:00
hjk
22aef3b61a VcsBase: Remove remaining BaseTextEditor::editor() usage
Change-Id: I5414319b30f29dfd2d321f6ca99554df8202e6d8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-02 11:01:49 +02:00
hjk
9c152fce7e Vcs: Collapse VcsSubmitEditorFactory hierarchy
Same pattern as for VcsSubmitFactory.

Change-Id: I7adb8868a83842c1b6c642db372a3624dd2e879e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-01 10:41:21 +02:00
Christian Kandeler
1d5091e48f Do not use deprecated Qt functionality.
Replace all* remaining deprecated Qt 4 functions with
their Qt 5 counterparts. This means we no longer need to
define the QT_DISABLE_DEPRECATED_BEFORE macro.
This patch is relatively small because most source-compatible
changes of this kind have been done before.

* The one exception is the QmlDesigner, which uses QWeakPointer
in a deprecated way all over the place.

Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-29 14:10:41 +02:00
hjk
59259df569 Vcs: Convert to new editor construction scheme
Change-Id: I4b4516c8cdf1a934a7865ac6dce904a244995b5b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-28 17:02:38 +02:00
hjk
5f7e89d914 Vcs: Some naming re-organization
Rename VcsCommand to VcsCommandTag, Command into VcsCommand
(Too generic to not mistake for Core::Command IMNSHO),
remove the now unneeded namespace qualification when not needed,
adjust surrounding code.

Change-Id: Iceb18a21e5e6dffa1a622241286f766985bb8d22
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-28 16:37:00 +02:00
hjk
f08ff20e94 Vcs: Move some static functions from *EditorWidget to *Editor
Change-Id: Ic7c0a3bca982f5728e28ff9f3e1e054b5a902ea9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-28 15:09:28 +02:00
hjk
251a1d2588 TextEditor: Clean up/streamline SyntaxHighlighter setup
No need for the third construction way if that's not
really used by the factories anyway.

Change-Id: Id3b34da5b0320babae9bef96a79bbaa52e0db06d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-27 15:00:43 +02:00
hjk
4d082cee74 VcsBase: Use static pattern for VcsBaseOutputWindow
Also rename to VcsOutputWindow.

Change-Id: I79547b1154603a8c7b3604eadc5b460930c6109c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-27 12:12:15 +02:00
Eike Ziller
aa6495a261 ExtensionSystem: Remove Qt4 support
Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5.

Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-27 08:44:34 +02:00
Orgad Shaneh
6fc20eeccb Gerrit: Set Refresh as the default button
Without a default button, Browse is activated on return.

Task-number: QTCREATORBUG-12898
Change-Id: I8673ef91a56eac9f49770432e4c29241d3606a58
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-26 11:04:18 +02:00
Orgad Shaneh
e992b1a097 Git: Do not pass --author on commit when author is unchanged
Change-Id: Ic77961ad9e426353d662e0d61eebdaba6bc2cf4d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-25 11:19:09 +02:00
hjk
6431ab2c79 Use Qt 5's QStringList::join(QChar)
Less typing and less cycles than join(QString) where appropriate

Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-25 08:21:14 +02:00
Eike Ziller
6772ba622a Fix closing editor with ctrl+w or "x" or File > Close
If there are other editors on the document visible in some split, it
should not close the document, but only the editor.

Task-number: QTCREATORBUG-9346
Change-Id: Idce1ae2f518d4c6e875d86f9831d41c46c06361c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-22 08:54:34 +02:00
hjk
2481e71d18 Vcs: Move editor construction over to new scheme
Change-Id: I491b9f37bfe15ebc800fedd5c683bfaf24e63889
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-21 11:50:27 +02:00
Eike Ziller
b25c575b22 Fix default shortcut for git commit
Still works in 3.2, broke with ae844bdf9e

Change-Id: I3ff806c299baef5ff8ada393e4934244064e81e6
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-20 13:24:40 +02:00
hjk
351abd035b Vcs: Flatten the VcsBase::BaseCheckoutWizard hierarchy
Following the new simple-factory pattern

Change-Id: Idceb7a339169af37a040f9da7d36d3fe22dfb347
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-18 17:06:59 +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
Eike Ziller
264df002e6 VCS: Make submit editor closing independent from current editor
The VCS plugins keep a reference to the submit editor, so it can
explicitly be closed, instead of relying on the correct currentEditor in
the editor manager.

Change-Id: I14aab63447f790f2065a8d8dc6b50aeacbd1e941
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-15 15:33:14 +02:00
Orgad Shaneh
da7a6e64ae PushToGerrit: Improve tooltip
Task-number: QTCREATORBUG-11930
Change-Id: Id09b71759a1fe67c558500a2a460669f708b1dee
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-08-15 10:14:19 +02:00
Orgad Shaneh
e5b2c079ca PushToGerrit: Do not allow spaces in the reviewers edit
Task-number: QTCREATORBUG-11930
Change-Id: I0566fe2ef1d6e5ad9d99256d8a57a8e876a2e0c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-14 18:17:44 +02:00
Robert Loehning
eb1ce50779 Compile fixes for Qt 4.8
Change-Id: Ie28d5901fe27fec4f928204296bf1013e10c556a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-13 17:32:36 +02:00
jkobus
ceedde8769 Try to show some meaningful diff when in merging state.
Instead of showing 3-way diff, show simple diff
of conflicted file compared to the head of current branch.

Task-number: QTCREATORBUG-10099
Change-Id: I9419236f0249fd2752f89ea80a2a644fb80af095
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 16:53:24 +02:00
jkobus
0b1a49a66e Fix const correctness
Change-Id: I40728827423ef0832640de2ebd2ad6d637fb4a5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 16:45:52 +02:00
jkobus
87b5db5562 Save / restore state in diff editor when reloading
Task-number: QTCREATORBUG-12650
Change-Id: I0bb25ed39f8a15dd5da798ebf0ce72898a2e3b3d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-13 15:44:36 +02:00
jkobus
a9f00ac145 GitClient: use "git show" for show instead of "git diff"
Task-number: QTCREATORBUG-12755
Change-Id: Idc4427425a3ef3e70c8738f1062e20d50bab69ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 14:24:58 +02:00
jkobus
afea017c80 DiffEditor: Fix double click inside commit editor
The bug was that if you double-click a file
in the commit editor, then double-click another one,
the diff remains with the first one.

Change-Id: I1f49b549c9dfd3ebd4ec6950ed28dd8cbc7d0227
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-12 10:30:01 +02:00
Daniel Teske
fd18503ef2 Fix placement of Bypass hooks checkbox
Make it aligned to other labels.

Task-number: QTCREATORBUG-7202
Change-Id: I333f34d93fba8c8b6cf461f8ab1d9c26eeda20e7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-11 12:45:16 +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
Orgad Shaneh
ed02e7f3c5 Git: Fix crash when returning to commit editor from diff
The crash happens on Linux/Xming. 2 subsequents calls to
slotRefreshCommitData occur, m_commitDataFetcher is released when the
first one is handled, and the second call dereferences NULL.

Change-Id: Ibc06fe5dd89b790ac84544f6842cbf345d118703
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 15:27:00 +02:00
Tobias Hunger
db72d6f5f6 Git: Initialize some member variables in constructor
Detected by CppCheck

Change-Id: I4dfafc75349a6f14e050cbf405f0b2dc9fce5cef
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-04 14:50:01 +02:00
hjk
d7c2b0b681 TextEditor: Consolidate document access functions.
There was document(), textDocument() and baseTextDocument().
Two should be enough...

Change-Id: Id9e41c8d857c5cb3269a9fce5ab594d34448c982
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 10:43:56 +02:00
Orgad Shaneh
42bbae26a3 Git: Do not suggest tag name for local branch
This causes unnecessary name ambiguity.

Change-Id: Id27060edb19b4902f2a93da042eb8389754b8e04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-08-04 09:49:39 +02:00
Orgad Shaneh
117436a65a DiffEditor: Use explicit DirectConnection for context menu
The menu is expected to be populated after the signal is emitted.

Change-Id: Ibcb9eaf3742942801ad79b98000d48cb93d5ae31
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-08-04 09:26:32 +02:00
Orgad Shaneh
7a7690f0ec Git: Parse for-each-ref output as UTF-8
Adding a branch with non-ascii chars then refreshing the branch list on
Windows invalidates the branch name.

Change-Id: I59d3e092c66fdcc7cea38a8451de6b5e42cd5de0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-07-30 09:12:44 +02:00
hjk
3e830a781f Git: Simplify action callback handling
Change-Id: I5fbf0c3c89ee66b8d4339ee9100f63b53aae41f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-29 15:55:32 +02:00
hjk
ae844bdf9e Git: Simplify code for action generation
Instead of returning (Action, Command) pairs for further modification,
pass in everything to setup the Command, and return only the Action.

Change-Id: I85695f2f35a9b9a1f34b00db7de5135909045e05
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-29 09:41:05 +02:00
hjk
4ddcb7505d Git: De-noise gitplugin.cpp
Following suit.

Change-Id: I88c1164136e76451c56a21915ed087f4d5ebe594
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-29 08:51:29 +02:00
hjk
49b5502a18 GitEditor: Rename GitEditor into GitEditorWidget
This makes it consistent with the BaseText terminonlogy

Change-Id: I4073169a19eaa75df7a29f96d74a85ab96bc352d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-28 10:38:19 +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
hjk
c1a741022f Git: Remove unused declarations
Change-Id: I733aa001a721376ad69c0ae492290e37c71b6f84
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-23 07:12:41 +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