Commit graph

2288 commits

Author SHA1 Message Date
Jaime van Kessel
5036eccd32 Moved multiple components to their own files
CL-541
2017-11-27 10:15:28 +01:00
Ghostkeeper
e0f0e098ff
Use MaterialsModel for materialsModel
This specialized InstanceContainersModel has an override that makes the model a bit more efficient when non-materials get their metadata updated.

Contributes to issue CURA-4243.
2017-11-27 09:54:40 +01:00
Diego Prado Gesto
fa00a17c78 Make UI changes in the Simulation View for adapting the color gradient
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
2017-11-26 21:21:18 +01:00
Ruben D
ffef26097d
Merge branch '3.1' 2017-11-26 18:48:42 +01:00
Ruben D
0d0bcb8aea
Clip text that exceeds the width of the text box.
For #2802.
2017-11-26 18:48:27 +01:00
Ruben D
8847325cf8
Remove limit on length for integer arrays
The integer arrays were limited because the text in the text field is not properly clipped. I found a fix for that.

Fixes #2802.
2017-11-26 18:47:58 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3
CL-541
2017-11-24 11:26:30 +01:00
Jaime van Kessel
57406100ef Fixed status icon in monitor tab
CL-541
2017-11-24 10:55:24 +01:00
Diego Prado Gesto
0b434978dd CURA-4561 Add tooltip also to the Cancel button. 2017-11-24 10:34:38 +01:00
ChrisTerBeke
46a575b84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:31:30 +01:00
Jaime van Kessel
9d7cd72691 JobData is now shown in monitor screen again
CL-541
2017-11-24 09:38:10 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +01:00
Jaime van Kessel
c523a6ddf6 Progress is now shown for LegacyPrinter while printing
CL-541
2017-11-24 09:22:50 +01:00
Jack Ha
6f708fef8f Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-23 15:27:32 +01:00
Jack Ha
b6410ecf12 CURA-4561 prepare button upgrades 2017-11-23 15:27:22 +01:00
Mark
49705492ce Merge branch '3.1' 2017-11-23 14:37:31 +01:00
Lipu Fei
dad2dfda89 No need to set currentItem after a material is imported
CURA-4546
2017-11-23 14:08:10 +01:00
Aleksei Sasin
1141368682 Hide icons if monitor view is selected CURA-4527 2017-11-23 12:54:53 +01:00
Mark
835a0fb5d3 Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-23 10:39:00 +01:00
Mark
3477b902ab
Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation
Cura 4527 view orientation
2017-11-23 09:56:26 +01:00
Diego Prado Gesto
2042cdf155 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-22 20:11:24 +01:00
Diego Prado Gesto
b776afaf3d CURA-4509 Changing layout of the print time information tooltip,
now in two lines per feature. This is for avoid trimming the labels
because they depend on the language.
2017-11-22 20:09:39 +01:00
Ghostkeeper
3823cca936
Disable Russian translation since it's incomplete
The maintainer of this translation didn't want to continue spending time to keep his translation up-to-date.

Contributes to issue CURA-4601.
2017-11-22 12:45:21 +01:00
Aleksei S
d7b230269b The icons changed
CURA-4527
2017-11-22 11:10:25 +01:00
Jaime van Kessel
f987e6d977 Functionality properties (canPause, canPreHeatBed, etc) are now in the Controller.
It's actually up to the controller to say something about this, so this location makes more sense

CL-541
2017-11-21 16:59:17 +01:00
Jaime van Kessel
0fe91db636 Moved HeatedBedBox to own qml file
CL-541
2017-11-21 16:52:37 +01:00
Jaime van Kessel
34e808d585 PrinterOutputModel now has different extruders if it has more than one.
It used to just fill the list with references to the first one created.
CL-541
2017-11-21 16:36:51 +01:00
Jaime van Kessel
d8b12be5e4 LegacyUM3 now correctly gets material set
CL-541
2017-11-21 16:26:17 +01:00
Jaime van Kessel
e3d07f1806 Moved ExtruderBox and OutputDeviceHeader to their own files.
This makes it a whole lot easier to get an overview.

CL-541
2017-11-21 16:06:30 +01:00
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again
CL-541
2017-11-21 15:12:23 +01:00
Jack Ha
602e8c0e66 Changed 'Check material compatibility' to 'Check compatibility' because it's not only materials possibly being incompatible 2017-11-21 15:12:17 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements
Container stack improvements
2017-11-20 17:42:26 +01:00
Jaime van Kessel
7d28b26ff2 Merge branch 'master' of github.com:Ultimaker/Cura into qtquick-controls-2.0 2017-11-16 16:48:22 +01:00
Jack Ha
228039545b CURA-4525 send active build plate to legacy UM3 with Print over network 2017-11-16 09:58:53 +01:00
Jack Ha
e2a663992c CURA-4525 Added an option to turn on the UI elements of multi build plate 2017-11-15 17:00:19 +01:00
Aleksei S
ce0510cee3 Hide icons if they overlap monitor button
CURA-4527
2017-11-15 16:34:22 +01:00
Jack Ha
864f417723 CURA-4525 Fix load and save projects. Not storing build plates or object names yet. 2017-11-15 16:03:32 +01:00
Aleksei S
3d2868c336 Added icons
CURA-4527
2017-11-15 00:43:17 +01:00
Jack Ha
bd8aa8d989 CURA-4525 automatic build plate menu items using BuildPlateModel 2017-11-14 14:27:46 +01:00
Jack Ha
97f61366a8 CURA-4525 fix accidently remove all scenenodes when deleteAll 2017-11-13 16:51:07 +01:00
Jack Ha
e21acd1a07 CURA-4525 first multi slice + multi layer data, added filter on build plate, added option arrange on load, visuals like convex hull are now correct 2017-11-09 17:03:20 +01:00
Jack Ha
41d5ec86a3 CURA-4525 updated scene node menu and added multi buildplate arrange 2017-11-08 14:07:40 +01:00
Jack Ha
38670171f5 CURA-4525 party working objects list and build plates 2017-11-07 14:52:22 +01:00
Jack Ha
5050124699 CURA-4525 wip objects menu 2017-11-06 14:03:39 +01:00
Jack Ha
5b368fbfd5 CURA-4104 added first sucky build plate selection options 2017-11-06 14:03:03 +01:00
Aleksei S
7722e438c9 Changed orientation button location, adjusted call functins
CURA-4527
2017-11-06 10:28:07 +01:00
ChrisTerBeke
d32b7f0091 Merge branch 'master' into container_stack_improvements 2017-11-06 09:49:44 +01:00
Aleksei S
fb8bde6f76 Added view rotation for each click
CURA-4527
2017-11-03 15:29:33 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging
Jogging
2017-11-01 16:15:40 +01:00
Aleksei S
87a7bf72a8 Monitor view, "connect" button position
CURA-4509
2017-11-01 15:57:30 +01:00