GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,682 Commits 294 Branches 267 Tags
Commit Graph

5668 Commits

Author SHA1 Message Date
c.lamboo
efce84284e Update translation strings 
The profile name in the translation string was hard coded to be prepended before the actual string. Put this in the translation string as some languages may change the position of this part of the sentence.
 2022-07-15 10:29:56 +02:00
Jelle Spijker
c37285f9c0 Merge branch '5.1' 2022-07-15 10:14:17 +02:00
c.lamboo
35fce917c6 Use UM.Window in the material sync dialog and the preference pages 
CURA-9428
 2022-07-15 07:25:54 +02:00
Jelle Spijker
1a0ecfd850
Merge branch '5.1' 
# Conflicts:
#	.github/workflows/conan-package.yml
#	.github/workflows/cura-installer.yml
 2022-07-14 16:30:52 +02:00
Jaime van Kessel
32121c7adc Add background color for rename dialogs 
CURA-9465
 2022-07-11 16:21:10 +02:00
Jaime van Kessel
6536b37525 Set background color for machine actions 
Otherwise the background is always white, which makes it unusuable for darktheme

CURA-9465
 2022-07-11 16:19:26 +02:00
Jaime van Kessel
656a3dc707 Remove stray print 2022-07-11 16:02:17 +02:00
jspijker
f9d4628b95 Merge branch 'main' into CURA-9365 
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/cura-installer.yml
#	.github/workflows/requirements-conan-package.txt
#	resources/definitions/Mark2_for_Ultimaker2.def.json
#	resources/definitions/elegoo_neptune_2.def.json
#	resources/definitions/elegoo_neptune_2D.def.json
 2022-07-08 12:37:32 +02:00
joeydelarago
5d5c83ec11
Add missing background color to WorkspaceSummaryDialog.qml 
CURA-9402
 2022-07-07 15:06:53 +02:00
Jaime van Kessel
bafffa994c Fix toolbar being drawn over monitor page 
CURA-9401
 2022-07-05 13:43:20 +02:00
Remco Burema
7ae1b2a074
Merge pull request #12635 from Ultimaker/CURA-9270_discard_or_keep_changes_not_updating 
Add the "clear" hack to the tableModel for discardOrkeepchanges
 2022-07-01 14:44:23 +02:00
Remco Burema
3dc646874d
Merge pull request #12634 from Ultimaker/CURA-9402_fix_background_dark_theme 
Fix background dark theme
 2022-07-01 14:30:10 +02:00
Remco Burema
ca36b4f2ef Set proper background color for open project dialogs. 
part of CURA-9402
 2022-07-01 14:22:27 +02:00
Jaime van Kessel
a8a2fd8007 Add the "clear" hack to the tableModel for discardOrkeepchanges 
It's the same hack that we already use for the other instances where we use the tableModel.
For some reason it wasn't done here, so we also had the not updating bug

CURA-9270
 2022-06-29 13:34:41 +02:00
Casper Lamboo
f4ee4ad05d
Merge pull request #12573 from Ultimaker/CURA-8849_more_intent_fixes 
[CURA-8849] more intent fixes
 2022-06-29 13:01:09 +02:00
Jaime van Kessel
2335322381 Properly set background for AboutDialog 
CURA-9402
 2022-06-29 10:57:11 +02:00
Ghostkeeper
03398f3275
Add more extensive descriptions for about page entries 
The translators had lots of questions about these. So I'm adding more extensive descriptions for them for any future translators.
 2022-06-29 10:31:35 +02:00
j.delarago
7700d01cf3 Fix implicitWidth binding loop. 
CURA-8849
 2022-06-28 16:39:25 +02:00
j.delarago
8761a476a6 Fix height binding loops 
CURA-8849
 2022-06-28 16:33:35 +02:00
j.delarago
c118bd4e29 Adjust space between configuration warning and resolution options to closer match design. 
CURA-8849
 2022-06-22 11:13:50 +02:00
j.delarago
09f2a73cb1 Fix tooltip showing on hover when no tooltipText in provided. 
CURA-8849
 2022-06-21 16:29:41 +02:00
j.delarago
cde897ff1e Instead of having a seperate tooltip for the checkbox and the text area, the two have been combined into one tooltip. 
The reason for this is that hovering the mouse between the checkbox and text was causing some strange behaviour where sometimes the tooltip would not appear.

The effect of the changes in RecommendedSupportSelector.qml are the same as RecommendedAdhesionSelector.qml. It just required a bit of refactoring to have the checkbox and the textlabel in the same component.

CURA-8849
 2022-06-21 11:59:03 +02:00
Jaime van Kessel
52ea80f6c9 Fix the font for searchbars being styled correctly 
By setting the font.italic to true, we actually reset the entire font.

Fixes #12565
 2022-06-21 10:58:53 +02:00
j.delarago
4ee4a781f4 Change flashing yellow warning on resolution combobox to blue flashing lining. 
Removed alwaysRunToEnd on animation since we would like the previous animation to stop if a user clicks through multiple intents triggering multiple animations.

CURA-8849
 2022-06-20 11:33:28 +02:00
j.delarago
9c16e200e0 Update reset settings icon in print settings to match new color used in recommeded settings 
CURA-8849
 2022-06-20 10:56:00 +02:00
j.delarago
c6bc3a5cd7 Add tooltip to IconWithText.qml, 
Use this to display tooltips for Infill, Support and Adhesion in recommended settings.

