GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 21:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,977 Commits 290 Branches 260 Tags
Commit Graph

9977 Commits

This Branch
This Branch
All Branches
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
831a91afff
Add test for upgrading preference file 
Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Ghostkeeper
d929359d77
Implement version upgrade 2.7 to 3.0 
The theme 'cura' was renamed to 'cura-light', so that needs to be updated in the user's preferences.

Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +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
b677a81d9b
Change default theme 
This new field is now read by Uranium that indicates the default theme to load first before there are any changed preferences.

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
a29c9307de
Merge branch '2.7' 2017-08-28 16:46:42 +02:00
Ghostkeeper
08f69d168d
Add Chinese language entry to change log 
Contributes to issue CURA-4000.
 2017-08-28 16:46:26 +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
alekseisasin
6c280fff9a Merge pull request #2271 from Ultimaker/thopiekar-plugin-browser-send-more-info 
PluginBrowser: Send also OS and architecture
 2017-08-28 15:30:49 +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
b84500f742 Import Application instead of inline import CuraApplication 
CURA-4186
 2017-08-28 14:35:36 +02:00
Lipu Fei
37414e7bc7 Fix code style: double quotes instead of single quotes 
CURA-4186
 2017-08-28 14:34:53 +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
fieldOfView
61442e512f Fix setting the Gantry height setting in Machine Settings 2017-08-28 10:13:06 +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
Lipu Fei
141aad5513 Trigger to re-evaluate default settings in per-object settings when the active stack gets changed. 
CURA-4186

Trigger signals to re-evaluate default settings in pre-object settings
when the active stack gets changed. Otherwise the values won't be
updated directly.
 2017-08-25 12:48:47 +02:00
Lipu Fei
a320784a6d For a per-object setting, use the user-defined value first 
CURA-4186

In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
 2017-08-25 12:19:05 +02:00
Lipu Fei
414901ae84 Force update the provider when the setting's limit_to_extruder gets changed 
CURA-4186

In the per-object settings, when a setting's limit_to_extruder gets
changed, its value should be updated too.
 2017-08-25 11:58:40 +02:00
Lipu Fei
c44e527305 Remove warning in /PerObjectContainerStack 
CURA-4186
 2017-08-25 11:57:52 +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