13224 Commits

Author SHA1 Message Date
casper
8fc0fb2737 Update AboutDialog
CURA 8687
2022-02-09 12:34:18 +01:00
casper
6b85423948 Update WorkSpaceSummaryDialog
CURA 8687
2022-02-09 12:31:26 +01:00
casper
30bd9e7d67 Update Dialog in context menu
CURA 8687
2022-02-09 11:17:19 +01:00
Jaime van Kessel
6e2bcc8f67
Merge pull request #11409 from Ultimaker/CURA-8915_raft_middle_layers
Raft Middle Layers
2022-02-09 10:43:14 +01:00
casper
4737fed9d4 Allow commas as number input 2022-02-08 16:48:10 +01:00
casper
3a74417e6e Add comments 2022-02-08 16:01:29 +01:00
casper
9c2d370e72 Allow SpinBox components to contain fractional values 2022-02-08 15:52:49 +01:00
Jaime van Kessel
91b3d116bf Merge branch 'CURA-8378_improve_checkbox_visibility' of github.com:Ultimaker/Cura 2022-02-08 15:31:56 +01:00
MatiGabaglio
e6b8116873
Update Trimaker Nebula Plus profile
We have eliminated the list of excluded materials.
2022-02-08 09:14:22 -03:00
casper
a0e5d66299 Disable stepSize in all SpinBoxes where stepSize is a non integer value
This should be enabled. However this is a feature gap of QtControls 2.x
2022-02-08 12:01:42 +01:00
j.delarago
6ebc51261c Add raft interface/middle layers to expert profile.
CURA-8915
2022-02-08 12:01:20 +01:00
Jaime van Kessel
930b3daf37
Merge pull request #11415 from Ultimaker/fix_show_hidden_settings
Fix show hidden settings
2022-02-08 11:49:04 +01:00
casper
50820048f7 Update SpinBox in ContextMenu 2022-02-08 11:34:54 +01:00
j.delarago
10070cf6eb Hide following settings when there are no interface layers
raft_interface_speed
raft_interface_acceleration
raft_interface_jerk
raft_interface_fan_speed

CURA-8915
2022-02-08 11:33:30 +01:00
j.delarago
e6e2d985a9 Hide following settings when there are no surface layers
raft_surface_speed
raft_surface_acceleration
raft_surface_jerk
raft_surface_fan_speed

Remove from raft_surface_extruder_nr since it determines the extruder to get settings from

CURA-8915
2022-02-08 10:54:40 +01:00
casper
c10d7d7537 Fix ProfilesPage
The properties were not (fully) updated to the updated properties

Cura 8687
2022-02-07 22:03:37 +01:00
casper
f957cc289e Fix Qt warnings
resolve binding loo in `SyncState`
move `updateCostPerMeter` function to root of `MaterialView` such that it is available of all sub components

Cura 8687
2022-02-07 22:01:45 +01:00
casper
7b8e73ae34 Update UM.ConfirmRemoveDialog
Cura 8687
2022-02-07 21:23:17 +01:00
casper
1746e24dd9 Make SpinBox a reusable component
Forgot to update Readonly `SpinBox`es to Qt 2 when implementing Cura
8684. As the spinbox is used in various places with the same
functionality it made sense to create a reusable component.

There is still a feature gap in the implementation; The `SpinBox`es
from QtControls 2.x value is defined as an integer. For some use-cases
we do require a fractional value in the `SpinBox`. The only two places
where this is required are the `material_diameter` and
`material_density` fields in the material prefference page.

Cura 8684
2022-02-07 19:59:57 +01:00
j.delarago
6888fafa96 Set correct styling for SettingCheckBox used in per model settings panel 2022-02-07 12:10:47 +01:00
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version
Contributes to issue CURA-8687.
2022-02-04 15:49:06 +01:00
Ghostkeeper
a03988d146
Replace MessageDialogs with new custom version
Changing a few fields.

Contributes to issue CURA-8687.
2022-02-04 14:38:25 +01:00
Ghostkeeper
7f8591718d
Remove central messageBox in favour of local box
The profile import/export was the only place where it was used, in our code base.

Contributes to issue CURA-8687.
2022-02-04 14:31:27 +01:00
Ghostkeeper
9a3cab1ec2
Change easy dialogs to UM.MessageDialog
A few fields have changed.
There's also a harder one, a generic one that is re-usable. I want to do that one in a separate commit since it'll need to be checked all over the code for its usage.

