Commit Graph

4946 Commits

Author SHA1 Message Date
hjk
3dfe728272 Debugger: Explicitly convert to integers in some dumpers
More in line with other places.

Change-Id: I0828b5ce0469f4c71081d45250c72acabb363b1a
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-08-23 05:46:05 +00:00
Eike Ziller
112bdc0f88 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id3be48ea1d00fadbec9a56d721688732118aab28
2016-08-15 14:42:47 +02:00
Eike Ziller
9142934d8e Merge remote-tracking branch 'origin/4.0' into 4.1
Conflicts:
	share/qtcreator/templates/wizards/classes/itemmodel/listmodel.cpp
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I0ece46a7df3b5a6e045b30db60e608212a40cc4d
2016-08-15 14:34:25 +02:00
Alessandro Portale
486c3670cf Fix the QmlProject app wizard
Change-Id: I710b446b5e4346b45f1aa4c7a851428b6bc57454
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-08-11 16:44:05 +00:00
Alessandro Portale
4556cee18e Qt labs Controls App Wizard: Add virtual keyboard for Boot2Qt
If the Boot2Qt plugin is installed, the wizard generates the required
code to instantiate the virtual keyboard and to slide it in & out.

Change-Id: Ibd78ac216841c1c05128272abfa7b86a14131022
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2016-08-11 08:43:24 +00:00
David Faure
252a3f89c6 Fix wrong code in list/table model templates
rowCount should return 0 if the parent *is* valid, and return
the actual number of rows when queried with an invalid index.

Change-Id: I00e3d4ea79e1aaf0be1974da876c5a871d3924e6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-10 16:13:40 +00:00
Alessandro Portale
809257ca1b Qt Quick Controls 2 App Wizard: Add virtual keyboard for Boot2Qt
If the Boot2Qt plugin is installed, the wizard generates the required
code to instantiate the virtual keyboard and to slide it in & out.

Change-Id: I1610575729b1a2bd570ef7d7b6870f579f5e34f0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2016-08-10 15:53:40 +00:00
Alessandro Portale
b18e084fc0 Qt Quick App Wizard: Add virtual keyboard for Boot2Qt
If the Boot2Qt plugin is installed, the wizard generates the required
code to instantiate the virtual keyboard and to slide it in & out.

Change-Id: I700a00d60de2936972713bf383570629c8bf678f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2016-08-10 15:53:19 +00:00
Orgad Shaneh
670e54345c Remove use of deprecated Qt algorithms
Change-Id: Ib35cffa2d5762874feea9b1d4df7f569c0e5f496
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-09 13:41:25 +00:00
hjk
56548a13bb Debugger: Fix metaObject extraction logic
A variable name mixup, potentially leading to endless loops.

Change-Id: I43f430ec89a8230da665fbfcef8d7f1491b0e2c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-05 13:01:21 +00:00
Ulf Hermann
94ca84c1e4 Timeline: Add some theming
While we're at it, also remove all the weird borders and use standard
icons. The timeline doesn't have a "baroque" theme, it's all flat for
now. If the need arises we can add some gradients here and there.

Change-Id: Ia9ce22d7f412c4999feca2284959be4d734267ac
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 11:35:35 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:40:07 +02:00
Alessandro Portale
8366bb1694 QmlDesigner: Fix visibility of Origin control
Give the control the same border like all other controls. This improves
the visibility with the light theme.

Repeated 9 times. Needs to be made a component in master.

Change-Id: I11afa8c7ef628582c3d94fa8b42a27fb4f6e1368
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-05 09:08:45 +00:00
Alessandro Portale
d6613a08fd Dark Theme: Make unfocussed minitargetchoser item easier to spot
The least invasive way to do that was to chose a brighter background
color.

Task-number: QTCREATORBUG-16702
Change-Id: I4d3d129ddc197e9747079484d9faf104e1b8c3bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-04 14:56:10 +00:00
Alessandro Portale
04c136b92f Qml Designer Theming: Fix background color
The background color for light theme is too dark. Instead of trying hard
to deduct that color mathematically, let's add a theme role for it.

Change-Id: I6a49d43e7e11c87427242819c67988b05b87518b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-04 14:56:08 +00:00
Alessandro Portale
985e7006cc Flat Light Theme: Fix inactive project tab in Projects mode
The text should not be white, since it is dran on a bright background.

Change-Id: I1671c84946b9449539c10f7863fe85e04d4dd362
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-03 10:14:29 +00:00
Alessandro Portale
ce799321ac Qt Creator Dark text color scheme: Fix #d64564
Replace all three occurrences of #d64564 with #ff6aad
Otherwise it is hard to read preprocessor code, qml bindings or
mismatched parentheses.

