GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-25 07:39:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,784 Commits 291 Branches 265 Tags
Commit Graph

7768 Commits

Author SHA1 Message Date
Lipu Fei
b03f666bf5 WIP: Make it work with Python 3.7 packaing 2020-02-07 23:14:47 +01:00
Nino van Hooff
050ff62344 Don't show license Screen when there are no licenses to show 
CURA-7198
 2020-02-07 13:47:15 +01:00
Ghostkeeper
341e149d0e
Ignore g-code lines with syntax errors 
Discovered while working on CURA-7145.
 2020-02-05 12:52:54 +01:00
Ghostkeeper
3513266549
Guard against unexpected file structures 
We shouldn't break on that.

Contributes to issue CURA-7024.
 2020-02-04 15:52:12 +01:00
Ghostkeeper
a1f3444271
Don't delete containers from plugins directory 
Some plug-ins provide extra profiles and we don't want to check them or delete them regardless of what their content is.

Contributes to issue CURA-7024.
 2020-02-04 15:46:06 +01:00
Ghostkeeper
4307942544
Also remove instance containers referred to by extruder stacks 
Contributes to issue CURA-7024.
 2020-02-04 15:33:06 +01:00
Ghostkeeper
b549d20ec5
Document which stack layer is which container type 
Contributes to issue CURA-7024.
 2020-02-04 15:17:31 +01:00
Ghostkeeper
232b59bfb6
Merge branch 'master' into CURA-7024_remove_hidden_stacks 2020-02-04 14:25:22 +01:00
Ghostkeeper
ccc295e2bc
Use sets for folder names from the start 
We use a set here because we want to remove the current version from it later on. However if we change the variable to contain a set instead of a list, MyPy will start complaining that we change the type.

Contributes to issue CURA-7024.
 2020-02-04 14:20:08 +01:00
Ghostkeeper
5a7ec98f1e
Slightly improve wording 
'Layer data' is a bit technical.
 2020-02-04 14:14:23 +01:00
Ghostkeeper
f38dc82ac8
Remove hidden stacks and their dependencies 
This searches for stacks that are hidden and removes them, and also removes any extruder stacks that depended on those hidden global stacks and any user and quality changes profiles referred to by those removed stacks.

Contributes to issue CURA-7024.
 2020-02-04 14:12:57 +01:00
Ghostkeeper
bb73831889
Cura directory may be empty 
Contributes to issue CURA-7024.
 2020-02-04 14:11:41 +01:00
Jaime van Kessel
15d83cc6da
Fix typing issue 2020-02-04 13:38:52 +01:00
Ghostkeeper
94e97aff37
Add a function that only gets called when upgrading from version 4.4 
Contributes to issue CURA-7024.
 2020-02-04 13:02:07 +01:00
Ghostkeeper
fa44da3155
Slightly improve wording 
'Layer data' is a bit technical.
 2020-02-04 11:46:29 +01:00
konskarm
35903e7dd3
Merge pull request #6988 from Ultimaker/CURA-7071 
CURA-7071/Added option to redirect to Web MP from Cura MP
 2020-02-04 11:02:30 +01:00