Contributes to issue CURA-8687.
2022-02-04 13:24:14 +01:00
casper
fc633b8769 Fix show hidden settings 2022-02-04 10:33:38 +01:00
goofoo3d
31225d5b32
Add new machine Goofoo Cube (#10962)
* add goofoo,renkforce printf

* 优化PVA打印的配置

* 修正双喷打印不能重叠的问题

* 修改配置信息

* 添加机型配置

* 新增 goofoo 2-1混色脚本,优化机型配置.

* 优化goofoo 2-1混色脚本

* 调整了机型配置

* 添加不同口径喷嘴

* 添加喷嘴口径

* 修改机器名称不对的问题

* modify setting_version = 16 to setting_version = 17

* modify renkforce & goofoo's files setting_version = 16 to 17

* modify pva support_pattern & e-one size

* modify pva support pattern to grid

* Add new machine Goofoo Cube

* modify some goofoo_cube definitions and 0.7_pla_standard

Co-authored-by: laiqiqi <laiqiqi886@163.com>
2022-02-03 17:24:24 +01:00
Ghostkeeper
d1540ff652
Add setting for raft middle layer count
Since the top layer can now have a different extruder, you might want to have a more normal raft layers.

Contributes to issue CURA-8915.
2022-02-03 15:02:57 +01:00
Ghostkeeper
35e01be0c6
Only show raft surface settings if there are surface layers
Otherwise these settings have no effect.

Discovered while working on CURA-8915.
2022-02-03 14:58:37 +01:00
Evangelos Trantos
d7c3495509
Merge pull request #11328 from Ultimaker/CURA-8378_improve_checkbox_visibility
Cura 8378 improve checkbox visibility
2022-02-02 19:54:34 +02:00
Ghostkeeper
268d16ca34
Update default_values to be equal to the new values
This helps when testing CuraEngine via command line.
2022-02-02 15:44:20 +01:00
Ghostkeeper
06bbeff21a
Merge branch 'marketplace_redesign' 2022-02-02 15:39:21 +01:00
Ghostkeeper
60a52b0963
Merge branch 'master' of https://github.com/jianshu-du/Cura into jianshu-du-master 2022-02-02 14:19:34 +01:00
Jaime van Kessel
b18582e1fb Fix size of USB manual control buttons
CURA-8684
2022-02-02 10:23:00 +01:00
Jaime van Kessel
b8e4baba0e Clean up the manual printer control QML
The QML could be simplified quite a bit to get the same results.

CURA-8684
2022-02-02 10:13:33 +01:00
64bittuning
49ed4be4ac Added omitted line
material_flow_layer_0 was mistakenly omitted from the previous file push.
2022-02-01 15:22:16 -05:00
MariskaMaas
a03396e9b6 Update cura.po
Reseller requested segmentar to be changed to seccionar since that is more correct.
2022-02-01 16:29:24 +01:00
Ghostkeeper
02c517a841
Enforce minimum column width through binding formula
We can't enforce it when resizing, due to the width rescaling with the width. But we can enforce it through the binding formula after applying the width scale.

Contributes to issue CURA-8686.
2022-02-01 13:04:16 +01:00
Joey de l'Arago
a87c92eddd
Merge pull request #11387 from Ultimaker/CURA-7541_align_buildplates
[CURA-7541] align digital buildplates
2022-02-01 10:57:24 +00:00
Ghostkeeper
8de1f923a4
Fix clicking, and don't allow dragging if not needed
When I changed the MouseArea into a TooltipArea, the clicking broke because the tooltip area doesn't catch mouse events. I could add another mouse area on top, but for better efficiency it's nice to re-use the TooltipArea. Just need to remember to allow clicking it.
I also found a small issue where you could flick the table even if it's not big enough to scroll. This should fix that.

Contributes to issue CURA-8686.
2022-02-01 11:54:43 +01:00
Ghostkeeper
aac5535c2b
Run new build plate images through OptiPNG
Contributes to issue CURA-7541.
2022-02-01 11:29:50 +01:00
j.delarago
248cd6205d Increase canvas size of backplate image to stop repeating texture (MacOS does not attempt to tile the image, however Ubuntu does)
Texturing a set of faces with an image smaller than the faces will cause repeating. Normally this is not noticable since the edges of the backplate logos are mostly transparent but in this case the backplate faces were much taller than the input image. This change adds enough empty vertical height to the backplate image so that the tiling can not be seen.

CURA-7541
2022-02-01 10:58:44 +01:00
casper
cdc7303ad9 Set default z hop speed to maximum allowed value for tevo tarantula pro
Fixes https://github.com/Ultimaker/Cura/issues/11365
2022-02-01 10:29:52 +01:00
NilsRo
ce048f1d9b Update anycubic_i3_mega_s.def.json 2022-01-31 21:21:32 +01:00
Jaime van Kessel
ecba5b409c Fix binding loop in objectItemButton
CURA-8684
2022-01-31 17:32:10 +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
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
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
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