Commit graph

8902 commits

Author SHA1 Message Date
Jaime van Kessel
0edc3f2680 Make some minor improvements to the qml
This implements some of the best practices that weren't used yet for the QML

CURA-6005
2019-01-04 10:17:06 +01:00
Amanda de Castilho
de95d4f021
Update DisplayFilenameAndLayerOnLCD.py
updated to display layer count before filename (layer number was getting cut off in event of long filename).
updated to include option to start layer count at either 0 or 1.
removed ':' in the display string as it is a gcode command that was splitting the line into two different commands.
2019-01-03 21:00:50 -08:00
Jaime van Kessel
49076a7103 Remove the unneeded BackupListModel
CURA-6005
2019-01-03 17:42:58 +01:00
Jaime van Kessel
1578aaa301 Minor code cleanup
CURA-6005
2019-01-03 17:17:40 +01:00
Jaime van Kessel
83fbb78c9e Backup uploading now shows a intermediate progress bar and hides when done
CURA-6005
2019-01-03 17:15:32 +01:00
Jaime van Kessel
e36b3e37d1 Remove indirection in the translation
CURA-6005
2019-01-03 17:13:47 +01:00
Jaime van Kessel
ed9a51791b Handle bunch of review comments
CURA-6005
2019-01-03 17:05:58 +01:00
Jaime van Kessel
4d1e9d24f9 Cleanup documentation
Either fix the style to doxygen or remove it if it just repeated the functionnname.

CURA-6005
2019-01-03 16:58:51 +01:00
Jaime van Kessel
785f2a8a8b Merge branch 'CURA-6005_cura_drive_plugin' of github.com:Ultimaker/Cura into CURA-6005_cura_drive_plugin 2019-01-03 16:52:02 +01:00
Jaime van Kessel
ea1712df0f Codestyle fixes & simplifications
CURA-6005
2019-01-03 16:51:28 +01:00
Jaime van Kessel
65183ade0a No longer chache singleton objects
CURA-6005
2019-01-03 16:44:08 +01:00
Ghostkeeper
e15e06f29f
Make Z relative
This way if we ever want to change the parent's Z for some other ordering requirements, the children will stay in order.
2019-01-03 16:04:28 +01:00
Ghostkeeper
798c1f198c
Hide action panel when displaying a stage with a background
This is not the worst hack ever, but it's quite a hack.

Contributes to issue CURA-6054.
2019-01-03 16:04:27 +01:00
Jaime van Kessel
1973397b92 Remove confusing printer preference text
CURA-6003
2019-01-03 15:34:41 +01:00
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Lipu Fei
a14c846e29 Rename CheckBox.qml to CheckBoxWithTooltip.qml
CURA-6005
2019-01-03 11:53:19 +01:00
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Ghostkeeper
78ee666919
Merge branch '4.0' 2019-01-03 11:09:28 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
7fc4e6ddde Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-03 10:23:22 +01:00
Jaime van Kessel
195d39f698 Update the style of the postprocessing button
CURA-6043
2019-01-03 09:47:48 +01:00
Lipu Fei
ee72284616 Use appropriate log level
CURA-6035
2019-01-03 08:32:42 +01:00
Ghostkeeper
4177faa6ea
Fix font usage in installed plug-ins
Several different font sizes should be used here.

Contributes to issue CURA-6025.
2018-12-31 15:37:31 +01:00
Ghostkeeper
7ef8287e52
Fix theming of back button in Marketplace
Give it a bit more space for if the translated text is wider, and if it is wider also align it properly with the arrow.

Contributes to issue CURA-6025.
2018-12-31 15:33:37 +01:00
Ghostkeeper
30ab1a957f
Make headers of Marketplace large
As per the design.

Contributes to issue CURA-6025.
2018-12-31 15:18:50 +01:00
Ghostkeeper
df0351acd4
Fix fonts of plug-in tiles
Contributes to issue CURA-6025.
2018-12-31 15:14:23 +01:00
Jaime van Kessel
e02fcd664c Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-31 14:34:53 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
2018-12-31 13:22:53 +01:00
Ghostkeeper
c333899d18
Fix reference to renamed file 2018-12-31 11:09:26 +01:00
Jaime van Kessel
a16e406507 Properly display the full type + brand of unknown material
CURA-6033
2018-12-31 11:01:30 +01:00
Jaime van Kessel
c08339e191 Merge branch 'CURA-6033_unknown_material' of github.com:Ultimaker/Cura into 4.0 2018-12-31 10:33:01 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +01:00
Ghostkeeper
265a1b3fa0
Add version upgrade plug-in for 4.0 to 4.1
This currently only updates the stack files, but all files have to be upgraded because of that stupid setting_version.

Contributes to issue CURA-5848.
2018-12-27 16:50:05 +01:00
Marijn Dee
12a4a5e9f5 Fixing the rest of the automatic test failures 2018-12-21 15:06:02 +01:00
ChrisTerBeke
64f5c4f263 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 13:33:16 +01:00
Ghostkeeper
d880194c8c
Merge branch '4.0' 2018-12-21 11:59:41 +01:00
Jaime van Kessel
7269065cca Only clear the stored optimized layer data if the slice started 2018-12-21 11:54:11 +01:00
Ghostkeeper
8308e48c2d
Merge branch '4.0' 2018-12-21 11:51:04 +01:00
ChrisTerBeke
a86f253bf3 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 10:58:13 +01:00
Ghostkeeper
75fbdf2c94
Expand error message for cases when extruders are disabled
It is also unable to slice models that are on extruders that are disabled.
2018-12-21 10:40:37 +01:00
Marijn Dee
131211e604 Fixed the unit tests 2018-12-21 09:42:28 +01:00
Aleksei S
81a6531f47 Fix range slider label position in LayerSlider.qml. 2018-12-20 20:37:48 +01:00
ChrisTerBeke
5403f5241b Fix not registering cloud output device for every machine 2018-12-20 17:21:07 +01:00
Marijn Dee
9d27c29c8c Fixed indentation and relative import, tests still fail though 2018-12-20 17:04:17 +01:00
Marijn Dee
403010aa90 Mirrored the changes made to the models in Commons 2018-12-20 16:32:00 +01:00
ChrisTerBeke
bfd1debb8f Merge branch '4.0' into STAR-322_cloud-connection 2018-12-20 15:49:00 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
Lipu Fei
346d8d884e Remove unnecessary patches in TestSendMaterialJob
CURA-6035
2018-12-20 14:23:39 +01:00
Lipu Fei
e79f312fa0 Fix unit tests for SendMaterialJob
CURA-6035
2018-12-20 14:20:34 +01:00
Jaime van Kessel
9ffc039254 Fix logo aliasing
CURA-6044
2018-12-20 14:01:12 +01:00