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

26552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jelle Spijker
f730959f78 fixed discard or keep combobox on Mac 
Use the new controls ComboBox
 2021-08-30 16:15:02 +02:00
Konstantinos Karmas
de1a299e7a Add missing view_normal icon in the deprecated icons 
Also remove the capitalization from the `viewMode`.

CURA-8520
 2021-08-30 14:28:52 +02:00
Konstantinos Karmas
57b0287c84 Add missing Play icon 
The `play` icon is readded to the theme and remapped to the `Play.svg`.

Found by @fieldOfView.

CURA-8520
 2021-08-30 14:27:52 +02:00
Jelle Spijker
374fb78342
Merge pull request #10365 from Ultimaker/CURA-8498_make_setting_search_magnifier_themable 
Replace the textfield with cura.Textfield
 2021-08-30 14:23:40 +02:00
jelle Spijker
5ba1e8eda8 Settings search field uses italic style 
Restored italic font style for the search field.
To not break look and feel with the old TextField
behaviour
 2021-08-30 14:20:09 +02:00
jelle Spijker
2548fd8014 Fix greyed out cluster printers 
The PrintWindow still used an old style combobox.
This resulted in a Mac user not being able to specify
which clustered printer he wanted to send a slice to.

Using the new QtQuick.Controls and specifically setting
the currentIndex fixed it for Mac.
 2021-08-30 13:41:55 +02:00
Jaime van Kessel
a1378f9a06 Replace the textfield with cura.Textfield 
This way we don't have to use the html in the setting item and we
dont have to re-do the whole hover logic in the search text field.

THis also makes the search magnifier themed, so it looks a lot better
in the dark theme

CURA-8498
 2021-08-30 13:28:00 +02:00
Konstantinos Karmas
9504ee60d4
Merge pull request #10358 from Ultimaker/CURA-8521_Add_missing_preference_vesion_upgrade 
Add the missing preference upgrade for 4.9 to 4.10
 2021-08-30 13:17:08 +02:00
Jaime van Kessel
b2c6063b61 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-30 13:11:21 +02:00
Jaime van Kessel
43fd38e48e Add missing return 
This caused the slicing to not be correctly aborted when the primetower was
in the wrong location

CURA-8499
 2021-08-30 13:10:10 +02:00
Jaime van Kessel
f12f1ea438 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-30 13:04:48 +02:00
Konstantinos Karmas
e9e34b5448
Merge pull request #10359 from Ultimaker/CURA-8502_disable_df_save_if_name_is_invalid 
Disable df save if name is invalid
 2021-08-30 11:57:46 +02:00
Konstantinos Karmas
cf93f66135 Add missing Group.svg icon 
CURA-8520
 2021-08-30 11:42:57 +02:00
Konstantinos Karmas
b41b0e55b5 Add missing icon mappings 
CURA-8520
 2021-08-30 11:29:18 +02:00
Jaime van Kessel
42948c376f Add extruder to current version for version upgrade script 
This should remove the Unable to upgrade file of type extruder of version 2
messages

CURA-8509
 2021-08-30 11:16:49 +02:00
Jaime van Kessel
183fbfad41 Disable save to DF if the textfield is in an invalid state 
CURA-8502
 2021-08-30 11:09:55 +02:00
Jaime van Kessel
9bdeb82314 Add the missing preference upgrade for 4.9 to 4.10 
This could break backups in certain cases

CURA-8521
 2021-08-30 10:51:27 +02:00
Konstantinos Karmas
3e0b395c72 Add the Buildplate.svg to the Cura icons 
The icon existed only in the UM3NetworkPrinting plugin but it was also used in the ConfigurationItem.qml in Cura, so it had to be moved to the Cura icons.

CURA-8520
 2021-08-30 10:45:45 +02:00
Jaime van Kessel
3191baf5a0 Add delete to handlers 
CURA-6096
 2021-08-27 14:36:04 +02:00
Konstantinos Karmas
8de5e1e5b9 Account for the width of the arrow in the Extruders row 
Although the ExpandablePopup already sets the anchors of the `headerItem` to account for the arrow icon on the right side, the ConfigurationMenu's extruder row was ignoring it, thus making the elided text of the last extruder to overlap with the arrow icon a bit.

This commit fixes that by explicitly accounting for the width of the arrow in the extruders row.

