GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-05 09:36:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,525 Commits 295 Branches 268 Tags
Commit Graph

1189 Commits

Author SHA1 Message Date
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
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
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
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
Jaime van Kessel
f3384b043d Only variants of active machine are now shown 
CURA-1278
 2016-05-13 11:26:08 +02:00
Jaime van Kessel
b3e741e90c Added variant selection 
CURA-1278
 2016-05-13 10:16:58 +02:00
Jaime van Kessel
f5e63f2e71 Changing the material is now possible 
CURA-1278
 2016-05-12 17:38:43 +02:00
Jaime van Kessel
89c0644e4b Added activeMaterial property 
CURA-1278
 2016-05-12 17:01:47 +02:00
Jaime van Kessel
44f5559db3 Moved addMachine to machineManager 
CURA-1278
 2016-05-12 15:18:13 +02:00
Jaime van Kessel
65022c3d18 Fixed adding machine in printer dialog 
CURA-1278
 2016-05-12 11:53:01 +02:00
Jaime van Kessel
78e9545ece Machines can now be removed 
CURA-1278
 2016-05-12 11:46:28 +02:00
Jaime van Kessel
d8e4aa9078 Moved machinePage to Cura 
CURA-1278
 2016-05-12 11:24:09 +02:00
Jaime van Kessel
133229d086 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-12 09:31:43 +02:00
Jaime van Kessel
ac9b391e7f Fixed available printers in dropdown menu 
CURA-1278
 2016-05-11 17:20:09 +02:00
Arjen Hiemstra
3514d4839d Fix combo box setting item so it displays the right things 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
d1d2dc04c5 Display the correct tooltips for reset and inherits buttons 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
d4b5cd519b Fix SettingCheckbox so it displays correctly 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
2b479e5651 Add a hovered property to SettingItem 2016-05-11 17:19:31 +02:00