summaryrefslogtreecommitdiff
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.1'Orgad Shaneh2016-08-058-32/+95
|\ | | | | | | Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
| * Dark Theme: Make unfocussed minitargetchoser item easier to spotAlessandro Portale2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | 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>
| * Qml Designer Theming: Fix background colorAlessandro Portale2016-08-045-0/+5
| | | | | | | | | | | | | | | | 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>
| * Flat Light Theme: Fix inactive project tab in Projects modeAlessandro Portale2016-08-031-1/+1
| | | | | | | | | | | | | | 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>
| * Qt Creator Dark text color scheme: Fix #d64564Alessandro Portale2016-08-021-3/+3
| | | | | | | | | | | | | | | | | | 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>
| * Debugger: Move rarely interesting [extraData] out of sighthjk2016-08-011-16/+58
| | | | | | | | | | | | | | | | 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>
| * Debugger: Fix display of dynamic propertieshjk2016-08-011-3/+4
| | | | | | | | | | | | | | | | 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>
| * Debugger: Deactivate metaObject extraction by inferior callhjk2016-08-011-0/+5
| | | | | | | | | | | | | | | | 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>
| * Debugger: Robustify QObject detectionhjk2016-08-011-4/+12
| | | | | | | | | | Change-Id: I24aa26134e674725c84f511ac610dc06a76a775d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Debugger: Use '[d]' for artificial QObjectPrivate memberhjk2016-08-011-1/+1
| | | | | | | | | | | | | | | | | | 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>
| * Wizards: Fix list model wizard's rowCount()Lorenz Haas2016-07-311-1/+3
| | | | | | | | | | | | | | | | | | | | 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>
| * QmlDesigner: Fix Flat Dark QmlDesigner_HighlightColorAlessandro Portale2016-07-301-1/+1
| | | | | | | | | | | | | | | | | | 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>
| * creator-dark scheme: Make selection behave with the other colors #2Alessandro Portale2016-07-301-1/+1
| | | | | | | | | | | | | | | | Set the selection color back to the previous one. Task-number: QTCREATORBUG-16682 Change-Id: I13a00bde7fcceda5d911802e65afd3593b1630f5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * creator-dark scheme: Make selection behave with the other colorsAlessandro Portale2016-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.1'Orgad Shaneh2016-07-2965-225/+272
|\ \ | |/ | | | | Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
| * ProjectExplorer: Themable miniprojecttargetselector.cppAlessandro Portale2016-07-283-3/+3
| | | | | | | | | | | | | | | | 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>
| * Fix qbs build on macOSChristian Kandeler2016-07-281-1/+1
| | | | | | | | | | | | | | "osx" -> "macos" Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * QmlDesigner.PropertyEditor: Improve binding editorThomas Hartmann2016-07-281-97/+114
| | | | | | | | | | | | | | | | | | 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>
| * QmlDesigner.PropertyEditor: Show border between buttonsThomas Hartmann2016-07-282-4/+2
| | | | | | | | | | | | | | without this it is not 100% clear that we have separated buttons. Change-Id: I2d8ee228a0104d68e381d23c5435a1b9cb7cf4cb Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * QmlDesigner: Remove lines/borders from scrollbarsThomas Hartmann2016-07-281-5/+0
| | | | | | | | | | Change-Id: Iefc1d6a42df2aa858b68d4ce25840c766a8c86cb Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * QmlDesigner: Avoid double borders between items in the item libraryAlessandro Portale2016-07-281-41/+43
| | | | | | | | | | Change-Id: I09ecba996d269a63ab24668f7f8a1c0669d9a2af Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * QmlDesigner.PropertyEditor: Unify size of controlsThomas Hartmann2016-07-288-8/+9
| | | | | | | | | | Change-Id: I375396ada5f394247346c3a66319796295894641 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * QmlDesigner: Rework of theming colorsThomas Hartmann2016-07-2810-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Themes: Enable using the original Window color for toolbarsAlessandro Portale2016-07-285-0/+5
| | | | | | | | | | | | | | | | | | | | | | 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>
| * QmlDesigner.PropertyEditor: Align reset buttonThomas Hartmann2016-07-273-3/+5
| | | | | | | | | | Change-Id: I05fd4f6a2cc668a5ec65919b1ef83bea117a7789 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Merge remote-tracking branch 'origin/4.0' into 4.1Oswald Buddenhagen2016-07-271-5/+5
| |\ | | | | | | | | | Change-Id: I71d3064a5f65ec658a7ecf248bdce0a3aeea89f4
| | * fix qt namespace retrieval when an early break happenedOswald Buddenhagen2016-07-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the logic to retrigger the namespace retrieval was broken, so if it was triggered for some reason before qt was "sufficiently available", the bad/failed guess would persist. Change-Id: I90e02247142814bdc3f6d5cddfc0c2fe37665a3e Done-with: hjk Reviewed-by: hjk <hjk@theqtcompany.com>
| * | QmlDesigner.StatesEditor: Themed bordersAlessandro Portale2016-07-272-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | QmlDesigner: Themable and HighDPI Text style iconsAlessandro Portale2016-07-279-8/+8
| | | | | | | | | | | | | | | Change-Id: Ib677d38d660b631a235c00c1e37590780aadb252 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * | QmlDesigner.PropertyEditor: Fix resetting of alignmentThomas Hartmann2016-07-262-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | QmlDesigner.PropertyEditor: Exchange colors for buttonsThomas Hartmann2016-07-262-3/+3
| | | | | | | | | | | | | | | | | | | | | This way the button and button states are easier to grasp. Change-Id: I78421fd5da7a879b728e5aece3ed29c61d7d2c17 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | QmlDesigner: Themable text alignment iconsAlessandro Portale2016-07-2615-6/+7
| | | | | | | | | | | | | | | Change-Id: If499c4e131a0c56d24afb6ae355d1b8bd6338435 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * | QmlDesigner: Adjust QmlDesigner_HighlightColorThomas Hartmann2016-07-265-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | QmlDesigner: Use QmlDesigner_HighlightColor consistentlyThomas Hartmann2016-07-262-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Adding QmlDesigner highlight color to ThemeThomas Hartmann2016-07-267-3/+12
| | | | | | | | | | | | | | | Change-Id: I73d6ec3b7bff5e161de54a3287e3352435753234 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * | QmlDesigner: Fix a typo in a property editor labelAlessandro Portale2016-07-261-1/+1
| | | | | | | | | | | | | | | Change-Id: I1b1cd8f402d379fc6db023ba1225757a7ca1099f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * | QmlDesigner: Fix transparent color issue for font sizeThomas Hartmann2016-07-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | QmlDesigner: Theming fix for font sizeThomas Hartmann2016-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | The color of the combobox was not defined by the theme. Change-Id: Iae9487f6c80e07c0c7b0155db79d9125c082c33f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | QmlDesigner: Use theme text color for TargetComboBoxThomas Hartmann2016-07-251-0/+2
| | | | | | | | | | | | | | | Change-Id: I9c9b8286c226973f1c5008d807e4e3d452a76229 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * | QmlDesigner: New anchor iconsAlessandro Portale2016-07-2512-21/+21
| | | | | | | | | | | | | | | | | | | | | Themable and High-DPI Change-Id: Ic073a6a8c5f3fc7eb28b9b498d3dddbebedb243c Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * | QmlDesigner: Theme binding text fieldThomas Hartmann2016-07-253-38/+56
| | | | | | | | | | | | | | | | | | | | | | | | The text field for bindings was not properly themed, yet. We also use general Qt Creator icons for apply and cancel. Change-Id: I45f1220540a6eaeff05be0b99d8b70b64ca67af4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * | Debugger: Show object address with LLDB if there is nothing betterhjk2016-07-251-2/+8
| | | | | | | | | | | | | | | | | | | | | Mimic what GDB does. Change-Id: Ied3fff41339220eacc5c942b3f30e744f9f32a21 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Welcome: Added keyboard hotkeys to open sessions and recent projectsSerhii Moroz2016-07-285-8/+83
| | | | | | | | | | | | | | | | | | Change-Id: Ia7c1ec11b2fa3e4b61b842fd1e9e4df7aa6f7be3 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | | SCXML: Fix UI textLeena Miettinen2016-07-261-2/+2
| | | | | | | | | | | | | | | Change-Id: Ic8c0c27c12bcd9992cf3518087c283606f5acdeb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Autotest: Fix project wizard text grammar and capitalizationLeena Miettinen2016-07-251-5/+5
|/ / | | | | | | | | Change-Id: I0f3f6ff92200760d4a226bf34a8fd10ca9d8cbf2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Fix regression caused by stylingThomas Hartmann2016-07-221-1/+1
| | | | | | | | | | | | | | The highlight for changed properties was broken for combo boxes. Change-Id: Iaf345f2c4b0a246588a58b970cb7927004a73774 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Theming: Do not hardcode the mapping from theming colors to QPaletteThomas Hartmann2016-07-222-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to hardcode the mapping from theming color roles to QPalette roles, since such a mapping can be easily defined in the theme itself. I added optional color roles for each QPalette role. Themes that do not change the palette do not have to take care at all and themes that change the palette define only the QPalette roles they require. Change-Id: Id195052c96117b7a1a8d7d7d6acacd44e66e22f3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Debugger: Improve QObject related dumpers in release buildshjk2016-07-224-163/+349
| | | | | | | | | | | | | | | | | | | | | | Make QMeta* dumper work without debug info. Show QObject parent and children list in this case. QObject properties are not visible, and neither actual type of QObject children. Change-Id: I05417a7d78084234403a964f683db6867b6686f0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Mark out of scope variables as suchhjk2016-07-211-0/+7
| | | | | | | | | | | | | | | | | | At least LLDB reports sometimes out of scope variables as such. Report them as "out of scope" instead of letting the common struct dumper fail and report its generic "not available". Change-Id: Ic9d0d196894ef811fab8e6a586bf55d80cd02e45 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: fix warning if colorLogic does not existTim Jenssen2016-07-213-22/+10
| | | | | | | | | | | | | | | | The idea that these spinboxes should be a mashup with a slider was never completely implented. Change-Id: I049f0db595fcce0fb59fad550ceb1a4ca2b415bb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
View Lorry Controller Status