Commit Graph

40 Commits

Author SHA1 Message Date
hjk
242af33430 ProjectExplorer: Use a real label for the extra BoolAspect checkbox label
And show a tool tip also there.

Noticeable e.g. in the "Incredibuild for Windows" buildstep checkboxes.

Change-Id: Iebabda6fb025596aa9dbc7c917c4bdbeb25a1a8d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-06 14:41:21 +00:00
hjk
5327b91e99 IncrediBuild: Rework BuildConsoleBuildStep
Change-Id: I7ab8bc18c229e1d748dbbc494b2ba254085c0e0e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-06 09:20:21 +00:00
hjk
8245cd2c52 ProjectExplorer: Add BaseStringAspect::setToolTip()
Change-Id: I120b52ef0bc3a3ad180e739df353855cca4ffb8b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-05 10:54:14 +00:00
hjk
120540f1db ProjectExplorer: Add BaseIntegerAspect::setToolTip()
Change-Id: I7a9fe0695b30c926d6b3e11302a4a8eaadfa2b16
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-29 11:18:16 +00:00
hjk
6775eeefc5 ProjectExplorer: Add some BaseStringListAspect
Only for storage now, sufficient for the upcoming use in MakeStep.

Change-Id: Ia84595c6cd50f75c70ccef2afb366db3da0e51ff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-21 13:33:11 +00:00
hjk
1060bb7605 ProjectExplorer: Add a BaseIntegerAspect::defaultValue
If the actual value equals that, the value key will be removed from
the settings.

This is useful for the job count in the MakeStep.

This might be usable in this or similar form also for the other types,
but I'd rather wait for more use cases.

Change-Id: Ic4865ca2d4dc61c778f6b8c4c307f7fcf4243e43
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-21 12:52:07 +00:00
hjk
de7c57b051 ProjectExplorer: Add ability to disable Base{Bool,Integer}Aspect
Can be used in MakeStep.

Change-Id: I2a49b3071e610be5e29dbcb40f6ab7f283ad5a0b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-21 12:51:15 +00:00
Tobias Hunger
dbb640783c BaseStringAspect: Provide a way to place a hook between UI and value
Change-Id: Ie6fd1c3215cba06dd67673b978af9f457f7fa9c8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-04-30 13:09:32 +00:00
Eike Ziller
e9661e43cb Merge remote-tracking branch 'origin/4.12'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp

Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
2020-04-28 15:48:36 +02:00
Christian Kandeler
2b6ce6cea5 Fix display of some file paths on Windows
In particular, the "executable on host" field on RemoteLinux & friends
had the wrong separators.

Change-Id: Ic36d73e863c78dcefd5c670537dd7c86b081d173
Reviewed-by: hjk <hjk@qt.io>
2020-04-27 09:06:13 +00:00
Tobias Hunger
69b0a2cafc PathChooser: Allow for chooser-only selection of files/directories
Makes the line edit disabled and read-only in that case.
We also need to change the custom context menu from the line edit to the
path chooser itself, because disabled widgets do not show a context
menu, but we still want to see the select & copy, and the special
items for opening explorer or terminal.

Task-number: QTCREATORBUG-23798
Change-Id: Ib653b4eaaedfbe54c614377795ddc52d21ac12c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-21 13:18:43 +00:00
hjk
79b680e7f0 Utils: Rename PathChooser::{f,setF}ileName() to {f,setF}ilePath()
It's returning a FilePath, so it's a better fit.

Keep the old versions as inline function now to ease downstream migration.

Change-Id: I535887928018f42b92895c8b0c82527f0d55e5ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-04-09 17:30:23 +00:00
Tobias Hunger
cda392d02d BaseStringAspect: Enable use of validators
Change-Id: I93ec60da6dc783beb2a81c0cc25c942e82e75f42
Reviewed-by: hjk <hjk@qt.io>
2020-03-20 09:44:13 +00:00
hjk
84d0e3dda8 Utils: Use FilePath for PathChooser::m_baseDirectory
... and collapse the two accessor versions to one.

Change-Id: I282753a0092601cff073684053ff914016452645
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-19 07:59:13 +00:00
Christian Kandeler
290dcb555b LayoutBuilder: Fix assert
Let's add an explicit QLabel in the BaseBoolAspect, as the layout
builder does not expect an empty string in the middle of a row.