Change-Id: I2812f3d10a1b1d4d2206cc4c19e97b81391e4ce4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-02 21:49:12 +00:00
hjk
36875ad4f3 Debugger: Move rarely interesting [extraData] out of sight
Together with [metaObject] and [connectionLists]. This also
saves a few cycles in the main code path.

Change-Id: I8460267f04a0c1d63ab0f991450863669cc760e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-01 13:21:42 +00:00
hjk
d5d449e421 Debugger: Fix display of dynamic properties
While the properties were dumped properly, only the number of
static properties was shown.

Change-Id: I3ccd98478e62d99849f5012121d2ff2bda500319
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-01 11:46:44 +00:00
hjk
d1109c50e0 Debugger: Deactivate metaObject extraction by inferior call
This seems to have side-effects on memory contents. Right now it is
unclear what happens exactly, so revert for 4.1rc.

Change-Id: I7b1b8e376ac84b6656b1abdae720d7bead1c0b89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-01 10:45:47 +00:00
hjk
4c4698917e Debugger: Robustify QObject detection
Change-Id: I24aa26134e674725c84f511ac610dc06a76a775d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-01 10:45:33 +00:00
hjk
7b1a1305db Debugger: Use '[d]' for artificial QObjectPrivate member
Derived classes might have a real 'd' member. '[d]' on the other hand
is not a valid identifier and also fits into the '[children]',
'[parent]' etc scheme.

Change-Id: I60650a032c49caef1bf5553ebaae8d6b7d219d44
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-01 10:18:12 +00:00
Lorenz Haas
69143bc3a9 Wizards: Fix list model wizard's rowCount()
rowCount() must return 0 when the parent is valid: this indicates that
the list's items has no children and thus it is no tree model. The
list's size has to be returned for an invalid parent (== the invisible
root node).

Change-Id: Ieaa884958ea0094aca2232160b6f769bf90514c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-31 09:23:38 +00:00
Alessandro Portale
f41e1d3a31 QmlDesigner: Fix Flat Dark QmlDesigner_HighlightColor
Selected items in the navigator tree are hard to read. This patch turns
the highlight slightly darker, which makes the light gray navigator item
text easier to read.

Change-Id: Ibe1de477f44ad8dfd7b53c3d7bd92b39ad0ed1a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 12:12:28 +00:00
Alessandro Portale
5e93c5efa9 creator-dark scheme: Make selection behave with the other colors #2
Set the selection color back to the previous one.

Task-number: QTCREATORBUG-16682
Change-Id: I13a00bde7fcceda5d911802e65afd3593b1630f5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 11:59:20 +00:00
Alessandro Portale
39ddd353e4 creator-dark scheme: Make selection behave with the other colors
Selected preprocessor code was unreadble: unsaturated red on turquese.
The selection color now defines a foreground color (the same as the
line number color).

Task-number: QTCREATORBUG-16682
Change-Id: Ibb213010557da5bd68fb5a22822cad467fd03092
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 11:52:04 +00:00
Orgad Shaneh
35d7352b3e Merge remote-tracking branch 'origin/4.1'
Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
2016-07-29 16:13:18 +03:00
Alessandro Portale
9f53b0e13c ProjectExplorer: Themable miniprojecttargetselector.cpp
Replace some hard-coded colors with theme colors. That is required for
the Flat Light theme.

Change-Id: I2ce289fce8c2e6437148eb691484e0441975979f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 15:30:17 +00:00
Serhii Moroz
cda7a3188f Welcome: Added keyboard hotkeys to open sessions and recent projects
Change-Id: Ia7c1ec11b2fa3e4b61b842fd1e9e4df7aa6f7be3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-28 15:04:55 +00:00
Thomas Hartmann
ccf040239f QmlDesigner.PropertyEditor: Improve binding editor
The binding editor now behaves like a modal dialog in the
property editor.

Change-Id: I9b1a0635dbe5cc0b055225411af653dd8bf6b735
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 14:42:35 +00:00
Thomas Hartmann
5303a9b485 QmlDesigner.PropertyEditor: Show border between buttons
without this it is not 100% clear that we have separated buttons.

Change-Id: I2d8ee228a0104d68e381d23c5435a1b9cb7cf4cb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 13:29:03 +00:00
Thomas Hartmann
589aef89e0 QmlDesigner: Remove lines/borders from scrollbars
Change-Id: Iefc1d6a42df2aa858b68d4ce25840c766a8c86cb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 13:16:42 +00:00
Alessandro Portale
dbe42bf040 QmlDesigner: Avoid double borders between items in the item library
Change-Id: I09ecba996d269a63ab24668f7f8a1c0669d9a2af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-28 11:28:41 +00:00
Thomas Hartmann
638279cc98 QmlDesigner.PropertyEditor: Unify size of controls
Change-Id: I375396ada5f394247346c3a66319796295894641
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 11:07:43 +00:00
Thomas Hartmann
b8a22a5ec1 QmlDesigner: Rework of theming colors
* Use the original fancy toolbar colors by removing the
  Alpha channel.

