12148 Commits

Author SHA1 Message Date
Ghostkeeper
3a9c8d16a2
Fix remaining references to instance_container._id
These must've slipped through the cracks.

Contributes to issue CURA-4243.
2017-10-30 15:07:46 +01:00
Lipu Fei
e6e61e9a3c
Merge pull request #2697 from Ultimaker/feature_add_user_agreement
Feature add user agreement
2017-10-30 14:50:52 +01:00
fieldOfView
7a9dda4022 Disable jogging for UM3
NetworkPrinterOutputDevice does not have the API to control jogging
2017-10-30 14:46:31 +01:00
Aleksei S
22aaf64b63 Simplified version for validation need to show user agreement
CURA-4501
2017-10-30 14:42:46 +01:00
Lipu Fei
69cd00d1c7 Do not take into account the active materials when importing a quality profile
CURA-4451

When importing a quality profile, it should not fail/succeed based on
which materials are activated at the moment. The imported quality
profile will be available when the user switches to a compatible
settings.
2017-10-30 13:13:54 +01:00
Lipu Fei
0096fe0de3 Fix project loading to handle "Not Supported" quality profiles
CURA-4451
2017-10-30 12:54:21 +01:00
Lipu Fei
b6dd87081c Add upgrade script for 3.0 to 3.1
CURA-4451

- Add upgrade script for 3.0. to 3.1
- Upgrade old stack files so they will use "empty_quality" as the
  "Not Supported" quality profile.
- Increase SettingVersion to 4
2017-10-30 12:45:25 +01:00
fieldOfView
2d109090bc Show material name instead of extruder number 2017-10-30 12:40:41 +01:00
fieldOfView
fc7d1210cf Fix qml binding loop 2017-10-30 12:31:46 +01:00
fieldOfView
6fa4dd0a97 Fix qml binding loops 2017-10-30 12:26:02 +01:00
fieldOfView
84002a70d0 Remove binding loop by cleaning up tooltipText creation 2017-10-30 11:50:57 +01:00
Ghostkeeper
839c8ccc52
Fix 'Could not get metadata of container <empty string>'
Turns out that the side bar header was requesting the metadata before the active material was set. Now I'm just saying that if the active material was not set, it should not be compatible.

Contributes to issue CURA-4243, side-ways.
2017-10-30 11:15:41 +01:00
Lipu Fei
c0f1af94ab Show Add Machine dialog after User Agreement dialog is closed
CURA-4501
2017-10-30 10:33:50 +01:00
Lipu Fei
85f7b1ac03 Fix code style
CURA-4501
2017-10-30 10:32:46 +01:00
fieldOfView
6d4ea381f0 Create cost specification tooltip 2017-10-29 11:47:49 +01:00
fieldOfView
0372475560 Rearrange print specs area
* remove superfluous "Print time" label
* format print time tooltip
* add elide to cost spec
* add (empty) cost spec tooltip
2017-10-29 10:09:52 +01:00
fieldOfView
6a0ba43508 Make sure monitor buttons do not extend sidebar 2017-10-29 10:07:42 +01:00
fieldOfView
208d365d51 Make sure saveRow does not extend sidebar 2017-10-29 09:20:59 +01:00
fieldOfView
177295999b Allow richer markup in tooltips 2017-10-29 09:19:50 +01:00
Mark
0bdc1aad00 Fixed code comments
CURA-4501
2017-10-29 09:04:23 +01:00
Mark
8bfd10f9aa Refactor and cleanup
CURA-4501
2017-10-28 20:29:26 +02:00
Mark
910386eaf7 remove unused import 2017-10-28 15:43:26 +02:00
Mark
5db0fc7785 Add useragreement screen on first run of Cura
CURA-4501
2017-10-28 15:43:01 +02:00
Ghostkeeper
8bbb6c1af5
Load and serialize container ID and name properly: not in metadata
We shouldn't write the name or ID, who are now in the metadata.
Also we should load the name and ID properly from the file.

