3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-01-10 00:27:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
17664 commits 352 branches 300 tags 790 MiB
Commit graph

7699 commits

Author SHA1 Message Date
Jaime van Kessel
37af42aa93 Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-31 10:28:53 +01:00
Jaime van Kessel
f9e76aa6c9 Merge branch 'feature_resize_settings_panel' of github.com:Ultimaker/Cura into 4.0 2018-12-31 10:09:33 +01:00
Jaime van Kessel
52d97dfbd2 Change back the behavior of the output device selector to the old way 
Although the new way was discussed with our UXers, we got a number of reports that it was confusing.
I also accidentally started a print while using it
 2018-12-31 09:32:16 +01:00
Ghostkeeper
139ab2e0bb
Increment setting_version to 6 
Because Cura 4.1 is going to have a version upgrade to change the stack files.

Contributes to issue CURA-5848.
 2018-12-27 16:39:05 +01:00
Ghostkeeper
88d6e0bcaf
Correct inst.cfg version 
Contributes to issue CURA-5848.
 2018-12-27 16:27:26 +01:00
Ghostkeeper
542a0cb2d1
Merge branch 'gMax-1.5+-Cura-3.5.1' of https://github.com/gordo3di/Cura into gordo3di-gMax-1.5+-Cura-3.5.1 
Conflicts:
	resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg -> Profile weight vs. new global property
 2018-12-27 16:20:37 +01:00
Ghostkeeper
abe684c1bd
Use Item instead of rectangle without defined colour 
Item should be faster to render.

Contributes to issue CURA-6056.
 2018-12-27 13:36:17 +01:00
Ghostkeeper
02f7a14765
Fix ordering of a bunch of profiles 2018-12-27 11:29:45 +01:00
Ghostkeeper
f2a32e62fc
Rename 'Protected profiles' to 'Default profiles' 
We agreed that it looks better, especially when listed right above 'Custom profiles'.
 2018-12-27 11:06:09 +01:00
Ghostkeeper
c6c09a8327
Limit height of settings drop-down to window size 
It seems to be very hard to limit it to not overlap with the action panel. Well, going out of the window is a bigger problem so at least we can fix that.

Contributes to issue CURA-6054.
 2018-12-24 16:16:23 +01:00
Ghostkeeper
b7a23399f5
Move action panel in front of settings panel 
The settings panel can now be so long that they overlap (if the user so chooses). This causes the action panel to be hidden behind the settings. We'd prefer to show the action panel in front, always.

Contributes to issue CURA-6054.
 2018-12-24 15:37:48 +01:00
Ghostkeeper
c6f4cb4927
Make the settings panel resizable 
You can now drag the bottom side of the panel to make it bigger or smaller.

Contributes to issue CURA-6054.
 2018-12-24 15:31:47 +01:00
alekseisasin
facf1428d6
Merge pull request #5020 from Ultimaker/CURA-6004_missing_tooltips 
Cura 6004 missing tooltips
 2018-12-21 14:57:06 +01:00
Jaime van Kessel
766fc2293e Fix visibility for machine icon in dark theme 2018-12-21 14:35:41 +01:00
Jaime van Kessel
81e356ea1b Switch out the containersModel for the more specific printersModel 2018-12-21 11:20:09 +01:00
Jaime van Kessel
0965d909c0 Remove the show property from the tooltip 
This was a bit of a weird setup, so i removed it. This way the tooltip can be used
in the same way as the regular tooltip (by simply setting the visibility)

CURA-6004
 2018-12-20 16:41:26 +01:00
Jaime van Kessel
3f599bd06f Ensure that the tooltip text is translated 
CURA-6004
 2018-12-20 16:31:57 +01:00
Ghostkeeper
5bf260f524
Don't break binding of is_favorite upon clicking star 
We shouldn't override it here because doing that causes the binding to break. Just remove the favourite and let the model update itself, thus removing the star.

Contributes to issue CURA-6032.
 2018-12-20 14:40:37 +01:00
Ghostkeeper
f3a0b44d5e
Simplify is_favorite condition 
No stupid ternary operators necessary.

Contributes to issue CURA-6032.
 2018-12-20 14:40:29 +01:00
Jaime van Kessel
9ffc039254 Fix logo aliasing 
CURA-6044
 2018-12-20 14:01:12 +01:00
