28353 Commits

Author SHA1 Message Date
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
Ghostkeeper
a4ef86609f
Implement option to disable selections
Sometimes you don't want the user to be able to highlight certain rows.

Contributes to issue CURA-8686.
2022-01-25 18:48:06 +01:00
Ghostkeeper
6457410a53
Copy new Table implementation to Cura.TableView
There we can re-use it. We can't re-use that implementation from the Digital Library itself, since that plug-in needs to be compatible with older Cura versions as well.

Contributes to issue CURA-8686.
2022-01-25 18:37:34 +01:00
Ghostkeeper
39e29ae768
Fix QML warning of 0 height from before table is filled
If there is no model data, the cells will be empty and would have a height of 0. The table warns us that a height of 0 is not allowed.

Contributes to issue CURA-8686.
2022-01-25 18:34:04 +01:00
Ghostkeeper
2429f28b7f
Limit column widths to not exceed the total width of the table
A bit clunky, but very effective!

This way we don't have to deal with clipping or scrolling horizontally.

Contributes to issue CURA-8686.
2022-01-25 18:31:43 +01:00
Ghostkeeper
279c23f5aa
Elide header text too
Otherwise it just overlaps with the next column.

Contributes to issue CURA-8686.
2022-01-25 18:26:15 +01:00
Ghostkeeper
c6717c67f4
Don't let table overlap lining
Contributes to issue CURA-8686.
2022-01-25 18:24:38 +01:00
Ghostkeeper
88bf1995c0
Fix cell height adjusting to content
To be honest, I'm not entirely sure why it only works here if I use implicitHeight instead of height.

Contributes to issue CURA-8686.
2022-01-25 18:22:38 +01:00
Ghostkeeper
bbb40d9b11
Allow double-clicking on a file to open it
Contributes to issue CURA-8686.
2022-01-25 18:19:08 +01:00
Ghostkeeper
a7da4e4ef9
Fix integration with new table view
Only a single selected item for the moment.

Contributes to issue CURA-8686.
2022-01-25 18:11:30 +01:00
Ghostkeeper
59494cdace
Implement selection
Contributes to issue CURA-8686.
2022-01-25 18:03:45 +01:00
Ghostkeeper
5671b6c61f
Replace TableView with custom implementation
I intend to copy this implementation to mainline Cura when it's done.

Contributes to issue CURA-8686.
2022-01-25 17:51:48 +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
ea60fdeacd
Update resources/qml/Preferences/MachinesPage.qml
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2022-01-25 15:59:17 +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
Ghostkeeper
2758957d5c
Use TabRow for material page selection
The contents of the page is done with a simple page that becomes visible or not. The easiest solution I could think of. No StackLayout necessary here.

Contributes to issue CURA-8686.
2022-01-25 13:57:47 +01:00
Ghostkeeper
cfafdf878a
Move contents of ProfileTab to ProfileOverview file
This way it is re-useable, and no longer connected to the concept of a tab view.

We can then display it in the profile manager.

Contributes to issue CURA-8686.
2022-01-25 13:34:13 +01:00
Ghostkeeper
50960ce5cf
Use UM.TabRow instead of a tab view
This styles it for us automatically.
However the contents of the tab disappears now. I'll have to restore that, but since that moves a bunch of code I'd rather do that in a separate commit.
I also changed the item to a column so that we don't have to link up the anchors very weirdly/difficulty with all of the buttons and messages that are optional. This just automatically makes space if there need to be extra buttons and messages in between, and even deals with the spacing correctly.

Contributes to issue CURA-8686.
2022-01-25 12:09:59 +01:00
Ghostkeeper
5f101e8233
Set checked tab for TabRowButton
We're changing this so that the button doesn't set this by itself. This is necessary so that I can use this TabRowButton also when it's not in a repeater (for the global stack in the profile manager).

Contributes to issue CURA-8686.
2022-01-25 11:58:44 +01:00
j.delarago
7f81a2aa8c Rename low quality CheckMark.svg -> Check.svg
Rename low quality Check.svg -> CheckThin.svg
2022-01-25 11:32:41 +01:00
j.delarago
0f4a49ac6d Remove unused CheckBoxBorder.svg, the checkbox is defined using styling instead of an svg. 2022-01-25 11:09:27 +01:00