Commit graph

4748 commits

Author SHA1 Message Date
Jaime van Kessel
2b54d75453 Merge branch 'mb-more-z-seam-options' of https://github.com/smartavionics/Cura 2017-09-01 13:22:13 +02:00
Jaime van Kessel
9ec7ef8dba Made print spec invisible when monitoring print 2017-09-01 13:07:00 +02:00
Jaime van Kessel
a6e90270cf Updated margins so low resolution screens can actually have some settings visible 2017-09-01 12:05:20 +02:00
Lipu Fei
ceccca8244 Reduce the width of the license window
CURA-4222
2017-09-01 10:18:27 +02:00
Mark Burton
125dc75a0f Now blurb for relative_extrusion says absolute extrusion mode will be set before any gcode script is output. 2017-09-01 07:54:56 +01:00
Lipu Fei
aad628a46f Change to new design for extruder number settings
CURA-4211
2017-08-31 17:49:24 +02:00
Lipu Fei
c2645d0022 Change extruder tabs to buttons
CURA-4211

Change extruder tabs to buttons according to the new design.
2017-08-31 17:49:23 +02:00
Lipu Fei
b75140973e Change extruder tab to use new button style
CURA-4211

- Use new button style ("Extruder" text with an extruder icon) for
  extruder tabs
- The "Extruder" text will disapear if the width is not enough
2017-08-31 17:49:23 +02:00
Lipu Fei
7de9ccefaa Change extruder button on the toolbar side
CURA-4211

Change the extruder button on the toolbar side according to the new
design.
2017-08-31 17:49:23 +02:00
Lipu Fei
b174d04a9b Add SVG image for extruder button
CURA-4211
2017-08-31 17:49:22 +02:00
Ghostkeeper
31af4b7dde
Remove unused icon
Contributes to issue CURA-4213.
2017-08-31 17:34:23 +02:00
Ghostkeeper
28d18d88e5
Make top bar buttons smaller
Contributes to issue CURA-4213.
2017-08-31 17:30:44 +02:00
Ghostkeeper
d13b693da0
Hide icons if top bar buttons have no icon
Otherwise there's some empty space there and the RecolourImage will colour that space white.

Contributes to issue CURA-4213.
2017-08-31 17:24:12 +02:00
Ghostkeeper
bec786b140
Move printer status icon outside of the monitor button
It's positioned on the right side now above the side bar.

Contributes to issue CURA-4213.
2017-08-31 17:13:56 +02:00
Ghostkeeper
c6d614156f
Move the Cura logo into the top bar
Looks ugly there, I think, but the colours will be changed eventually so we'll see.

Contributes to issue CURA-4213.
2017-08-31 16:09:16 +02:00
Ghostkeeper
062957c249
Hide the header if it would be empty
It would be empty if the machine is single extrusion and has no materials or variants.

Contributes to issue CURA-4241.
2017-08-31 15:51:51 +02:00
Ghostkeeper
0fc40d571a
Only make separator visible if the element above and below it are visible
The behaviour should be the same, if it was implemented correctly previously.

Contributes to issue CURA-4241.
2017-08-31 15:47:29 +02:00
alekseisasin
e38ec9d5e8 Renamed "Hotend" to "Extruder"
CURA-4256
2017-08-31 14:19:01 +02:00
alekseisasin
7c637029b6 Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature
Show target hotend temperatures
2017-08-31 13:46:55 +02:00
alekseisasin
37eb74e99e Fixed quality file names
CURA-4128
2017-08-31 13:16:08 +02:00
alekseisasin
d23e9cafe4 Merge pull request #2162 from FABtotum/master
FABtotum Personal Fabricator
2017-08-31 12:56:24 +02:00
Mark Burton
58e2d07cbd Add comment that absolute extrusion mode will always be set before start and end gcode. 2017-08-31 10:55:52 +01:00
Ghostkeeper
18a07b6eee
Change support Z offset to 2*layer_height
The materials team found this to work better.
2017-08-31 11:49:24 +02:00
Ghostkeeper
582a17c6af
Sort all UM2+ profiles
This will make it easier to modify these profiles in the future.
2017-08-31 11:48:41 +02:00
Ghostkeeper
ed7e204cc0
Fix colour of time estimates text
I'd like it to be the same colour as the text underneath it, so subtext it is.

