Commit Graph

36142 Commits

Author SHA1 Message Date
Marco Bubke
5529f07f97 QmlDesigner: Remove unused ItemLibraryModel::createDragPixmap
Change-Id: I1a8838969a5b5bd4917ee35afbbde0348737660c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-12 15:28:29 +02:00
Marco Bubke
a5fb3ad669 QmlDesigner: Use library entry icon for DnD in item library
Change-Id: Ie8a55c352eddcfec3591e2174373bed524a81dac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-12 15:28:20 +02:00
Marco Bubke
5523bea6fb QmlDesigner: Fix icon names for ItemLibraryEntry
icon and iconPath are two different icons.

Change-Id: I62ab07a13240bc23bc9d807dbd46742ce7d71300
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-12 15:28:11 +02:00
Marco Bubke
4a37d689a5 QmlDesigner: Move default icon path in getter
Change-Id: I752d6694a6a13fe7001675e67b3b7773f142675b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-12 15:25:02 +02:00
Marco Bubke
62e2d9ac8f QmlDesigner: Remove dragIcon from ItemLibrary
Was not used any more.

Change-Id: I6fbe2e5224cfcf7f6250684f7653b34f3247220a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-12 15:24:15 +02:00
Eike Ziller
1fda462500 Avoid explicit checks for windows host when working with file paths
We have fileNameCaseSensitivity and withExecutableSuffix et al.

Change-Id: I79bd2cd57e258c3f15673a661a49bab597d7afa4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 14:33:34 +02:00
Eike Ziller
de32c0fc4f Add search to project tree.
Change-Id: I1c3c3dbb27adebcacfbb1e937e76e7ff2dd3d385
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 14:33:21 +02:00
Eike Ziller
d1c53b5a6d Find: Gracefully handle small size of find tool bar
Hide the labels and buttons if it gets too small.

Change-Id: Id6a3d695909e13be7160890ed04117c25929c7f7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 14:33:11 +02:00
Marco Bubke
2715082ec6 QmlDesigner: Append qmake output to compile log too
Change-Id: I9946da6b03baeabb2cd443a54a169c1994af5e5d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-12 13:50:19 +02:00
Orgad Shaneh
4df7656394 Git: Preserve author on cherry-pick
Change-Id: Ib3184631145ed6c6eb72dd5b7c33e415fc0cc799
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-12 13:26:30 +02:00
Orgad Shaneh
e0196e38e2 Git: Replace string literal with constant
Change-Id: I457d69f1eac9810e2746d9f544151e421c147fac
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-12 13:24:00 +02:00
Daniel Teske
241d3a1ef6 QmakeProject: Rework allProFiles()
Change-Id: I49309565368fb8e00dd5a67c0e3ac77392924c75
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-12 12:56:48 +02:00
Orgad Shaneh
0926da3a03 VCS: Disable Back when checkout/clone is done
Task-number: QTCREATORBUG-11701
Change-Id: I2f0b7913bf2bf113f3ac8c258f2b2497991d547a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-12 12:06:18 +02:00
hjk
b969b05b31 Core: Code style
Change-Id: I0b1faa9f2216f1396c19373e9292c204b32f7314
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-12 12:04:59 +02:00
Alessandro Portale
e54764fb9e Icons for Qt Creator.
In various eras, we collected images/icons in .png format
from different sources. In some cases from hired designers,
some contributors, and even some Qt Creator developers.
That causes more or less subtle in consistencies ranging
from color schemes to shadow directions.

Now - in the era of High-Dpi - we suddenly need high
resolution "@2x" versions of our graphics, but do not have
the original graphics files to easily generate them.

This approach here supplies many of the graphics in SVG,
editable with Inkscape. Existing pngs are re-created as
vector graphic. That way, the original graphics
sources are finally public and version controlled. Also,
we potentially get more consistent graphics and
High-resolution versions.

The shell script executes Inkscape to export the images and
icons as pngs.

