258 Commits

Author SHA1 Message Date
casper
b51c787f62 Re-use Cura.ToolbarButton in per object settings menu
CURA-8684
2022-01-26 08:56:33 +01:00
casper
24a8e8b761 Merge remote-tracking branch 'origin/CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity' 2022-01-25 16:06:05 +01:00
casper
ad3832791c Use Button in tool bar button component
CURA-8684
2022-01-25 16:05:49 +01:00
Casper Lamboo
f834e63413
Update plugins/PerObjectSettingsTool/ToolBarButton.qml
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2022-01-25 15:54:33 +01:00
casper
09793854ef Update Buttons to QtControls 2.0 in per model settings dialog
CURA-8684
2022-01-21 13:38:58 +01:00
casper
bcd1689680 Update buttons in per object settings plugin to QtControls 2
CURA-8684
2022-01-20 22:58:43 +01:00
casper
f2ee58a08b Update PerObjectCategory to QtQuick.Controls 2.1
CURA-8684
2022-01-20 22:15:22 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
7d9c6e1449 Fix QML warning 2021-10-08 13:35:01 +02:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Ghostkeeper
6f6d8d0f93
Override all settings that might influence infill mesh shells to 0
If the user had specialised settings fixing the number of walls or skin layers to an integer number, this fixed value would get copied over from the extruder settings, causing infill meshes to have walls by default.
This is unintuitive. We want infill meshes to behave like it's only infill by default. So remove all of those overrides so that only infill gets printed there, by default.

The user may still change the number of walls or skin layers or their parent settings. But by default it should now behave like infill within infill, regardless of the user's setting overrides.

Fixes issue CURA-8393 and fixes #9815.
2021-07-15 18:46:20 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Ghostkeeper
5252d53187
Merge branch '4.10' 2021-06-17 12:07:25 +02:00
Remco Burema
8aa071056b
Now unused API field only took integers originally.
We want to keep it this way so people can still make plugins work for older versions of Cura, like 3.6, where the 'api' field with just a single major version, instead of the 'supported_sdk_versions', which can be either a version-string like '7.6.0' or a list of version strings.
2021-06-17 11:15:33 +02:00
Ghostkeeper
92ff9ac313
Merge branch '4.10' 2021-06-16 16:45:51 +02:00
Ghostkeeper
ddfcc94649
Merge branch 'CURA-8320_update_sdk' into 4.10 2021-06-16 16:45:37 +02:00
Ghostkeeper
31106d13d0
Reduce nesting complexity with some pre-checks
There were two pre-checks here, where the main body of the function was indented two deep. Instead, just early-out if the checks fail. This is easier to read and understand.

Found during investigation of CURA-8128.
2021-06-16 12:58:09 +02:00
Ghostkeeper
f18e5f96ab
Use Cura-style drop-down to select mesh type
MacOS has some trouble with the QtQuick.Controls 1 system-styled drop-downs since Qt 5.15. We've removed the other ones, but forgot about this one.

Contributes to issue CURA-8128.
2021-06-15 17:13:08 +02:00
Remco Burema
04002056ae
Update SDK/API from 7.5.0 to 7.6.0 for 4.10
CURA-8320
2021-06-15 16:08:07 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
Jaime van Kessel
6483db3d47
Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura"
This reverts commit 90eb2bfbdcc66fdbf82b0e1dac6bcf1a536845b0, reversing
changes made to 91c4d8b5f2cf3c18df2f75a0161f727eeae1bf41.
2021-05-27 16:01:17 +02:00
Kostas Karmas
7feba68847 Add new icon for block support overlaps
CURA-8205
2021-05-14 09:16:43 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Ghostkeeper
08be77adad
Increment SDK version to 7.5.0
The Cura 4.9 release will have expanded functionality. If you have a plug-in that uses this functionality, marking it as using SDK 7.5.0 will notify older Cura releases that they can't use that plug-in.
2021-04-06 13:28:08 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +02:00
Jaime van Kessel
5b43c94c0b
Mark setting as disabled in perobject setting panel if it's enabled property requires it
This is a bit different from the rest, since hiding would mean that the setting can't be removed.