Matt Jani
35aadad747 Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-02-03 16:55:57 +01:00
Ghostkeeper
66e2ca6aa5
Merge branch 'CURA-7099_sync_sideloaded_plugins' 2020-02-03 16:12:56 +01:00
Matt Jani
81429f8985 Cleaned up timelapse post processing script (issue #6730) 2020-02-03 15:19:11 +01:00
Jaime van Kessel
1fc0705c31
Remove a bit of over verbose logging 
It would put the content of the entire licence file into the log,
which seems a bit much to me.
 2020-02-03 13:20:08 +01:00
Jaime van Kessel
42f7cead4d
Merge branch 'CURA-7155_confusing_license_dialog_page_count' of github.com:Ultimaker/Cura 2020-02-03 13:16:23 +01:00
Ghostkeeper
2c28f70016
Add warning if you haven't sliced before going to layer view 
Done as a 5 minute fix.

Fixes #7044.
 2020-02-03 11:22:22 +01:00
Nino van Hooff
a02b753d53 Count the number of packages which have a license to display 
CURA-7155
 2020-01-30 16:42:42 +01:00
Ghostkeeper
d437d480dc
Code style: Spaces around binary operators 
Contributes to issue CURA-7099.
 2020-01-30 16:10:36 +01:00
Jaime van Kessel
37471b7861
Merge branch 'CURA-7152_unreadable_license_dialog' of github.com:Ultimaker/Cura 2020-01-30 15:32:21 +01:00
Remco Burema
99680db819
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-30 15:07:06 +01:00
Remco Burema
c6b6af14cf
Fix typo. 2020-01-30 15:06:47 +01:00
Nino van Hooff
eec7d2f0cd Use default timeout for sync dialog 2020-01-30 14:56:19 +01:00
Nino van Hooff
8ea3004c73 Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog 
CURA-7152
 2020-01-30 12:51:13 +01:00
Jaime van Kessel
d15e64cc5b
Remove unused import 2020-01-30 09:44:15 +01:00
Jaime van Kessel
18163af5a3
Ensure that the default default marketplace URL is used when not defined 
CURA-7071
 2020-01-30 09:42:51 +01:00
Nino van Hooff
8c250cfbbc Process review comments 
CURA-7099
 2020-01-29 11:28:29 +01:00
Matt Jani
155408d77d Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-28 15:28:26 +01:00
Matt Jani
f62312449b Fixed wrong extrusion (issue #6730) 2020-01-28 15:26:43 +01:00
Ghostkeeper
242da1b3aa
Give web marketplace button a hover colour 
It needs to be the same as the bar beneath the marketplace tab buttons when highlit.

Contributes to issue CURA-7071.
 2020-01-28 14:47:00 +01:00
Ghostkeeper
6553443f3b
Make marketplace materials link slightly smaller 
Contributes to issue CURA-7071.
 2020-01-28 14:41:29 +01:00
Ghostkeeper
38e7a9e4df
Turn Marketplace link into an actual link 
With consistent styling. The original design didn't have the link underlined but since the rest of the Cura UI has it underlined I let that happen here too.

Contributes to issue CURA-7071.
 2020-01-28 14:37:59 +01:00
Ghostkeeper
e51a1b18be
Add link text to marketplace search page 
Contributes to issue CURA-7071.
 2020-01-28 14:19:33 +01:00
Ghostkeeper
1c79193f9a
Always go to plug-ins page regardless of active tab 
This was a requirement from UX. Apparently we're adding a link to the materials elsewhere.

Contributes to issue CURA-7071.
 2020-01-28 13:25:27 +01:00
Nino van Hooff
d4eb463f2d Always subscribe to packages after installing them 
Now that we subscribe for all situations where a package is installed,
it makes sense to watch package installs and create a 1:1 relation that
way. Prevents code duplication.

CURA-7099
 2020-01-28 13:08:57 +01:00
Ghostkeeper
13644f7e41
Load different pages of Marketplace depending on current tab 
Feels intuitive actually, but if you think about it it's weird that the link should change depending on the tab that's next to it.

Contributes to issue CURA-7071.
 2020-01-28 11:58:56 +01:00
Ghostkeeper
ad2b8f140e
Make Marketplace link configurable from the build system 
This way you could set it to marketplace-staging if you like.

Contributes to issue CURA-7071.
 2020-01-28 11:52:46 +01:00
Ghostkeeper
654a28450d
Fix dark theme icon colour 
Contributes to issue CURA-7071.
 2020-01-28 11:36:42 +01:00
Ghostkeeper
e6856b02a4
Make entire tooltip area clickable 
Also saves on another component. And it's more logical, easier to use and fault-tolerant.

Contributes to issue CURA-7071.
 2020-01-28 11:33:25 +01:00
Ghostkeeper
1d110c2c33
Reduce size of web marketplace link button 
Contributes to issue CURA-7071.
 2020-01-28 11:31:10 +01:00
Ghostkeeper
812017c814
Switch out shop icon 
The sourceSize needs to be adjusted because this is an SVG that we don't necessarily want to stretch but just want to render directly at the correct size.

Contributes to issue CURA-7071.
 2020-01-28 11:29:01 +01:00
Nino van Hooff
5cedb2933e Only subscribe when logged in. (When installing a package from toolbox) 2020-01-28 09:31:36 +01:00
ninovanhooff
3a0bd48e1b
Merge pull request #7011 from Ultimaker/CURA-7090-addition 
CURA-7090/Added check to reevaluate dismissed incompatible packages
 2020-01-27 14:33:13 +01:00
Kostas Karmas
a720939e64 Fix max layer to correspond to starting layer 
When the starting layer was set to 0 the max layer was not adjusted
to be max_layer-1.
This commit makes the extra adjustment.
 2020-01-27 14:21:51 +01:00
konskarm
e128dadbf5
Merge pull request #6930 from jtychu/master 
Update DisplayFilenameAndLayerOnLCD.py
 2020-01-27 14:08:26 +01:00