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

24795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thushan Fernando
116f3adf5f
Initial Cocoon Create sources. 2020-08-06 16:10:44 +10:00
KOUBeMT
142bd77d50 Merge remote-tracking branch 'upstream/master' 
Merge remote-tracking branch 'upstream/master'
 2020-08-05 15:22:11 +02:00
Jaime van Kessel
c8771124ad
Change function name to better reflect what it does 
CURA-7609
 2020-08-05 14:56:39 +02:00
Ghostkeeper
1f2c1d1700
Merge branch '4.7' 2020-08-05 14:55:26 +02:00
Ghostkeeper
711e930fa0
Enable support brim by default for tree support 
This was decided on by the material & process engineers. It's a pretty safe change since the support brim pretty much has only advantages if there is no support infill.

Fixes ST-3552.
 2020-08-05 14:55:07 +02:00
Kostas Karmas
4a04126e91 Fix "Fetching Packages" text in the Marketplace in dark mode 
CURA-7627
 2020-08-05 14:13:39 +02:00
Kostas Karmas
3228766dd5 Fix "Fetching Packages" text in the Marketplace in dark mode 
CURA-7627
 2020-08-05 14:12:00 +02:00
Remco Burema
deec650668
Merge branch '4.7' 2020-08-05 08:17:10 +02:00
Remco Burema
b394be3583
Remove superfluous theme entry. 
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
 2020-08-05 08:16:10 +02:00
Remco Burema
60dd4f411b
Readable text in dark mode. 
part of CURA-7627
 2020-08-05 08:03:12 +02:00
Ghostkeeper
1085709407
Fix arrow position if tooltip is too big to fit on the screen 2020-08-05 02:44:19 +02:00
Ghostkeeper
3b8ae6439c
Put the setting tooltip in a scrollview 
You can now scroll through it if the description is too long for it to fit on the screen.
 2020-08-05 02:40:45 +02:00
Ghostkeeper
d710d42c0a
Keep tooltip visible when hovering over it 
Except when hovering over it while it's completely invisible. You just get this 100ms leeway time to transition from the setting to the tooltip.
 2020-08-05 02:16:16 +02:00
Ghostkeeper
96e631bfda
Merge branch '4.7' 2020-08-05 01:28:36 +02:00
Ghostkeeper
f6eddc12fd
Fix setting visibility for tree support settings 
These have moved. The Support Structure setting was already present in the support category.

Done as a 5 minute fix while working on the Settings Guide.
 2020-08-05 01:28:27 +02:00
Ghostkeeper
37c310ddd5
Merge branch '4.7' 2020-08-05 00:35:10 +02:00
Ghostkeeper
b02f3bc043
Fix visibility of some settings regarding support structure and support meshes 
I think for the support meshes, some settings were simply missed because they are in completely different categories. For instance, the support flow rate also applies to support meshes so those settings should be visible.

For the tree support settings, I think that when the tree support became activated by support_structure, the developer checked for instances where the support_tree_enable setting made a setting visible (as alternative to the normal support_enable setting). Like Support Infill Density used to be visible if normal support or tree support was enabled, and now needs to check only for normal support. However they didn't also look for settings that are ONLY available for normal support and not for tree support. So those settings now have extra conditions that disable them if the support structure is set to tree support.
With this I tried to word the check correctly in case we ever get a third support construction type. Like, sometimes a setting is not shown with tree support because tree support explicitly doesn't support it (e.g. Conical Support), but sometimes it's not shown with tree support because it's specific to area support (e.g. support join distance).

Done as a five minute fix (although typing this commit message also took five minutes) as I encountered these problems while working on the settings guide.
 2020-08-05 00:34:59 +02:00
Kostas Karmas
4e20c7dddc Rework the open project dialog to contain only 1 dropdown 
With the caveat that the qtQuickControls had to be updated to 2.3, due to a qt bug in 1.x that did
not update the dropdown popup list according to the ListModel.
This leads to a different look in the dropdowns and in the buttons of the open project dialog,
compaired to the rest of the application.

CURA-7609
 2020-08-04 16:33:11 +02:00
KOUBeMT
fa8066ab0d Adding_Acetate_profiles 2020-08-04 16:10:36 +02:00
Jaime van Kessel
c8746eced6
Move some HTML codes out of the translation 
Due to string freeze we can't fix this for 4.7

CURA-7627
 2020-08-04 13:44:33 +02:00
Jaime van Kessel
a8904e76b0
Merge branch '4.7' of github.com:Ultimaker/Cura 2020-08-04 13:31:17 +02:00
Jaime van Kessel
af9a078d41
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-04 13:30:39 +02:00
Jaime van Kessel
955b2950e8
Change tertiary button to use link text color 
CURA-7627
 2020-08-04 13:30:01 +02:00
