GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 08:44:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,220 Commits 291 Branches 260 Tags
Commit Graph

166 Commits

Author SHA1 Message Date
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
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
b19e7cd027
Add warning icon when not all extruders have same intent 
CURA-6601
 2019-09-26 16:26:55 +02:00
Jaime van Kessel
b7b34eb6f7
Re-add the reset custom settings button to recommended panel 
CURA-6810
 2019-09-26 13:39:16 +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