9924 Commits

Author SHA1 Message Date
Lipu Fei
68a89db863 Move star icon in profile dropdown a little to the left
CURA-4148

The star icon in the profile dropdown box is too much to the right,
which overlaps a little with the dropdown arrow button.
2017-08-28 11:18:26 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons
CURA-4148

Resolve merge conflicts.
2017-08-28 11:13:38 +02:00
fieldOfView
2ac67a7d34 Fix setting the Gantry height setting in Machine Settings 2017-08-27 22:04:46 +02:00
Ghostkeeper
0aa1f04b1d
Correct width of monitor icon
Because the overlay is wider this one needs to be just as wide.

Contributes to issue CURA-4148.
2017-08-25 14:56:39 +02:00
Ghostkeeper
3db799c661
Remove unnecessary crap from monitor icon
All the metadata and empty tags and no-op groups and such.

Contributes to issue CURA-4148.
2017-08-25 14:55:13 +02:00
Ghostkeeper
aa9347d7be
New icon for monitor tab
Fresh from the press.

Contributes to issue CURA-4148.
2017-08-25 14:53:07 +02:00
Ghostkeeper
585c04dfaa
Also show warning icon when the set-up on other extruders is unsupported
So I added a function that checks the support on all extruders and the global stack.

Contributes to issue CURA-4148.
2017-08-25 14:27:45 +02:00
Ghostkeeper
165665247f
Remove unused property valueWarning
It is unused here. There is such a property being used by the profile selection drop-down but that one uses the valueWarning property in SidebarHeader.qml which is exactly the same.

Contributes to issue CURA-4148.
2017-08-25 14:03:54 +02:00
Ghostkeeper
0c7fd82e22
Give icons in the top bar a different size
Because one of the icons now needs to be rectangular. All icons in there have the same style so they all have to be resized.

Contributes to issue CURA-4148.
2017-08-25 13:57:24 +02:00
Ghostkeeper
5be0d664f4
Remove unused colour from tab_settings icon
This icon is recoloured so the colour doesn't matter. When there is no colour, the icon preview shows up better in my browser and my file explorer...

Contributes to issue CURA-4148.
2017-08-25 13:51:40 +02:00
Ghostkeeper
78dbe8c56a
Remove offline icon
We don't show an icon in that case any more.

Contributes to issue CURA-4148.
2017-08-25 13:03:50 +02:00
Ghostkeeper
c25b94ce31
Move status icons to the middle-right side of monitor icon
They are actually moved inside the image, rather than in code. This way the theme can still adjust the icon.

Contributes to issue CURA-4148.
2017-08-25 13:02:51 +02:00
Ghostkeeper
ff4fb0dea0
Merge branch 'patch-4' of https://github.com/probonopd/Cura into probonopd-patch-4 2017-08-25 09:41:59 +02:00
Ghostkeeper
9cea356a18
Replace tabs with spaces
As per our code style standard.
2017-08-25 09:22:47 +02:00
Ghostkeeper
90583bd56d
Replace tabs with spaces
And fix the alignment while we're at it.
2017-08-25 09:22:07 +02:00
Ghostkeeper
4b4f971222
Make 'other' the default category
This should make it a bit easier for others to create a new definition since there is less for them to 'have to know'. Previously they would be required to fill in as category Other, but now they can just leave the category out.
2017-08-25 09:17:55 +02:00
Ghostkeeper
4835ffa403
Don't recolor printer status buttons
Just leave it to the actual icons to provide colour. It may be a bit harder to modify the colours in a different theme then, but now we can have multi-colour icons (as per the new theme requires).

Contributes to issue CURA-4148.
2017-08-24 21:22:13 +02:00
Ghostkeeper
26033e3454
Optimised connected icon
Changed rects with rounded corners into circles. Merged two circles that depicted a circle-with-outline into one circle with an outline. Changed the outline path to a polyline with a stroke.

Contributes to issue CURA-4148.
2017-08-24 17:22:34 +02:00
Ghostkeeper
457472ee61
Fix connected icon
It was rendered wrong by the export of Sketch.

Contributes to issue CURA-4148.
2017-08-24 17:11:59 +02:00
Ghostkeeper
f0c446cb28
Optimise status icons
Removed unnecessary transforms. Changed square rects which had their corner radius set to half their width into actual circles. Merged some glyphs that were a stroke and a background into one glyph with an actual stroke and background. Applied necessary transforms to actual coordinates. Dereferenced xlink symbols that were used only once.

Contributes to issue CURA-4148.
2017-08-24 17:10:20 +02:00
Ghostkeeper
974bf9de4d
New printer status icons
These are the new icons from the UX guys for the printer status.

Contributes to issue CURA-4148.
2017-08-24 16:29:11 +02:00
Ghostkeeper
1f29501836
Remove more useless code
These are all unused.

Contributes to issue CURA-4148.
2017-08-24 16:15:19 +02:00
Ghostkeeper
b7261306ec
Remove useless transformations
They ended up in the same place as the original glyph...

