4088 Commits

Author SHA1 Message Date
fieldOfView
08f2143790 Simplify showing each material length individually
CURA-1687
2016-07-07 23:58:14 +02:00
fieldOfView
c4a2e659e3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 22:17:55 +02:00
fieldOfView
9c492342cb Show each material length individually
CURA-1687
2016-07-07 22:17:35 +02:00
Tim Kuipers
df780023ed JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:22:44 +02:00
Tim Kuipers
91082404be JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:18:46 +02:00
Tim Kuipers
4349f6c75b fix: make infill_mesh visible by default because it's the only setting which is only visible in the per-object settings menu which is not normally visible (CURA-833)
Because it should never show up in the normal global/extruder settings tab, people might forget about this setting. It's one of the reasons per-object settings is awesome ^^.
2016-07-07 21:18:25 +02:00
Tim Kuipers
d6c25fcd10 JSON feat: infill mesh (CURA-833) 2016-07-07 21:04:23 +02:00
fieldOfView
c36af13daf Fix PerObjectSettings, which were broken due to the material editing merge
CURA-342
2016-07-07 18:25:20 +02:00
fieldOfView
8d56d25a8e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 18:11:29 +02:00
fieldOfView
a774f06237 Hide checks if the printer is not connected, hide bed temperature if no bed is installed
CURA-1385
2016-07-07 17:54:43 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing
Material Editing Support
2016-07-07 17:34:57 +02:00
Arjen Hiemstra
6b9689c2c7 Use clearer styling of disabled entry fields on the materials page
Contributes to CURA-342
2016-07-07 17:32:49 +02:00
Arjen Hiemstra
7df5008d3c Disable spool weight etc. fields since they are not yet functional
Contributes to CURA-342
2016-07-07 17:32:11 +02:00
Arjen Hiemstra
975106b90e Also update description and adhesion info when they change
Contributes to CURA-342
2016-07-07 17:31:12 +02:00
Arjen Hiemstra
571523e0ef Ensure an XML material always has a description and adhesion_info metadata entry
Contributes to CURA-342
2016-07-07 17:30:39 +02:00
fieldOfView
66dd4a7a50 Add exception logging
CURA-1385
2016-07-07 17:08:03 +02:00
Jaime van Kessel
bea9f7590c Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 17:02:59 +02:00
Jaime van Kessel
0477955974 Sidebar stuff is now properly done in a loader (and in seperate files)
CURA-1036
2016-07-07 17:02:29 +02:00
Jack Ha
6374eee7b4 Fix LayerView cursor issue.
CURA-1381
2016-07-07 16:55:56 +02:00
Jack Ha
3e869048fd Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:23:53 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small.
CURA-1671
2016-07-07 16:23:27 +02:00
Jaime van Kessel
c38797b4fe Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:15:12 +02:00
Jaime van Kessel
a76f6375c7 Added way to stop the heating of bed / hotend in checkup
CURA-1385
2016-07-07 15:56:14 +02:00
Ghostkeeper
9d1ea28b49
Remove old commented-out code
The function it calls no longer exists. The protobuf message it listens to was renamed and the renamed message is properly listened to in the line above.

Contributes to issue CURA-1687.
2016-07-07 15:51:25 +02:00
Jaime van Kessel
67938b5739 Merge branch 'feature_versionupgrade' of github.com:Ultimaker/Cura 2016-07-07 15:42:08 +02:00
Ghostkeeper
8f5e56c66e
Make documentation specify filename without extension
Contributes to issue CURA-844.
2016-07-07 15:22:27 +02:00
Tim Kuipers
7fc37e7a74 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 15:18:57 +02:00
Tim Kuipers
101b22528b JSOn feat: nozzle startup prime location (CURA-1816) 2016-07-07 15:15:22 +02:00
Ghostkeeper
e6efba3868
Make version upgrade also translate file names
This was required since Cura 2.1 produced files with the same filename (bar extension). This then resulted in two containers with the same ID. If you had bad luck, an instance container was chosen as global container (depending on which was first in the unordered dictionary). This gives the current settings the postfix _current_settings, fixing that issue.