CURA-7569
2020-12-21 13:15:32 +01:00
Jaime van Kessel
dc944ff5e9
Also add wall_line_count when adding a infill mesh
CURA-7793
Fixes #8589
2020-11-03 16:06:10 +01:00
Kostas Karmas
03dc8d00fe Up the SDK version to 7.4.0
In preparation for release of the 4.8.

CURA-7795
2020-10-22 11:29:25 +02:00
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7
CURA-7641
2020-08-07 11:12:27 +02:00
fieldOfView
c34162a2ba Merge branch 'master' into feature_support_meshes_present
# Conflicts:
#	cura/Scene/CuraSceneController.py
#	cura/Scene/CuraSceneNode.py
2020-06-04 10:27:11 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
2020-05-28 17:31:24 +02:00
Ghostkeeper
783b26e521
While searching, search through all settings rather than just visible
This makes it consistent with the searching of the normal settings list. It also makes it easier to find certain things like the Cutting Mesh or something.
2020-05-15 13:11:28 +02:00
Nino van Hooff
a4fe3d7685 Convert doxygen to rst for POS, MonitorStage, PostProcessing 2020-05-08 16:28:07 +02:00
Ghostkeeper
085462667e
Merge branch 'CURA-7383_sdk_ver_7_2_0' 2020-04-21 12:03:28 +02:00
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6
CURA-7383
2020-04-21 11:46:12 +02:00
Ghostkeeper
f38ae5bb96
Fix i18n catalog for per-object settings panel
Turns out that all of these had not been working properly for a while.

Contributes to issue CURA-7344.
2020-04-21 11:39:49 +02:00
fieldOfView
ca7a4b4779 Disable user "unchecking" mesh type in per model settings panel 2020-03-22 19:21:41 +01:00
konskarm
3d054a9400
Merge pull request #7223 from Ultimaker/CURA-7255_infill_only_dropdown
CURA-7255_infill_only_dropdown
2020-03-13 10:30:09 +01:00
Nino van Hooff
2625bbef44 Changed pos infill only label per suggestions by Tim and Yi-An
CURA-7255
2020-03-12 14:01:03 +01:00
Nino van Hooff
ce12827879 Fix infill mesh defaults not visible when changing per object settings
The problem: When infill mesh is set, wall_thickness and
top_bottom_thickness are added to the settings. Then these settings are
set to visible on the visibility_handler.
It appears however, that the visibility_handler considers all added
settings to be visible. It thus concludes that no UI update is necessary
because the settings are already added.
2020-03-12 13:25:29 +01:00
Nino van Hooff
8c0a2ff72e Remove debug print 2020-03-06 11:14:49 +01:00
Nino van Hooff
c8c4fe65cf Fix two if statements which caused POS settings to be unselectable 2020-03-06 11:00:56 +01:00
Nino van Hooff
dc6339b295 Change the infill-only checkbox in per object settings to a dropdown
CURA-7255
2020-03-04 11:56:57 +01:00
Ghostkeeper
a776f54e7f
Fix making settings visible if the default was 0
If the default was 0, then the if statement would evaluate as False and it would not make them visible until you closed and re-opened the panel.

Contributes to issue CURA-7211.
2020-02-13 13:09:57 +01:00
Ghostkeeper
3b235d5536
Make settings visible too after adding them
Contributes to issue CURA-7211.
2020-02-13 13:08:32 +01:00
Ghostkeeper
53e1742d27
Merge branch 'master' into infill_mesh_shell_defaults 2020-02-11 17:21:19 +01:00
Ghostkeeper
6f707f3149
Bump SDK version number of Cura 4.5 to 7.1
We've added new things to our API. This allows plug-in developers to use them.

Contributes to issue CURA-7205.
2020-02-10 10:45:07 +01:00
Tim Kuipers
9c2fd1c9d4 automatically add shell thickness to stack and set to zero for infill meshes
and remove when unmodified and we change to another mesh type
2020-01-03 15:57:20 +01:00