**Note:** if the Cura window gets resized way too much, the extruder icons will still overlap with the arrow, since there is no space to fit everything.

CURA-8496
 2021-08-26 13:31:27 +02:00
Jaime van Kessel
e5a2c612f9
Merge pull request #10338 from Ultimaker/CURA-8496_Fix_arrow_overlapping_with_material_name 
CURA-8496: Account for the width of the arrow in the Extruders row
 2021-08-26 13:30:33 +02:00
Konstantinos Karmas
fcbb16b70c Account for the width of the arrow in the Extruders row 
Although the ExpandablePopup already sets the anchors of the `headerItem` to account for the arrow icon on the right side, the ConfigurationMenu's extruder row was ignoring it, thus making the elided text of the last extruder to overlap with the arrow icon a bit.

This commit fixes that by explicitly accounting for the width of the arrow in the extruders row.

**Note:** if the Cura window gets resized way too much, the extruder icons will still overlap with the arrow, since there is no space to fit everything.

CURA-8496
 2021-08-25 17:13:43 +02:00
Jaime van Kessel
6feaecc450 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-25 17:10:09 +02:00
Jaime van Kessel
88b5c4c8be Merge branch 'CURA-8497_Image_spacing_is_misaligned_in_messages' of github.com:Ultimaker/Cura into 4.11 2021-08-25 16:57:50 +02:00
Konstantinos Karmas
bbada73550 Remove outdated image from "new printers added" message 
CURA-8497
 2021-08-25 15:32:42 +02:00
Jaime van Kessel
55d6ff0e61 Clean up formating of the insert queries 
CURA-6096
 2021-08-25 13:58:11 +02:00
Jaime van Kessel
132b863e13 Add update queries for variant, intent & qualit DB handlers 
CURA-6096
 2021-08-25 13:48:25 +02:00
Jelle Spijker
392cca431f
Merge pull request #10331 from Ultimaker/CURA-8380_Align_link_style_among_OS_in_whats_new 
CURA-8380: Align link style among os in whats new
 2021-08-25 13:16:50 +02:00
Jaime van Kessel
deab3fd32b Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-25 13:01:27 +02:00
Jaime van Kessel
1740f8e880 Add Anycubic Vyper 
CURA-8515

commit 24250e19e94f8bf1b8cfe9edf1e29b7e78284525
Author: Jaime van Kessel <nallath@gmail.com>
Date:   Wed Aug 25 11:54:15 2021 +0200

    Move files to right location

commit 96efe7a885ba215a4334a36bcb1fee4b4f5a42a4
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Wed Aug 25 10:43:19 2021 +0800

    Update anycubic_vyper_.def.json

commit a620b9026191e86c41657a39a3ec50f946ef8eff
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 10:30:44 2021 +0800

    Upload anycubic_vyper_platform.stl

commit 84d48ce5239b8dd2b044d160b9e7f5513a03b8a5
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 10:29:56 2021 +0800

    Delete anycubic_vyper_platform.3mf

commit d66cb4221d4e03175f7bf6e5cfe6ce27c2608d5b
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 10:12:56 2021 +0800

    Add files via upload

commit 78bd0ea81842eaf96ac63c4eb1a48b6fb368973c
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 09:59:40 2021 +0800

    Update anycubic_vyper_.def.json

commit de1f452a0a4416e277e19cb11e30c5f4ce6bc849
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Tue Aug 24 09:57:48 2021 +0800

    Delete anycubic_vyper_platform.stl

commit 106e40950aaee8ee118a017b3c23852e756c97bb
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Fri Aug 20 12:25:53 2021 +0800

    Add Anycubic Vyper

commit 4cab52c9ca32f9773c87bcab78086a29ce863180
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Fri Aug 20 11:51:08 2021 +0800

    Revert "Add Anycubic Vyper"

commit ed5916df6c6b7a0762bc34c682975089a8b2baf1
Author: ThatGuyZim <89188660+ThatGuyZim@users.noreply.github.com>
Date:   Fri Aug 20 11:43:49 2021 +0800

    Add files via upload
 2021-08-25 11:59:19 +02:00
Jelle Spijker
50c11e5fdf
Merge pull request #10330 from Ultimaker/CURA-8496_Fix_long_material_names_overlappint_with_icon 
CURA-8496: Fix showing only the material type after resizing Cura's window
 2021-08-25 11:57:54 +02:00