Kostas Karmas
e5d3271698 Fix mypy complaining that Application has no createQmlComponent 
Using CuraApplication instead fixes the problem

CURA-7609
 2020-08-03 17:43:14 +02:00
Kostas Karmas
9ad046654a Add typing in WorkspaceDialog.py 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309170

CURA-7609
 2020-08-03 17:31:21 +02:00
Kostas Karmas
6c59616e39 Process feedback comments 
Comments https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309980 and https://github.com/Ultimaker/Cura/pull/8142#discussion_r464310281

CURA-7609
 2020-08-03 17:30:21 +02:00
Kostas Karmas
60cfb6a8be Change name of updatable_machines to updatable_machine_names 
Since it is a list of name strings and not a list of machines.

Response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464307564

CURA-7609
 2020-08-03 17:28:44 +02:00
Kostas Karmas
949837f041 Fix crashing when opening project files without materials 2020-08-03 16:20:44 +02:00
Kostas Karmas
a6d779e722 Sort materials based on extruder position in the open project dialog 
From eCCB
 2020-08-03 16:20:29 +02:00
Kostas Karmas
3d5bbfbfaa Change color of busyIndicator according to the Theme 
Also for the text "No printer found in your network" in AddNetworkPrinterScrollView

CURA-7627
 2020-08-03 16:19:37 +02:00
Jaime van Kessel
5e788235c8 Add missing theme-ing to cloud first run screen 
CURA-7627
 2020-08-03 16:19:26 +02:00
Kostas Karmas
17b6dd46b0 Change color of busyIndicator according to the Theme 
Also for the text "No printer found in your network" in AddNetworkPrinterScrollView

CURA-7627
 2020-08-03 16:05:20 +02:00
Kostas Karmas
ce72bb1a0b Fix creating new machine being reverted to overridde in some cases 
CURA-7609
 2020-08-03 15:47:01 +02:00
Jaime van Kessel
d8427b4109
Add missing theme-ing to cloud first run screen 
CURA-7627
 2020-08-03 15:38:20 +02:00
Kostas Karmas
9793c2cfde Fix crashing when opening project files without materials 2020-08-03 14:54:44 +02:00
Kostas Karmas
6050d042f4 Change width column widths in AddLocalPrinterScrollView 
To make sure that printer names are not truncated.
From CCB
 2020-08-03 14:43:23 +02:00
Kostas Karmas
9f6b4f0255 Sort materials based on extruder position in the open project dialog 
From eCCB
 2020-08-03 14:34:45 +02:00
Kostas Karmas
f80dbefad3 Change width column widths in AddLocalPrinterScrollView 
To make sure that printer names are not truncated.
From CCB
 2020-08-03 13:50:29 +02:00
Ghostkeeper
877e2213de
Fix disabling of zoom-to-mouse preference in orthographic camera mode 
It doesn't work then.

Done as a 5-minute-fix.
 2020-08-03 12:27:37 +02:00
Jaime van Kessel
b2ca6a9224
Add removed theme entries again 
Some plugins were using them.
 2020-08-03 10:38:33 +02:00
Kostas Karmas
37febc9f60 Remove comment 
CURA-7609
 2020-08-03 09:24:40 +02:00
Kostas Karmas
db857c8c20 Add extra spacing between categories in the open project dialog 
CURA-7609
 2020-08-03 09:21:16 +02:00
Kostas Karmas
ff4e4ccf55 Change text in the combobox 
Since it was anyway truncated

CURA-7609
 2020-08-03 09:07:20 +02:00
Ghostkeeper
690f263f41
Update language translation files with new setting description 
Contributes to issue CURA-7622.
 2020-07-31 14:12:12 +02:00
Ghostkeeper
fea5da3175
Add missing description to translation templates 
Contributes to issue CURA-7622.
 2020-07-31 14:11:07 +02:00
Ghostkeeper
1a5fe28c70
Write a description for Support Structure 
That was still missing, oops. I'm aborting the translations to get this in. It's important enough to break the string freeze and restart the translations process at this stage.

Contributes to issue CURA-7622.
 2020-07-31 14:08:21 +02:00
Ghostkeeper
493ee46cf6
Update Cura version in header metadata 
Contributes to issue CURA-7622.
 2020-07-31 13:07:46 +02:00
Ghostkeeper
7e9d599a61
Update translation files from updated template 
This is automated with 'make i18n-update-po'.

Contributes to issue CURA-7622.
 2020-07-31 13:04:45 +02:00
Ghostkeeper
348127a2e5
Restore report-msgid-bugs-to metadata 
Somehow the msgmerge thing removed it.
 2020-07-31 12:52:03 +02:00
Ghostkeeper
063c44796e
Update translation templates for Cura 4.7 
These are the new translations (and the translations that moved their locations) for Cura 4.7.

Contributes to issue CURA-7622.
 2020-07-31 12:49:50 +02:00