GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,745 Commits 291 Branches 260 Tags
Commit Graph

136 Commits

Author SHA1 Message Date
fieldOfView
b622738ae3 Fix missing icons since move to PyQt6 2022-04-22 22:33:14 +02:00
j.delarago
c294680022 Fix scrollbar filling space by replacing custom implementation with generic UM.ScrollBar 
CURA-9144
 2022-04-21 15:52:15 +02:00
j.delarago
9a0f693ef7 Wrapping Retrieval in DFRetrieval does not seem to work in QT6, the object returned only undefined for all enum values. 
Fixed by creating and registering the enum inside DigitalFactoryController.py

CURA-9126
 2022-04-21 12:02:06 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
Jaime van Kessel
dd037fa946 Make "create new" button visible 
CURA-9126
 2022-04-13 16:25:24 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
j.delarago
6d2293db08 Remove unused Table in DigitalLibary Plugin 
CURA-8640
 2022-04-05 15:55:45 +02:00
j.delarago
e86f860a2c Update TableView and TableModel in DigitalLibrary plugin. 
This is not backwards compatible with Cura < 5.0 due to the removal of Qt.labs

CURA-8640
 2022-04-05 15:47:08 +02:00
j.delarago
184f4b808e Bump QtQuick version to fix RegularExpressionValidator import 
CURA-8640
 2022-04-05 15:11:07 +02:00
j.delarago
4ec2edec67 Add replacement for QT.labs.models.TableModel 
Implementation is intended to function the same as before.

CURA-8640
 2022-04-05 15:03:45 +02:00
c.lamboo
4f70d34631 wip qt changes 2022-03-30 16:55:56 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator 
Due to Qt6 API change

CURA-8640
 2022-03-30 15:10:37 +02:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
 2022-03-24 11:53:44 +01:00
c.lamboo
0dda27094e Fix textfield height for entering project name in DL 
from eccb @fvrmr
 2022-03-24 10:31:10 +01:00
j.delarago
b2bed4efdd Fix setting visibility styling working in one theme and not the other. 
CURA-8688
 2022-03-02 09:06:47 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade 
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
 2022-02-21 11:52:28 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
j.delarago
c57220f33c Fix search icon having no left padding in DF search bar. 2022-02-07 13:20:45 +01:00
Evangelos Trantos
d7c3495509
Merge pull request #11328 from Ultimaker/CURA-8378_improve_checkbox_visibility 
Cura 8378 improve checkbox visibility
 2022-02-02 19:54:34 +02:00
Ghostkeeper
02c517a841
Enforce minimum column width through binding formula 
We can't enforce it when resizing, due to the width rescaling with the width. But we can enforce it through the binding formula after applying the width scale.

Contributes to issue CURA-8686.
 2022-02-01 13:04:16 +01:00
Ghostkeeper
8de1f923a4
Fix clicking, and don't allow dragging if not needed 
When I changed the MouseArea into a TooltipArea, the clicking broke because the tooltip area doesn't catch mouse events. I could add another mouse area on top, but for better efficiency it's nice to re-use the TooltipArea. Just need to remember to allow clicking it.
I also found a small issue where you could flick the table even if it's not big enough to scroll. This should fix that.

Contributes to issue CURA-8686.
 2022-02-01 11:54:43 +01:00
Ghostkeeper
ee81326d6a
Fix remaining merge conflicts 
- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.

Contributes to issue CURA-8684.
 2022-01-31 17:08:56 +01:00
Ghostkeeper
7bc109d1f0
Remove outdated comment 
It's no longer limiting the width to be at least 10 pixels, due to how it has to scale with the width of the table.

Contributes to issue CURA-8686.
 2022-01-28 10:57:00 +01:00
Ghostkeeper
43d4075309
Bring changes from TableView to Digital Library version 
The classes should be approximately the same. There's 2 differences now though:
* The ScrollBar is re-implemented in the Digital Library because the re-useable component is not available in all Cura editions that the Digital Library needs to support.
* The sections are not working. It was removing big parts of the table for some reason and I don't think it's worth debugging since this version of the table doesn't use it at all. It's also a bit faster this way.

Contributes to issue CURA-8686.
 2022-01-26 17:24:24 +01:00
j.delarago
05d542c8d0 Bump UM version for CheckBox 2022-01-26 09:53:17 +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
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
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
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
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
73a151ab49
Put focus on search bar when Digital Library opens 
Fixes CURA-8768.
 2022-01-13 13:55:42 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +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
Ghostkeeper
a878cfae7a
Merge branch 'master' into marketplace_redesign 2021-12-31 14:07:51 +01:00
casper
02c81234d0 Remove references to the toolbox plugin from the themes.json 
Some other components were (incorrectly) using these theme variables.
Replaced them by another theme variable with the same value.

CURA 8588
 2021-12-30 13:38:16 +01:00
Remco Burema
448fbf7408
Qt5->Qt6: Register QML enums as (uncreatable) meta object not type. 
part of CURA-8591
 2021-12-29 11:37:18 +01:00
Remco Burema
20b435af76
Qt5->Qt6: More renamed stuff. 
part of CURA-8591
 2021-12-29 11:18:49 +01:00