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

181 Commits

Author SHA1 Message Date
Lipu Fei
29c883d489 Fix option_extruder case for per object settings panel 
CURA-3814
 2017-05-24 09:36:07 +02:00
fieldOfView
93c5b382ba Fix selecting settings for Per Model Settings with single extrusion printers 2017-05-10 17:37:35 +02:00
Jaime van Kessel
7632b9df79 Removed unused connection 2017-05-09 10:27:50 +02:00
Arjen Hiemstra
0fad973181 Never enable the per-object tool when in simple mode 
Contributes to CURA-3577
 2017-04-25 16:12:36 +02:00
Arjen Hiemstra
7822173881 Remove extruder selection from per-object settings tool 
Contributes to CURA-3577
 2017-04-25 16:12:03 +02:00
Mark Burton
0237a5a386 Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles 
# Conflicts:
#	cura/CuraApplication.py
 2017-02-15 08:20:45 +00:00
Mark Burton
db3cf0c0fb Add the [int] setting type for settings that are a list of integers. 
The RegExpValidator (more of a restrictor than a validator) requires the
text to start with a '[' and then have a sequence of integers separated by
commas. A trailing ']' is accepted.
 2017-01-27 15:54:19 +00:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
fieldOfView
cbf553aad1 Fix scale of Add Machine and Select (Per Object) Settings dialogs... 
... on fairly high, but non-"retina" screens.

I have a new laptop with a 13" 1080p display, which I use at its native resolution. This works fine for most dialogs, except the mentioned two which are shown comically large.
 2016-12-23 12:55:16 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. 
CURA-2917
 2016-12-12 16:05:35 +01:00
Simon Edwards
882f4c1aef Make the other parts of the Cura UI which have a filter, also search on i18n labels. 
CURA-2653 Searching in English while other language set
 2016-12-08 16:55:22 +01:00
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking). 
CURA-2917
 2016-11-21 21:36:08 +01:00
Tim Kuipers
e51f9ba678 fix: exclude command line settings from being viewed in the frontend (CURA-566) 2016-11-07 11:54:47 +01:00
Jaime van Kessel
e67f5bdd44 PerObject tool is now disabled when group or multiple objects are selected 
CURA-2287
 2016-11-03 15:33:18 +01:00
Jack Ha
3f6877d2ec Keep per object extruder when switching machines. CURA-2533 2016-10-12 13:58:09 +02:00
Ghostkeeper
6f412c0825
Improve translation context for some labels 
These translations went sort of wrong in the Turkish translation, because the context was unclear. I've tried to clarify it better.

Contributes to issue CURA-570.
 2016-10-05 11:39:29 +02:00
fieldOfView
c3d8b6fb8c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-22 16:52:41 +02:00
fieldOfView
e9d44a07cc Fix up layout of Per Model Settings panel 2016-09-22 16:52:29 +02:00
Ghostkeeper
15792b8f09
Code style: Spaces around binary operators 
Also the equal-sign in key-word arguments, though that goes against PEP8, but that's in our code style documentation.

Contributes to issue CURA-2319.
 2016-09-22 15:33:17 +02:00
Jaime van Kessel
b7351a56e4 Added forcefull property changed if perobjectsettings extruder was changed 
CURA-2319
 2016-09-21 15:07:37 +02:00
Jaime van Kessel
c13003c960 Switching between stacks now ensures that right value is used for perobject 
CURA-2319
 2016-09-21 14:15:48 +02:00
Jaime van Kessel
ddc4c73f8b Updated documentation for perobject visiblity 
CURA-2319
 2016-09-21 13:56:02 +02:00
Jaime van Kessel
6b613fd86b If the stack number is 0 it's now correctly used by perobject settings 
CURA-2319
 2016-09-21 13:37:41 +02:00
Jaime van Kessel
cf06a918a8 Per object tool now also triggers recenter 
CURA-2401
 2016-09-20 13:12:27 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
fieldOfView
4de78db87a Revert "Remove "infill mesh" as a standard visible setting" 
This reverts commit 46942d7cf23e32dcdf5dbf00440aa781061f4f65.

