15521 Commits

Author SHA1 Message Date
saumyaj3
135a6bb43d Applied printer-linter format 2024-05-03 10:51:34 +00:00
Saumya Jain
ee7b8e4574
Merge branch 'main' into main 2024-05-03 12:25:46 +02:00
saumyaj3
542da3fbdf Applied printer-linter format 2024-05-03 10:23:01 +00:00
Saumya Jain
5485ee7a21 remove unused settings
CURA-11707
2024-05-03 12:22:00 +02:00
Saumya Jain
9e2ffd5255
Merge branch 'main' into main 2024-05-03 10:37:06 +02:00
Saumya Jain
f36db2ced7 fixing versioning
CURA-11707
2024-05-03 10:36:25 +02:00
Saumya Jain
ea6efbd26f
Merge branch 'main' into main 2024-05-03 10:26:20 +02:00
saumyaj3
83b99e3b40 Applied printer-linter format 2024-05-03 08:15:43 +00:00
Saumya Jain
4379a00b41
Merge branch 'main' into main 2024-05-03 10:05:25 +02:00
august.chi
b4c626484f Based on the reviewer's feedback, I have made some changes:delete material params
Signed-off-by: august.chi <august.chi@anker-in.com>
2024-04-28 10:22:46 +08:00
augustchi
fd8f5fccb2
Merge branch 'Ultimaker:main' into Cura_ankermake_august 2024-04-28 09:43:51 +08:00
Saumya Jain
fb965b8d0c merge 5.7 2024-04-26 15:53:03 +02:00
Casper Lamboo
6d3636558e
Merge pull request #18936 from Ultimaker/CURA-11840_Update_Changelog_571
CURA-11840 update changelog 571
2024-04-22 14:56:50 +02:00
Saumya Jain
6542d9ff13 changes made regards to PR review
CURA-11851
2024-04-22 14:45:51 +02:00
MariMakes
58e374c739 Updated Changelog for Cura 5.7.1
With the updated changes
2024-04-22 14:45:10 +02:00
c.lamboo
a73dc80847 Merge branch 'refs/heads/5.7' into CURA-11851-warning-message-for-extruder2 2024-04-22 14:19:41 +02:00
Saumya Jain
df25f5c173 Update core compatibility warning message
CURA-11851
2024-04-22 14:03:40 +02:00
Saumya Jain
21e4f99b9d Add core compatibility check for Factor4 machine
A new function has been added to the MachineManager class to check for core compatibility in the Factor4 machine. This function ensures the selected core is compatible for use with the Factor4 machine and if not, it displays a warning icon with an appropriate message.

CURA-11851
2024-04-22 14:00:56 +02:00
Paul Kuiper
913f979847 Adding Factor 4 platform and backplate.
PP-470
2024-04-22 13:10:04 +02:00
pkuiper-ultimaker
8984c35c36 Applied printer-linter format 2024-04-22 10:51:30 +00:00
Paul Kuiper
5080309ed2
Removed redundant settings 2024-04-22 12:50:08 +02:00
Paul Kuiper
67108e3e5d Profiles for the Factor 4
PP-470
2024-04-22 10:54:42 +02:00
Saumya Jain
597a871807
Merge branch 'main' into CURA-11003-add-searchbar-for-offlineprinter 2024-04-12 12:32:25 +02:00
Saumya Jain
fd01684a23
Update resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2024-04-12 12:31:57 +02:00
Saumya Jain
17372064c7
Update resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2024-04-12 12:31:52 +02:00
Saumya Jain
a3911bdbfa PR comments
CURA-11003
2024-04-12 12:29:07 +02:00
Jaime van Kessel
7a5c773e90
Made printprocess reporting settings not settable per mesh 2024-04-12 11:08:35 +02:00
Saumya Jain
c010b58dad
Merge branch 'main' into main 2024-04-11 13:45:00 +02:00
Saumya Jain
1457569aeb Fix handling of undefined printer items in AddLocalPrinterScrollView
This commit addresses an issue wherein undefined current items were not properly handled in the AddLocalPrinterScrollView module. We've changed the code so that it now checks if currentItem and currentItem.name exist before attempting to assign. If they don't exist, we now set default values to avoid null or undefined references. This prevents potential errors or inconsistent behaviors in the UI.