Change-Id: Id426ee94b151833cd52e29a8234966aba9cd38bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Adam Strzelecki <ono@java.pl>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-12 09:21:56 +02:00
Fawzi Mohamed
f398f674b4 qmljseditor: remove unused qdebug imports
Change-Id: I233564dc459453234f3e8594fc560d5b71481dee
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-11 17:33:18 +02:00
Tim Jenssen
de847bf891 QmlDesigner: remove debug enum
Change-Id: Icbb1ac041387b1dda136957c4689b79a5615ed89
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 16:03:00 +02:00
Tim Jenssen
8dd5e4e590 QmlDesigner: use a central notTooBrightHighlightColor()
Change-Id: I71988cda0f9488a59722b00e0c0c0e926a15e7f2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 16:02:55 +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
Tim Jenssen
ef87889b63 QmlDesigner: add reload feature to item library view
Change-Id: Ib71dc235abd059056063c5d9b9072c8bdc932762
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 14:13:22 +02:00
Thomas Hartmann
94887ce539 QmlDesigner.StatesEditor: Fixing capitalization of qml file
Change-Id: Idb6e2bcb787a8ff3b5d26330a1ced1f930f0bc1d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-11 14:12:34 +02:00
Fawzi Mohamed
05671973b6 qmljstools: remove unused qdebug imports
Change-Id: Ifd21344c35989490884fa274ba64c23ea4c033cf
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-11 13:34:09 +02:00
Tim Jenssen
001a3a4b43 QmlDesigner: rename getting qml source path method
Change-Id: I354f3a76b18d83874c17f673ea42ebebe05b71ed
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 13:12:00 +02:00
Tim Jenssen
515c77e8d7 QmlDesigner: move the beauty bottom rect inside the scrollview
Change-Id: I3cb85c6d7e9e259db7f4af28083d53539e5631b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 13:11:43 +02:00
Thomas Hartmann
25d3a9e3fe QmlDesigner.PropertyEditor: Adding property to QmlModelNodeProxy
Change-Id: I8624cc5c5fc016a56f3dea18d0cca1620c6c4b86
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 13:06:18 +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
Nikolai Kosjar
5a7916d26e CppEditor: Clean up CppEditor/CppEditorWidget
* Excess includes and forward declarations
* Access protection levels
* QTC_OVERRIDE
* Remove declared but not implemented/used functions.
* Remove unused class

Change-Id: Ia19ddddccd9adde827a7875b466fde5ca4d96e7d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-10 15:13:45 +02:00
Nikolai Kosjar
5f7f6f877a CppTools: Remove some duplicate code
Change-Id: I83c0bbcf221fd163cd2514a9d23983b82e1f04fd
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-10 15:13:16 +02:00
Nikolai Kosjar
11845cd3dc CppTools: Unexport some internal classes.
Unexports CppModelManager, CppSourceProcessor and CppToolsPlugin.

Now only some constructor signatures mention "Internal::" in the
exported symbols:

% nm --extern-only --demangle ./lib/qtcreator/plugins/libCppTools.so | grep "Internal::"
CppTools::CppClassesFilter::CppClassesFilter(CppTools::Internal::CppLocatorData*)
CppTools::CppClassesFilter::CppClassesFilter(CppTools::Internal::CppLocatorData*)
CppTools::CppEditorSupport::CppEditorSupport(CppTools::Internal::CppModelManager*, TextEditor::BaseTextEditor*)
CppTools::CppEditorSupport::CppEditorSupport(CppTools::Internal::CppModelManager*, TextEditor::BaseTextEditor*)

Change-Id: I167c21a6dc03cf02230c95fde66cf404e40df36f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-10 15:12:50 +02:00
Nikolai Kosjar
9921960a72 Cpp{Editor,Tools}: Move tests for IncludeGroups to CppTools
They belong there. This will also kill the CppSourceProcessor dependency
from CppEditor.

Change-Id: Ic2ae6b0c6f0913d913636be61df194846985d1ce
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-10 15:12:38 +02:00
Eike Ziller
50233c0a6a Remove unused function
Change-Id: Ifc020ca81f3eae53bd254db62f65d603774128b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-10 14:17:14 +02:00
David Schulz
5dfbfd2af0 Editor: Remove unused code from open editors window.
Change-Id: I830786192e5087d6bfdef9ce33fc67f441915136
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-10 07:53:41 +02:00
Robert Loehning
76f829164a debugger: Add some code for testing ctor in plugin
Change-Id: I0c35549804befc8aed034e35c9cce24f57e41337
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-06 16:20:07 +02:00
Thomas Hartmann
c5dad0f638 QmlDesigner.StatesEditor: Adding context menu to collapse the view
Change-Id: I5c118281ec8b9b3ef059e668ed4f534b70f952e1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-06 15:31:57 +02:00
Thomas Hartmann
6d1ae0e268 QmlDesigner.StatesEditor: Small adjustments to styling
Fine tuning of the styling and some minor adjustments.
The TextFields for the state names are always visible now.

