GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 290 Branches 260 Tags
Commit Graph

149 Commits

Author SHA1 Message Date
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
Remco Burema
7021ff0b67
Qt5->Qt6: Replace QT_ENUMS with pyqtEnum. 
part of CURA-8591
 2021-12-28 14:59:25 +01:00
Remco Burema
32b52c6166
Qt5->Qt6: Rectify constant locations: UserRole, CppOwnership 
part of CURA-8591
 2021-12-28 14:54:56 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6. 
part of upgrading Qt to v6.2: CURA-8591
 2021-12-28 14:46:02 +01:00
Ghostkeeper
1df859e046
Catch IndexError when logging errors 
And log that error too, then.

Fixes Sentry issue CURA-32J.
 2021-11-23 19:04:33 +01:00
Remco Burema
b5d58f78d7
Fix: Actually make SearchBar-component independant. 
It still depended on the Digital Library 'parent'.

part of CURA-8559
 2021-11-12 11:49:37 +01:00
Remco Burema
977a12c989
Steal search-bar from DigitalFactory. 
Make 'SearchBar' into a reusable component, so it can be used in the (new) Marketplace search. Also now at least the word 'Search' can be translated ;-)

part of CURA-8559
 2021-11-12 09:52:24 +01:00
Jelle Spijker
666880ad20
Only show certain App Switcher icons when account has DF access 
Added a dictionary where additional user rights can be set.
A plugin such as the DigitalFactory can update this dictionary
if certain account rights change. The `account.additionalRights`
is intended to allow us some flexibility, without breaking the API
in the future.

The Application Switcher now queries the additional account rights,
which is updated by the DF plugin to only show `My printers`,
`Digital Library` and `Print jobs` when the user has access to the
DF.

Contributes to CURA-8624
 2021-10-18 15:37:06 +02:00
Konstantinos Karmas
87add2c8de Revert "Revert "Use optional last output (file) name from output-dev to set project name."" 
This reverts commit 24ff3692bd5b73828a1c5a58cdd55400cdddad9c.
 2021-09-15 12:26:18 +02:00
Konstantinos Karmas
4e89ee0ccc Check against the correct SDK version 
Since the `self.setLastOutputName` is available in 4.12 (SDK 7.8.0) onwards.

CURA-8566
 2021-09-14 16:05:04 +02:00
Jaime van Kessel
c593f62271 Only set the lastOutputName if the SDK is high enough 
This ensures that the DF plugin is backwards compatible

CURA-8358
 2021-09-14 14:43:10 +02:00
Ghostkeeper
8ed2e7bd44
Increment version number of Digital Library plug-in to 1.1 
Contributes to issue CURA-8551.
 2021-09-10 16:49:14 +02:00
Ghostkeeper
24ff3692bd
Revert "Use optional last output (file) name from output-dev to set project name." 
This reverts commit c2c53d51c1954315324982bd916b8aad5c19946d.
 2021-09-10 16:46:53 +02:00
Ghostkeeper
9e2b556ce8
Revert "Only change project name when saving to project files." 
This reverts commit b97920e5b155caaab6a8b3bb167853a00ae4b604.
 2021-09-10 16:46:39 +02:00
Jaime van Kessel
3caee3f143
Merge pull request #10328 from Ultimaker/CURA-8358_Retain_last_saved_filename 
Retain the last saved filename after saving a file
 2021-09-02 09:54:35 +02:00
Remco Burema
b97920e5b1
Only change project name when saving to project files. 
CURA-8358
 2021-09-01 18:11:10 +02:00
Remco Burema
c2c53d51c1
Use optional last output (file) name from output-dev to set project name. 
Instead of relying on the filename emitted when the workspace is changed. This is done so the user can also change the project name when saving to an output device, such as a local file, or the digital library, that supports changeing the (file)name.

CURA-8358
 2021-09-01 16:04:05 +02:00
