Commit graph

1428 commits

Author SHA1 Message Date
Ghostkeeper
45382dc088 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
0298e3adca Use default value instead of value
Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
9aaa81be50 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
dc82a90047 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
caa108c3cf Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:45:13 +02:00
Ghostkeeper
d29e366945 Fix BQ Hephestos 2 definition
The settings were in the wrong category. They were defined by value instead of default value, and the metadata was in there double.

Contributes to issue CURA-1278.
2016-05-17 17:44:32 +02:00
Ghostkeeper
232e4fbe0d Put settings in overrides JSON category
Not in a subcategory of settings or anything.

Contributes to issue CURA-1278.
2016-05-17 17:43:28 +02:00
Ghostkeeper
ad1b08c080 Put settings in overrides JSON category
Not in a subcategory of settings or anything.

Contributes to issue CURA-1278.
2016-05-17 17:41:53 +02:00
Ghostkeeper
6c74350c6e Merge
Contributes to issue CURA-1278.
2016-05-17 17:40:56 +02:00
Ghostkeeper
2cf025c91a Translate definition for M180
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
8606961c3f Fix name of author
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
8cf05fd2fc Remove old machine definitions
These have already been translated. I should've added these to their respective commits, I guess.

Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
fea09482b5 Translate definition for Innovo INVENTOR
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
f0e99122c7 Add definition for German RepRap Neo
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
20c7ce404d Add definition for BQ Witbox 2
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Jaime van Kessel
a2862d8c24 Moved offset to meta-data
CURA-1278
2016-05-17 16:49:59 +02:00
Jaime van Kessel
5c1210dddf Removed settings subobject in overrides
CURA-1278
2016-05-17 16:39:10 +02:00
Jaime van Kessel
f66f0658d9 Fixed mistakes in the definitions
CURA-1278
2016-05-17 15:45:21 +02:00
Ghostkeeper
1c01eef409 Add definition for BQ Witbox
Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
a16ff27ed6 Fix definition 'default' -> 'value'
Forgot that. Sorry.

Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
6449062332 Add definition for BQ Prusa i3 Hephestos XL
Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
53c6ce11e7 Correct version number
I should've changed this when converting the definition.

Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
0b2b9bd332 Add definition for BQ Hephestos 2
Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
b62e382cf2 Add platform for BQ Prusa i3 Hephestos
Forgot this one when converting it.

Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
0e5dcca81d Add definition for BQ Prusa i3 Hephestos
Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Jaime van Kessel
6d25d21126 getting id of definition when none was found no longer causes exception
CURA-1278
2016-05-17 12:55:40 +02:00
Ghostkeeper
f24b56dc85 Move author and file formats to metadata
The name can't be moved since it is not optional.

Contributes to issue CURA-1278.
2016-05-17 11:20:17 +02:00
Jaime van Kessel
12fd002e67 Active quality is now displayed (and changable) again
CURA-1278
2016-05-17 10:50:01 +02:00
Jaime van Kessel
56422a2725 Merge pull request #744 from thopiekar/patch-3
BQ Hephestos2: Removing machine_gcode_flavor
2016-05-17 09:24:33 +02:00
Arjen Hiemstra
3531e4c3e8 Nest all controls inside the mousearea of SettingItem
This makes hover events work properly without all the hassle
2016-05-16 18:22:37 +02:00
Arjen Hiemstra
f5e97c5001 Make SettingComboBox work (mostly) properly
=
2016-05-16 18:22:37 +02:00
Arjen Hiemstra
06432c3b0b Make SettingCheckBox properly handle the value 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
5b31634d3c Make SettingTextField work 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
e4fe1c6e21 Add PropertyProviders to SidebarSimple and use them for property values 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
b1df8e9448 Use MachineManager and PropertyProvider to restore several bits of behavioiur 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
442d2b6e71 Use the right tooltip for SettingCategory 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
adc699c63b Add a SettingPropertyProvider object to the setting items 2016-05-16 18:16:42 +02:00
Thomas Karl Pietrowski
c83a5a30cc BQ Hephestos2: Removing machine_gcode_flavor
This is already default at https://github.com/Ultimaker/Cura/blob/master/resources/machines/fdmprinter.json#L115
2016-05-16 11:13:39 +02:00
Thomas Karl Pietrowski
481b350cfd BQ Hephestos2: Removing override of support_enable
"support_enable" is already set as "enabled": false in fdmprinter.json.
So this line is unneeded here.
2016-05-14 18:42:23 +02:00
fieldOfView
12638f3601 Make machine prefix for jobname optional
CURA-1480
2016-05-13 19:04:32 +02:00
fieldOfView
da872871bd Add back option to turn off automatic update check if the UpdateChecker plugin is available
CURA-1540
2016-05-13 18:35:41 +02:00
fieldOfView
5df7c519c2 Removed option to turn off automatic updated check from GeneralPage.qml
UpdateChecker is not a required plugin, so we cannot rely on there being functionality to automatically check for updates. Note that the preference is still there, so the user can still turn off automatic update checking by editing the cura.cfg file.

CURA-1540
2016-05-13 17:29:49 +02:00
Jaime van Kessel
ad7531eded Added quality instances stubs
CURA_1278
2016-05-13 15:56:41 +02:00
Jaime van Kessel
bfbb48268a Added material stubs
CURA-1278
2016-05-13 15:48:56 +02:00
Tim Kuipers
c832b92e6f JSON fix: made infill/skin overlap disabled for concentric pattern (CURA-967) 2016-05-13 13:37:43 +02:00
Tim Kuipers
3d94d24372 JSON feat: skin overlap (CURA-967) 2016-05-13 13:28:00 +02:00
Tim Kuipers
883d138f67 Merge branch '2.1' 2016-05-13 12:19:19 +02:00
Jaime van Kessel
dd24e488a8 Materials & variants are now correctly checked when active
CURA-1278
2016-05-13 12:04:38 +02:00
Jaime van Kessel
5dbe0bdc03 Machine variants can now be selected from dropdown menu
CURA-1278
2016-05-13 11:46:54 +02:00
Jaime van Kessel
6ffde62bcf Added stubs for hasVariants & hasMaterials
CURA-1278
2016-05-13 11:42:29 +02:00