Commit graph

6533 commits

Author SHA1 Message Date
fieldOfView
6f06e9b320 Update material costs in slice info area when changing material settings
(without reslicing)
2017-01-09 15:24:20 +01:00
fieldOfView
c48f02a7eb Fix horizontal scrolling/flicking of materialview
(probably windows-only)
2017-01-09 14:19:22 +01:00
fieldOfView
4ba8b4e7c8 Update spool length and cost per meter when editing values in materials dialog 2017-01-09 14:08:50 +01:00
fieldOfView
ebbe37a6cd Remove "Edit" button from materials page
The "Edit" button is an unnecessary barrier. Read-only materials are still uneditable.
2017-01-03 11:23:31 +01:00
fieldOfView
6479f2f938 Remove redundant "(Approx.)"
It is made redundant by the ~, and Approx. is an ugly abbreviation anyway
2017-01-03 11:11:57 +01:00
fieldOfView
a83c397d69 Show material cost in Job Specs area...
...if weight/price information is available
2017-01-03 11:05:32 +01:00
fieldOfView
27cf300ba6 Remove lingering debug statement 2017-01-03 11:05:32 +01:00
fieldOfView
ac34fe89ee Make currency preference settable 2017-01-03 11:05:32 +01:00
fieldOfView
4429825d15 Show the calculated values are an approximation 2017-01-03 11:05:31 +01:00
fieldOfView
a06f66305f Calculate spool length and cost per meter 2017-01-03 11:05:31 +01:00
fieldOfView
7516fb6056 Store cost & weight as preference values independent of material definition
Users need to be able to set these values independent of the xml definition, as it is not a material property but something that depends on the reseller etc. It must also be settable for read-only materials.
2017-01-03 11:05:31 +01:00
14bitVoid
8ee6b89a56 Adds a setting to select skin pattern for first layer 2017-01-02 22:54:53 +01:00
Ghostkeeper
6b7bae4dff
Make prime tower flow inherit from material flow
This is a profile enhancement requested by the material team.
2017-01-02 17:05:30 +01:00
Ghostkeeper
341b92860c
Also format g-code in extruder start and end g-code settings
Would be nice, eh?

Contributes to Github issue #1225.
2016-12-29 20:52:08 +01:00
Ghostkeeper
5c4526f280 Merge branch '2.4' 2016-12-29 10:53:01 +01:00
Ghostkeeper
42abc76cd9
Update translation templates
These are the string changes that have been introduced for version 2.4.
2016-12-28 10:54:31 +01:00
Ghostkeeper
ae170830fb
Make minimum fan speeds scale with parent fan speed setting
Otherwise you get cryptic error messages about settings that may be hidden having invalid values, since minimum fan speed may not be higher than maximum fan speed. The value of the setting with the default settings should be the same.

Contributes to Github issue #1268.
2016-12-28 10:22:35 +01:00
Ghostkeeper
84871017b8
Merge branch 'fieldOfView-fix_dialog_scales' 2016-12-27 10:41:46 +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
Tim Kuipers
fda18286e3 JSON fix: prime tower thickness defaulted to zero, rather than defaulting to full prime tower (CURA-3175) 2016-12-21 11:40:12 +01:00
Ghostkeeper
70628bef3b
Merge branch 'fieldOfView-fix_theme_machine_selection' 2016-12-21 09:37:05 +01:00
Ghostkeeper
fb80992788 Merge branch 'fix_theme_machine_selection' of https://github.com/fieldOfView/Cura into fieldOfView-fix_theme_machine_selection 2016-12-21 09:34:19 +01:00
fieldOfView
f9ed6af6d6 Tweak the hovered state of the machine selection to match the rest of the header 2016-12-20 14:35:00 +01:00
Jaime van Kessel
7858e967e7 Minor textual changes for changelog 2016-12-20 09:33:33 +01:00
Jaime van Kessel
7921d05682 Added delta support to changelog 2016-12-20 09:30:45 +01:00
Jaime van Kessel
aa5c169c98 Also added victor9999 in the thanks message of changelog 2016-12-20 09:26:45 +01:00
Jaime van Kessel
1d9ac5dfa4 Merge branch '2.4' of github.com:Ultimaker/Cura 2016-12-19 16:35:45 +01:00
Jaime van Kessel
323e426ce8 Updated changelog for 2.4 2016-12-19 16:35:20 +01:00
Jaime van Kessel
ccaca9d788 Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2016-12-19 13:05:12 +01:00
Jaime van Kessel
c25c4c1d77 Moved conflict boxes to be aligned with "headers"
CURA-1263
2016-12-19 13:04:55 +01:00
Ghostkeeper
5caa1b9b58 Allow floating point values higher than 9.9999
It would allow only one digit before the radix.

