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

28353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
ecba5b409c Fix binding loop in objectItemButton 
CURA-8684
 2022-01-31 17:32:10 +01:00
Jaime van Kessel
cef3b5db16 Fix mergeconflict 
CURA-8684
 2022-01-31 17:30:03 +01:00
Ghostkeeper
474497b8bb
Merge branch 'CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'' of github.com:Ultimaker/Cura into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity' 2022-01-31 17:09:06 +01:00
Ghostkeeper
ee81326d6a
Fix remaining merge conflicts 
- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.

Contributes to issue CURA-8684.
 2022-01-31 17:08:56 +01:00
Jaime van Kessel
6ef28db458 Remove unneeded semicolon 
CURA-8684
 2022-01-31 17:06:59 +01:00
Ghostkeeper
6db4a55f6e
Merge branch 'replace_controls_1_for_controls_2' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity' 
Conflicts:
	plugins/ImageReader/ConfigUI.qml
	plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
	plugins/PerObjectSettingsTool/SettingPickDialog.qml
	resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
	resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
	resources/qml/Preferences/GeneralPage.qml
	resources/qml/Preferences/Materials/MaterialsPage.qml
	resources/qml/Preferences/Materials/MaterialsView.qml
	resources/qml/Preferences/ProfilesPage.qml

These conflicts are all arising from headers/includes being updated at the same time, or from the two branches marking the other one's components as needing OldControls.
This introduced more OldControls markers which don't get marked as merge conflicts by Git. This happens when an element could just be left as the original name but from the new import (e.g. a Button stays a Button in Controls 2, but should be marked as from OldControls on the branch that doesn't update the Button).
 2022-01-31 16:53:45 +01:00
casper
4cb4e0e38c Re-enable validators in ImageLoaderPlugin 
CURA-8684
 2022-01-31 15:47:42 +01:00
casper
b2af6308e5 Add validator to material cost/weight spinboxes 
This way only valid numbers can be entered

CURA-8684
 2022-01-31 15:18:58 +01:00
casper
14767a92c6 Allow mouse selection in SpinBox 
CURA-8684
 2022-01-31 14:35:21 +01:00
casper
1ecc1ad753 Update styling in image loader plugin 
CURA-8684
 2022-01-31 13:43:08 +01:00
j.delarago
092dd8a918 Add imports for typing, add spacing 
CURA-7541
 2022-01-31 13:35:42 +01:00
Joey de l'Arago
736988da7c
Add space around operators 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-01-31 12:30:09 +00:00
Joey de l'Arago
8f58c786bb
Add Typing 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-01-31 12:29:49 +00:00
Joey de l'Arago
7dd4a3b8bd
Add typing 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-01-31 12:29:39 +00:00
Joey de l'Arago
7479aafe13
Fix incorrect comment 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-01-31 12:29:23 +00:00
casper
264ce3bdd1 Make texts fields selectable by mouse for various components 
This enables mouse-selectable for
- The image reader dialog
- Layer view text field (in simulation view)
- The TextField with unit component (for instace used to set the scale
 of models)
- Rename dialog(s)
- Currency text field
- The settings filter text field

CURA-8684
 2022-01-31 10:28:00 +01:00
j.delarago
0b4568d687 Add S3 and S5 new backplate image. The new images are higher resolution and scaled to fit the size of the backplate. 
Update texture coordinates of S3 and S5 for new scaled images.

CURA-7541
 2022-01-31 09:21:06 +01:00
j.delarago
50ab14a072 Add new Ultimaker 2 plus connect platform model and backplate image. 
CURA-7541
 2022-01-31 09:21:00 +01:00
j.delarago
31e11c415d Add obj_trimmer.py script for trimming obj files used for printer base plates. 
CURA-7541
 2022-01-31 09:20:53 +01:00
casper
5aa67770a2 Add properties (with defaults) to the PrintSetupHeaderButton state-props 
Resolves 2 QML-warnings

CURA-8684
 2022-01-31 09:00:30 +01:00
casper
f94813a98e Fix description 
CURA-8684
 2022-01-31 08:59:23 +01:00
casper
8979632457 Resolve Qt warning 
CURA-8684
 2022-01-30 23:30:39 +01:00
casper
ac080f3cd7 Provide height in the line type combobox of the simulation view 
CURA-8684
 2022-01-30 23:22:58 +01:00
casper
f62a5e7340 Allow decimal point for values input in materials view 
CURA-8684
 2022-01-30 23:19:11 +01:00
NilsRo
a54b0ec84c Update anycubic_i3_mega_s.def.json 
Added more Cura settings
 2022-01-30 17:44:11 +01:00
NilsRo
de8c256056 Feedrate to newest firmware 2022-01-29 20:05:36 +01:00
NilsRo
f4be1c85d8 Update anycubic_i3_mega_s.def.json 2022-01-29 19:38:27 +01:00
NilsRo
6660f4dfc7 Updated Acceleration and speed 2022-01-29 19:09:34 +01:00
64bittuning
1bea19169d Start code revisions 
During a supplementary review, the start codes were found to be mislabeled. This has been corrected.
 2022-01-29 00:21:44 -05:00