Jaime van Kessel
183fbfad41 Disable save to DF if the textfield is in an invalid state 
CURA-8502
 2021-08-30 11:09:55 +02:00
Jaime van Kessel
668624e13d Set lifetimes correctly 2021-08-19 10:01:01 +02:00
Konstantinos Karmas
9f31e1421b Make lifetime optional in the getBackwardsCompatibleMessage 
This should fix the failing tests
 2021-08-18 17:18:21 +02:00
Ghostkeeper
a40c7e7410
Default lifetime for successful upload messages 
There is no real reason to keep this visible indefinitely.
 2021-08-18 15:36:41 +02:00
Remco Burema
3061490675
Fix look for string in enum-type. 
CURA-8473
 2021-08-12 10:05:16 +02:00
Remco Burema
ecf820f3db
Fix tests. 
CURA-8473
 2021-08-11 12:35:54 +02:00
Remco Burema
5d7804deae
Digital Library plugin needs to be backwards compatible. 
Message-types are a new parameter to Messages, so they can't be used in SDK/API versions smaller than 7.7.0.

CURA-8473
 2021-08-11 12:14:02 +02:00
Jaime van Kessel
8b2904ee3b Merge branch 'CURA-8441_campaign_links' of github.com:Ultimaker/Cura 2021-08-09 14:09:27 +02:00
Konstantinos Karmas
97c779cc53 Use the old icon names 
So that they can still be found in 4.9 and 4.10 Cura version.

CURA-8444
 2021-08-06 09:50:04 +02:00
Konstantinos Karmas
10ec9e2754 Remove the tooltipWidth property 
The `tooltipWidth` property is not available in 4.9 and 4.10. This property was added to make sure that the tooltip has a smaller width than the DigitalLibrary window, or else the tooltip doesn't get drawn at all, which is confusing. Since it was not available in 4.9 and 4.10, the tooltip text smaller had to become smaller to make sure that it will fit.

CURA-8444
 2021-08-06 09:49:29 +02:00
Konstantinos Karmas
22e407207f Manually add the magnifier icon in the search bar in DL 
The `leftIcon` property, which is not available in 4.9 and 4.10, so the DigitalLibrary window wasn't getting drawn. To keep having the icon, I manually added the RecolorImage in the search textfield.

CURA-8444
 2021-08-06 09:47:47 +02:00
Jaime van Kessel
57e66a5796 Add campaign links 
CURA-8441
 2021-08-05 15:42:23 +02:00
Jelle Spijker
2263969d5f
Updated message with message types 
Contributes to CURA-8418
 2021-07-28 08:45:42 +02:00
Jaime van Kessel
900db57f0f
Update messages to use the message_types 
CURA-8418
 2021-07-27 11:54:43 +02:00
Ghostkeeper
50e0885b55
Apply clipping paths in this image 
QtSVG doesn't support clipping paths. QtSVG only supports the SVG 1.2 Tiny specification. See https://doc.qt.io/qt-5/svgrendering.html for more information on exact support.
 2021-07-21 13:10:14 +02:00
Remco Burema
86d104afe7
DL: Allow 1 char filenames (not counting extension). 
CURA-8395
 2021-07-20 18:01:44 +02:00
Remco Burema
71937bf828
DL: Align with online backend on allowed characters. 
CURA-8395
 2021-07-20 17:58:29 +02:00
Remco Burema
f9557295fa
Allow non-ASCII characters for DL project names. 
CURA-8395
 2021-07-16 12:39:41 +02:00
Ghostkeeper
cc82ff97a7
Merge branch 'CURA-8112_Inform_the_user_about_their_subscription_limits' 2021-07-16 10:04:43 +02:00
Konstantinos Karmas
82c189327d Change link of "Upgrade plan" button 
CURA-8112
 2021-07-15 16:36:49 +02:00
Jaime van Kessel
e9ecba1374
Remove bindingloop in project selector 2021-07-14 16:03:06 +02:00