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

165 Commits

Author SHA1 Message Date
hjk
d2ec7d80d9 TextEditor: Merge the two sets of *EditorWidget constructors 
Change-Id: I45d87d0be722ac36d64af222f03f8cb76242c9df
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-19 09:19:33 +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
jkobus
45dc2e2a73 Show the chunk context info in unified diff 
Task-number: QTCREATORBUG-12394
Change-Id: I827fb894fd373b34cbae19f686b15acb697489c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-14 20:10:47 +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
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
Orgad Shaneh
d03927f373 DiffEditor: Fix no newline handling 
Change-Id: I3278ae80d7ee010942122723b3e8bb8c729e7182
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-11 20:20:20 +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
jkobus
d6e0df1c74 Fix reading of git format-patch output 
Task-number: QTCREATORBUG-12627
Change-Id: I7df1fe27f6502895ab9c82178084d2b631468c5d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-04 10:55:28 +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
f5b0bd32b2 TextEditor: Remove one stack of EditorWidget constructors 
There are conceptually only two: one that operates a new document,
and one that shares one. Being explicit makes moving data over to
the Editor hierarchy easier. Convenience can be re-added there,
later.

Change-Id: I9b34ff26628c99ffff01201dcf99332d5e7253e9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-08-01 14:10:23 +02:00
Jarek Kobus
4c7f1c5ea9 DiffEditor: Fix newline handling for not the last chunk 
Task-number: QTCREATORBUG-12665
Change-Id: I7a54fa5502d3e06c6e1ccd99dec800f80e217333
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-28 11:21:44 +02:00
Orgad Shaneh
7d3d80a6d5 DiffEditor: Add a failing test for regression 
Task-number: QTCREATORBUG-12665
Change-Id: I02f4a9d3444e775049e1712a1dd985b95dc874f3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-07-28 11:21:01 +02:00
Orgad Shaneh
b117efc594 DiffEditor: Tests cleanup 
Change-Id: Iddabf11692a192874096bb5f030d8575fc5cefd6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-07-28 11:20:41 +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
c9c4f05fee Fix newline handling in diff editor 
Task-number: QTCREATORBUG-12618
Change-Id: If2a30ff4efdc106f43e2ea77d2783ea797e92722
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-09 16:19:51 +02:00
jkobus
e4ff24ea31 Handle similarity index in git commits 
Task-number: QTCREATORBUG-12619
Change-Id: I5af39f18bc02ce1f06bf72f155bf0aaabe8b228d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-07 15:49:43 +02:00
jkobus
5ebd59d12b Rename some methods and variables in DiffEditor 
Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-07 10:34:17 +02:00
jkobus
91e4271069 Hide reload button for diff editor when there is no reloader 
Refactor code a bit. Now DiffEditorController has a pointer
to DiffEditorReloader.

Change-Id: I224579127f112923bc665cd59717b0c4d833981b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-07 10:34:11 +02:00
jkobus
656c3343ee Make it possible to save diff editor contents 
Task-number: QTCREATORBUG-12548
Task-number: QTCREATORBUG-12549
Change-Id: Ia27080cc689da48fc5401010e2277edaf0a01f4d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-04 14:31:01 +02:00
jkobus
f07cb7ae3a Fix double click on removed lines in unifieddiffeditor 
Task-number: QTCREATORBUG-12493
Change-Id: I31c63cfb5f05e73595fc42eef258998e2783697a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-04 14:16:21 +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
hjk
93ccf4f266 IDocument: Make mimeType a value member 
Change-Id: I2e90ccf0a45ae8d00bcd00ec77fe0d9776f2f119
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-01 10:54:55 +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
d6583f0f47 Git: Add on-demand branches expanding 
Make "branches expanding" on demand and asynchronous.
After "git show" there is clickable text: "Branches: <Expand>" in
description. If user clicks this text then branches for commit is
triggered and done asynchronously.

Task-number: QTCREATORBUG-11293
Done-with: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Change-Id: I772cfef823d3f95e2b3060dfb5973157d81fc11a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-06-24 11:19:28 +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
Tobias Hunger
836e17a57c Revert "VCS: Open diff/blame editors in other split" 
This change has lead to complaints about diff views opening
in apparently random places for users with several splits.

This reverts commit 02b3a79c5f.

Conflicts:
	src/plugins/diffeditor/diffeditorplugin.cpp
	src/plugins/subversion/subversionplugin.cpp

Change-Id: I2eab8ff2d88a9e12f4dc7ec3a9ca65455daf15e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-17 15:40:40 +02:00
jkobus
13dad5afe6 Fix test for DiffEditor 
Change-Id: I7359fade254b281ebf6422faf7f229bb1b82d8a8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-17 11:04:33 +02:00
Orgad Shaneh
b8df1a9b55 DiffEditor: Support patch with empty new/deleted file 
Change-Id: Ic0341239309be3eae1ab2faf296bc6a698acebb0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-16 10:44:07 +02:00
Tim Sander
870e58bfd1 qbs build fix: add selectabletexteditorwidget.cpp/h files 
Change-Id: Ic0c61924b3a39f6147565b31103807584e7a9598
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-06-13 17:24:23 +02:00
Alessandro Portale
ce250a7ba6 DiffEditor: Remake of the toolbar icons incl. @2x variants 
The icons now have consistent positions and shadows, anti
alias and a HiDPI variant.

Change-Id: I7d3a9512113788c95a132a79a58c8f559f46d00e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-13 16:05:45 +02:00
Alessandro Portale
23d3ada73f Move reload icon from diff editor to core 
It is a generic icon, and will for example also be used
in the Help plugin. Also make it more round and add a 2x variant
for HiDPI.

Change-Id: I2ad4fc1e2d2766042646a47483f129447c2c3c25
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-06-13 12:15:54 +02:00
Orgad Shaneh
5e883e5b4d DiffEditor: Support patch with new/deleted file 
Change-Id: I669564355e27dc06464fc8d8641b2f4255c8965e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-11 15:42:05 +02:00
Orgad Shaneh
67561efd29 DiffEditor: Fix test 
* Add trailing newline
* Fix offset by 1 for line numbers
* Swap expected and actual result
* Join short lines

Change-Id: Ia1c618e5fc86dc16956176241205a2108a1ba3e4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-11 14:34:36 +02:00
Orgad Shaneh
fb48205e98 DiffEditor: Cleanup regexps 
* Remove escape where not needed ('-', ',')
* Remove brackets for single symbols (\d, \w)

Change-Id: I2595bfc775f93aeddc367d8889cd78fb5a3fac83
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-11 12:47:18 +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
hjk
3462c5ef42 IEditor: Make duplicatesSupported a value member 
Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-21 14:29:00 +02:00
Orgad Shaneh
e7a7c02b4d DiffEditor: Pass const lists and string by reference 
Change-Id: I6acdc4db61aeed1353bed2207736268dfabf3f17
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-05-20 12:36:19 +02:00
hjk
6e584b5b49 DocumentModel: Make interface static 
Move item model implementation to private, adjust user code.

Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-13 11:48:30 +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
Friedemann Kleint
35eb3b1560 Diff Editor: Fix compilation with Qt < 5.2. 
Change-Id: I95401ed010e41341eb25bba032b924765b2c1be5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-12 09:22:44 +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
Joerg Bornemann
84df758ec6 use new base import style in qbs files 
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-03-11 14:20:22 +01:00