1277 Commits

Author SHA1 Message Date
fieldOfView
3e369c2494 Hide profiles selection (variant/material/quality) when hiding settings 2017-01-11 18:31:33 +01:00
awhiemstra
47be957f38 Merge pull request #1267 from alephobjects/GCODEReader_upstream
Add a Gcode reader plugin
2017-01-11 17:15:52 +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
Ghostkeeper
6f7de84af0
Merge branch '2.4' 2017-01-07 19:20:22 +01:00
Ruslan Popov
0c4b2c404b Add Russian language into select control on General Page. 2017-01-06 23:51:28 +03:00
Jaime van Kessel
4d0a0e5ad1 Added support mesh and anti overhang mesh to exclude list in settingview
CURA-3177
2017-01-06 13:21:47 +01:00
Youness Alaoui
f095e9050f T466: Hide the search icon from printer setup
When in custom mode in the printer setup pane and a gcode file gets loaded
the search icon needs to disappear as well.
Reported by @GhostKeeper, and fix provided by @victor9999
2017-01-05 13:14:33 -05: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
Jack Ha
93137fcc91 Added compatibility mode - old layer view is now also available 2017-01-02 12:56:18 +01:00
Victor Larchenko
90f7cebbbb D6: Fixed gcode loading to scene while undo/redo 2016-12-23 15:53:17 -05:00
Victor Larchenko
3605403314 D6: Moved file loading code 2016-12-23 15:53:16 -05:00
Victor Larchenko
26fe0ddbb5 D6: Refactoring 2016-12-23 15:53:16 -05:00
Victor Larchenko
c18b3149da D5: Moved loading files code 2016-12-23 15:53:16 -05:00
Victor Larchenko
1631045d7a D5: Refactoring 2016-12-23 15:53:16 -05:00
Victor Larchenko
b4a7173a61 T466: Only one gcode file can be loaded at a time, and deleting previous gcode file when loading non-gcode file
Merge changes : Only call backgroundItem.hasMesh if/on an imported model (skips if only curaprofiles get loaded)
2016-12-23 15:53:15 -05:00
Victor Larchenko
1f84ad7084 T466: Added explanation text on settings panel 2016-12-23 15:53:15 -05:00
Victor Larchenko
84add5be84 T466: Added disabling of view button 2016-12-23 15:53:15 -05:00
Victor Larchenko
8987aa2048 T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
Victor Larchenko
64d7bb0c2a T466: Added ability to print loaded gcode 2016-12-23 15:53:14 -05:00
Victor Larchenko
2ee5e2cb0b T466: Added hiding of properties menu 2016-12-23 15:53:13 -05:00
Victor Larchenko
65f3495a29 T466: Added pausing of backend work 2016-12-23 15:53:12 -05: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
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
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
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
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
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
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
Ghostkeeper
0ca157518e
Update current item when importing new material
Since we select the newly imported material, we need to update the current item so that the window on the right also gets updated.

Contributes to issue CURA-3138.
2016-12-16 11:12:33 +01:00
Ghostkeeper
4fdaf734fc
Make translation hint a bit more clear for translators
The old message didn't really say anything useful.

Contributes to issue CURA-3138.
2016-12-16 10:58:13 +01:00
Jaime van Kessel
6baff7bbb2 Fixed create profile from settings not working 2016-12-15 17:18:08 +01:00
Jack Ha
2cf181080a Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-14 16:53:22 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00