16106 Commits

Author SHA1 Message Date
Ian Paschal
d077dcc851 Fix printer card skeleton colors
Contributes to CL-1051
2018-10-24 11:13:38 +02:00
Ian Paschal
8662e1a125 Fix override dialog box
Contributes to CL-897
2018-10-24 11:13:12 +02:00
Ian Paschal
a247fe204f Fix print job context menu height
Contributes to CL-897, CL-1051, CL-1111
2018-10-23 16:27:45 +02:00
Ian Paschal
0045559d01 QML Clean-up
Contributes to CL-897, CL-1051, CL-1111
2018-10-23 15:45:44 +02:00
Ian Paschal
f9545a339d QML Clean-up
Contributes to CL-897, CL-1051, CL-1111
2018-10-23 15:41:56 +02:00
Ian Paschal
1bd488dd6c Remove comments
Contributes to CL-897
2018-10-23 15:25:42 +02:00
Ian Paschal
9a16d45be5 Round divisions
Contributes to CL-1051, CL-897, CL-1111
2018-10-22 16:02:55 +02:00
Ian Paschal
34abc48a1a Remove binding loops
Contributes to CL-1051
2018-10-22 15:31:38 +02:00
Ian Paschal
817899686a Dark mode theme improvements
Contributes to CL-1111
2018-10-19 16:23:16 +02:00
Ian Paschal
1ad008f45c Style improvements
Contributes to CL-897 and CL-1051
2018-10-17 16:32:30 +02:00
Ian Paschal
6f33c4410c Review tweaks
Contributes to CL-897 and CL-1051
2018-10-17 14:39:42 +02:00
Ian Paschal
2dcfc049ba Remove skeleton loading after print jobs received
Contributes to CL-1051
2018-10-17 14:28:17 +02:00
Ian Paschal
b99bc06d1c Clean up more errors
Contributes to CL-1051
2018-10-16 09:34:50 +02:00
Ian Paschal
1fa7a8880b Clean up some QML warnings
Contributes to CL-1051
2018-10-15 17:02:27 +02:00
Ian Paschal
3ef6359930 Merge remote-tracking branch 'origin' into clean_print_job_info_block 2018-10-03 16:07:34 +02:00
Lipu Fei
254106bb26 Format date strings to ISO YYYY/MM/DD in Toolbox
CURA-5762
2018-10-03 15:39:25 +02:00
alekseisasin
742f135733
Merge pull request #4268 from smartavionics/mb-extruder-cooling-fan-number-gui
Added extruder setting field for cooling fan number.
2018-10-03 15:17:35 +02:00
alekseisasin
5cd4d741c9
Merge pull request #4267 from smartavionics/mb-extruder-cooling-fan-number
Add machine_extruder_cooling_fan_number setting to specify print cooling fan for each extruder.
2018-10-03 15:17:02 +02:00
Jaime van Kessel
9986e38dca Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:25:19 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Aleksei S
7a87783237 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:24:20 +02:00
Aleksei S
959f698b03 Update date format
CURA-5762
2018-10-03 13:23:37 +02:00
Ian Paschal
7f370a7574 Clean-up mistakes
Oops!
2018-10-03 12:28:35 +02:00
Lipu Fei
b97f4ea30c Merge remote-tracking branch 'origin/3.5' 2018-10-03 11:49:38 +02:00
Lipu Fei
c3e7e426ff Fix getDefaultVariantNode for UM2
CURA-5790

UM2 has optional variant which depends on whether Olsson Block is
enabled. getDefaultVariantNode() should take that into account.
2018-10-03 11:24:27 +02:00
Ian Paschal
5ca0c599e9 Review feedback
Now with unified style as agreed upon by Simon & Ian.

Rules:

- ID before all other props.
- All props before children.
- All props after ID in alphabetical order.
- Empty line between children.
- Semi-colons.

