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
28,174 Commits 291 Branches 265 Tags
Commit Graph

28174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Casper Lamboo
69de60eb14
Update resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-01-27 16:03:58 +01:00
Jaime van Kessel
df58028cb8
Merge pull request #11116 from Ultimaker/PP-99_Line-width-fix-for-.3mm-profiles_master 
Pp 99 line width fix for .3mm profiles master
 2022-01-27 15:52:29 +01:00
Ghostkeeper
497eda90c3
Merge branch 'master' of https://github.com/heed818/Cura into heed818-master 2022-01-27 15:39:34 +01:00
Rijk van Manen
3aaff952bd
Merge branch 'master' into PP-99_Line-width-fix-for-.3mm-profiles_master 2022-01-27 15:25:57 +01:00
Jaime van Kessel
40dd2523df
Merge pull request #11352 from Ultimaker/PP-45-optimize-the-maximum-extrusion-area-deviation-setting 
update Maximum Extrusion Area Deviation
 2022-01-27 15:03:38 +01:00
Jaime van Kessel
81dfb7942f
Merge pull request #11206 from Ultimaker/PP-98_extra-skin-wall-count-fix 
remove skin outline count overwrite
 2022-01-27 14:57:32 +01:00
Ghostkeeper
43d4075309
Bring changes from TableView to Digital Library version 
The classes should be approximately the same. There's 2 differences now though:
* The ScrollBar is re-implemented in the Digital Library because the re-useable component is not available in all Cura editions that the Digital Library needs to support.
* The sections are not working. It was removing big parts of the table for some reason and I don't think it's worth debugging since this version of the table doesn't use it at all. It's also a bit faster this way.

Contributes to issue CURA-8686.
 2022-01-26 17:24:24 +01:00
Ghostkeeper
7a1c3e1bd5
Use customised TableView for Keep/Discard Changes dialogue 
Had to make some more modifications to get it to work again this time, due to the way the width of the table scales with the dialogue. But it's nice now.

Contributes to issue CURA-8686.
 2022-01-26 16:30:50 +01:00
Ghostkeeper
ec21b167d0
Resize columns when TableView is resized 
They should retain their width proportionally.
This also fixes a case where the width of the TableView was initialised as 0 but then changed for some anchors due to weird bindings. Because it now updates the tableView when the width is changed.

Contributes to issue CURA-8686.
 2022-01-26 16:29:09 +01:00
Ghostkeeper
fa177f5192
Implement section headers 
I'm not real happy with the limitations I had to work with here. The TableView can only accept a table of strings, so I basically had to fit everything into editing this dictionary of strings. Not the best. But it's very effective.

Contributes to issue CURA-8686.
 2022-01-26 15:37:17 +01:00
Ghostkeeper
5c71671585
Make setting names italic if changed in quality-changes profile 
This was the behaviour before.

Contributes to issue CURA-8686.
 2022-01-26 14:00:29 +01:00
casper
a2d03af2f1 Use states to set border&background color in print setup header button 
CURA-8684
 2022-01-26 12:15:13 +01:00
casper
a66275ce73 Fix PrintSetupHeaderButton displaying text twice 
CURA-8684
 2022-01-26 12:01:30 +01:00
casper
b3a6d8a1fc Use UM.Label in print setup header button 
CURA-8684
 2022-01-26 11:47:14 +01:00
casper
a74c7aa4f3 Remove unused contentItem 
CURA-8684
 2022-01-26 11:46:40 +01:00
Ghostkeeper
c973be3115
Use new TableView for profile overview 
This requires some more changes that are not yet implemented: Italic text for things that were changed in the profile, and section headers. Let's see what I can do...

Contributes to issue CURA-8686.
 2022-01-26 11:39:23 +01:00
Ghostkeeper
5e5e0febb9
Format calculated functions in QualitySettingsModel itself 
That way we don't have to re-format it in the display in the table.

Contributes to issue CURA-8686.
 2022-01-26 11:33:42 +01:00
Ghostkeeper
e607ae7b92
Show tooltip if text got elided 
This way you can still see the whole text, even if the cell is too small. Handy.

Contributes to issue CURA-8686.
 2022-01-26 11:24:41 +01:00
casper
200e4df025 Fix issues in simulation view 
- Correctly display text in LayerType dropdown menu
- Use UM.Label component to reduce code duplication
- Don't display QtControls default dropdown icon

CURA-8684
 2022-01-26 10:25:20 +01:00
j.delarago
05d542c8d0 Bump UM version for CheckBox 2022-01-26 09:53:17 +01:00
casper
b51c787f62 Re-use Cura.ToolbarButton in per object settings menu 
CURA-8684
 2022-01-26 08:56:33 +01:00
AnnaKang0219
5645eacc64 Update crazy3dprint_cz_300.def.json 
fix retraction_speed 70 to 50
 2022-01-26 11:32:15 +08:00
Casper Lamboo
26bd68d891
Update resources/qml/Preferences/MachinesPage.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 22:38:02 +01:00
Casper Lamboo
95c79e7921
Update resources/qml/Preferences/MachinesPage.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 22:37:39 +01:00
Casper Lamboo
a3edf9e3e3
Update resources/qml/Preferences/MachinesPage.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 22:33:51 +01:00
Ghostkeeper
f22fea5f22
Scroll back to top when contents of table change 
Contributes to issue CURA-8686.
 2022-01-25 19:05:54 +01:00
Ghostkeeper
2a5abfdb01
Downgrade UM version, re-implementing scroll bar 
This plug-in needs to be compatible with Cura 4.9 and up, which means we can't use UM.ScrollBar.

Contributes to issue CURA-8686.
 2022-01-25 18:53:52 +01:00
Ghostkeeper
c6eb1e668d
Rename tableScrollView to tableBase 
It is no longer a scrollview, after all, since the TableView itself already scrolls (and leaves the header nicely at the top this way).

Contributes to issue CURA-8686.
 2022-01-25 18:51:03 +01:00
Ghostkeeper
83953b03b4
Use new table element for saving files as well 
Re-using that component.

Contributes to issue CURA-8686.
 2022-01-25 18:48:45 +01:00