GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 15:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,408 Commits 295 Branches 268 Tags
Commit Graph

27408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
casper
d3f01034a2 Highight default action and listen to keyboard actions in image dialog 
CURA-8684
 2022-01-25 10:54:09 +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
casper
9e5fd998f4 Update open files dialog to QtControls 2 
CURA-8684
 2022-01-24 14:11:02 +01:00
casper
582e4fcbd0 Update print action hotkey listener to QtControls 2 
CURA-8684
 2022-01-24 10:31:17 +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
8cc1604b2f Update Buttons to QtControls 2.0 in the simulation view expend menu bar 
CURA-8684
 2022-01-21 14:07:41 +01:00
casper
09793854ef Update Buttons to QtControls 2.0 in per model settings dialog 
CURA-8684
 2022-01-21 13:38:58 +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
ee38c9c05b Update QtControls to v2.0 in image reader plugin 
CURA-8684
 2022-01-21 12:24:40 +01:00
casper
bcd1689680 Update buttons in per object settings plugin to QtControls 2 
CURA-8684
 2022-01-20 22:58:43 +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
f2ee58a08b Update PerObjectCategory to QtQuick.Controls 2.1 
CURA-8684
 2022-01-20 22:15:22 +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
Ghostkeeper
7a5db88fd8
Update slider to Controls 2 
Because Controls 1 is going out.
The rest of the controls elements here are left as they were since they need to be styled.

Contributes to issue CURA-8686.
 2022-01-20 17:58:11 +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
796779316f
Fix scrolling through post-processing scripts list 
It turns out this has been broken for a while. I don't think anyone adds that many scripts that they'd need to scroll this, but if they want to they can now.

Contributes to issue CURA-8686.
 2022-01-19 17:33:10 +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