Commit Graph

2166 Commits

Author SHA1 Message Date
Daniel Teske
6822c47c01 NewDialog: Simplfy code for templates view's signals
We don't need to connect to the clicked signal, since we are already
connected to the current changed of the selection model. Also set the
model for the templates view in the constructor, so that we can also
connect to the selection model in the constructor.

Change-Id: I88cd1bef97136604125fc74e18ffcc5c1c118a1d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-07 12:23:19 +02:00
Eike Ziller
a007dfd474 Add highresolution images to resources
Change-Id: Id93469d7b249272396576775e4732ec1461d77b6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-03 10:14:18 +02:00
Adam Strzelecki
4a88b76b5e Added several 2x (Retina) icon versions
This adds Retina versions for most often used assets in Qt Creator.

Task-number: QTCREATORBUG-10917
Change-Id: I83df52681da0934ed65a32765acfe63ffa21c5cf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-03 09:46:32 +02:00
Eike Ziller
c1b6571d71 Allow resizing of locator edit
Task-number: QTCREATORBUG-6719

Change-Id: I97a8972da3cb793324ca366bf4c977553e6bb38d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-03 09:02:02 +02:00
Eike Ziller
cab8e4aa03 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
2014-04-02 13:24:34 +02:00
Christian Stenger
c4fa365cbb Valgrind: Fix missing pause icon
Task-number: QTCREATORBUG-11836

Change-Id: Id38cecac418754adf61834ccc343420c31fb4f48
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-28 16:56:21 +01:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
Marco Bubke
fec491a290 Remove unused private member variable m_id
Change-Id: I23907f9d95e6abd72980391e082159e61f8fecc5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-26 15:03:17 +01:00
Daniel Teske
d587789cd0 DocumentManager: Ensure that checkForReload is called after modal dialog
Task-number: QTCREATORBUG-11727

Change-Id: Ia20b4556206571f5605f4133521c146ad164426a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-25 15:10:39 +01:00
Orgad Shaneh
186a12ece9 Locator: Use display name for open documents entries
Task-number: QTCREATORBUG-7000
Change-Id: Ibeafebdcd9aee44ab0d69e2d7dc156c06acf6618
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-03-24 08:48:41 +01:00
Kai Koehne
10133693fb Fix typo in variable name
Change-Id: Ieab22fb5e5ab5b505821b6ebe01472681b1fade4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-19 13:33:46 +01: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
Robert Loehning
42dddc1110 Fix tooltip
The button actually reads "Do Not Show Again".

Change-Id: I9e8599d26f1fe4ce73af739833dcec1ed8cc9a07
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-17 19:24:35 +01:00
Jarek Kobus
96a3fd53e8 Fix tooltips, add lacking dots
Change-Id: Id54a11b6868d5033fd1ecfd6324b7e50b94e305c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-13 12:06:27 +01:00
Nikolai Kosjar
7c0bb193d8 CppTools/QmlJSEditor: Hide "Preserve Case" for Replace Symbol Under Cursor
...since it does not make sense for symbols.

Task-number: QTCREATORBUG-11669
Change-Id: Ic249cb15cdb3b324a9b215323acd802a33797100
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-12 21:01:33 +01:00
hjk
3b84a6dc88 Use ICore::dialogParent for message boxes without parent so far
Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-12 12:06:10 +01:00
Leena Miettinen
0d7b820371 Core: fix capitalization of a button text
Change-Id: I35d878c72f967ef6bba17c1e259c562f2d4d1593
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-12 11:00:27 +01:00
Leena Miettinen
a8e08dc1bd Core: fix capitalization and wording of UI text
Change-Id: Idc6deb33cefc69bce80c989d04c59a0a4d7201e4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-11 16:41:42 +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
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
Tobias Hunger
f6f8e56cf1 EditorManager: Add NoNewSplits to OpenEditorFlags
This is used together with OpenInOtherSplit to suppress creation
of a new split if none are currently in use.

Change-Id: Ied97dcd6a756518bcf8bbe1d815cb2df9b872bfc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 15:58:02 +01:00
Tobias Hunger
c9b6897e78 EditorManager: Add OpenEditorFlags to openEditorWithContents
This requires moving the activateEditor call into openEditorWithContents.

Remove that line elsewhere when editors are constructed. Keep it when
reusing an existing editor though.

Change-Id: I872f03e16fde42f3b8adec2cf2344b7cc495cd08
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 15:56:43 +01:00
Eike Ziller
d52ee686d1 Save settings less aggressively.
Remove saving settings on auto-save, and only save settings when
switching away from projects mode, instead of any mode switch.

Change-Id: I3369b7f5ee785467d57c47e1a194a8ef989b98fb
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 15:52:04 +01:00
Leena Miettinen
fed6b8bdd0 Core: add punctuation to messages
Change-Id: Ied2569a5cb09ff44335ad7b498b869e9f0dbb91e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 12:42:42 +01:00
Tobias Hunger
11cc292da6 EditorManager: Add NoFlags as 0-option
Add NoFlags as 0 option to OpenEditorFlags.

Change-Id: I33fca771b6c51442febff8a4bb3c06c844147758
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-06 09:47:28 +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
Tobias Hunger
28feeca155 VcsManager: Add convenience signal for Vcs config changes
Change-Id: Iac7b80fca94eee428650f0a53af8c2c1c46e6f89
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-05 16:13:38 +01:00
Tobias Hunger
c5dfa1f2bf VcsManager: Add method to get additionalToolsPaths from all IVcsControls
Change-Id: I87910a5a3ccc8e9e00d1b9081ea860832b9fe576
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-05 16:13:31 +01:00
Tobias Hunger
1b83666d31 IVcsControl: Add additionalToolsPath()
Add a method for a VCS to tell creator where it installed additional
tools that it came with. This is useful for e.g. git on windows
which ships with a nice bunch of unix tools.