CURA-11003
2024-04-10 17:24:55 +02:00
Saumya Jain
3908db7696 Update search bar style and theme alteration
CURA-11003
2024-04-10 15:45:24 +02:00
Saumya Jain
d017f0ec9c increased size of clear icon
CURA-11003
2024-04-08 15:37:48 +02:00
GregValiant
54636c3421 Monitor Page Preheat values
Change the default preheat values to the Initial Layer values.
2024-04-05 13:32:28 -04:00
Saumya Jain
7231c273a1 Refactor textChanged event
helps to increase code readability and maintainability.

CURA-11003
2024-04-05 16:26:33 +02:00
Saumya Jain
66754d837b Remove redundant printerSearchTimer
CURA-11003
2024-04-05 16:24:34 +02:00
Saumya Jain
8efc5ece01
Merge branch 'main' into Cura_ankermake_august 2024-04-04 15:18:09 +02:00
Saumya Jain
7a6f195b74 changed filter from "id" to "name" as both are different
CURA-11003
2024-04-04 14:37:51 +02:00
Saumya Jain
f35865e3c4 property name hasSearchFilter changed
CURA-11003
2024-04-04 14:13:58 +02:00
Saumya Jain
2ed0377a05 added column for removing the magic number
CURA-11003
2024-04-04 14:09:58 +02:00
Saumya Jain
a6e91fecf3
Merge branch 'main' into CURA-11003-add-searchbar-for-offlineprinter 2024-04-03 17:08:11 +02:00
Saumya Jain
da8db6201e merge 5.7 2024-04-03 16:59:46 +02:00
Saumya Jain
4c42ed7085 Refactor code in AddLocalPrinterScrollView.qml
The commit simplifies the function for updating current items in the AddLocalPrinterScrollView.qml file. It also removes unnecessary properties and functions, streamlining the process for setting printer info. The changes improve code readability and efficiency

CURA-11003
2024-04-03 16:16:28 +02:00
Saumya Jain
b810e63c60
Merge branch 'main' into CURA-11003-add-searchbar-for-offlineprinter 2024-04-03 14:52:19 +02:00
Saumya Jain
56d6325671 expanding found machines inside sections
CURA-11003
2024-04-03 14:50:14 +02:00
Saumya Jain
2249e298ca Implement printer search feature in local printer selection
Added a search field in the 'Add Local Printer' section which allows users to search for their desired printer. A timer has been set to trigger the search function as the user types into the search field. A clear button is visible for easy removal of the search text. Adjusted the ListModel.py to correctly emit dataChanged signal when there are changes in the list.

CURA-11003
2024-04-03 12:32:25 +02:00
HellAholic
8c0225c20e
Merge pull request #18796 from Ultimaker/CURA-11738-string-correction-for-openUCP
Corrected string
2024-04-03 12:25:35 +02:00
Nathan Rooy
e8d7a3cda6
Merge branch 'main' into main 2024-04-02 10:20:27 -04:00
Mariska
1a552af450
Two corrections
Removed a <
Added the mention of Support for the brim inside only
2024-04-02 11:47:13 +02:00
MariMakes
03a6d090db Update Changelog for Stable Release
Added the introduced bugfixes to the changelog
2024-04-02 11:40:00 +02:00
Saumya Jain
aa900abe9b Corrected string
As it doesn't open the file as Cura project anymore

CURA-11738
2024-04-02 10:59:53 +02:00
Saumya Jain
547f1bb8de Merge branch '5.7' 2024-04-02 10:15:00 +02:00