* Use the splitter colors for borders to avoid white borders
  in light themes.

* Use the FancyToolButtonHoverColor for buttons and combo boxes.

Change-Id: Id636e0713c8e2769c5eb03a115a60ccad8226f23
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 10:59:58 +00:00
Alessandro Portale
4bdd1ffbf7 Themes: Enable using the original Window color for toolbars
This patch adds a flag which enables the "fancy" side/tool/status bars
to use the original Window color from the application palette.

The flag is disabled for all themes by default.

Task-number: QTCREATORBUG-16331
Change-Id: I1433e865e1903012d521a2cdb7083f110086e455
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-28 08:58:47 +00:00
Thomas Hartmann
fc792d0218 QmlDesigner.PropertyEditor: Align reset button
Change-Id: I05fd4f6a2cc668a5ec65919b1ef83bea117a7789
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-27 14:20:34 +00:00
Oswald Buddenhagen
034cff4693 Merge remote-tracking branch 'origin/4.0' into 4.1
Change-Id: I71d3064a5f65ec658a7ecf248bdce0a3aeea89f4
2016-07-27 12:45:54 +02:00
Alessandro Portale
b4bb1e97b8 QmlDesigner.StatesEditor: Themed borders
Use the typical theme color role for border.color in the state items and
"+" button.

Change-Id: Id87180deeff8c69da2bacf541484482a2cd4d380
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-27 10:22:33 +00:00
Alessandro Portale
3752a67de7 QmlDesigner: Themable and HighDPI Text style icons
Change-Id: Ib677d38d660b631a235c00c1e37590780aadb252
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-27 07:55:05 +00:00
Thomas Hartmann
fb9638f8c9 QmlDesigner.PropertyEditor: Fix resetting of alignment
This change makes sure that the default horizontal or vertical
alignment is selected after resetting it.

Change-Id: I057a8f0a0c1c343c89902c38ec4d39828deaaef3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-26 21:54:17 +00:00
Thomas Hartmann
02be113ce3 QmlDesigner.PropertyEditor: Exchange colors for buttons
This way the button and button states are easier to grasp.

Change-Id: I78421fd5da7a879b728e5aece3ed29c61d7d2c17
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-26 21:18:22 +00:00
Alessandro Portale
3e4cbdb69f QmlDesigner: Themable text alignment icons
Change-Id: If499c4e131a0c56d24afb6ae355d1b8bd6338435
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-26 13:56:45 +00:00
Thomas Hartmann
b496ac8832 QmlDesigner: Adjust QmlDesigner_HighlightColor
I use the color from the flat style proposal.
This color seems to work good enough in all themes.

Change-Id: Ie543236fb578141bd3c1fb12c783597b26b12138
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-26 13:02:29 +00:00
Thomas Hartmann
8f50599462 QmlDesigner: Use QmlDesigner_HighlightColor consistently
This fixes a couple of issue in the .css and we
always use the same highlight color (QmlDesigner_HighlightColor).

Change-Id: I6522eabc00c30399b2c3b2689256b970ec558719
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-26 13:02:22 +00:00
Thomas Hartmann
8f393efec0 Adding QmlDesigner highlight color to Theme
Change-Id: I73d6ec3b7bff5e161de54a3287e3352435753234
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-26 11:07:32 +00:00
Alessandro Portale
4afb97f1af QmlDesigner: Fix a typo in a property editor label
Change-Id: I1b1cd8f402d379fc6db023ba1225757a7ca1099f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-26 08:36:22 +00:00
Leena Miettinen
e67cb6d521 SCXML: Fix UI text
Change-Id: Ic8c0c27c12bcd9992cf3518087c283606f5acdeb
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-26 07:36:21 +00:00
Thomas Hartmann
a831391337 QmlDesigner: Fix transparent color issue for font size
We use z instead of visible, because visible triggered issues
in the layout engine. I use both for now. It seems to
work with recent Qt versions.

Change-Id: I74fc1eac6d8443a85683c208ccf99b5d3f0eee09
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-25 21:35:04 +00:00
Thomas Hartmann
e28724d16d QmlDesigner: Theming fix for font size
The color of the combobox was not defined by the theme.

Change-Id: Iae9487f6c80e07c0c7b0155db79d9125c082c33f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-25 16:46:49 +00:00