Jaime van Kessel
5b8dac8ec9
Merge pull request #10332 from fieldOfView/fix_missing_star_icon 
Fix missing "star" icon in Cura 4.11
 2021-08-24 16:52:01 +02:00
fieldOfView
82912ef20c Add alias for previously existing "star" icon 2021-08-24 16:34:28 +02:00
Jaime van Kessel
2bef85c6c2 Remove weird whitespace 
CURA-6096
 2021-08-24 14:45:52 +02:00
Konstantinos Karmas
99f8c85065 Style the "no plugin/material installed" texts in the installed tab 
The default black text color was invisible in the dark theme.
 2021-08-24 13:33:05 +02:00
Konstantinos Karmas
d24d520db0 Change background of Premium plugins and materials 
Or else the link "Search materials" in the materials tab was very hard to see.

CURA-8380
 2021-08-24 13:32:25 +02:00
Konstantinos Karmas
01b0d78f7b Use custom style for the links in the what's new textArea 
A style had to be prepended in the text to make sure that it adheres to the style we want instead of using the OS-based link style.

Note: For some reason QML ignores all other link-style tags (such as `a:hover`, `a:focus` etc) apart from `a:link`, so we can only change the style for the normal link and NOT for when it is clicked or hovered.

CURA-8380
 2021-08-24 13:31:39 +02:00
Konstantinos Karmas
2718d6a69a Change the ColumnLayout to Column in the ConfigurationMenu 
When the labels were getting truncated and invisible after reducing the width of Cura's window, their visibility wasn't being restored back and, as a result, the `materialTypeLabel` was the only one that was remaining visible, even if there was enough space for the full `materialBrandColorTypeLabel`.

Changing the ColumnLayout to a Column, where the width is inherited from the parent, fixes that issue.

CURA-8496
 2021-08-24 10:35:33 +02:00
fieldOfView
2238234741 Add id & brand and don't send material properties to CuraEngine 2021-08-24 09:57:30 +02:00
Konstantinos Karmas
a754b49299 Merge branch '4.11' into CURA-8496_Fix_long_material_names_overlappint_with_icon 2021-08-24 09:38:25 +02:00
Konstantinos Karmas
6ad358a55d Set the job name whenever the workspaceLoaded is called 
CURA-8358
 2021-08-23 17:07:36 +02:00
Ghostkeeper
6b5ea9086f
Fix spelling in documentation 
Saw this and wanted to take it along blindly with whatever next modification I made to Cura. However I need to switch branches now so it's just going to be a rather useless commit I guess.
 2021-08-23 14:40:57 +02:00
Jaime van Kessel
78b6bf2ed4 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-23 11:01:01 +02:00
Jaime van Kessel
52525038e3 Merge branch 'CURA-8496_Fix_long_material_names_overlappint_with_icon' of github.com:Ultimaker/Cura into 4.11 2021-08-23 11:00:29 +02:00
Jaime van Kessel
b887398da6 Remove unneeded width from labels 
CURA-8496
 2021-08-23 10:56:43 +02:00
Jaime van Kessel
2350712633 Remove incorrect reference to icons in some machine definitions 2021-08-22 19:57:09 +02:00
Ghostkeeper
44913c0d87
Merge branch '4.11' 2021-08-20 17:37:49 +02:00
Ghostkeeper
e27ec57b04
Fix spelling 2021-08-20 17:37:38 +02:00
Cyril
53263cf054
Improve FLSUN Super Racer profile (#10192) 
* Improve FLSUN Super Racer profile

- Added quality profiles based on profiles provided by FLSUN
- Improved machine settings based on FLSUN's Marlin sources
- Replaced Super Racer STL with correct one

* Update flsun_SuperRacer.stl

* Update definitions

* Update flsun_sr.stl

* Update flsun_sr.stl

* Update flsun_sr.def.json

* Improve platform

* Normal quality by default

* Improvements

* Fix double settings

CURA-8510
 2021-08-20 17:18:37 +02:00
Jaime van Kessel
e0e8223c5d Move DB handling into specialised classes 
This keeps CuraContainerRegistry a lot cleaner, especially when more container types are
added

Cura-6096
 2021-08-20 15:40:50 +02:00