GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 08:08:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,407 Commits 290 Branches 260 Tags
Commit Graph

11407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
67c11b8cdf
Fix code style 
CURA-4503
 2017-10-31 09:24:32 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01:00
ChrisTerBeke
d718e6e36c Create extruder stack for single extruder machines on start - CURA-4482 2017-10-31 09:08:20 +01:00
Ghostkeeper
d24fa3bc3b
Set name directly in metadata when clearing 
Because the setName function checks if the name is equal to the previous name, but at that point the previous name doesn't exist.

Contributes to issue CURA-4243.
 2017-10-31 08:23:57 +01:00
Ruben D
93e746b1b3
Warm up to layer_0 temperatures in start g-code 
Thanks to nounours2099 for the correction.

Fixes #2631.
 2017-10-31 00:23:05 +01:00
Ghostkeeper
8eaec149fa
Make sure the ID stays in the metadata when clearing it 
Previously the ID was also exempted from the clear.

Contributes to issue CURA-4243.
 2017-10-30 15:54:26 +01:00
Aleksei S
7f02ddd6e9 Simplified version for validation need to show user agreement 
CURA-4501
 2017-10-30 15:43:40 +01:00
Lipu Fei
aab601927c Show Add Machine dialog after User Agreement dialog is closed 
CURA-4501
 2017-10-30 15:43:40 +01:00
Lipu Fei
b5904cd239 Fix code style 
CURA-4501
 2017-10-30 15:43:40 +01:00
Mark
ca8127c047 Fixed code comments 
CURA-4501
 2017-10-30 15:43:39 +01:00
Mark
9aebb395ab Refactor and cleanup 
CURA-4501
 2017-10-30 15:43:39 +01:00
Mark
b45e44b388 Add useragreement screen on first run of Cura 
CURA-4501
 2017-10-30 15:43:39 +01:00
fieldOfView
8dfba9a318 Stop SettingTextField from setting values when getting/losing the focus 
Fixes #2694
 2017-10-30 15:31:14 +01:00
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
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