12253 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Ghostkeeper
0f61e25a77
Fix anchoring width of network printer view to scrollbar
You can't anchor to something that's not a parent or sibling, and the scrollbar was an... uncle?

Contributes to issue CURA-8686.
2022-01-21 17:07:10 +01:00
Ghostkeeper
643f6e7d27
Customise scrollbar for combobox widgets
Contributes to issue CURA-8686.
2022-01-20 17:28:31 +01:00
Ghostkeeper
4f82137035
Customise scrollbar for extruder selectors
Contributes to issue CURA-8686.
2022-01-20 17:26:49 +01:00
Ghostkeeper
08b8dcfa43
Use custom scroll bar for object selector
Contributes to issue CURA-8686.
2022-01-19 17:59:41 +01:00
Ghostkeeper
efc748cc99
Remove unused ScrollView widget
We were not using Cura.ScrollView anywhere.

Contributes to issue CURA-8686.
2022-01-19 17:16:39 +01:00
Ghostkeeper
f1db69a36a
Remove extra ScrollView and customise ListView instead
Contributes to issue CURA-8686.
2022-01-19 17:14:30 +01:00
Ghostkeeper
5b76cf5689
Merge branch 'replace_controls_1_for_controls_2' into CURA-8686_views_controls2 2022-01-19 16:37:24 +01:00
Ghostkeeper
8f87b7c4bb
Merge branch 'master' into replace_controls_1_for_controls_2 2022-01-19 16:37:08 +01:00
Ghostkeeper
26b40e6669
Remove what's new images again
These have been moved to cura-binary-data.
2022-01-19 16:34:14 +01:00
Ghostkeeper
9124f213ea
Prevent QML errors when model is not yet initialised
I'm not sure when this happens, but it updates this text twice: Once with 'undefined' name and once with the proper name. For the user it displays the name correctly, but it may be so fast that nothing was visible.

Discovered during work on CURA-8686.
2022-01-19 16:31:36 +01:00
Ghostkeeper
fa2fbb99c7
Fix height and scrolling of add printer menus
This fixes the irritating scrolling behaviour of the local printer menu, as well as the disappearing items (former issue which had a workaround) and makes it use a styled scroll bar.

Contributes to issue CURA-8686.
2022-01-19 16:26:48 +01:00
Ghostkeeper
f94b7ce753
Replace ScrollView+Column+Repeater by ListView with correct scrollbar
Much simpler. And looks more consistent too.

Contributes to issue CURA-8686.
2022-01-19 14:59:48 +01:00
Ghostkeeper
5041162a99
Use custom scroll bar for qualities+intents menu
Contributes to issue CURA-8686.
2022-01-19 14:47:55 +01:00
Ghostkeeper
c57126fb00
Use re-useable scrollbar and remove ScrollView
The machine selector has the scroll view inside of the listview. It just needs to use our new scrollbar element instead of the default.

Contributes to issue CURA-8686.
2022-01-19 14:32:12 +01:00
Ghostkeeper
7e1b92953c
Update ScrollView to Controls 2 and customise with scrollbar
Contributes to issue CURA-8686.
2022-01-19 14:14:03 +01:00
Ghostkeeper
509c9068eb
Convert all ScrollViews to Controls2
This was a bit of a doozy. One was really simple but the other one had me stumped for a while: The Controls2 version doesn't have the viewport property any more, so just use the width.

Contributes to issue CURA-8686.
2022-01-19 13:48:21 +01:00
Ghostkeeper
4d9039288b
Use new ScrollBar for material sync dialogue
Contributes to issue CURA-8686.
2022-01-18 19:10:06 +01:00
Ghostkeeper
52f5b91621
Upgrade material list ScrollView to Controls2
Took some effort. This was a weird one. I had to manually set the contentHeight to the height of the contents. Perhaps the ScrollBar itself was messing with it?

Contributes to issue CURA-8686.
2022-01-18 19:01:22 +01:00
Ghostkeeper
bb32f25b49
Replace old ScrollView with new ListView
I also swapped out the old NewControls import to just be the actual Controls, and used OldControls to import the Controls1 module. This is consistent with the rest of the code base as far as I could find.

Contributes to issue CURA-8686.
2022-01-18 18:43:27 +01:00
Ghostkeeper
4614b3a9e1
Use new ListView instead of ScrollView, with correct scrollbar
I also fixed an undefined reference for whether a button needed to be enabled, if no profile was selected yet. The button was invisible if it was undefined, but it was still giving QML warnings.

