76 Commits

Author SHA1 Message Date
Jaime van Kessel
3dec4e228b Use leftpadding instead of binding anchors outside of siblings 2021-08-12 15:48:58 +02:00
Konstantinos Karmas
b850d8c18e Center the extruder icon in the tabRowButton in the custom print settings
CURA-8011 and CURA-8202
2021-07-06 14:10:19 +02:00
Konstantinos Karmas
e7648b654d Fix ExtruderIcon size in the printer settings tab
CURA-8011 and CURA-8202
2021-07-05 14:11:40 +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
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
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
Kostas Karmas
c0ac03f2ae Change Custom profiles title similar to Default
CURA-6941
2019-12-09 14:35:19 +01: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
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
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
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
Lipu Fei
2d59271a69 Remove hard-coded height 2019-10-03 12:28:07 +02:00
Jaime van Kessel
ff3837bac5
Only show "Custom Profile" header if there are custom profiles
CURA-6844
2019-10-02 16:48:57 +02:00
Jaime van Kessel
c6850b4f73
Set right text color if menubutton is disbled
CURA-6848
2019-10-02 16:39:50 +02:00
Lipu Fei
e5d94fd2e4 Change to "name" property
CURA-6599
2019-09-26 17:19:15 +02:00
Jaime van Kessel
b72b542d21
Add missing font & color
CURA-6810
2019-09-26 12:55:14 +02:00
Lipu Fei
9ced5e9205 Fix QObject segfaults in QML
CURA-6599
2019-09-25 14:38:38 +02:00
Lipu Fei
f395c92732 Fix custom profile menu
CURA-6599
2019-09-25 08:28:24 +02:00
Lipu Fei
f2e518da6b Fix code style and typing 2019-09-25 08:23:57 +02:00
Jaime van Kessel
84e5114566
Fix minor review comments
CURA-6598
2019-09-18 14:17:26 +02:00
Jaime van Kessel
fade8d3644
No longer make border width hardcoded
CURA-6598
2019-09-18 14:10:52 +02:00
Ghostkeeper
2d0a122c2d
Display list of custom quality profiles
If you activate any of them from here though, it'll crash.

Contributes to issue CURA-6598.
2019-09-12 15:13:02 +02:00
Jaime van Kessel
423b4ad869
Fix binding loop
CURA-6598
2019-09-04 17:16:07 +02:00
Jaime van Kessel
994e0e53cc
Switch the anchors to paddings
Otherwise the bottomb button would extend from the popup.

CURA-6598
2019-09-04 16:54:35 +02:00
Jaime van Kessel
53aaaab891
Add a topMargin for the qualities menu
CURA-6598
2019-09-04 16:43:59 +02:00
Jaime van Kessel
2dbfbecd12
Ensure that show/hide behavior of the qualities intent menu is correct
It would previously blink if you pressed the button, as a click outside would hide it
due to close policy, but a mouse release would show it again (as it's hidden and that's what the
on clicked of the button did)

CURA-6598
2019-09-04 16:37:10 +02:00
Jaime van Kessel
c2225c9afc
Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface 2019-09-03 11:27:38 +02:00
Jaime van Kessel
ac0c7fd4d6
Remove unused properties
CURA-6598
2019-09-03 11:27:11 +02:00
Lipu Fei
52f3f9b773 Update QML import versions and add headings
CURA-6598
2019-09-03 11:17:20 +02:00
Lipu Fei
0926c223b2 Add missing renderType: Text.NativeRendering
CURA-6598
2019-09-03 10:53:53 +02:00