178 Commits

Author SHA1 Message Date
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
0904324dde Use medium_button instead of toolbar_button
Since it is less specific and can be used in other places too.

CURA-8202
2021-07-01 10:02:09 +02:00
Konstantinos Karmas
6cf25aa540 Make the icons in the recommended window same size as the toolbar icons
CURA-8202
2021-06-30 12:28:46 +02:00
Konstantinos Karmas
4583866f57 Add toolbar button icon size
Which is slightly smaller than the button icon

CURA-8202
2021-06-30 12:28:08 +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
Kostas Karmas
f887db23f6 Use detail_level to describe the icons (instead of size)
Previously the icons were organized according to "size" which could prove to be confusing.
This commit fixes that by organizing them according to "detail_level".

CURA-8010
2021-04-28 18:53:32 +02:00
jelle Spijker
9ea97f7561
SVG are not correlated to pixel size.
Although this deviates from the UX practices. It tended to confuse the
programmers ;-) The variances in level of detail for the icons are now
placed in the sub-directories. small, default and big.

CURA-8010_new_icons
2021-04-28 15:45: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
9da321ffb9
Update Layouts, Control.Styles and Dialogs
CURA-7813
2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Jaime van Kessel
ea7dc0ff01
Fix custom profiles not always being visible in menu
CURA-7589
2020-08-17 14:09:27 +02:00
Jaime van Kessel
ec48496790
Remove unneeded binding
This binding wasn't needed to prevent a binding loop, but it did cause
the length to not be updated correctly sometimes

CURA-7589
2020-08-14 10:00:33 +02:00
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
2020-06-09 15:33:22 +02:00
Kostas Karmas
ec62cd5671 Fix "Unable to assing null to double" QmlWarning 2020-06-05 14:20:52 +02:00
Ghostkeeper
31aee866f4
Check if options are available before matching on them
This prevents a QML warning when the ListModel is created before the property provider is. This QML warning looked like this:
2020-03-20 15:04:30,012 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/cura/../resources/qml/MachineSettings/ComboBoxWithOptions.qml:74: TypeError: Cannot call method 'match' of undefined

Done during Turbo Testing and Tooling.
2020-03-20 15:09:46 +01:00
Ghostkeeper
5cfe71e516
Fix binding loop in action panel widget
This widget can't set its width to the width of its children, since its children anchor to its right-hand side which depends on the width.
This fixes the following warning in the log:
2020-03-20 14:25:20,351 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/plugins/PrepareStage/PrepareMain.qml:16:5: QML ActionPanelWidget: Binding loop detected for property width

Done during Turbo Testing and Tooling.
2020-03-20 14:52:33 +01:00
Ghostkeeper
3af91bfca7
Fix QML warning assigning undefined to an integer field
Fixes the following QML warning in the logs:
2020-03-20 14:02:13,482 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml:125:13: Unable to assign [undefined] to int

Instead it now assigns the first extruder before a printer has been created. The first extruder also doesn't exist yet at this point, but this doesn't really matter because there is no interface to show yet at this point.

Done during Turbo Testing and Tooling.
2020-03-20 14:17:24 +01:00
Lipu Fei
65e1314538 Fix QML null warnings 2020-02-13 12:26:49 +01:00
Kostas Karmas
c0ac03f2ae Change Custom profiles title similar to Default
CURA-6941
2019-12-09 14:35:19 +01:00
Jaime van Kessel
d93f6f25d2
Prevent "sticky" tooltips
When quickly moving the mouse in and out, the timer would
still be running, so the tooltip would become active once the mouse
moved out of the area.
2019-11-11 10:47:53 +01:00
Remco Burema
da92c36afb
Don't show tooltip immediately. 2019-11-06 17:22:58 +01:00
Nino van Hooff
248f4fc21c Draw the NoIntentIcon over the intent description hover area.
This fixes a bug where the NoIntent tooltip was hidden by the intent
description

CURA-6936

(cherry picked from commit 315b93a1525ba53f520f12b09669668266f12c6c)
2019-11-04 11:13:48 +01:00
Jaime van Kessel
5f2984b77e
Remove unused catalog
20ms faster is 20ms faster...
2019-10-25 15:49:05 +02:00
Nino van Hooff
2058cf8601 Merge remote-tracking branch 'origin/master' 2019-10-21 13:37:37 +02:00
Nino van Hooff
3d30674465 Clarify "reset quality button" purpose 2019-10-21 13:37:28 +02:00
Nino van Hooff
b182830c21 Add tooltips for intent profiles to the Custom Quality panel.
The description is optional.
Tooltip will not show if no description is set

CURA-6853
2019-10-17 17:17:06 +02:00
Nino van Hooff
3709cfa4ed Add tooltips for intent profiles to the Recommended Quality panel.
The description is optional.
Tooltip will not show if no description is set

CURA-6853
2019-10-17 15:54:03 +02:00
Remco Burema
fde4804a58 Merge branch 'master' into CURA-6862_truncate_profile_names 2019-10-15 11:48:08 +02:00
Remco Burema
71701f15cf Remove function to reintroduce binding.
Also force max width to integer value and comment why there is a plain value like 0.7 in the code.
part of CURA-6862
2019-10-15 11:38:51 +02:00
Nino van Hooff
ca21268a12 Elide the profile text in the middle for the PrintSetupSelector.
This makes sure that at least some part of the name and some part of the
variant details (qualityy, diameter) is visible

CURA-6862
2019-10-15 10:26:52 +02:00
Lipu Fei
8f66809159 Always show custom qualities
CURA-6882
2019-10-14 14:34:35 +02:00
Nino van Hooff
279d5671d8 Cleanup CustomPrintSetup.qml
CURA-6862
2019-10-14 12:14:31 +02:00
Nino van Hooff
c147174668 Limit profile name to 70% of available width for CustomPrintSetup
This leaves 30% for the variant detail info

CURA-6862
2019-10-14 11:05:24 +02:00
Lipu Fei
8940097265 Separate black and grey text for quality menu
CURA-6846
2019-10-07 21:35:31 +02:00
Ghostkeeper
e5c0812acc
Fix scrolling through profiles on Qt5.12+
Contributes to issue CURA-6843.
2019-10-04 16:22:34 +02:00
Lipu Fei
c528000268 Add activeQualityDisplayName to remove code duplication
CURA-6846
2019-10-04 14:26:20 +02:00
Ghostkeeper
618cbffaa7
Apply screenScaleFactor to implicitWidth (and cleanup) 2019-10-04 12:58:40 +02:00
Jaime van Kessel
5bd5875a20
Also add intent warning to custom print setup
CURA-6601
2019-10-04 10:39:02 +02:00
Lipu Fei
61a1b61756 Remove unnecessary activeQualityName property
CURA-6846
2019-10-04 10:27:39 +02:00
Jaime van Kessel
4793c77380
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 09:39:47 +02:00
Jaime van Kessel
f8951e4140
Add scrollbar to profile dropdown
CURA-6843
2019-10-04 09:39:26 +02:00
Lipu Fei
bd84c4d98d Show quality and intent a custom profile is based on
CURA-6846
2019-10-03 14:18:51 +02:00
Lipu Fei
26b523f190 Fix quality profile menu size
CURA-6838
2019-10-03 12:37:11 +02:00