Contributes to issue CURA-4148.
2017-08-31 10:21:28 +02:00
Ghostkeeper
c4910503e4
Correct height of tips text
The contentHeight property seems to indicate the height of only one line, contrary to the documentation...

Contributes to issue CURA-4148.
2017-08-31 10:18:54 +02:00
Ghostkeeper
526a42f7a0
Put sidebar contents inside a scroll view
That means that you can't depend on the parent height and such any more. Luckily I already changed that in the previous commit.

Contributes to issue CURA-4148.
2017-08-31 09:51:19 +02:00
Ghostkeeper
95ba4b9368
Link anchors differently
Once this is in a scroll view, the width of the parent box isn't fixed any more. We'd have a lot of binding loops. So now this linking is not dependent on the parent width any more but rather on the theme sizes.

Contributes to issue CURA-4148.
2017-08-31 09:35:27 +02:00
Mark Burton
0efa2ac168 Tweak z_seam_corner option strings and the descriptive blurb. 2017-08-30 20:14:35 +01:00
Mark Burton
092bc2f916 Revert "Tweak z_seam_corner option strings and the descriptive blurb."
This reverts commit 27967a1531.
2017-08-30 19:20:49 +01:00
Mark Burton
27967a1531 Tweak z_seam_corner option strings and the descriptive blurb. 2017-08-30 19:19:16 +01:00
krios-fabteam
b4ae52b4c3 added 2 more variants
improved quality profiles
2017-08-30 17:17:39 +02:00
Ghostkeeper
5b36869b32
Update background colour of status icons
This outline needs to be the same colour as the background of the top bar.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
99cae1469e
Copy status icons to dark theme
We want the dark theme to use these icons, but we want to update these icons for the light theme so I'm back-upping the icons for the dark theme.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
a60cf07844
Use black logo for light theme
It's black on white instead of white on black.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
c0f7d6aa19
Copy Cura logo from Light theme
We're going to keep this dark theme with the white Cura logo but modify the Light themed one to have a black logo.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
d4e5e10825
Restore vertical margins
We weren't allowed to change that yet.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
f301464987
Update missing colours
And colours that have to change because the behaviour was changed (such as opacities now being themeable.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
e619c11e01
New base theme: Cura-light
There is a new theme now, Cura Light, based on the original colours of Cura 15.6 through 2.7. It is now also the base of the themes. It will soon be made the temporary default until the UX team can come up with something better for the dark theme.

Contributes to issue CURA-4148.
2017-08-30 16:08:42 +02:00
Jaime van Kessel
8830fa7e10 Merge branch '2.7' of github.com:Ultimaker/Cura 2017-08-30 15:12:56 +02:00
Ghostkeeper
6f77cfc763
Always show plain monitor icon, never with_status
The status icons are just overlaid on top of the monitor icon.
No need for any specialised icon with a background or anything.

Contributes to issue CURA-4148.
2017-08-30 15:02:43 +02:00
Lipu Fei
e8e8081215 Add quality_definition for UM2ex and UM2go
CURA-4139

UM2ex and UM2go should share the same set of quality profiles as UM2.
2017-08-30 14:58:07 +02:00
Lipu Fei
f426a0aa62 Add quality files for UM2
CURA-4139

Add dedicated quality files for UM2 so they won't get profiles with
layer height higher than 0.25mm
2017-08-30 14:56:38 +02:00
Ghostkeeper
2c7c29dc71
Merge branch 'master' into quarter_cubic_infill 2017-08-30 11:03:04 +02:00
alekseisasin
ac6f50e686 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-29 18:24:47 +02:00
alekseisasin
472b9fc779 Setting was not visible because was applied wrong settings scope
CURA-4192
2017-08-29 18:23:35 +02:00
Ghostkeeper
f5e0db5e2a
Add missing period
Spotted a small mistake in the translations by accident.
2017-08-29 17:23:17 +02:00
Ghostkeeper
f7def41df8
Enable prime tower for CPE+ 0.8 Fast Print
The prime tower is enabled for the other two quality profiles but not for this one, so we're making this consistent (with confirmation from the Materials team).
2017-08-29 15:27:10 +02:00
krios-fabteam
be4fa98638 removed quality duplicates 2017-08-29 11:34:21 +02:00
fieldOfView
4d0c77683c Show target hotend temperature(s) 2017-08-29 11:02:37 +02:00