3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 16:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 302 branches 270 tags 770 MiB
Commit graph

18800 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ghostkeeper
42058a2e8f
Revert "Prevent some unneeded calling of signals" 
This reverts commit 85f10e7c4f.
The second time you start Cura, it won't slice due to the number of extruders being wrong.
 2018-12-24 09:37:17 +01:00
Jaime van Kessel
e4af883f25 Add missing signal 2018-12-21 18:19:34 +01:00
Jaime van Kessel
972be1b54a Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-21 18:13:43 +01:00
Remco Burema
4065c83188 Show settings prime-tower-only brim depends on when active. [CURA-5864] 2018-12-21 17:57:47 +01:00
Remco Burema
f62e8b4bb2 Create 'brim for prime tower only' option (see also backend PR). [CURA-5864] 2018-12-21 17:38:30 +01:00
Jaime van Kessel
f627560751 Add timer to QualityProfilesDropdownMenuModel to prevent unneeded updates 
It's the same old trick we've pulled off quite often, so this should be pretty safe
 2018-12-21 17:12:07 +01:00
Jaime van Kessel
85f10e7c4f Prevent some unneeded calling of signals 2018-12-21 16:57:52 +01:00
Ghostkeeper
2277a3d316
Prevent syncing with invalid configurations 
Contributes to issue CURA-6033.
 2018-12-21 16:43:45 +01:00
Ghostkeeper
a720cca5b6
Fix background colour for dark theme 
The default colour for Rectangle is white. So this Rectangle, not defining a colour, became white. Instead we should use an Item, which cannot have a background colour and thus becomes transparent, making the background colour the same as the button below, which was intended. It's also slightly faster to render.

Contributes to issue CURA-6033.
 2018-12-21 16:40:24 +01:00
Ghostkeeper
5e98544541
Don't change the model depending on isValidMaterial 
That would cause a circular dependency in a way.

Contributes to issue CURA-6033.
 2018-12-21 16:33:16 +01:00
Ghostkeeper
e8ea742cf6
Retain binding with isValidMaterial on hover 
So that if a material becomes valid, it updates this property.

Contributes to issue CURA-6033.
 2018-12-21 16:27:38 +01:00
ChrisTerBeke
912652654b Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 15:28:56 +01:00
Jaime van Kessel
4ab79f963a Remove deprecated functions 2018-12-21 15:10:14 +01:00
Jaime van Kessel
33c97fcf4a Updated typing 2018-12-21 15:09:09 +01:00
Marijn Dee
12a4a5e9f5 Fixing the rest of the automatic test failures 2018-12-21 15:06:02 +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
432b0837ce Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-21 14:48:50 +01:00
Aleksei S
c8994102da Use short for each javascript function 
CURA-6033
 2018-12-21 14:44:25 +01:00
Jaime van Kessel
766fc2293e Fix visibility for machine icon in dark theme 2018-12-21 14:35:41 +01:00
Aleksei S
01783e7f68 Check material name instead of material brand 
CURA-6033
 2018-12-21 13:54:01 +01:00
ChrisTerBeke
64f5c4f263 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 13:33:16 +01:00
Ghostkeeper
d880194c8c
Merge branch '4.0' 2018-12-21 11:59:41 +01:00
Ghostkeeper
07f0433751
Correct link to manual 
They changed this on the website, breaking all previous releases of Cura in the process.
 2018-12-21 11:59:12 +01:00
Jaime van Kessel
59b7e62c01 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-21 11:54:33 +01:00
Jaime van Kessel
7269065cca Only clear the stored optimized layer data if the slice started 2018-12-21 11:54:11 +01:00
Ghostkeeper
8308e48c2d
Merge branch '4.0' 2018-12-21 11:51:04 +01:00
Ghostkeeper
a5500b028f
Use HTTPS for Help links 
The Ultimaker website doesn't even accept anything else any more.
 2018-12-21 11:50:46 +01:00
Jaime van Kessel
b0cba98ec4 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-21 11:20:33 +01:00
Jaime van Kessel
81e356ea1b Switch out the containersModel for the more specific printersModel 2018-12-21 11:20:09 +01:00
ChrisTerBeke
a86f253bf3 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 10:58:13 +01:00
Ghostkeeper
75fbdf2c94
Expand error message for cases when extruders are disabled 
It is also unable to slice models that are on extruders that are disabled.
 2018-12-21 10:40:37 +01:00
Marijn Dee
131211e604 Fixed the unit tests 2018-12-21 09:42:28 +01:00
Ghostkeeper
e51b5993d3
Don't create system tray icon in headless mode 2018-12-20 21:56:27 +01:00
Aleksei S
81a6531f47 Fix range slider label position in LayerSlider.qml. 2018-12-20 20:37:48 +01:00
Aleksei S
9430c421eb Code refactor 
CURA-6033
 2018-12-20 18:19:59 +01:00
Aleksei S
7cfb29e337 If a connected printer has a selected material which is unknown 
for Cura then show a message for  downloading it from Marketplace
CURA-6033
 2018-12-20 18:12:40 +01:00
ChrisTerBeke
5403f5241b Fix not registering cloud output device for every machine 2018-12-20 17:21:07 +01:00
Marijn Dee
9d27c29c8c Fixed indentation and relative import, tests still fail though 2018-12-20 17:04:17 +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
Marijn Dee
403010aa90 Mirrored the changes made to the models in Commons 2018-12-20 16:32:00 +01:00
Jaime van Kessel
3f599bd06f Ensure that the tooltip text is translated 
CURA-6004
 2018-12-20 16:31:57 +01:00