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

574 Commits

Author SHA1 Message Date
fieldOfView
7d2a7bd157 Abbreviate headers 
CURA-1668
 2016-06-09 21:40:07 +02:00
fieldOfView
0d7a7d9299 Update wording to make storing/updating/discarding current settings more clear 
CURA-970
 2016-06-09 19:18:46 +02:00
fieldOfView
d34d398e96 Change the implementation of creating a profile from the current settings 
The newly created profile now combines the settings of the active quality profile and the current settings

CURA-970, CURA-1585
 2016-06-09 18:40:42 +02:00
fieldOfView
c6b1706460 Fix customisedSettings button (profiles dropdown) layout and behavior 
CURA-1685
 2016-06-09 17:49:33 +02:00
fieldOfView
0952dd0327 Removed warnings about undefined properties 
CURA-1278
 2016-06-09 16:01:08 +02:00
fieldOfView
887a5f4f80 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 15:51:40 +02:00
fieldOfView
38c6c3cb01 Minor fixes to SidebarHeader 
CURA-1689
 2016-06-09 15:51:28 +02:00
Arjen Hiemstra
90ddff1c7f Remove obsolete debug statement 
Contributes to 1685
 2016-06-09 15:35:37 +02:00
Arjen Hiemstra
98c9f202a2 Do not produce an error when a setting has been filtered out 
Contributes to CURA-340
 2016-06-09 15:32:41 +02:00
Arjen Hiemstra
abf634c0b0 Filter visible settings based on if they can be set per extruder 
Contributes to CURA-340
 2016-06-09 15:14:32 +02:00
Arjen Hiemstra
3a75e1fb79 Fix setting the active extruder 
Contributes to CURA-340
 2016-06-09 15:12:37 +02:00
Arjen Hiemstra
4a43b50b7a Remove unused action properties from Sidebar 2016-06-09 15:07:57 +02:00
Arjen Hiemstra
88d87e8e85 Cleanup sidebarheader and fix extruder selection 
Contributes to CURA-340
 2016-06-09 14:32:13 +02:00
Arjen Hiemstra
725086b0dd Remove ProfileSetup and move its contents to SidebaarHeader 
Contributes to CURA-340
 2016-06-09 14:32:13 +02:00
Simon Edwards
c03588c6e5 Profile export now goes via the plugin system, and does the same filename checks as before. 
Contributed to CURA-1667 Profile import/export
 2016-06-09 14:14:48 +02:00
fieldOfView
8f4f67d552 Show "Protected profiles" / "Custom profiles" section on profiles page 
CURA-855
 2016-06-09 13:41:33 +02:00
fieldOfView
f498f0237c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 13:16:38 +02:00
fieldOfView
cd803bc36e Determine readonly state from location in filesystem instead of a metadata property 
CURA-1684
 2016-06-09 13:16:23 +02:00
Ghostkeeper
6a520cad47
Change focus upon extruder switch 
This applies a setting that is currently being typed by the user. Otherwise it would take the currently being typed value along to the next tab, since it can't update a setting value while it is in focus.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-09 11:48:37 +02:00
fieldOfView
5da3665832 Fix duplicating the first item on the Profiles page 
CURA-1585
 2016-06-09 11:22:33 +02:00
Jaime van Kessel
e4e307cd2a Inheritance button now works if instance containers contain functions 
CURA-1686
 2016-06-09 10:25:01 +02:00
Jaime van Kessel
a070684ade Fixed minor issue for inheritance button 
It didn't always reset to correct value. CURA-1278
 2016-06-09 09:59:06 +02:00
fieldOfView
ecfd7e5993 Move InstanceContainersModel has_settings into metadata to clean up the model 
CURA-1668
 2016-06-09 08:21:18 +02:00
fieldOfView
e702fef44b Add header to profile settings table 2016-06-08 22:07:57 +02:00
fieldOfView
f764ac8362 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 17:51:07 +02:00
fieldOfView
ca308c5b05 Add notice if a profile has no settings, and if the current settings are "empty" 
CURA-1668, CURA-696
 2016-06-08 17:50:54 +02:00
Jaime van Kessel
85d5247deb Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-08 17:47:46 +02:00
Jaime van Kessel
fcd6f0959f Inheritance button now only shows if there is a function in the container stack at some point 
CURA-1278
 2016-06-08 17:47:23 +02:00
fieldOfView
07b51d0ca8 Strike out profile value if it is overridden by the current setting 
CURA-1668
 2016-06-08 17:04:04 +02:00
fieldOfView
2d63ce889f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 16:45:35 +02:00
fieldOfView
da467b9b28 Only shown the current settings column when the currently active quality profile is selected 
CURA-1668
 2016-06-08 16:45:20 +02:00
Ghostkeeper
7dbafa06d1
Make SidebarHeader use ExtrudersModel 
This model is also used by the extruder selection drop-downs, and it's automatically filled already so that was double logic.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 16:36:01 +02:00
fieldOfView
2d998c127b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-08 16:35:23 +02:00
fieldOfView
485ae53660 Show quality profile and user profile settings side-by-side on Profiles manager 
Introduces ContainerSettingsModel, which can combine the settings of instances from multiple containers into one model.

Towards CURA-1668
 2016-06-08 16:35:10 +02:00
Arjen Hiemstra
1131623278 Disable the property editor when the value of the setting is not used 
Contributes to CURA-1278
 2016-06-08 16:34:19 +02:00
Tim Kuipers
21ad4713a7 Merge branch '2.1' 2016-06-08 15:35:45 +02:00
Jaime van Kessel
cf15f9e2a1 Added handling of special case when only user & definition were set 
CURA-1278
 2016-06-08 15:31:28 +02:00
Jaime van Kessel
3881ed8a61 Fixed behaviour of inheritance button 
CURA-1278
 2016-06-08 14:58:05 +02:00
Arjen Hiemstra
2cedc69ed1 Remove all special floating point handling code from SettingTextField 
Since we now always send setting values as string and the conversion
from float
to string already does the rounding, there is no need to also do it
here.

Contributes to CURA-1278
Contributes to CURA-389
 2016-06-08 13:46:30 +02:00
Arjen Hiemstra
b53926b9de Exclude machine_settings from the settings visible in the sidebar 
Contrivbutes to CURA-1645
 2016-06-08 13:29:36 +02:00
Ghostkeeper
af484b03d8
Fix typo in variable name 2016-06-08 11:29:24 +02:00
Jaime van Kessel
761d3f1a27 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-08 11:02:45 +02:00
Jaime van Kessel
77431b01a3 Inherit button now has the same behaviour as 2.1 again 
CURA-1278
 2016-06-08 11:02:04 +02:00
fieldOfView
1a8fe6aa1f Fix customised settings indicator 
CURA-1585
 2016-06-08 10:55:48 +02:00
Simon Edwards
44d9fefd5d Profile export from the Profiles window. 
Contributed to CURA-1667 Profile import/export
 2016-06-07 16:13:12 +02:00
Jaime van Kessel
51ea6779df Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-07 12:53:24 +02:00
Jaime van Kessel
68837a089a Moved some properties to bindings due to bug in qt 5.5.1 
CURA-1494
 2016-06-07 12:50:57 +02:00
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item 
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
fieldOfView
ce388c4b23 Show settings in profile as a sorted list with section headers 
CURA-1585
 2016-06-07 11:18:09 +02:00
fieldOfView
bbc33f5d70 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 11:01:24 +02:00