feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
37,444 Commits 108 Branches 368 Tags
d2ec7d80d92952262b164068b52f63e39e259f7c
Commit Graph

32 Commits

Author SHA1 Message Date
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
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
908db4af5d Fix focus handling in diff editor 
Task-number: QTCREATORBUG-12288
Change-Id: Ie5195fd3447bcedc4f7fd0515bedb524b5d96663
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-13 15:28:13 +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
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
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
hjk
bf5e43be94 TextEditor: Merge ITextEditor and BaseTextEditor 
Adjust all callers, de-export BaseTextEditorAnimator

Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-25 13:45:55 +02:00
jkobus
cb0e1d040e Fix double click in left view of sidebysidediffeditor 
Task-number: QTCREATORBUG-12493
Change-Id: I008cae61ce2a32f1abce56c66ee09387768fbeb8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-04 10:27:27 +02:00
Erik Verbruggen
87fa7b77dd Remove unused variables. 
These produce warnings with -Wunused-const-variable.

Change-Id: I897446cfd019c5328e3b1962f16a2190af37959d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-27 11:25:19 +02:00
hjk
62a870a14f TextEditor: Simplify HighlighterFactory hierarchy 
Change-Id: I555639a9137dcb8ccb471e1615823870c8158b3c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-26 15:54:12 +02:00
Orgad Shaneh
6c921090bf DiffEditor: Avoid "jump to file" for directories and nonexistent files 
Submodule diff sample (sub is the submodule's root directory):

diff --git a/sub b/sub
index 6ae5025..4b26500 160000
--- a/sub
+++ b/sub
@@ -1 +1 @@
-Subproject commit 6ae5025c9a66767e90cd320f9661e7694f7ea8b5
+Subproject commit 4b2650066d4143e8b7a9f4b19e46b96996a1dd90

Change-Id: I388de5bc50ceb1fcfc31a3a70ce8328c83fafa71
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-23 16:35:41 +02:00
jkobus
dcedc45474 Compile fix 
Change-Id: I0b586bd1b024c3d1f0eaebfc057e85fbedfe72cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-06-06 14:43:58 +02:00
jkobus
8cad94534f Implement unified diff editor 
Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-06 12:33:59 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
 2014-05-02 10:00:20 +02:00
Robert Loehning
70e47527bc Compile fix for Qt4 
Change-Id: I16cc2f6f9cc7ace7aa7fb34a340ea714b6ac9c3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-04-16 14:29:12 +02:00
jkobus
18fc5e3f91 DiffEditor: replace carriage return chars with spaces. 
Make sure text block is valid before using its layout.

Task-number: QTCREATORBUG-12056
Change-Id: I618edfcf549b675282587aed577810b806692bd4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-04-16 10:35:14 +02:00
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
 2014-03-18 14:46:29 +01:00
jkobus
f4db27a65c Reorder coloring inside diff editor 
Display properly separators in differences

Change-Id: Ia7aa1f1ee96a07e0ed96773e8363e68f3d3a5638
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-03-12 11:55:19 +01:00
jkobus
9c2cdc8965 DiffEditor: refactor internal structures. 
Simplify the implementation a lot.

Change-Id: I3f5daa3d2ce14c28d48c2e1e996ec4935d1dae3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-03-11 15:34:10 +01:00
Oswald Buddenhagen
52bf71fbdf Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
 2014-03-11 13:39:55 +01:00
jkobus
b846840c52 Move more function into diffutils, fix calculateOriginalData. 
Change-Id: Id7bbdbf7778d21cb9aa15148876db95e9228fab3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-03-10 13:01:29 +01:00
Eike Ziller
5dd8d7cd9c Editors: Move id() from editor to document. 
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-05 16:27:52 +01:00
jkobus
a746f6fb27 Move internal structures and some functions into diffutils.h 
Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-28 10:42:50 +01:00
jkobus
0ba55199b2 Prepare for patch generation, fix internals. 
Change-Id: Ib3b7c5c433f9f9230eb14d23a3029681841e2e68
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-27 16:19:00 +01:00
jkobus
9f10e8daac Refactor internal structures inside diff editor 
Move "changed" property out of TextLineData into
RowData as "equal".

Change-Id: Id9cb87d099cecb61a2774e7a4fffcc162dece604
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-27 12:26:06 +01:00
jkobus
ab9db1433a Small refactor. 
Change-Id: I8bdf3830e230b5db3d6041fae0d22c05cfc047d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-26 12:35:26 +01:00
hjk
6c6f47f86c Core: Make IEditor::id a value member and adjust users 
Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-25 10:36:25 +01:00
jkobus
52e166c5ae Move Gui stuff out of DiffEditorController 
Place it in DiffEditorGuiController, will be needed for
sharing gui settings between unified and sidebyside versions.

Change-Id: I8a858d0549ff84e21f7c909288ca07c5a2ef4e5b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-24 11:43:25 +01:00
jkobus
73cf43f323 Add DiffEditorManager, refactoring. 
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).

Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-18 13:46:49 +01:00
Jarek Kobus
1c76e25fdc Move some functions to Differ, add unified diff 
Change-Id: Id8178fb84f25a18fda42e02954f28359d0ef4623
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-14 14:37:55 +01:00
Jarek Kobus
e8482f3e49 Fix comment 
Change-Id: I0750ecae4d103d93ca20bef657b98a468bb355fc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-14 11:09:52 +01:00
Jarek Kobus
c18fa9112b Rename DiffEditorWidget -> SideBySideDiffEditorWidget 
It's the preparation for the new UnifiedDiffEditorWidget

Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 17:13:14 +01:00