Contributes to issue CURA-8686.
2022-01-18 18:37:34 +01:00
Ghostkeeper
7a1578cbc4
Re-use component scrollbar from Uranium
It's a new component so that we don't have to re-implement it everywhere. In this case we do have to anchor it correctly though because ScrollView doesn't do that by itself.

Contributes to issue CURA-8686.
2022-01-18 18:22:49 +01:00
Ghostkeeper
ae81b5e3e7
Fix flickable with custom scrollbar
A bit of a hassle with the scrollbar overlapping the background here.

Contributes to issue CURA-8686.
2022-01-18 18:13:13 +01:00
Ghostkeeper
1cc3aecd8c
Use correct scrollbar and clip contents
We've not been clipping this for so long, but the text really does overlap with the label and the buttons if we don't (and the text is sufficiently large).

Contributes to issue CURA-8686.
2022-01-18 17:56:31 +01:00
Ghostkeeper
c605b45b7c
Use styled scroll bar, and no ScrollView
Make sure the text aligns next to the scrollbar instead of behind it, too.

Contributes to issue CURA-8686.
2022-01-18 17:51:37 +01:00
Ghostkeeper
f808f5f545
Merge branch 'replace_controls_1_for_controls_2' into CURA-8686_views_controls2 2022-01-18 17:20:37 +01:00
Ghostkeeper
dbb2bce157
Fix icon name with Controls 2 action
The text above this icon name got changed in master, which led to a minor merge conflict here that wasn't discovered.
2022-01-18 17:19:52 +01:00
Ghostkeeper
e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
2022-01-18 17:17:10 +01:00
Remco Burema
08f49d6ede Incompletely translated languages now selectable.
Was deemed OK to do this by UX. Since some of these are _very_ incomplete, a heading was added to the combobox to indicate where the incomplete languages start, so the user isn't confused when +- 90% is still in English.

CURA-8899
2022-01-18 16:50:50 +01:00
Jelle Spijker
74829f5642
Merge pull request #11196 from Ultimaker/CURA-8592_python_3.10
Upgrade to Python 3.10
2022-01-18 12:26:45 +01:00
Ghostkeeper
d4381a6dd0
Get rid of double scrollbar due to flickable in scrollview
The tutorials say it should work, but it doesn't. Now we make the whole thing a flickable with an attached textarea property, which does seem to work.

Contributes to issue CURA-8686.
2022-01-17 19:21:14 +01:00
Ghostkeeper
7f0af55d1d
Fix top and bottom margins
These were undefined properties otherwise.

Contributes to issue CURA-8686.
2022-01-17 17:59:45 +01:00
Ghostkeeper
7bda1336da
Use new scrollbar with QtControls 2 scroll view
A bit confusing that you have to set the parent and position manually, but okay.

Contributes to issue CURA-8686.
2022-01-17 17:57:22 +01:00
Ghostkeeper
70a79c9b5c
Use custom scroll bar for settings list
This is necessary to get the same design working in Controls 2.

Contributes to issue CURA-8686.
2022-01-17 17:14:31 +01:00
Jaime van Kessel
288aeec2db Disable menuItems if they aren't visible
This prevents the shortcuts from breaking
2022-01-17 15:32:27 +01:00
Jaime van Kessel
901f6c4b63 Fix ctrl+shift+s shortcut 2022-01-17 15:06:32 +01:00
Jaime van Kessel
3e4c171603 Simplify the OpenFilesMenu
CURA-8683
2022-01-17 11:09:42 +01:00
Ghostkeeper
348abad6eb
Fix maximumWidth properties on ActionButtons
Turns out this wasn't really functional. We didn't use it. Now we use it for the MessageStack.

Contributes to issue CURA-8682.
2022-01-14 19:43:44 +01:00
Ghostkeeper
b5e7a60a8a
Fix scaling of language and theme drop-downs with width
The width was unknown because it's all in a scrollview that could have an infinite width. I now fixed it to scale with the viewport's width.

Contributes to issue CURA-8682.
2022-01-14 19:43:43 +01:00
Jaime van Kessel
d7d6918ab7 Use CuraMenu so that custom styling is used
CURA-8683
2022-01-14 15:01:48 +01:00
Jaime van Kessel
4db8878317 Fix ordering of material menu selection
CURA-8683
2022-01-14 14:33:46 +01:00