Commit graph

9177 commits

Author SHA1 Message Date
Diego Prado Gesto
b18565d9cf Merge branch 'master' into feature_intent_container_tree 2019-09-10 11:08:21 +02:00
Ghostkeeper
f561218346
Merge branch '4.3' 2019-09-09 17:37:12 +02:00
Ghostkeeper
8c817e041e
Reduce size of print head without fans for one-at-a-time mode
This allows you to place models more compactly.

According to the discussion at #5590, this was tested to work well.

Fixes #5590.
2019-09-09 17:37:01 +02:00
Ghostkeeper
a43de19113
Reduce size of print head without fans for one-at-a-time mode
This allows you to place models more compactly.

According to the discussion at #5590, this was tested to work well.

Fixes #5590.
2019-09-09 17:36:14 +02:00
Lipu Fei
3f3aac7ce5
Merge pull request #6289 from Ultimaker/feature_intent_interface
Feature intent interface
2019-09-09 16:53:37 +02:00
Diego Prado Gesto
ddcd8e40cc
Merge pull request #6292 from samirabaza/patch-7
Update printrbot_simple.def.json
2019-09-09 16:26:51 +02:00
Ghostkeeper
354729b621
Only show support flow if support is enabled 2019-09-07 23:19:59 +02:00
Ghostkeeper
5e302c6a67
Fix display of Z Hop After Extruder Switch Height on single extruder
If the setting is enabled on a single extruder printer, it'll show the Z Hop Height setting anyway even though it has no effect.
2019-09-07 23:18:02 +02:00
Ian Paschal
dfc23d994f
Add bom_numbers field to definitions
CS-171
2019-09-06 16:03:26 +02:00
Ghostkeeper
82aa0492ea
Revert "CS-171 Add R2 support" 2019-09-06 14:00:04 +00:00
Ian Paschal
b7cc48131c Add bom_numbers field to definitions
CS-171
2019-09-06 11:23:02 +02:00
Ghostkeeper
bff9f2fb82
Merge branch 'patch-5' of https://github.com/samirabaza/Cura into samirabaza-patch-5 2019-09-05 14:38:47 +02:00
Lipu Fei
c7c859f02c Revert "Update S3 definition"
CURA-6742

This reverts commit bb11c695e2.
2019-09-05 09:14:52 +02:00
Lipu Fei
13011e375b Fix quality layer label alignment
CURA-6598
2019-09-05 09:01:00 +02:00
Lipu Fei
bb11c695e2 Update S3 definition
CURA-6742
2019-09-04 17:40:04 +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
7f3b55a286
Remove unknown reference
CURA-6598
2019-09-04 16:48:06 +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
Diego Prado Gesto
ebd3b4b9bf Change the URL to check for new firmware
Contributes to CURA-6742.
2019-09-04 10:26:48 +02:00
Ghostkeeper
52cb68fdb3
Commit actual files instead of my symlinks
I've been having this profile added via a symlink so that it would update itself. I didn't know that symlinks were possible in Git.

Contributes to issue CURA-6742.
2019-09-04 09:23:27 +02:00
Ghostkeeper
de7915688a
Move profiles from pr-data to main Cura repository
Don't look too deeply into this, please.

Contributes to issue CURA-6742.
2019-09-04 09:16:22 +02:00
Lipu Fei
d154c98476
Merge pull request #6288 from Ultimaker/feature_bottom_face
Align Face To Build-Plate
2019-09-03 16:14:48 +02:00
Remco Burema
5b48e13337 Remove 'align face to bottom' from context-menu.
part of CURA-6745
2019-09-03 14:25: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
51ed0072db
Apply proposed Creality changes
These are the changes currently confirmed by multiple people in this comment: https://github.com/Ultimaker/Cura/issues/6106#issuecomment-524241165

Contributes to issue #6106.
2019-09-03 09:48:01 +02:00
SAMSECTOR
cb65cb868e
Update printrbot_simple.def.json
manufacturer name changed from "PrintrBot" to "Printrbot" to allow the profile under the "Add a printer" menu
not appearing in version 4.2.1
2019-09-02 22:20:20 +03:00
SAMSECTOR
957add798b
Update printrbot_simple_extended.def.json
manufacturer name changed from "PrintrBot" to "Printrbot" to allow the profile under the "Add a printer" menu
not appearing in version 4.2.1
2019-09-02 22:14:24 +03: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
Remco Burema
b97015a354 Added 'align selected face with buildplate' feature.
Alt-click to select a face. See the (identically named) 'feature_bottom_face' branch in Uranium for more indepth information.
2019-09-02 00:17:14 +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
d59d7e5b8d Bump version nr 2019-08-29 13:09:42 +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