Ghostkeeper
9546c85967
Add boxes containing information on extruders
...
These are meant to eventually replace the bullet-list of information we currently have.
Contributes to issue CURA-3161.
2017-02-03 13:50:17 +01:00
Ghostkeeper
7b8d41cb8f
Remove old connected printer header
...
It has been replaced by a nicer header.
Contributes to issue CURA-3161.
2017-02-02 14:48:06 +01:00
Ghostkeeper
c7a91f07d2
Add label for printer connection text to header
...
Also fixed the indenting of the previous two labels to use spaces instead of tabs. I knew I was going to forget putting it back to spaces after working on a different project that uses tabs.
The information is duplicated now. I'll remove the old one promptly.
Contributes to issue CURA-3161.
2017-02-02 14:45:44 +01:00
Ghostkeeper
1f0bcc1abd
Add header bar for print monitor
...
It lists the name of the printer it is connected to, and the address on the right side. This won't work for USB printing (it'll give errors there). I'll solve that later.
Contributes to issue CURA-3161.
2017-02-02 14:34:40 +01:00
Victor Larchenko
bc300d1116
T524: Added theme picker
2017-02-02 13:27:58 +06:00
Ghostkeeper
5c2f1a935a
Move monitorLabel into PrintMonitor.qml
...
It's a label that belongs to the print monitor after all. Let the print monitor file decide how it's going to look.
Contributes to issue CURA-3161.
2017-02-01 17:31:36 +01:00
Jack Ha
2f9618f2ad
Merge branch 'master' into layer_view3_cleanup
2017-01-30 11:25:55 +01:00
Mark Burton
31c1684066
Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles
2017-01-27 15:55:43 +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
Ghostkeeper
73516fce89
Merge branch 'fieldOfView-fix_unthemed_rects'
2017-01-26 17:21:21 +01:00
Ghostkeeper
d3029c6c4f
Add Brazillian Portuguese language
...
The translation is almost complete at the moment. In the beta of the next release we'll decide if we want to keep this language.
2017-01-26 17:06:06 +01:00
fieldOfView
e2a9fc0d79
Rename header tab status overlays to make them reusable
...
The "settings" tab could use a status overlay to show setting errors and slicing paused states.
2017-01-26 14:32:47 +01:00
fieldOfView
5939ff9b81
Make header tab button color stylable
...
The monitor tab icon is split up in a base monitor tab icon and a status overlay, each with their own color.
2017-01-26 14:17:07 +01:00
fieldOfView
4a3329bc6c
Remove background from setting buttons (revert, override notice, linked)
...
The background now reverts to "transparent". These icon buttons are outside the setting control, so they should not have the background of the control itself.
2017-01-25 15:26:32 +01:00
fieldOfView
a823980d17
Replace "transparent" Rectangles by Items
2017-01-25 15:21:37 +01:00
fieldOfView
bf3d3d46e2
Fix Rectangles that always show as white regardless of the theme
2017-01-25 15:12:57 +01:00
Mark Burton
d288619ebf
Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles
2017-01-25 11:56:11 +00:00
Jack Ha
3a2438937d
Removed crappy legend
2017-01-25 12:46:07 +01:00
jack
26ad2c8f6e
Merge pull request #1378 from fieldOfView/feature_layerview_legend
...
Layerview Legend
2017-01-25 11:53:41 +01:00
fieldOfView
878ccc679c
Add a legend to Layer View
2017-01-24 23:24:52 +01:00
Jack Ha
e21a6ed62a
Cleanup
2017-01-24 16:52:47 +01:00
Mark Burton
eebd0862cc
Merge branch 'master' into mb-infill-line-angles
2017-01-24 15:02:50 +00:00
Ghostkeeper
a8efde9450
Merge pull request #1243 from fieldOfView/feature_material_cost
...
Implement material cost
2017-01-24 15:54:57 +01:00
Jaime van Kessel
858886d6b7
Merge branch '2.4' of github.com:Ultimaker/Cura
2017-01-23 15:09:48 +01:00
Jaime van Kessel
3d58bd4d49
Workspace & load image dialog can now be resized
...
CURA-3247
2017-01-23 15:08:37 +01:00
Jack Ha
abe7a8e9a3
Merge branch 'master' into layer_view3_cleanup
2017-01-17 15:16:50 +01:00
Mark Burton
03fe03ed65
Modify the constraints of the SettingTextField when the setting type is "str".
...
When the setting type is "str" it now allows the setting contents to be
up to 20 characters long with no constraint on what those characters are.
2017-01-16 16:05:21 +00:00
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