Note: I didn't touch the DiscoverUM3Action because that's it's whole own UI part.
2018-10-03 10:55:38 +02:00
Diego Prado Gesto
6db1342255 Fix the layer view when there is a print job with only one layer.
Contributes to CURA-5789.
2018-10-03 10:44:20 +02:00
alekseisasin
5456637e4a
Merge pull request #4369 from fieldOfView/fix_usb_temperature_while_heating
Fix updating temperature while preheating bed or extruder
2018-10-03 10:35:30 +02:00
Aleksei S
0edcd316d3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 10:33:06 +02:00
Aleksei S
51e7b6c388 Change font style for active material in preferences
CURA-5747
2018-10-03 10:30:48 +02:00
Ian Paschal
2c5095befb Add copyright headers 2018-10-03 09:43:13 +02:00
Ian Paschal
9caeddf824 Merge branch 'master' of https://github.com/Ultimaker/Cura into clean_print_job_info_block 2018-10-03 09:08:26 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Diego Prado Gesto
46e0a39c15 Merge branch 'Patola-3.5' into 3.5 2018-10-02 17:48:56 +02:00
Diego Prado Gesto
afccd38a5d Add preposition to be consistent with other strings.
Contributes to CURA-5741.
2018-10-02 17:48:25 +02:00
Diego Prado Gesto
04c72c0875 Merge branch '3.5' of git://github.com/Patola/Cura into Patola-3.5 2018-10-02 17:26:14 +02:00
Diego Prado Gesto
a99241d20b Add missing quote.
Contributes to CURA-5741.
2018-10-02 15:53:06 +02:00
Diego Prado Gesto
19b76d0c27 Merge branch '3.5' of github.com:Ultimaker/Cura into 3.5 2018-10-02 15:45:25 +02:00
Jaime van Kessel
13ab9ba384 Merge branch 'patch-1' of https://github.com/adecastilho/Cura 2018-10-02 13:15:48 +02:00
Jaime van Kessel
9970f0e752 Merge branch 'fix_polygon_connector_setting' of https://github.com/BagelOrb/Cura 2018-10-02 13:12:21 +02:00
Cláudio 'Patola' Sampaio
e457b2e67c Merge branch '3.5' of https://github.com/Ultimaker/Cura into 3.5
Updated to push to upstream
2018-10-02 07:01:39 -03:00
Cláudio 'Patola' Sampaio
6d17144766 Updated strings to Cura 3.5 2018-10-02 07:00:14 -03:00
Jaime van Kessel
13eaa14752 Set preference for sending info to default state instead of removing them
CURA-5095
2018-10-02 11:37:04 +02:00
alekseisasin
84c667265d
Merge pull request #4200 from BagelOrb/top_bottom_settings_enabled_function
JSON fix: only enable skin settings when there is skin
2018-10-02 11:21:15 +02:00
Jaime van Kessel
7ffcfa25e9 Merge branch 'CURA-5095_reset_slice_info_collection' of github.com:Ultimaker/Cura into 3.5 2018-10-02 11:17:39 +02:00
Mark
d39f6d061b
Merge pull request #4365 from smartavionics/mb-gyroid-infill
Add gyroid infill pattern.
2018-10-02 10:43:41 +02:00
Jaime van Kessel
18361b9434 Ensure that CuraAPI can be called in the same way as before
This should prevent another API break.

CURA-5744
2018-10-02 10:42:15 +02:00
Diego Prado Gesto
4f9661b7f5 Merge branch 'traditional_chinese_3.5' into 3.5 2018-10-02 10:35:59 +02:00
Diego Prado Gesto
6212bcbc33 Add traditional chinese translations to Cura.
Contributes to CURA-5741.
2018-10-02 10:34:37 +02:00
Lipu Fei
729f9a69ba
Merge pull request #4455 from Ultimaker/fix_toolbox_download
Fix toolbox download
2018-10-02 10:27:00 +02:00