Change-Id: I617085bb08fd4bb0e926610b1c3f3020db3c68a8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-06 15:31:52 +02:00
Ulf Hermann
5a170fc6cc QmlProfiler: Remove useless virtual method from AbstractTimelineModel
It's never called in a virtual way.

Change-Id: Ib3dd8eadd98daf12d29907d46f2699668bff090c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-06 15:30:51 +02:00
Ulf Hermann
1c4db84063 QmlProfiler: Don't convert between QColor and QVariantList
There is no reason to express colors as QVariantList.

Change-Id: I8c816e547b2f9be0f02a9d275791021ac06cff4f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-06 15:29:46 +02:00
Ulf Hermann
94722ec5e7 QmlProfiler: Unify event type definitions
Generally save both the Message and RangeType attributes so that we
avoid clashes between those types. Also keep all the types in one
place and make their names follow qtdeclarative's conventions.

Change-Id: I811bfcc4b72aaa2a0142babc92d96968ed2d4007
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-06 15:24:28 +02:00
hjk
83df620612 Debugger: Remove QmlCppEnginePrivate
No need for a pimpl containing three pointers in an
internal class.

Change-Id: Iabafa5da4a684099cbfd3e945a642929a2cecf50
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-06 15:00:07 +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
hjk
544e07d114 Debugger: Code cosmetics
Change-Id: I52a0f5d842917459ba05a0423402ffebd640db61
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-06 14:40:52 +02:00
hjk
946ab99b9f Debugger: De-noise
Change-Id: Ia7ba88d25ba088ccc5db92a5544abc82e9a48d33
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-06 14:40:29 +02:00
Ulf Hermann
6d41c6922f QmlProfiler: put all of the traceview in one QQuickView
Having multiple views not only is bad for performance but also creates
difficult to debug problems on some hardware configurations and is
fairly confusing.

Task-number: QTBUG-38222
Change-Id: I885e800b1ededab9137874105e3b2f9ec88a06e8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-06 14:21:28 +02:00
Ulf Hermann
a5863aba87 QmlProfiler: Draw Overview in multiple passes
If there are too many events it takes too long to draw the overview.
By drawing only part of the events in each paint callback and
scheduling multiple paints we can mitigate that. The result is that a
rough outline is visible immediately and the details are filled in bit
by bit.

Task-number: QTCREATORBUG-12341
Change-Id: Id94d914e2926be01cb1635fbd8814c4d2f57d23b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-06 14:21:17 +02:00
Eike Ziller
ade2710725 TextEditors: Keep visible position in editor for 'external' changes
If contents of a text editor change from outside the editor,
the visible portion of the text in the viewport should stay the same.
That is especially apparent when opening a document in a split view, and
adding/removing lines in one of them, above the first visible line in
the other.

Task-number: QTCREATORBUG-11486
Change-Id: I28cde17ecf98cb98c1d6f1259dc66d3671585ee3
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-06-06 13:37:35 +02:00
hjk
73360f8acb Debugger: Remove some unused code
Change-Id: I69322a5c95ecbf8df8eeff31ef68cc17811fc1b6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-06 12:56:37 +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
8cb25f9e3e VariableChooser: Add support for (plain) text edits
Task-number: QTCREATORBUG-4309
Change-Id: I3d81244fe380bdf79e108f41c2c06df88b116137
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-06 10:37:10 +02:00
Tobias Hunger
b35ddc57ed Inline CustomWizard::initWizardDialog()
It is used only once, so get rid of that indirection.

Change-Id: I017abe58cdcdcc7f8b6c6c1c81296a7ef4cd81cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-06 09:36:16 +02:00