Ghostkeeper
9b235aebf2
Add clock icon to pre-heat countdown
...
It's aligned left of the pre-heat countdown and only visible if the countdown is visible.
Contributes to issue CURA-3161.
2017-02-07 16:38:28 +01:00
Ghostkeeper
8e25a1c73f
Also use central pre-heat time when sending time to printer
...
Oops.
Contributes to issue CURA-3161.
2017-02-07 16:32:36 +01:00
Ghostkeeper
1a902b21bb
Store default pre-heat time in central location
...
Its default is 900s or 15 minutes. QML now requests the time-out time and sends it on to the printer.
Contributes to issue CURA-3161.
2017-02-07 16:29:41 +01:00
Ghostkeeper
d705fb1d76
Document why we set endTime to the current date initially
...
Contributes to issue CURA-3161.
2017-02-07 16:24:28 +01:00
Ghostkeeper
d3d36d47eb
Add countdown timer for pre-heat time
...
Not happy with how there is '900' in multiple places in the code. I might do something about that later.
Contributes to issue CURA-3161.
2017-02-07 16:22:47 +01:00
Ghostkeeper
559b40867e
Call pre-heat if pre-heat button is pressed
...
Contributes to issue CURA-3161.
2017-02-07 13:29:57 +01:00
Ghostkeeper
f24d778cc5
Disable pre-heat button when not connected
...
This covers the case when there is no printer added as well as the case where a printer is added but not connected.
Contributes to issue CURA-3161.
2017-02-07 12:51:02 +01:00
Jack Ha
1d77864915
Added force layer view compatibility mode. CURA-3273
2017-02-07 09:36:21 +01:00
Ghostkeeper
b1448887ba
Add button to pre-heat build plate
...
This is the one. The actual commit that implements the issue. It doesn't do anything yet, this button, but it's how it should look.
Contributes to issue CURA-3161.
2017-02-06 16:45:52 +01:00
Ghostkeeper
b1a8b28e87
Bind default pre-heat temperature to current build plate temperature
...
Currently the setting 'resets' when you go out of the print monitor mode. That wasn't the original intention but it works kind of nicely. We'll bring it up in a meeting whether this needs to be changed.
Contributes to issue CURA-3161.
2017-02-06 15:44:40 +01:00
Ghostkeeper
78fed0531d
Fix hovering the setting box
...
The 'hovered' property was taken from the example of the setting item, but that doesn't exist apparently. I looked up how it is normally done in QML.
Contributes to issue CURA-3161.
2017-02-06 15:17:59 +01:00
Ghostkeeper
27ff55d75b
Add binding to current maximum bed temperature
...
Instead of the MAXTEMP placeholder.
Contributes to issue CURA-3161.
2017-02-06 15:09:18 +01:00
Ghostkeeper
3fb625109e
Add text field for target pre-heat temperature
...
I'm sure it's quite buggy on all sides though.
Contributes to issue CURA-3161.
2017-02-03 17:04:31 +01:00
Ghostkeeper
abb9b8d7f0
Add box for build plate monitoring
...
This one's a bit bigger. It is supposed to contain the pre-heat button.
Contributes to issue CURA-3161.
2017-02-03 15:52:14 +01:00
Ghostkeeper
03e16b5398
Fix material colour when no printer is selected
...
It's invisible anyway, but the hex colour gives no errors at least.
Contributes to issue CURA-3161.
2017-02-03 15:49:18 +01:00
Ghostkeeper
1305dd88d7
Remove old extruder monitoring code
...
It has been replaced by these fancy new boxes.
Contributes to issue CURA-3161.
2017-02-03 15:20:24 +01:00
Ghostkeeper
a6c244f969
Use setting separator margin between material colour and name
...
It's a bit smaller. Looks like it belongs together now.
Contributes to issue CURA-3161.
2017-02-03 15:06:21 +01:00
Ghostkeeper
41c94fd247
Add variant names to extruder boxes
...
In the bottom-right corner.
Contributes to issue CURA-3161.
2017-02-03 15:03:24 +01:00
Ghostkeeper
ee3e0ba6ab
Add material indication to extruder boxes
...
Only if a material is known of course. But the case where it is unknown is not tested.
Contributes to issue CURA-3161.
2017-02-03 14:52:09 +01:00
Ghostkeeper
687cdcc30e
Add grey border between extruder boxes
...
This is done by fitting tightly a rectangle around the grid of boxes. The boxes themselves have a white background but there is spacing between the boxes, which results in the little border.
Contributes to issue CURA-3161.
2017-02-03 13:54:37 +01:00
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
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
