911 Commits

Author SHA1 Message Date
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
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
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
casper
c63b94375d Update materials slot preference menu to QtControls 2
CURA-8684
2022-01-24 23:34:38 +01:00
casper
b47c7c9395 Update materials view preference menu to QtControls 2
CURA-8684
2022-01-24 23:28:25 +01:00
casper
6dc535063b Update profiles preferences page to QtControls 2
CURA-8684
2022-01-24 22:37:39 +01:00
casper
b6e375a3be Update machines preferences page to QtControls 2
CURA-8684
2022-01-24 22:34:14 +01:00
casper
3e98282871 Update material preferences page to QtControls 2
CURA-8684
2022-01-24 22:31:36 +01:00
j.delarago
5788ea8d00 The visibility settings in the preferences is defined in Uranium rather than Cura. The CheckBox has been moved to Uranium so that all parts of the project have access to this default styled component. 2022-01-24 14:03:47 +01:00
j.delarago
17339ba77e Merge branch 'master' into CURA-8378_improve_checkbox_visibility 2022-01-24 13:17:37 +01:00
j.delarago
4c9c2ad131 "checkedState" is now "checkState" in newer CheckBox
Remove partiallyCheckedEnabled since Cura.CheckBox manages this itself.
2022-01-21 18:16:16 +01:00
j.delarago
951e1cb37b Swap CheckBox for styled Cura.CheckBox 2022-01-21 18:07:45 +01:00
casper
092936ae3a Update Buttons to QtControls 2.0 in general preferences page
CURA-8684
2022-01-21 13:06:51 +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
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
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
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
Ghostkeeper
d966fe4811
Re-enable Czech translations
These translations are complete again.

Contributes to issue CURA-8753.
2022-01-10 15:07:23 +01:00
Jaime van Kessel
58a3aef8d4 Remove styles 2022-01-04 10:36:55 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
fvrmr
6962ecdf01 Update material sync link
Changed link how to load material profiles via usb
2021-12-17 10:24:18 +01:00
Ghostkeeper
f0dc7a0eea
Adjust message to include suggestion to update firmware
Because the issue could also be that their firmware is outdated and doesn't yet support syncing material.

Contributes to issue CURA-8671.
2021-12-03 13:59:01 +01:00
Ghostkeeper
6f8a4e93e7
Fix name of capability to filter on
Contributes to issue CURA-8671.
2021-12-03 13:26:51 +01:00
Ghostkeeper
b76df21b4b
Filter printer list by capabilities
And an example of such usage: In the material sync via cloud we only want to sync with printers that can receive those materials.

We might want to add a message for the user to also make sure the firmware is up to date. Because if the firmware is not up to date now it will show no printers and instruct the user how to connect the printer to the cloud.

Contributes to issue CURA-8671.
2021-12-02 17:55:53 +01:00
Jaime van Kessel
a68584cda1 Replace more instances of label with UM.Label 2021-11-10 17:42:23 +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
Ghostkeeper
dcf78b4885
Merge branch '4.12'
Conflicts:
	resources/i18n/de_DE/fdmprinter.def.json.po -> German translations got some fixes in master while we also updated the new translations for 4.12.
2021-11-08 13:55:09 +01:00
Jelle Spijker
1b503f003e
Disabled Čeština for 4.12
Contributes to CURA-8638
2021-11-08 13:48:11 +01:00
Ghostkeeper
1b36bc2e81
Remove padding on troubleshooting button
Contributes to issue CURA-8609.
2021-11-03 13:46:47 +01:00
Ghostkeeper
9c684cbc4d
Hide entire footer when the user started syncing
If they started syncing, most likely the list of printers is just complete and the user won't need this any more.

Contributes to issue CURA-8609.
2021-11-03 11:26:37 +01:00
Ghostkeeper
a35fcf493a
Allow word wrapping for error message
This prevents being able to align the text vertically with the troubleshooting button though. The text may become the larger of the two, in which case the text should be leading the height. Qt can do this with a Layout, however it then can't automatically adjust the width of the layout there since that would create a polish loop in the layout.

Contributes to issue CURA-8609.
2021-11-01 18:59:06 +01:00
Ghostkeeper
e7e513bb16
Reduce width to 0 if the icon is neutral
Because with our default theme, the neutral icon is empty. This causes the alignment of the label next to it to appear off.

Contributes to issue CURA-8609.
2021-11-01 18:27:38 +01:00
Ghostkeeper
fd79b76f07
Add troubleshooting link to footer
It's moving there now. However if there are any errors syncing with the printers, the troubleshooting link has to disappear from there.

This makes the layout quite complex, since the icon on the left and the button on the right are no longer vertically centred. The text used to be vertically centred too, but can't do that any more since the text is not the determiner of the height any more, with there being a horizontally aligned button below it. It's all a bit complex now.

Contributes to issue CURA-8609.
2021-11-01 18:18:56 +01:00
Ghostkeeper
cd286a006e
Add missing colours, fixing dark theme
Don't just use white rectangles or black text. Use the theme where appropriate. And these rectangles are just outlines.

Contributes to issue CURA-8609.
2021-10-29 15:18:40 +02:00
Ghostkeeper
ce4117a3ee
Reset export USB button when re-opening window
To do that, I moved the property to track that state to the root of the window.

Contributes to issue CURA-8609.
2021-10-29 15:12:16 +02:00
Ghostkeeper
c58d03ad4c
Change button to 'done' once USB export has completed
Also important to keep in mind: It won't change to 'done' if the user cancelled the file dialogue.

Contributes to issue CURA-8609.
2021-10-29 15:06:44 +02:00
Ghostkeeper
f56e438747
Fix broken references
Just some things that the QML is complaining about. This actually did fix the spinning of the spinners.

Contributes to issue CURA-8609.
2021-10-15 15:52:54 +02:00
Ghostkeeper
bfb8d9ddf1
Show 'Done' button when sync was successful
And make it close the window when pressed then.

Contributes to issue CURA-8609.
2021-10-12 17:34:34 +02:00