64bittuning
8198bc0db5 Submitting for approval 
Upon doing my research, I have seen several other people struggle with build issues. I feel at this time that I have done my due dilligence, and as long as my only failure is 14/15, I feel this PR is ready.
 2022-01-28 16:33:13 -05:00
64bittuning
556a451b9e There is a bug in the Repo tests, and I'm going to find it. 
Yep, this is getting upsetting.
 2022-01-28 15:48:52 -05:00
64bittuning
6651309669 Resetting all files 
Going to open a bug report if these fail.
 2022-01-28 15:27:13 -05:00
64bittuning
1e67650f77 Update existing profiles 
The Tronxy community has requested the removal of "max feedrate" settings in the slicer profile. The machines are usually run on one of three firmwares and these limitations really hinder slicer performance.
 2022-01-28 15:03:18 -05:00
Remco Burema
b96f58799c
Merge pull request #11342 from Ultimaker/CURA-8686_views_controls2 
Update views and tabs to use Controls 2
 2022-01-28 17:30:48 +01:00
jameschen1605
a20ff6f170
Add Hozo, Hozo 3Dprinter (#10856) 
* Add Hozo, Hozo 3Dprinter

Add Hozo, Hozo 3Dprinter from HardPrint

* Add Hozo, Hozo 3Dprinter

Add Hozo, Hozo 3Dprinter from HardPrint

* Add Hozo, Hozo 3Dprinter

Add Hozo, Hozo 3Dprinter from HardPrint

* Fixed gantry height

* Fixed ID field

* Add Hozo iX 3dprinter

Add 3dprinter profile

* Add Hozo iX 3dprinter

Add 3dprinter extruder

* Add Hozo iX 3dprinter

Add 3dprinter mesh

* Update and rename HardPrint_Hozo.def.json to hardprint_hozo.def.json

* Update and rename HardPrint_Hozo_iX.def.json to hardprint_hozo_ix.def.json

* Rename HardPrint_Hozo_extruder_0.def.json to hardprint_hozo_extruder_0.def.json

* Rename HardPrint_Hozo_iX_extruder_0.def.json to hardprint_hozo_ix_extruder_0.def.json

* Delete HardPrint_Hozo_iX_platform.stl

* Delete HardPrint_Hozo_platform.stl

* Add files via upload

* Change IDs

* Change IDs
 2022-01-28 16:39:14 +01:00
Ghostkeeper
fbb72d6f0a
Remove horizontal scrollbar policies from Cura.ScrollableTextArea 
There is no horizontal scrollbar any more so these are giving errors now.

Contributes to issue CURA-8686.
 2022-01-28 15:27:47 +01:00
Remco Burema
4d288d03d0 Merge branch '4.13' 2022-01-28 11:52:23 +01:00
Remco Burema
97d20bff1b
Merge pull request #11359 from Ultimaker/CURA-8916 
Update change_log.txt
4.13.1 		2022-01-28 11:51:44 +01:00
fvrmr
f32bfcc8a4 Update change_log.txt 
Fixed typo's
 2022-01-28 11:50:39 +01:00
Ghostkeeper
8d10e1d5a7
Simplify check for when quality profiles are activated 
Should behave the same way.

Contributes to issue CURA-8686.
 2022-01-28 11:34:44 +01:00
Ghostkeeper
92ed791f53
Simplify anchors of background rectangle 
Contributes to issue CURA-8686.
 2022-01-28 11:06:07 +01:00
Ghostkeeper
7bc109d1f0
Remove outdated comment 
It's no longer limiting the width to be at least 10 pixels, due to how it has to scale with the width of the table.

Contributes to issue CURA-8686.
 2022-01-28 10:57:00 +01:00
Remco Burema
dc14a0bb72 Merge branch '4.13' 2022-01-28 10:35:53 +01:00
casper
29fc98fea4 Add documentation to PrintSetupHeaderButton 
CURA-8684
 2022-01-28 10:33:01 +01:00
Remco Burema
9318e1d615
Merge pull request #11357 from Ultimaker/CURA-8916 
Update change_log.txt
 2022-01-28 10:31:08 +01:00
fvrmr
0d808ca2d4 Update change_log.txt 
Update change log 4.13.1
 2022-01-28 09:58:56 +01:00
casper
2290b46bf3 Use the Cura Combobox Component in simulation view 
CURA-8684
 2022-01-28 09:47:44 +01:00
casper
4ef394fa2d Update manual printer control to QtControls 2 
CURA-8684
 2022-01-28 09:47:01 +01:00
Casper Lamboo
7f17ef6c51
Update resources/qml/PrintSetupHeaderButton.qml 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-01-27 16:04:17 +01:00
Casper Lamboo
a5e2e29055
Update resources/qml/Preferences/GeneralPage.qml 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-01-27 16:04:10 +01:00