5456 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
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
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
j.delarago
05d542c8d0 Bump UM version for CheckBox 2022-01-26 09:53:17 +01: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
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
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
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
a73ae6b655 Replace Cura.CheckBoxWithTooltip with UM.CheckBox.
Remove Cura.CheckBoxWithTooltip.qml from qmldir module definition.

Remove Cura.CheckBox.qml from qmldir module definition as it has been moved to Uranium
2022-01-25 11:08:52 +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
casper
b45707af54 Update ask open project or models dialog to QtControls 2
CURA-8684
2022-01-24 21:58:23 +01:00
casper
4c0ee058e4 Update discard keep or discard changes dialog to QtControls 2
CURA-8684
2022-01-24 18:21:52 +01:00
j.delarago
f6c48fdf07 Rename EmptyCheck -> CheckMark 2022-01-24 14:20:28 +01:00
casper
9e5fd998f4 Update open files dialog to QtControls 2
CURA-8684
2022-01-24 14:11:02 +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
casper
582e4fcbd0 Update print action hotkey listener to QtControls 2
CURA-8684
2022-01-24 10:31:17 +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
j.delarago
171da643d5 I'm replacing all CheckBox in Cura with this CheckBox except ones that use the old "style" tag (Not in scope). This should make the design consistent everywhere and easier to update.
Moved set width and height from top level into "indicator" since this was causing the label to be cut off.

Swapped out setting_control_radius for checkbox_radius since these are different now.

Updated the UM.RecolorImage to work with tri state checkboxes so this can replace the Checkbox in SettingVisiblityPage.qml.
2022-01-21 18:06:31 +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
casper
092936ae3a Update Buttons to QtControls 2.0 in general preferences page
CURA-8684
2022-01-21 13:06:51 +01:00
casper
07095a5802 Update Material selection and variant selection buttons to QtControls 2
CURA-8684
2022-01-20 22:38:00 +01:00
casper
204d965df2 Use SecondaryButton in the usb print panel inplace of tye style prop
The Jog buttons are not changed yet as these button make use of the
`checked` property this is not yet implemented for Cura's `Action` and
by extension Cura's `Secondary` button.

CURA-8684
2022-01-20 22:15:22 +01:00
j.delarago
670872f8d1 Specify width and height in Cura.Checkbox
Update Dialogs to use Cura.CheckBox instead of QtQuick. This will make it easier to update the QtQuick checkbox version.
2022-01-20 17:31:00 +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
efcd00e2f3
Merge branch 'master' into marketplace_redesign
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
2022-01-20 15:57:28 +01:00
j.delarago
16e4ee58a9 Update Machine Settings Menu checkboxes to new style.
Change height of setting row to be set by TooltipArea instead of Checkbox and center Checkbox within TooltipArea
2022-01-19 18:04:29 +01:00