CURA-8849
 2022-06-20 10:52:31 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage 
This only needs to happen in code that uses PyQt, not in qml code
 2022-06-17 15:26:30 +02:00
j.delarago
f650579799 PrintQuality icon is slightly too right aligned due to the icon not filling the entire svg. 
There is no additional margin on the left that can be removed, so instead I've given it a small negative margin

CURA-8849
 2022-06-17 15:02:45 +02:00
j.delarago
9dff733345 Remove todos that are no longer applicable 
Remove debug print statement

CURA-9321
 2022-06-16 15:32:33 +02:00
j.delarago
cc58b362fc Add text wrapping for very long custom profile names. 
CURA-8849
 2022-06-16 14:19:39 +02:00
j.delarago
0fb2b46677 Intent button was showing when only a single intent is available. 
This was caused by visible being overridden.

CURA-8849
 2022-06-16 14:05:39 +02:00
j.delarago
1e0236e317 Remove left margins which don't align with the intended design. 
CURA-8849
 2022-06-16 13:56:46 +02:00
j.delarago
689547f125 We are using recommendedResolutionSelector._previousResolution to see if the resolution had changed before highlighting the resolution selector. This updates when intents change but not when qualities change. 
I tried updating when the qualities change but this was updating before this line
if(recommendedResolutionSelector._previousResolution !== Cura.MachineManager.activeQualityType)
which caused this always to resolve as true

The solution was to update _previousResolution after we select an item in the drop down.

CURA-8849
 2022-06-16 13:49:30 +02:00
j.delarago
1e5f6bce72 Increase margins on warning to match design 
CURA-8849
 2022-06-16 13:23:50 +02:00
j.delarago
7d8fdf8bdd Items in intent selection settings column were not filling width, the result of this was any item with more than one child would have these children squished together. 
Fix is to have the children fill their width

CURA-8849
 2022-06-16 13:12:36 +02:00
Casper Lamboo
dd76369b9a
Merge pull request #12528 from Ultimaker/CURA-8849 
[CURA-8849] Improve intent profile selection
 2022-06-15 18:24:18 +02:00
j.delarago
6f8470167f Suggested changes 
CURA-8849
 2022-06-15 17:40:07 +02:00
j.delarago
8362d4c967 Switch to column layout in RecommendedPrintSetup.qml so that left margins can be put on infill selector and items below it. 
Add warning and reset button when custom profile is select and/or settings have been changed

CURA-8849
 2022-06-15 10:48:04 +02:00
j.delarago
5fa10b0b8a Add campaign link 
CURA-8849
 2022-06-15 09:48:08 +02:00
j.delarago
d293855c65 Remove typo 
CURA-8849
 2022-06-15 09:07:35 +02:00
Ghostkeeper
3acc7bcb1c
Add actual link to help page for when a profile is not supported 
Doesn't have UTM tags though. Maybe that's not important here.

Contributes to issue CURA-8849.
 2022-06-14 18:20:35 +02:00
Ghostkeeper
b18cb1f649
Show UnsupportedProfileIndication if list of quality types is empty 
And otherwise show the intent and quality level selectors.

This is currently quite broken because the list of quality levels is not correct. It should only show a quality type if it is supported by all extruders.

Contributes to issue CURA-8849.
 2022-06-14 18:20:00 +02:00
Ghostkeeper
5c15ac68b8
Add a design for the notification when there's no recommended profile 
Looks more harsh than it should be, perhaps. I'd prefer if we could add some text that says that you can create your own custom profiles too...

Contributes to issue CURA-8849.
 2022-06-14 16:59:23 +02:00
Ghostkeeper
b8e3793631
Fix QML warning about no variable 'transparent' existing 
It's a colour name. It should be within quotes here.

Contributes to issue CURA-8849.
 2022-06-14 16:19:56 +02:00
Ghostkeeper
aee614ff9b
Hide intent category selector if there's just 'default' intent 
It doesn't make sense to let the user choose then.

Contributes to issue CURA-8849.
 2022-06-14 16:12:10 +02:00
Ghostkeeper
6b6f41bfe9
Add a horizontal line between sections of recommended set-up 
This delimits the selecting of the profile from the few basic settings.

Contributes to issue CURA-8849.
 2022-06-14 16:07:05 +02:00
Ghostkeeper
83ea5c2944
Fix triggering first pulse 
Before the first pulse, the _previousResolution property was still bound to the activeQualityType property of the MachineManager. When it then checks if it changed, it finds that it didn't change because it checks against that same property, but the _previousResolution automatically updated with it. After that it loses its binding because it's set in the function itself to a fixed value.
Instead, we'll now give it its initial value with the Component.onCompleted function so that it doesn't bind, and then doesn't change along with the first change.

Contributes to issue CURA-8849.
 2022-06-14 16:00:14 +02:00
Ghostkeeper
e095d41f0b
Implement pulse animation option for ComboBox widget 
You can now call pulse() on it and it'll pulse in the warning colour.

Contributes to issue CURA-8849.
 2022-06-14 16:00:14 +02:00
Ghostkeeper
bd131257fe
Implement sending a signal when changing intent changes quality level 
For now it does nothing. But I'm adding a function that should cause the combobox to pulse. That'll be a new feature so I'm implementing it in a separate commit.

Contributes to issue CURA-8849.
 2022-06-14 16:00:13 +02:00
j.delarago
40d473c243 Add circle with letter inside for non default intents 
CURA-8849
 2022-06-14 15:44:11 +02:00