Contributes to issue CURA-844.
2016-07-07 15:13:58 +02:00
Ghostkeeper
1b0974ba9f Rename translation dicts to plural form
This is more in line with the rest of the code.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
19b4ec655e Move some things to metadata section
Why there is a difference between 'general' and 'metadata', only His Noodleness knows. Also put in a default for the type. It should apparently be 'quality' unless it is a user profile.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
8f34186a9b Rename settings section to values
It should be called 'values' in the new version.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
b841738b76 Translate variants in profile
Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
c50619e363 Add additional settings transformations since 2.1
These should be all the settings that were changed since Cura 2.1.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
93041191c2 Move translateVariant to VersionUpgrade21to22
Also make it a dictionary look-up, like the rest, instead of a series of if-statements.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
439629d0b5 Translate variants and machine names
I'm not quite pleased with the variant translation being inside this function, so I'll move it to VersionUpgrade21to22 soon I think.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
f13db7de10 Make translatePrinter use dict
A translation dictionary makes it much easier to edit the translations. Also this now just translates one printer, instead of a list.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
b5efb2eee8 Make profile translation use new translateSettingName
Forgot about this one.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
88b36ad3d7 Make translateSettingName use dictionary look-up
This solution is a bit neater in code. It makes the function perform a single purpose, since it no longer translates a list of setting names but just one. Also it now neatly puts the translations in a separate, easy-to-modify dict. Only disadvantage is when simple key look-up is not sufficient, such as when renaming lots of settings at once, where substring matching would make the code a bit shorter. But we shouldn't do such a rename anyway.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
f07598a228 Translate profile names too
Not all profile name translations are entered yet, I think. I just did the material ones.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
7939a03114 Fix translating current_settings
It is not entirely accurate in the translated version, since the new current_settings is not machine-dependent any more. However, without information on the original file name, this is as good as it gets, since that instance profile there only mentions the machine it is dependent on in the file name.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
86544d4172 Fix translate function
It was expected to return a list of translated names, even though it actually translates in-place.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
39212a601e Fix import
Didn't see this due to the sea of errors that it gives.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
a87e756a42 Translate machine names
Some names might be changed. I know of at least one: ultimaker2plus -> ultimaker2_plus.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
7f5b656c68 Update translation of metadata
A few fields are different now.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
002f43598b Correct storing upgraded config location
Two big things had to happen for this: The resource types of quality and machine stack have to be defined before the initialisation of the version upgrade manager, since the version upgrade manager needs to know those storage locations at initialisation. But the storage location is still prefaced with '.config/UM' at this point, so instead we pass on the resource type (but the resource type still has to be defined before the init).

The other big change is that we now have to name the configuration type 'quality' and 'machine_stack' instead of 'instance_container' and 'container_stack' to coincide with the resource type. This allows us to be more consistent in later plug-ins when we also have to upgrade other instance container types.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Ghostkeeper
28cc1e8cf7 Translate material, variant and profile along
They might not exist any more because the relation of profiles to printers changed from 2.1 to 2.2 for some machines (notably the UM2+ variants). But then it'll just make it empty when loading.

Contributes to issue CURA-844.
2016-07-07 13:46:40 +02:00
Ghostkeeper
fbffff4c8d Write list creation as literal
Contributes to issue CURA-844.
2016-07-07 13:46:40 +02:00
Ghostkeeper
2de811accf Update how machine instances are translated to stacks
Lots of things have changed in how this works. Sadly, I can't translate things like the material, from PLA to ultimaker2_plus_0.4mm_pla. Not without implementing the entire container registry in the plug-in anyway.

Contributes to issue CURA-844.
2016-07-07 13:46:40 +02:00
Ghostkeeper
d1188899a7 Translate active machine setting
It was in machines/active_instance. Now it's in cura/active_machine. The setting value remains the same.

Contributes to issue CURA-844.
2016-07-07 13:46:40 +02:00