17119 Commits

Author SHA1 Message Date
Jaime van Kessel
3ad1802ab6 Prevent a KeyError from messing
CURA-5978
2018-11-27 14:34:29 +01:00
Aleksei S
8784ecd49a Change native rendering
CURA-5941
2018-11-27 14:09:47 +01:00
Aleksei S
6956a732a0 Use tapbar component from UM, change the print_setup_widget width 2018-11-27 13:49:04 +01:00
Diego Prado Gesto
e863c34f68 Align the text to the center of the button
Contributes to CURA-5942.
2018-11-27 13:33:35 +01:00
Diego Prado Gesto
fcde6e3a34 Fix the open file button
Now it has the correct size and it doesn't look blurry.

Contributes to CURA-5942.
2018-11-27 13:28:28 +01:00
Diego Prado Gesto
ea75a60dd8 Merge branch 'master' into ui_rework_4_0 2018-11-27 13:17:10 +01:00
Diego Prado Gesto
a6a364c337 Move material diameter and machine nozzle size to the extruder
definition.

Contributes to CURA-5902.
2018-11-27 13:12:47 +01:00
Diego Prado Gesto
0794a2c8c9 Remove not needed printer and extruder definitions.
Contributes to CURA-5902.
2018-11-27 13:03:36 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
Tests for um3networkplugin
2018-11-27 12:59:44 +01:00
Jaime van Kessel
fb84b344ec Add gradient to header bar 2018-11-27 12:58:06 +01:00
Jaime van Kessel
1a6822436d Add missing HoverEnabled property
Some systems, like mine, don't have the hoverEnabled default set to true.
2018-11-27 12:01:43 +01:00
Jaime van Kessel
e04f14b50c Also add shadow to openFile button 2018-11-27 12:01:05 +01:00
Jaime van Kessel
44c415ff78 Add shadow to ExpandableComponent 2018-11-27 11:58:32 +01:00
Diego Prado Gesto
75b827d373 Modify the hover behavior by removing the mouse area.
Contributes to CURA-5942.
2018-11-27 11:26:20 +01:00
Diego Prado Gesto
e2f85fcdc4 Add extra space to printer button.
Contributes to CURA-5942.
2018-11-27 11:25:43 +01:00
Aleksei S
e6c2238fd5 Added popup spacing by Y coordinate
CURA-5941
2018-11-27 11:24:09 +01:00
Ian Paschal
fd723e1084 Improve camera icon
Contributes to CL-1150
2018-11-27 11:19:45 +01:00
Ian Paschal
a3f0630ee9 Rename printer images
Contributes to CL-1150
2018-11-27 11:19:30 +01:00
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Diego Prado Gesto
729d37cabb Merge branch 'master' into ui_rework_4_0 2018-11-27 11:12:48 +01:00
Ian Paschal
475a94d10d Add printer images
Commit to CL-1150
2018-11-27 10:55:08 +01:00
Ian Paschal
8965695a59 Update MonitorPrintJobProgressBar.qml
Contributes to CL-1150
2018-11-27 10:54:46 +01:00
Ian Paschal
616ec13457 Change context menu button size
Contributes to CL-1150
2018-11-27 10:54:26 +01:00
Ian Paschal
7340b6dbc4 Update CameraButton.qml
Contributes to CL-1150
2018-11-27 10:53:00 +01:00
Ian Paschal
0cd9c8e087 Add machine images
Contributes to CL-1150
2018-11-27 10:52:49 +01:00
Lipu Fei
a99c1f4f73
Merge pull request #4885 from Ultimaker/CURA-5961-NaN_infill_before_adding_printer
Ensure that no weird data is set in the printSetupSelector on first start
2018-11-27 10:23:58 +01:00
Diego Prado Gesto
f91dbd356d Merge branch 'master' of github.com:Ultimaker/Cura 2018-11-27 09:51:00 +01:00
Diego Prado Gesto
48853d0d06 Merge branch 'pinchies-add-a-u20' 2018-11-27 09:50:43 +01:00
Diego Prado Gesto
39e1cfd6bc Fix indentation.
Contributes to CURA-5902.
2018-11-27 09:50:01 +01:00
Lipu Fei
bd42136712 Fix GcodeStartEndFormatter to use fallback values
CURA-5901

Use values from the global stack (if exist) as fallback values.
2018-11-27 09:49:38 +01:00
Diego Prado Gesto
493b37b0fe Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20 2018-11-27 09:44:11 +01:00
Jaime van Kessel
8e7e8354e7 Set colors to the correct ones 2018-11-27 09:41:45 +01:00
Aleksei S
ec63e6c130 Added icons
CURA-5941
2018-11-27 09:27:25 +01:00
Lipu Fei
2e81b97623 Use global_stack.extruders to find extruders
CURA-5978
2018-11-27 08:45:45 +01:00
pinchies
47ed9e3f5d
deleting the old wrong file.... 2018-11-27 15:09:36 +11:00
pinchies
519e2a3399
uploaded wrong file... oops 2018-11-27 15:06:54 +11:00
Diego Prado Gesto
fcc6af68af Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value.
Contributes to CURA-5980.
2018-11-26 17:55:25 +01:00
Diego Prado Gesto
ad3fa9548a Add sourceSize to the open file button.
Contributes to CURA-5942.
2018-11-26 17:53:38 +01:00
Diego Prado Gesto
6a2bbca7ce Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 17:53:24 +01:00
Jaime van Kessel
5ddb3ff909 Factor out superfluous use of small_tool_button style
The style was overly complicated for what it should do
2018-11-26 17:40:34 +01:00
Jaime van Kessel
a3b45ff203 Simplify the viewOrientation controls 2018-11-26 17:35:23 +01:00
Jaime van Kessel
a825daea95 Cleanup the Theme.json
There were a lot of sizes that weren't used
2018-11-26 17:10:48 +01:00
Jaime van Kessel
d85aee1c53 Ensure that no weird data is set in the printSetupSelector on first start
CURA-5961
2018-11-26 16:40:29 +01:00
ChrisTerBeke
efd5f3799b Also catch TypeError now that we have explicit arguments 2018-11-26 16:31:32 +01:00
ChrisTerBeke
6506596ece Fix typing syntax 2018-11-26 16:19:01 +01:00
Mark
7019afe21f
Merge pull request #4717 from forkineye/fix-wanhao_profiles
Fix Wanhao profiles to use speed_travel macro
2018-11-26 16:03:25 +01:00
ChrisTerBeke
e4d8fb36ab Add more typing as per request from @sedwards2009 2018-11-26 15:53:04 +01:00
Diego Prado Gesto
3d1157522a Reuse the RoundedRectangle component and indicate that only the bottom part of the popup should be rounded.
Contributes to CURA-5942.
2018-11-26 15:51:36 +01:00
Mark
39f123f8e0
Merge pull request #4670 from pinchies/add-cc-mm-2
Add Cocoon Create ModelMaker
2018-11-26 15:49:21 +01:00
Mark
88cedd25cf
Merge pull request #4664 from pinchies/master
Add JGAurora Z-603S
2018-11-26 15:47:28 +01:00