GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 21:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,989 Commits 290 Branches 265 Tags
Commit Graph

9131 Commits

Author SHA1 Message Date
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
f834e63413
Update plugins/PerObjectSettingsTool/ToolBarButton.qml 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2022-01-25 15:54:33 +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
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
d3f01034a2 Highight default action and listen to keyboard actions in image dialog 
CURA-8684
 2022-01-25 10:54:09 +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
9b11483428 Cura.Checkbox requires vertical alignment since it no longer takes up the same amount of vertical space. 2022-01-21 18:09:02 +01:00
j.delarago
951e1cb37b Swap CheckBox for styled Cura.CheckBox 2022-01-21 18:07:45 +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
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
f2ee58a08b Update PerObjectCategory to QtQuick.Controls 2.1 
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
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
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
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
85d0749f5f
Use Controls2 ListView instead of ScrollView for print job list 
No need for a ScrollView in Controls 2. And specialise the scroll bar.
Be sure to also align the right side of the contents with the scroll bar though.

Contributes to issue CURA-8686.
 2022-01-18 17:27:51 +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
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
Ghostkeeper
d87551ac9c
Use Controls2 ListView instead of Controls1 ScrollView to scroll 
Just a listview with a specialised scroll bar.

Contributes to issue CURA-8686.
 2022-01-18 17:01:16 +01:00
Ghostkeeper
ca3f29daf7
Use ListView for settings list in post-processing scripts 
With the customised scroll bar.

Contributes to issue CURA-8686.
 2022-01-18 15:14:29 +01:00
Ghostkeeper
954a3cb1db
Replace ScrollView by ListView in settings picking dialogue 
The ScrollView is no longer necessary in Controls2. Just have a ListView with customised scrollbar.

Contributes to issue CURA-8686.
 2022-01-18 14:54:36 +01:00
Ghostkeeper
f630b84788
Replace ScrollView with QtControls2 ListView 
I can't update the buttons (not part of this ticket) so I kept those Controls1.
The ScrollView is no longer necessary, just a ListView now with customised scroll bar.

Contributes to issue CURA-8686.
 2022-01-18 14:53:25 +01:00
Ghostkeeper
10303c10f9
Use new ScrollBar with controls 2 
Contributes to issue CURA-8686.
 2022-01-17 17:15:23 +01:00
Jaime van Kessel
0501b71e13 Also accept original casing to match with ID for material profile 
This fixes an issue reported by Essentium. They used capitals in their
id, so it could never match that with a material profile
 2022-01-17 10:53:52 +01:00
Jaime van Kessel
b614cabae6 Put back import 2022-01-14 13:05:07 +01:00
Ghostkeeper
73a151ab49
Put focus on search bar when Digital Library opens 
Fixes CURA-8768.
 2022-01-13 13:55:42 +01:00
Ghostkeeper
3c12a2629e
Only attempt to remove hidden container stacks if the directory exists 
Otherwise we can't even look for them.

Contributes to issue CURA-8591.
 2022-01-05 17:25:51 +01:00
Jaime van Kessel
6e4143ba59 Merge branch '4.13' of github.com:Ultimaker/Cura 2022-01-05 14:08:00 +01:00
Jaime van Kessel
61a7203726 Only reset marketplace page if the window isn't visible 
CURA-8588
 2022-01-04 13:13:31 +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
Jaime van Kessel
3bfea5b970 Ensure that stored log lines are sent to sentry if they haven't already been logged 
CURA-8760
 2022-01-03 14:10:36 +01:00
Jaime van Kessel
27e5905a32 Fix typing 
CURA-8588
 2022-01-03 11:44:05 +01:00
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00
Jaime van Kessel
60e6d7bcae Fix too large clickable area for author info in package card 
CURA-8588
 2022-01-03 11:20:27 +01:00
Jaime van Kessel
89c82964c3 Simplify restart check 
CURA-8588
 2022-01-03 11:14:28 +01:00
Jaime van Kessel
852076460f Remove unused imports 
CURA-8588
 2022-01-03 11:13:28 +01:00
Jaime van Kessel
6a39862349 Merge RestartManager into marketplace 
CURA-8588
 2022-01-03 11:12:52 +01:00
Jaime van Kessel
6af2677c52 Remove TabManager 
Since marketplace itself already needed to be a qObject, there wasn't
really a need to have a seperate object for it
 2022-01-03 11:06:19 +01:00