Jaime van Kessel
dc473dc78d Add missing typing for setting visibility preset model 2018-12-20 11:09:02 +01:00
Jaime van Kessel
8bff0d17e8 Prevent the backend attempting to reslice everytime a preference changed 2018-12-20 09:43:01 +01:00
Aleksei S
d891d30ab8 The Cura logo in left top corner is not displayed properly. 
CURA-6044
 2018-12-19 15:51:32 +01:00
Aleksei S
3953c7bb3a Added Tooltip alignment 
CURA-6004
 2018-12-19 14:24:02 +01:00
Ghostkeeper
c0835f3a2f
Code style 
Just something I boyscouted while working on something else.
 2018-12-19 14:02:17 +01:00
Diego Prado Gesto
6987d5ff78 Add a radius to the printer type label 2018-12-19 09:33:46 +01:00
Diego Prado Gesto
17cddac024 Merge branch '4.0' into CURA-6004_missing_tooltips 2018-12-19 09:03:31 +01:00
Ghostkeeper
c0c45519a0
Change another useless rectangle into an item 
It's more efficient to render. Also changed some code style.

Contributes to issue CURA-6032.
 2018-12-18 16:49:41 +01:00
Ghostkeeper
c66257bf4d
Use item instead of transparent rectangle 
This is faster to render.

Contributes to issue CURA-6032.
 2018-12-18 16:18:01 +01:00
Ghostkeeper
279812e4ff
Round width of buttons 
They were getting rendered a bit weird if your pixel scale was not an integer (for me it's 1.25).
 2018-12-18 13:58:21 +01:00
Jaime van Kessel
a181ffe79d Merge branch 'fix_print_monitor_dark_theme' of https://github.com/fieldOfView/Cura into 4.0 2018-12-18 13:54:45 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types 
[4.0] Every output device should define its connection type
 2018-12-18 13:23:02 +01:00
Lipu Fei
bf5559167e
Merge pull request #5015 from Ultimaker/CURA-5994_umop_firmware_update 
[4.0] CURA-5994 Cura used wrong firmware version for UMO+. The firmware was from UMO.
 2018-12-18 11:33:40 +01:00
Diego Prado Gesto
cc462ef3a6 Add a placeholder for a pattern in the header, if the theme wants to add one. 2018-12-18 10:29:44 +01:00
Jaime van Kessel
be9d35d45f Fix some minor layout issues 
CURA-6011
 2018-12-18 09:47:51 +01:00
Lipu Fei
6017c2b4d2 Replace isProfileUserCreated with hasCustomQuality 
CURA-6028
 2018-12-18 08:56:56 +01:00
Diego Prado Gesto
08458df873 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-17 17:56:22 +01:00
Diego Prado Gesto
62d20ac773 Change the base color of the tooltips to align with the designs 
Contributes to CURA-6004.
 2018-12-17 17:55:40 +01:00
Jaime van Kessel
d395c38436 Removed collapse / expand all 
I don't think it ever worked.
 2018-12-17 17:47:33 +01:00
fieldOfView
7d6e698f43 Fix (USB) print monitor in dark theme 2018-12-17 17:37:21 +01:00
Jaime van Kessel
a7c1a45d44 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-17 17:32:31 +01:00
Jaime van Kessel
0e294481ff Improve readability of printer_type_label for dark theme 2018-12-17 17:32:11 +01:00
Diego Prado Gesto
d6212d5a39 Add elide in the showcase title and reduce the height a bit so there are 
only 2 lines for the title.
 2018-12-17 17:29:24 +01:00
alekseisasin
4d135c13bb Cura used wrong firmware version for UMO+. The firmware was from UMO. 
The reason of this issue because it used a heated firmware from his
parent(UMO) printer. To avoid this case we need to define externally
the firmware_hbk_file property in umo+ defintion file
CURA-5994
 2018-12-17 16:46:02 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6 
Increment API version to 6
 2018-12-17 15:43:09 +01:00
Jaime van Kessel
aad7540366 Fix situation where multiple connect configurations would cause issues 
CURA-6011
 2018-12-17 13:31:38 +01:00
Diego Prado Gesto
ed4d339dee Change the margin in the view orientation buttons to aling the pixels correctly 2018-12-17 11:00:49 +01:00
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection 
CURA-6011
 2018-12-17 10:47:14 +01:00
Diego Prado Gesto
cbd8e72bd5 Add fixed width to the preview button 
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
 2018-12-17 10:42:52 +01:00