Commit graph

4484 commits

Author SHA1 Message Date
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
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
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
0781848af5 Reduce margin size for settings in recommended and custom mode
CURA-4148
2017-08-28 17:35:03 +02:00
Lipu Fei
0eb63637d4 Merge branch 'master' into feature_dark_colours_icons 2017-08-28 16:54:36 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Jaime van Kessel
8a0f6d969e Merge branch '2.7_stack_context' of github.com:Ultimaker/Cura into 2.7 2017-08-28 16:05:59 +02:00
Ghostkeeper
3dbf91eb18
Fix mistakenly translated replace key
Bad translator. Baaaaaaad.

Contributes to issue CURA-3999.
2017-08-28 15:42:12 +02:00
Ghostkeeper
1401d90bd0
Update Chinese translations for 2.7
These are the files I got from Bothof.

Contributes to issue CURA-3999.
2017-08-28 15:41:27 +02:00
Ghostkeeper
eeea30f2d1
Update translation templates for 2.7
New strings get empty translations. This is generated by calling 'make i18n-update-po-zh_CN'.

Contributes to issue CURA-3999.
2017-08-28 15:32:36 +02:00
Ghostkeeper
22b808afb3
Merge branch 'master' of https://github.com/PCDotFan/Cura into PCDotFan-master 2017-08-28 15:29:45 +02:00
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
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
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
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +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
ccf6d12283
Merge branch 'patch-9' of https://github.com/kemiq3d/Cura into kemiq3d-patch-9 2017-08-24 09:17:18 +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
6a40264f9a
Merge branch 'patch-7' of https://github.com/kemiq3d/Cura into kemiq3d-patch-7 2017-08-24 09:13:55 +02:00