It was not my decision to make
 2016-09-08 14:04:58 +02:00
fieldOfView
dc282dc263 Fix Per Model Settings crash when switching to multiextrusion printer 
CURA-2228
 2016-09-07 16:51:03 +02:00
Jaime van Kessel
1bafac94bd Value functions are now correcty copied when using per-object settings 
CURA-2224
 2016-09-07 09:55:22 +02:00
fieldOfView
a8d8a8a7ed CodeStyle 2016-08-30 14:09:16 +02:00
fieldOfView
4593e8615e Fix hiding extruder selection when switching to a signle extrusion printer 
CURA-2207
 2016-08-30 14:08:29 +02:00
Jaime van Kessel
fc5900c05a Width of the scrollview is now a bit wider, so minus signs don't fall off 
CURA-2131
 2016-08-22 16:30:56 +02:00
Jaime van Kessel
ea324eadc0 Added scroll bar to per object panel 
If there are too many per object settings a scrollbar is now displayed

CURA-2131
 2016-08-22 15:14:10 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology 
Update UI texts to be compliant to Ultimaker dictionary
 2016-08-15 11:35:19 +02:00
fieldOfView
5c63e5e13f Fix a typo in a comment 
CURA-2113
 2016-08-11 17:18:43 +02:00
fieldOfView
db028b7e5f Update "Select Settings dialog" when the user removes a setting 
CURA-2102
 2016-08-11 15:10:30 +02:00
Jaime van Kessel
91dfd971ca PerObject settings don't automatically get a user changed state 
CURA-2113
 2016-08-11 14:57:21 +02:00
fieldOfView
7aab8ad397 Change "object" to "model" 
UXD-83
 2016-08-10 17:55:51 +02:00
fieldOfView
b6bf02e0a0 Update swatch colors when changing materials 
CURA-1971
 2016-08-10 14:37:59 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
fieldOfView
2c61fe3249 Tweak layout of Per Object Settings 
CURA-1799
 2016-08-08 15:41:20 +02:00
fieldOfView
ca2daae6ab Add a "show all" toggle to the select per object setting window 
This way the user can add a setting that is not made visible in the sidebar. Adding a specific setting no longer needs a detour through the setting visibility preference page.

CURA-1799
 2016-08-08 15:11:38 +02:00
fieldOfView
36abe075cf Restyle categories in add per object settings visibility dialog 
... to match the Setting Visibility preference page
CURA-1799
 2016-08-08 14:24:38 +02:00
fieldOfView
7020fd6903 Allow adding multiple per object settings at once 
This reuses the "GUI pattern" of the main setting visibility page.
CURA-1799
 2016-08-08 14:23:39 +02:00
Ghostkeeper
021a33d6bd
Always set value of added setting instance 
The value property was sometimes not set. In the default case, this just added an empty setting instance (for a particular key), which appeared to do nothing until you've changed it. This appears correct because if it's not changed then it should be the same as the extruder's value, but if you then change the extruder's value it doesn't update its visible value but still has no value in the setting instance, so the value still falls back to the extruder and the setting ends up different from what is being displayed.

Contributes to issue CURA-1988.
 2016-08-05 17:30:22 +02:00
Ghostkeeper
51d972941e
Handle rounding errors in stack_nr 
Wouldn't want it to index extruder '1.0'.

Contributes to issue CURA-2067.
 2016-08-05 12:05:01 +02:00
Ghostkeeper
92b154f5fe
More defensive check for global_inherits_stack extruder 
This should never give the keyerror any more and always default back to non-global_inherits_stack mode.

Contributes to issue CURA-2067.
 2016-08-05 11:59:32 +02:00
Ghostkeeper
de7f32da19
Convert global_inherits_stack to int before slicing 
Sometimes it was accidentally converted to a float when it passes through Javascript.

Contributes to issue CURA-2055.
 2016-08-04 13:25:51 +02:00
Ghostkeeper
ee95e90b4b
Fix display update bug in per-object panel 
Setting .value creates a new Python attribute in the object. Setting with setProperty creates the setting property, like we wanted.

Contributes to issue CURA-2011.
 2016-08-04 12:36:33 +02:00