Change-Id: Ibc5f2fb57307bfadad140bd57d83917e56d57153
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-05 14:00:21 +01:00
hjk
7f76ef3b18 Core: Remove settings accessor indirection via MainWindow
Change-Id: I2ece1fb47eb48c4e56561ed2c947dc1c997af344
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-05 12:42:56 +01:00
Eike Ziller
9ac55e5b2c Fix escape handling in find tool bar.
It was explicitly handling the escape key for "return to current
document find", which is wrong since the shortcut for "return to editor"
(which it replaces) can be changed.
The correct thing is to register an own action for "return to editor"
for the find tool bar, overriding the default behavior.

Change-Id: I77c690fa5921ce4022b8d2b38383668efd717875
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-05 12:38:52 +01:00
Eike Ziller
3ba9db48ed Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
2014-03-04 14:04:07 +01:00
Eike Ziller
e58c1ab06e ActionManager: Remove QShortcut registration API
Registering QShortcuts doesn't solve any problem that is not already
solved by registering QActions, and shortcuts are in fact much more
limited (not being able to register multiple shortcuts for different
contexts).

Change-Id: I9478e601b2cbc3c5e12fb5baee43cacc20d0fb9c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-03 13:07:28 +01:00
David Schulz
2224472374 Core: Restore main window state before showing.
Change-Id: I665ee724d9778bf391e6c77497ee012fe5a6edaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-03 12:38:24 +01:00
Friedemann Kleint
028fe7f627 Remove leading newline characters from translated messages.
Change-Id: I237ad558e27a619f9162ebec2ef4ede9ed2cdeea
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-28 14:58:45 +01:00
Eike Ziller
92e930b367 Merge remote-tracking branch 'origin/3.1' 2014-02-28 13:53:42 +01:00
Eike Ziller
8e51a93d37 Make find options in tool bar more accessible.
Open a popup that doesn't close on every change of an option.
Make the options button accessible through tab.

Task-number: QTCREATORBUG-11340

Change-Id: I61b83243ead4b0b3d7075c1e8f8327cd31d9c2c4
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-28 13:43:20 +01:00
Eike Ziller
f5fdc07d47 Merge remote-tracking branch 'origin/3.1' 2014-02-27 17:13:27 +01:00
Eike Ziller
e4c2f569a8 Fix crash when restoring settings in registerShortcut
Introduced by c5cc4b1f13

Change-Id: Id546a4cf87cfb3709f11ee32439662fcda00bdd4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 17:13:00 +01:00
hjk
e94526100c Core: Delay coreOpened signal emission
This prevents some window restoring flickering.

Change-Id: Iead0e0f2129b969e1de7e22dbf15e641740e40e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 16:01:41 +01:00
Eike Ziller
dd10686ddb Do '&', '&&' conversion when creating id for external tool
Task-number: QTCREATORBUG-5827

Change-Id: Ib2a30a5c051be652ea99ff1923456d352b23a71d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-27 12:41:19 +01:00
Eike Ziller
3173548a11 Shortcut settings: Update collision markers when resetting shortcut
Task-number: QTCREATORBUG-6400

Change-Id: Ibef1da2fb71d157769412d7cbbd730e7656979ed
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 12:38:59 +01:00
Eike Ziller
32a017122b Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri

Change-Id: Iae83884b818a3d2d812936f463d7d52cd1f7b42a
2014-02-27 09:44:20 +01:00
hjk
b49ef52b86 Editors: Minor branch consolidation
Change-Id: Ida5ed6c5a7fb623c64573eb538771c4376c3c578
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-26 16:19:44 +01:00
Eike Ziller
c5cc4b1f13 Shortcuts: Remember them even for plugins that are not loaded
This also fixes the issue that shortcuts of designer integration gets
lost if it doesn't get initialized.

Task-number: QTCREATORBUG-4264
Task-number: QTCREATORBUG-11399
Change-Id: Ieb4fe5fd345e69aa62403e4578fa6028400aff6f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-26 16:10:12 +01:00
Eike Ziller
9d1a1d2cdf Editors: Sanity check that an id was set in the editor implementation.
Since the id is now a member, it must be explicitly set by
implementations.

Change-Id: Ibaa6ac604033ae0370e815b1e3d369dac99b36bd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-26 15:25:24 +01:00
Orgad Shaneh
16a957eb1b MainWindow: Delay restoreWindowState even more
When opening a core dump using command-line, the window still appears as
"fake maximized"

Change-Id: Ifdd9b58df1506de73357b9c3722bf6f3eaa3a1de
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-26 13:23:02 +01:00
hjk
a1034af2e8 Core: Mark shortcut conflicts in keyboard settings input box
Task-number: QTCREATORBUG-6

Change-Id: Ife1f97d24733814e7512dd8bc6584a1d72f66fa8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-26 12:22:11 +01:00
Frantisek Vacek
fa998d2d2c Improve Copy/CutLine actions usability
This patch implements two features:
1. Reimplement CopyLine to move text cursor at the beginning of line
2. Add copy/cutLine action to Advanced Edit menu, to make it
   discoverable for editor users.

Change-Id: I0bf336ebee4dbf5afd2c759e47b1830271bd9d18
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-02-26 10:26:44 +01:00
Eike Ziller
4251265a63 Unify text on buttons that open the options dialog
We have many buttons that open the options dialog, and many of these use
different terms.

Change-Id: I073fe2a23569c6f4174a2fb6567359c89cb2427c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-02-25 16:55:25 +01:00