GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 23:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,378 Commits 291 Branches 265 Tags
Commit Graph

4407 Commits

Author SHA1 Message Date
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
39d52556f4 Fix text alignments by using rounding 
CURA-6598
 2019-09-03 11:17:20 +02:00
Lipu Fei
52f3f9b773 Update QML import versions and add headings 
CURA-6598
 2019-09-03 11:17:20 +02:00
Jaime van Kessel
7dc84f14a8
Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface 2019-09-03 11:14:19 +02:00
Jaime van Kessel
f77ad22fe3
Fix hardcoded entries in radioCheckbar 
CURA-6598
 2019-09-03 11:13:47 +02:00
Lipu Fei
0926c223b2 Add missing renderType: Text.NativeRendering 
CURA-6598
 2019-09-03 10:53:53 +02:00
Ghostkeeper
b5d32a9b70
Move createQualityChanges function to QualityManagementModel 
This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless).

Contributes to issue CURA-6600.
 2019-09-02 17:07:18 +02:00
Lipu Fei
b358d8ddd0 Fix typo in ComboBox.qml 2019-09-02 13:20:09 +02:00
Jaime van Kessel
b00b8c8c58 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface 2019-08-29 16:28:26 +02:00
Jaime van Kessel
c80cd9679f Fix RadioCheckbars layout getting out of wack sometimes 
CURA-6598
 2019-08-29 15:15:35 +02:00
Jaime van Kessel
68d3cf8412 Fix binding loop in LabelBar 
CURA-6598
 2019-08-29 14:12:17 +02:00
Jaime van Kessel
ba0c16d968 Update intents model to use container tree 
CURA-6598
 2019-08-29 13:53:23 +02:00
Jaime van Kessel
f4dc93fc39 Prevent crash in model if no extruder is set 
CURA-6598
 2019-08-29 11:57:03 +02:00
Remco Burema
b56c09bcf4 Fix recommended-menu layer-height-label for Qt-5.10.0 
part of CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
c7b6133e3d Some UI polishing 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
a3d3580e2a Remove buildplate menu 
The menu wasn't used anymore and leaving it in just makes things more complicated
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
6220dfd153 Remove profile menu 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
7c832e7ea3 Intents are now also displayed in active profile labels 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
4520ee7e1c Added rounded corners to the intent menu 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
0891abf8af Fix hover & highlighting for the qualities& intent menu 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
5ab31df738 Add hover effect to quality/intent selector 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
210a2aa6bb Add arrow indicator to the custom print setup 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
d5bbc3f205 Remove reference to unknown component 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
f7e6f22e6c Fix typo 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
8445ebe8cf Remove menu that is no longer used 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
87fedc2620 Fix elide for the variant in configuration menu 2019-08-29 11:53:25 +02:00
Jaime van Kessel
5acc3111e0 Some minor UI fixes 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
6751dc4fc8 Remove unused QML component 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
92be261178 Update the profile selector to new style for the intents 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
7d65951f43 Refactor ComboBox to use states 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
c51dfec29f Ensure that the intent category names are displayed coorectly in recommended 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
94c2211e7f Further simplify the recommended print setup 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
a9e09c6f54 Removed unused timer 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
5401a4db15 Ensure that each intent gets it's own bar in recommended 
CURA-6598
 2019-08-29 11:53:19 +02:00
Jaime van Kessel
8d53ee90b4 Ensure that profile bar has no options selected if a quality_changes is active 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
9e5082a42f Cleanup the qml a bit 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
6b90975391 Replace the old settingSlider with the RadioButtonbar 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
3b93a1914a Ensure the Label bar uses the theme 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
ae406e2480 Fix the RadioCheckbar to work in Cura 2019-08-29 11:40:02 +02:00
Jaime van Kessel
a275e3de2b Add LabelBar component 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
a66c074e97 Simplify the alignment code 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
e47514d6dd Fix horizontal bar not coloring correct if last item is checkbox 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
cc4dc6a27c Fix overlap if first option is radioButton 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
abc6e5950b Fix alignment of inactiveMarker 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
11c23b4fe9 Add first draft of the radiocheckbar 
CURA-6598
 2019-08-29 11:40:02 +02:00
Ghostkeeper
b3fd310d37
Move removeQualityChangesGroup to QualityManagementModel 
This is an operation specific to the quality management page, so it should be located there.

Contributes to issue CURA-6600.
 2019-08-28 15:21:33 +02:00
Ghostkeeper
21412986d3
Remove material manager from MaterialsPage 
It is no longer used now that everything relevant has been moved to a separate class for this page specifically.

Contributes to issue CURA-6600.
 2019-08-27 18:01:35 +02:00
Ghostkeeper
3952366798
Move createMaterial to MaterialManagementModel and simplify it a bit 
We can reuse our duplicateMaterial function again but in a simpler way. Also finding the preferred material is simpler with our container tree.
However there seems to be a problem with finding the preferred material; it's not finding generic_pla for UM3 and AA0.4 anyway, and then falls back on a random material. This needs to be fixed in the variant node class.

Contributes to issue CURA-6600.
 2019-08-27 17:21:22 +02:00