Contributes to issue CURA-4148.
2017-08-24 16:12:25 +02:00
Ghostkeeper
36f9ca0efb
New Cura logo image
This one has white letters but should otherwise be more or less the same.

Contributes to issue CURA-4148.
2017-08-24 16:10:18 +02:00
Ghostkeeper
557173e799
Merge branch '2.7' 2017-08-24 15:33:01 +02:00
Ghostkeeper
a1fdcd0e48
Update prime tower settings for PVA
This reduces the jerk considerably and makes use of the new prime tower purge settings.
2017-08-24 15:32:41 +02:00
Ghostkeeper
4caad8f3b9
Add Creality CR10S4 and S5 definitions
They use the same settings as the normal one but they are larger printers.
2017-08-24 14:53:15 +02:00
Ghostkeeper
c43b7f6f1b
Update Creality CR10 Beta definition
The printer was also renamed to a more specific name. These are updates I'm getting from Michael.
2017-08-24 14:42:39 +02:00
Ghostkeeper
bef1611e98
Merge branch 'kemiq3d-patch-9' 2017-08-24 09:17:25 +02:00
Ghostkeeper
ccf6d12283
Merge branch 'patch-9' of https://github.com/kemiq3d/Cura into kemiq3d-patch-9 2017-08-24 09:17:18 +02:00
Ghostkeeper
5c66beb082
Merge branch 'kemiq3d-patch-8' 2017-08-24 09:15:26 +02:00
Ghostkeeper
548d17390e
Merge branch 'patch-8' of https://github.com/kemiq3d/Cura into kemiq3d-patch-8 2017-08-24 09:15:20 +02:00
Ghostkeeper
df4cd98406
Merge branch 'kemiq3d-patch-7' 2017-08-24 09:14:06 +02:00
Ghostkeeper
6a40264f9a
Merge branch 'patch-7' of https://github.com/kemiq3d/Cura into kemiq3d-patch-7 2017-08-24 09:13:55 +02:00
Ghostkeeper
222c9b66d8
Merge branch 'kemiq3d-patch-6' 2017-08-24 09:12:16 +02:00
Ghostkeeper
a12c569281
Merge branch 'patch-6' of https://github.com/kemiq3d/Cura into kemiq3d-patch-6 2017-08-24 09:12:00 +02:00
Ghostkeeper
523635dfc4
Merge branch 'kemiq3d-patch-5' 2017-08-24 09:10:21 +02:00
Ghostkeeper
ef3377e6fe
Merge branch 'patch-5' of https://github.com/kemiq3d/Cura into kemiq3d-patch-5 2017-08-24 09:10:05 +02:00
Ghostkeeper
65247ae9d4
Merge branch 'patch-4' of https://github.com/kemiq3d/Cura into kemiq3d-patch-4 2017-08-24 09:08:36 +02:00
Ghostkeeper
2000ccd8da
Merge branch 'patch-3' of https://github.com/kemiq3d/Cura into kemiq3d-patch-3 2017-08-24 09:07:11 +02:00
Ghostkeeper
5bd575c1aa
Merge branch 'fix_readme_make_definition' of https://github.com/fieldOfView/Cura into fieldOfView-fix_readme_make_definition 2017-08-24 00:11:37 +02:00
Ghostkeeper
cdf43ea6a4
Forgotten sidebar margins
The buttons need the sidebar margins too.

Contributes to issue CURA-4148.
2017-08-23 17:58:05 +02:00
Ghostkeeper
09a5cf1de2
Shift sidebar tooltips with the arrow outside of sidebar
Because now the arrow has the same colour as the sidebar so you won't see it otherwise.

Contributes to issue CURA-4148.
2017-08-23 17:53:00 +02:00
Lipu Fei
3d44d3c4ca Add logging and minor fix for project loading
CURA-4204
2017-08-23 17:42:40 +02:00
Lipu Fei
3805d2ff9e Add comments for HACK in project loading
CURA-4204
2017-08-23 17:37:59 +02:00
Lipu Fei
c37782d544 Stop slicing when a new slice is needed
CURA-4206
2017-08-23 17:19:48 +02:00
Ghostkeeper
fde4f44a1e
New dark theme
Also from the UX designers: A new dark theme that is exactly the same as the default theme except the background of the scene.

Contributes to issue CURA-4148.
2017-08-23 17:10:54 +02:00
Ghostkeeper
c2e4c14e59
Adjust vertical margins in sidebar
The section size adjusts the size of a setting item, and the actual control is centred within that space so in effect it controls the margins above and below each setting control.

Contributes to issue CURA-4148.
2017-08-23 17:02:07 +02:00
Ghostkeeper
11f8204644
Change margins in the side bar
These are more or less all margins in the side bar.

Contributes to issue CURA-4148.
2017-08-23 16:28:28 +02:00
Lipu Fei
d662770b22 Fix setting new material for stacks
CURA-4204

When a new material is created during project file loading, the material
for each stack is set according to the parent material ID, but actually
the child material should be used. This fix uses a hack to find the
corresponding child material for a stack so when a user chooses to
create a new material during project file loading, the material can be
correctly set.
2017-08-23 16:27:28 +02:00