20852 Commits

Author SHA1 Message Date
N95JPL
10643da56c Update DisplayFilenameAndLayerOnLCD.py 2018-11-19 13:09:20 +00:00
ChrisTerBeke
dc17bd8499 Fix the first tests 2018-11-19 13:54:45 +01:00
Ghostkeeper
30b20b4aa5
Add borders to expandable components
This adds a lining to all of the drop-downs from the stage menus.

Contributes to issue CURA-5876.
2018-11-19 13:50:32 +01:00
ChrisTerBeke
f8f133d2ef Fix running tests in plugin using pytest 2018-11-19 13:42:28 +01:00
Lipu Fei
b0f3fedc94 Fix import QtQuick versions to suit Qt 5.10
CURA-5785
2018-11-19 13:42:22 +01:00
Dario Minnucci
2f624cc78f Add BIBO2 printer (dual and single extruder settings) 2018-11-19 12:37:57 +01:00
Jaime van Kessel
a490e420f0 Prevent the setting items from being recreated every stage switch
CURA-5785
2018-11-19 11:42:04 +01:00
ChrisTerBeke
951a21ead7 Merge branch 'master' into tests-for-um3networkplugin 2018-11-19 10:58:07 +01:00
ChrisTerBeke
ee9210d8d1 Rewrite tests 2018-11-19 10:57:47 +01:00
ChrisTerBeke
23e957e1c5 Some more refactoring, splitting up methods 2018-11-19 10:44:24 +01:00
Jaime van Kessel
6fe89e3d54 Fix width of simulationView component not being set correctly
CURA-5785
2018-11-19 10:33:19 +01:00
Frischid
1c54319b64
Update AutoDetectBaudJob.py
Editing the file like this solved my problem connecting to German RepRap Neo
2018-11-17 21:45:35 +01:00
Jaime van Kessel
e3ebf89092 Ensure that width of popup does not get set to 0
CURA-5785
2018-11-16 17:26:10 +01:00
Ghostkeeper
f10bd28c4a
Improve grammar and do similar fix for extruder end g-code
Contributes to issue CURA-5906.
2018-11-16 17:25:32 +01:00
Remco Burema
69e2fa396e Refactor out unnecesary late init (to make tests cleaner). [UnitTests] 2018-11-16 16:53:37 +01:00
Remco Burema
3dd355976b Write tests for the FirmwareUpdateChecker-plugin. [UnitTests] 2018-11-16 16:41:09 +01:00
Marijn Deé
22aac7b566 Renamed TestContainerRegistry to ContainerRegistryMock 2018-11-16 16:35:08 +01:00
Marijn Deé
565f009e9b Added comments 2018-11-16 16:34:44 +01:00
Jaime van Kessel
6b55490af8 Fix final QML warnings
CURA-5785
2018-11-16 16:30:47 +01:00
Jaime van Kessel
bc5a2ce5b0 Make ViewSelector panel close upon selecting different view
CURA-5785
2018-11-16 16:16:15 +01:00
Jaime van Kessel
52b2f4579a Fix a number of QML warnings
CURA-5785
2018-11-16 16:13:09 +01:00
Marijn Deé
1000625d69 Added spaces around all = 2018-11-16 16:07:17 +01:00
Marijn Deé
0062250238 Moved the test to the plugin directory 2018-11-16 16:06:36 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly
CURA-5785
2018-11-16 16:04:11 +01:00
Marijn Deé
695d45ffbe Initialize the models with None 2018-11-16 15:54:07 +01:00
Jaime van Kessel
d661a8e626 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 15:23:38 +01:00
Jaime van Kessel
42399ecb24 Let headerItem fill entire component if no icon is set
CURA-5785
2018-11-16 15:17:34 +01:00
Jaime van Kessel
b72f1bb314 Add missing screenScaleFactor for implicit sizes
CURA-5785
2018-11-16 15:15:44 +01:00
Ghostkeeper
816d844258
Use textwidth instead of round
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 15:14:08 +01:00
Jaime van Kessel
fe15a0a513 Made width of machineSelector popup depend on size of the element
CURA-5785
2018-11-16 15:09:47 +01:00
Jaime van Kessel
5972bfaf03 Add round to minContentWidth
This prevents text from getting a weird width

CURA-5785
2018-11-16 15:06:21 +01:00
Jaime van Kessel
320efa443e Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 14:58:47 +01:00
Jaime van Kessel
3fd1cc0e8c Ensure that the added labels are also themable
CURA-5785
2018-11-16 14:58:11 +01:00
Marijn Deé
421af26f87 Extra test on test_sendMaterialsToPrinter, removed unused code 2018-11-16 14:54:49 +01:00
Remco Burema
2b8b995422 Refactor out unnecesary 'container' parameter (to make tests easier). [UnitTests] 2018-11-16 14:29:34 +01:00
Marijn Deé
e9e8c49b2d Added tests for SendMaterialJob and refactored SendMaterialJob for
better testability. This is part of a larger project to create tests
for the UM3NetworkPrinting plugin in preparation for printing from the
cloud
2018-11-16 14:16:45 +01:00
Ghostkeeper
3ef6d0544a
Fix spelling and indents
Ant-fuckery, as they say in the low lands.

Contributes to issue CURA-5785.
2018-11-16 14:11:23 +01:00
Ghostkeeper
e087db7c2e
Code style and fixes to comments
Contributes to issue CURA-5785.
2018-11-16 14:11:22 +01:00
Ghostkeeper
514fc13045
Remove redundant documentation
CURA-5875

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 14:04:33 +01:00
Ghostkeeper
81b6f3ab11
Update unclear qml ID's
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 14:03:39 +01:00
Ghostkeeper
de020b4c75
Remove commented out code
Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 14:02:00 +01:00
Ghostkeeper
e3dd5f1c39
Add documentation about qml z fix
Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 13:59:51 +01:00
Jaime van Kessel
93bd5fee53 Fix wrong push free shadow for one at a time.
It was applying the size twice. CURA-5822
2018-11-16 13:44:46 +01:00
Jaime van Kessel
240ac1f06b Clarify some setting descriptions 2018-11-16 13:03:45 +01:00
Ghostkeeper
bee563f01b
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-16 13:02:24 +01:00
Jaime van Kessel
401a6b5f8b
Merge pull request #4794 from fieldOfView/fix_adhesion_type_error
Fix adhesion type error during startup
2018-11-16 11:24:29 +01:00
N95JPL
1ae0728c9f
Modified "Display Filename And Layer On LCD"
This is a modified Display Filename And Layer On LCD script to offer a wider range of optional information.
Tried and tested on a Tevo Tornado (Running Marlin 2.x.x)
2 new options
- Scroll (If scrolling LCD is enabled)
- Max Layer (To display "Printing [name] - Layer # of ###")
2018-11-16 00:10:30 +00:00
Aleksei S
846d608a03 Merge branch 'master' of github.com:Ultimaker/Cura 2018-11-15 15:59:00 +01:00
Aleksei S
2bf4354fed Removed minimum_value for the setting support_roof_offset and support_bottom_offset
CURA-5880
2018-11-15 15:57:34 +01:00
Ghostkeeper
d732a2f953
Merge branch 'master' into ui_rework_4_0 2018-11-15 15:55:08 +01:00