Contributes to issue CURA-3157.
2016-12-19 12:25:49 +01:00
Ghostkeeper
45bc603c84
Allow floating point values higher than 9.9999
It would allow only one digit before the radix.

Contributes to issue CURA-3157.
2016-12-19 11:55:58 +01:00
Ghostkeeper
8fadc41ac8
Fix prime tower position limits w.r.t. the origin of its placement
The origin of the prime tower's coordinates are on the front-right side of the prime tower. We should adjust the minimum and maximum values of the position of the prime tower to account for that, rather than having the limits be based on the centre of the prime tower.
2016-12-19 11:33:57 +01:00
Jaime van Kessel
9fe0ccac23 Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2016-12-19 10:21:29 +01:00
Jaime van Kessel
ac216494e4 Default of don't show again checkobx is now true
CURA-1263
2016-12-19 09:52:51 +01:00
Ghostkeeper
958187eb5d
Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-16 17:17:44 +01:00
Ghostkeeper
76c2e87749
Fix more plural forms
Forgot these ones.

Contributes to issue CURA-1263.
2016-12-16 17:17:10 +01:00
Ghostkeeper
5b82098afc
Fix more plural forms
Forgot these ones.

Contributes to issue CURA-1263.
2016-12-16 17:15:32 +01:00
Ghostkeeper
33c79245ac
Fix plural form for number of overrides
Contributes to issue CURA-1263.
2016-12-16 17:08:57 +01:00
Ghostkeeper
263b084714
Remove commented material names repeater
Nallath intended to remove this, he says.

Contributes to issue CURA-1263.
2016-12-16 16:55:03 +01:00
Ghostkeeper
67d2d74f75
Merge branch '2.4' 2016-12-16 16:17:51 +01:00
Ghostkeeper
39c0a367b6
Update documentation of this stack description I found
Not really related, but doesn't hurt.

So... does not contribute to issue CURA-3157.
2016-12-16 16:17:14 +01:00
Ghostkeeper
0e31de3ed9
No longer crash when numeric settings are empty strings
They may temporarily be empty strings while the user is typing, but that currently makes the setting red. However, if we crash during the build plate updating, the front-end gets in some half-updated state in which settings get reset to their previous state every time the user changes anything. So don't crash here.

Contributes to issue CURA-3157.
2016-12-16 16:17:14 +01:00
Ghostkeeper
0c212d01b9
Tighten regex for floats
You're no longer allowed to type multiple radices, for instance.

Contributes to issue CURA-3157.
2016-12-16 16:17:14 +01:00
Jaime van Kessel
c4e061be60 Changed margins on save & load workspace dialog
CURA-1263
2016-12-16 14:38:31 +01:00
Jaime van Kessel
f598a49c4b Order of extruders is now sorted by position
CURA-1263
2016-12-16 13:29:51 +01:00
Jaime van Kessel
ff18a314ef Added extruder information to workspace summary dialog
CURA-1263
2016-12-16 13:16:11 +01:00
Jaime van Kessel
8391a7971b Added machine type to workspace summary dialog
CURA-1263
2016-12-16 12:40:59 +01:00
Jaime van Kessel
0e09de195b Added num user settings to save project dialog 2016-12-16 11:50:50 +01:00
Jaime van Kessel
4431241a51 Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2016-12-16 11:35:51 +01:00