Contributes to issue CURA-4243.
2017-10-27 16:50:13 +02:00
Ghostkeeper
a31c39b225
Use setters and getters for name and ID
Because their implementation changed, these would have been implemented in some other way. Instead I use the getters and setters which are inherited from the parent class and therefore are already updated.

Contributes to issue CURA-4243.
2017-10-27 16:35:58 +02:00
Jaime van Kessel
fbdc9ed223 Added reload qml action 2017-10-27 16:35:09 +02:00
Ghostkeeper
7ac3c1446b
Make ignored metadata keys a set
It needs to be a set now for Uranium.

Contributes to issue CURA-4243.
2017-10-27 16:25:52 +02:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
Mark
6c04a8be5d same font for checkbox label and some layout anchors 2017-10-27 13:48:55 +02:00
Diego Prado Gesto
fb88dd6326 CURA-4492 Postponed signals are now emitted even if we need user
interaction when changing quality profiles
2017-10-27 13:32:51 +02:00
Aleksei S
2a4addefbf Merge branch 'master' of github.com:Ultimaker/cura 2017-10-27 11:20:53 +02:00
Aleksei S
7e6e0e2021 Remove "not supported" quality files for "Builder premium" printer
CURA-4436
2017-10-27 11:18:46 +02:00
Lipu Fei
fe70e19089 Reset extruder numbers whose values are no longer valid
CURA-4176

After the user changes the number of extruders for a machine, some
extruder number settings may not have valid values any more. These
settings need to be reset.`
2017-10-27 10:59:03 +02:00
alekseisasin
e8bd404904 Merge pull request #2584 from Builder3D/master
Add Builder Premium
2017-10-27 10:25:11 +02:00
Ghostkeeper
ff5b9eefea
Minor improvement to German translation of 'Check all'
Thanks to @app-js. 'Alles auswählen' didn't fit.

Fixes #2689.
2017-10-27 09:33:40 +02:00
Aleksei S
ee228155af Remove unnecessary properties which after update triggered view rendering
CURA-4062
2017-10-27 09:24:31 +02:00
ChrisTerBeke
b91824aab1 Move towards making extruder manager a first class citizen - CURA-4482 2017-10-26 17:54:36 +02:00
Diego Prado Gesto
92ac7c5a15 Merge branch 'CURA-4451_not_support_container' 2017-10-26 16:55:17 +02:00
Diego Prado Gesto
b9c318d432 CURA-4451 Minor changes 2017-10-26 16:53:31 +02:00
Diego Prado Gesto
524ace9b04 Merge branch 'CURA-4451_not_support_container' of https://github.com/Ultimaker/Cura into CURA-4451_not_support_container 2017-10-26 15:30:07 +02:00
Diego Prado Gesto
9b066ea78b CURA-4451 Bring back again the PP 0.4 fast profile of UM2+ that was
deleted by mistake
2017-10-26 15:27:01 +02:00
ChrisTerBeke
723f6ce226 Only get extruder settings from extruder stack - CURA-4482 2017-10-26 15:10:52 +02:00
ChrisTerBeke
38fdb5e56f Refactor extruders model to always use extruder stacks + cleanup - CURA-4482 2017-10-26 14:45:24 +02:00
Aleksei S
938ae5af1d Added function to catch prepare and monitor button click
CURA-4062
2017-10-26 14:36:23 +02:00
ChrisTerBeke
8378c6f3c9 Always add extruder quality changes when getting quality changes by name - CURA-4482 2017-10-26 14:30:18 +02:00
ChrisTerBeke
d6ef96a825 Add todo comment 2017-10-26 14:07:47 +02:00
ChrisTerBeke
0021dee84b Always use extruder stacks when copying value to all extruder - CURA-4482 2017-10-26 14:04:05 +02:00
ChrisTerBeke
0b57096056 Always use extruder stacks when switching global container in machine manager - CURA-4482 2017-10-26 13:44:47 +02:00
ChrisTerBeke
7975420901 Always set active extruder index when loading active machine on start - CURA-4482 2017-10-26 13:34:59 +02:00
Lipu Fei
7d46eead60 Fix broken unit tests due to evaluation context
CURA-4498
2017-10-26 12:49:41 +02:00