Change-Id: I19ef80d31ad1f2527af7e5677751922ae4d5fcff
Reviewed-by: hjk <hjk@qt.io>
2019-12-17 17:22:08 +00:00
hjk
ce434ccb5d ProjectExplorer: Use full class for TriState value
Allows more compact code on the user side in most cases and
can hide the internal 'int-ness' from user code by wrapping
Variant conversions in the TriState class itself.

Change-Id: I4c91e0cd798ee988a0b9cb057749251a4efebaff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-12-03 12:08:52 +00:00
Christian Kandeler
221d356210 Qmake: Make proper use of BuildDirectoryAspect
Change-Id: I439496c85f7e0f402ab038de6a8171dd2f7d2ffd
Reviewed-by: hjk <hjk@qt.io>
2019-11-28 12:30:52 +00:00
Christian Kandeler
dd7f4890a2 ProjectExplorer: Introduce BuildDirectoryAspect
Change-Id: Id57d0a7901d2cec7b2d4f1fbeed6a1ecb41642cc
Reviewed-by: hjk <hjk@qt.io>
2019-11-27 13:49:53 +00:00
Christian Kandeler
6c66af5c23 ProjectExplorer: Add a base class for build aspects
... and make use of it in the QmlDebuggingAspect.
A build setting is conceptually not a boolean, but a tri-state, as we
need to support force-switching a feature on and off as well as
specifying that it is to be left at its default value.

Change-Id: I15552614c5cf4f5187c026909d233c13e3487e81
Reviewed-by: hjk <hjk@qt.io>
2019-11-25 13:25:02 +00:00
Christian Kandeler
9811f95aa7 Project Aspects: Provide alternative display style for selection aspect
Typically, a combo box is preferred to radio buttons.

Change-Id: I685d9c1773e4188252139fb7c784fd7b61e62c8f
Reviewed-by: hjk <hjk@qt.io>
2019-11-25 13:09:25 +00:00
Christian Kandeler
72ca179633 QtSupport: Add a QmlDebuggingAspect
... and make use of it in the qbs build configuration.
We cannot use it for qmake yet, because the build config there still has
a custom, non-aspectified widget.

Change-Id: Iacf902a2d9384d0074b10fdc98e082fa906fb6d6
Reviewed-by: hjk <hjk@qt.io>
2019-11-25 09:46:41 +00:00
Christian Kandeler
efa9832912 LayoutBuilder: Allow for more compact code at calling sites
Change-Id: I12bb6dbfc138e03138b9a74d36e864d8ea36092f
Reviewed-by: hjk <hjk@qt.io>
2019-11-07 11:53:37 +00:00
hjk
6eaf239777 ProjectExplorer: Prepare more flexibility to aspect layouting
This hides the explicit use of a QFormLayout from the aspect
interface in a new LayoutBuilder class. That currently works
only on a QFormLayout in the back, but opens the possibility
to use e.g. a QGridLayout as use on the Kits and some option
pages.

The aspects now only announce sub-widgets they like to add,
actuall positioning is does by a new LayoutBuilder class,
also cramming several widgets in an hbox in the right column
of the QFormLayout is done there.

Change-Id: I2b788192c465f2ab82261849d34e514697c5a491
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-18 12:24:39 +00:00
hjk
f4c1c0e441 ProjectExplorer: Rename BaseStringAspect::{f,setF}ileName
... to filePath and setFilePath. In line with Utils::FilePath.

Change-Id: I7115b91876542629c3d61c8259bbd8d9f4022fc1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-29 05:42:37 +00:00
Christian Kandeler
80716610c5 ProjectExplorer: Add tool tip to ExecutableAspect
Because our project mode uses a fixed width for some reason, the file
path of an executable often does not fit on its label. Add a tool tip to
work around this.

Fixes: QTCREATORBUG-18991
Change-Id: I4ab7cd8812ae15bcef95c16a862361e24a28c259
Reviewed-by: hjk <hjk@qt.io>
2019-07-23 15:26:48 +00:00
hjk
90ad2797eb ProjectExplorer: Add a 'readOnly' property to BaseStringAspect
Change-Id: I1aafcdc2d7b179a627060539cb7fbb9207c4f8ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-25 11:51:55 +00:00
Eike Ziller
5455234308 Merge remote-tracking branch 'origin/4.10'
Conflicts:
	src/libs/utils/consoleprocess.h

