88 Commits

Author SHA1 Message Date
Jaime van Kessel
965ecb744d Fix size of print setup selector
CURA-9139
2022-04-19 16:42:43 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
Jaime van Kessel
c9b9a41bb8 Fix injection of parameters in signals 2022-04-01 17:17:28 +02:00
j.delarago
e40a219b53 Add back code for resizing contentContainer.
This makes sure that the background get smaller when the setting container is resized.

CURA-8640
2022-04-01 11:36:22 +02:00
j.delarago
3dc67f387f Height based on implicitHeight/implicitWidth now.
Removed redundant code.

CURA-8640
2022-04-01 11:12:30 +02:00
j.delarago
ac907ca451 Update highlight colors
CURA-8688
2022-03-01 12:33:19 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Ghostkeeper
daac6faaba
Also use a themeable distance for pop-ups, not just for sticky components 2021-09-10 12:15:18 +02:00
Ghostkeeper
25e2828ed0
Don't hard-code the distance between pop-up and header
By default in all of our themes this ends up being the same distance at 100% pixel scale, but it now scales according to the pixel scale of the user's screen while still being properly rounded to integer coordinates.
2021-09-10 12:12:20 +02:00
Ghostkeeper
3d6b58d5c0
Always show down arrow regardless of expanded state
This is something our UX designer wants to change for all expandable header bar menus. The down arrow indicates that something will pop-up downwards once clicked. It is unnecessary to feedback the state of the expansion in the icon.

Contributes to CURA-8008.
2021-07-12 11:19:04 +02:00
Konstantinos Karmas
97bb25aef0 Fix Print settings window getting locked in the y direction
Due to a wrong reference, the settings window was getting an incorrect initialY position. This lead to the window being unable to be dragged in the y direction.

CURA-8011
2021-07-05 10:06:16 +02:00
Konstantinos Karmas
a7446d681f Set header border and color by default in ExpandablePopup and Component
CURA-8202
2021-07-01 14:20:57 +02:00
Konstantinos Karmas
0505842235 Remove DropShadow from ExpandablePopup and ExpandableComponent
Since they are not used anywhere anymore

CURA-8202
2021-07-01 12:07:35 +02:00
Konstantinos Karmas
0472df3814 Change collapse button icon in expandable component to chevron
CURA-8202
2021-07-01 11:42:31 +02:00
Konstantinos Karmas
8a22eaa5cc Merge branch 'master' into CURA-8013_Adjust_sizes_of_header_and_toolbar 2021-06-29 11:04:51 +02:00
Konstantinos Karmas
294b67f72f Replace the shadow of the PrepareMenu with a border
In order for that to be possible, the background border of the ExpandablePopup and the ExpandableComponent had to be exposed.

In addition, since in the `RowLayout` the `ConfigurationMenu` and the `MachineSelector` both draw a border around them, it means that there will be a double "divider" (one border line from each button). To overcome that, we set the spacing of the `RowLayout` as a `- border_width`, which ensures then that there will be only a single line of border between the two adjacent buttons.

CURA-8013
2021-06-28 17:50:38 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
Konstantinos Karmas
180732788b
Merge pull request #9472 from Ultimaker/CURA-7813_QML_warnings
Cura 7813 qml modules version bump
2021-03-30 09:42:59 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +02:00
jelle Spijker
3baa71fd48
Update QtGraphicalEffects, Window and Dialogs
CURA-7813
2021-03-29 18:12:35 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Jaime van Kessel
56c0cae71f DoubleClick and drag no longer contradict eachother for expandable component
CURA-6478
2019-04-29 15:13:01 +02:00
Jaime van Kessel
e5d7387fed Updated the documentation of the contentAlignment property 2019-04-29 11:54:33 +02:00
Diego Prado Gesto
c7bee73af6 Add cross cursor to the draggable expandable component.
Contributes to CURA-6478.
2019-04-26 13:49:55 +02:00
Remco Burema
77d8095208 Home/dock expandable-draggable on double-click. [CURA-6478] 2019-04-25 22:26:51 +02:00
Remco Burema
ac67e1a3a9 Make expandable component preferences load again. [CURA-6478] 2019-04-25 22:08:25 +02:00
Remco Burema
c4265c1f67 Scale instead of center for preview/prepare-menus. [CURA-6478] 2019-04-25 21:50:24 +02:00
Remco Burema
bd262ca6c4 Set min.-height and 'stage-awareness' for print-setup-UI. [CURA-6478] 2019-04-25 15:37:52 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Remco Burema
baac2d1a0f Fix various expandable/dragable/window interactions. [CURA-6478] 2019-04-25 13:33:31 +02:00
Remco Burema
9283c3d321 Add window-size handling to draggable component. [CURA-6478] 2019-04-25 11:08:13 +02:00
Remco Burema
7382798b6a Move setting the dragged-to position to its own function. [CURA-6478] 2019-04-25 08:43:36 +02:00
Remco Burema
78f15d8fcb Margins to main window for draggable component. 2019-04-25 08:43:36 +02:00
Remco Burema
37fddaee5c Limit draggable component to the main window. 2019-04-25 08:43:36 +02:00
Remco Burema
28a14c0a3b Make expandable component dragable. 2019-04-25 08:43:36 +02:00
Ghostkeeper
96a6b7559e
Remember opened state of settings panel
So if you restart Cura while the settings panel was open, it'll stay open when Cura is started back up.

Contributes to issue CURA-6069.
2019-01-02 14:05:17 +01:00
Diego Prado Gesto
4b6f4af44e Close the expandable panel when it becomes disabled
It happens when it's open and the user loads a GCode.

Contributes to CURA-5941
2018-12-11 11:10:45 +01:00
Diego Prado Gesto
716fedc782 Use no text by default for the disabled state of the panels
Contributes to CURA-5941.
2018-12-10 17:06:51 +01:00
Diego Prado Gesto
aa376e60da Make the disabled text translatable
Contributes to CURA-5941.
2018-12-10 14:45:11 +01:00
Diego Prado Gesto
590e8f5eb1 Wrap the disabled text in case it's too long.
Contributes to CURA-5941.
2018-12-10 14:41:15 +01:00
Diego Prado Gesto
3f97f83c47 Add a disabled state to the expandable components
In this case, when the component is disabled, there is an optional message that will show. It works for instance when loading a gcode and the print setup panel has to be disabled.

Contributes to CURA-5941.
2018-12-10 14:17:56 +01:00
Diego Prado Gesto
af37f51cf8 Make the expandable content header to be a common header for every expandable component.
Contributes to CURA-5941.
2018-12-10 13:36:06 +01:00
Diego Prado Gesto
dff364ee30 Change the panel to have also rounded rectangle in the top part
Contributes to CURA-5941.
2018-12-10 12:03:29 +01:00
Diego Prado Gesto
9e7a52e28b Update the background color for the expandable component when using the close button.
Contributes to CURA-5941.
2018-12-10 09:43:50 +01:00
Diego Prado Gesto
26be65e405 Fix some other merge conflicts
Contributes to CURA-6008.
2018-12-07 13:29:16 +01:00
Diego Prado Gesto
46fa33fda5 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:19:19 +01:00
Diego Prado Gesto
9c873faace Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:11:15 +01:00