Change-Id: I771630cb4dc60a9e87e9d30d6295040c27348d8c
2019-06-20 11:03:05 +02:00
Eike Ziller
9a2bc34776 Fix wrong default value for "Automatically manage signing"
In iOS build configurations.
When setting the default value after creating the "BoolAspect", also the
value must be changed to that default.
The original code only used the default value when restoring the aspect
from settings.

Task-number: QTCREATORBUG-22529
Change-Id: Icee0887e02d2b6d83273492a45f20c0263bb68cc
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-06-18 13:06:48 +00:00
hjk
67b33a0662 ProjectExplorer: Introduce a new BaseSelectionAspect
To handle an (exclusive) choice within a set of possible options,
visualized by a set of QRadioButtons.

Use in QdbMakeDefaultAppStep.

Change-Id: Icc62a45e8c5986cd9400f90449f92154ed854a22
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-14 13:34:38 +00:00
hjk
473a741c9f Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 12:23:26 +00:00
hjk
3941f0593b AutoTools: Use the base BuildConfiguration config widget
Change-Id: I928b9bc7adc3424008ead27fe8457d345e1bcda5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-29 09:04:45 +00:00
hjk
ceff49ec40 ProjectExplorer: Make BaseIntegerAspect operate on qint64
... and add a way to scale displayed values.

Change-Id: Icd342935c80cc4f2077df95d856b5d7ab38448f2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-24 12:13:33 +00:00
Christian Kandeler
a35c5901ea ProjectExplorer: Add missing BaseStringAspect::setFileName()
Was declared, but not implemented.

Change-Id: Ieeb8d021762d6254cdd5776e08d51cfd5a736c01
Reviewed-by: hjk <hjk@qt.io>
2019-04-23 10:38:23 +00:00
hjk
6f37348b4c Replace static_casts by QOverload where possible
Mainly to get rid of the QProcess::finished deprecation warning.

Also adjust coding style in the surrounding connects when needed.

Change-Id: I12f9b248c7974b892c4a069356e578e80f8c59e9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-02-26 15:18:14 +00:00
Christian Kandeler
499ccca115 RemoteLinux: Fix jumpy cursor when editing custom remote exeutables
Amends 93a6dd0c67.

Change-Id: I88e4537112c4c4dc5a471b4baffe6a93ed3b76ba
Fixes: QTCREATORBUG-21030
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-02-07 13:35:22 +00:00
hjk
50ce82d26a ProjectExplorer: Add a QTextEdit based variant for BaseStringAspect
... and use the QbsCleanStep as guinea pig.

Change-Id: Ic0d62700bf48fc7971a290c90394c74b8860b9ff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-01-18 13:48:36 +00:00
hjk
5ebab9cd35 ProjectExplorer: Allow tool tips for bool aspects
Useful e.g. for Boot2Qt::PushToDeviceStep

Change-Id: I41f4a52ee7d3b0f18df8b2249232cfd0e4445ced
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-23 14:12:53 +00:00
hjk
fb9865444d ProjectExplorer: Restrict uses of history completer key
... to cases where one was actually defined.

Change-Id: I3b23734f3e563389ef74e8089ce98300adc466bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-22 10:32:26 +00:00
hjk
8f987866b6 Project: Introduce BaseIntegerAspect base using spinboxes
Basically upstreamed/pimpled from VxWorks::BaseNumberValueAspect

Change-Id: I1dbedbbdd55b684fe1bb823e57d4830fb2eb0b0e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-04 15:23:26 +00:00
hjk
8dfa977f2f ProjectExplorer: Move Base{Bool,String}Aspect to new files
Create projectconfigurationaspect.{h,cpp} for re-usable aspects.

Also pimpl the two exported classes.

Task-number: QTCREATORBUG-19985
Change-Id: Id1d44b551c5dc2cf6eb4fbc3a2a505d4a83ae53f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-09-19 13:46:26 +00:00