GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,481 Commits 292 Branches 265 Tags
Commit Graph

8928 Commits

Author SHA1 Message Date
casper
4a436b5598 Display different types of manage buttons through Loader.sourceComponent 
cura 8734
 2021-12-08 14:46:29 +01:00
Jelle Spijker
fd508342fe
Renamed Manager to RestartManager 
Contributes to: CURA-8587
 2021-12-08 14:33:22 +01:00
casper
fb92f1f49a Merge branch 'CURA-8587_disable_update_install_and_uninstall' into CURA-8734_Package_card_refactor 2021-12-08 14:28:31 +01:00
Remco Burema
27cb1d2d9f
Also have/keep the uninstalled status displayed. 
'isRecentlyInstalled' was both for installing _and_ uninstalling. Will add the rename to the refactor later on.

part of CURA-8587
 2021-12-08 14:04:19 +01:00
Ghostkeeper
41ebd593c5
Revert "Merge branch 'bremco-graphics_buffer_update'" 
This reverts commit 5e60cc6208c16d966505e7a97d9bbbb0644d2716, reversing
changes made to c9feace0fbe02beb2089ec0af7be35127d7420f7.
 2021-12-08 12:02:49 +01:00
Ghostkeeper
0da37ae6e7
Revert "Workaround for if layer is None somehow." 
This reverts commit f0cb9dd39ef996225ebd6d7b8d5ffc986c90e2f0.
 2021-12-08 12:02:42 +01:00
Jelle Spijker
db09954ac8
Fixed returning an error after the package is destroyed 
Defensive programming

Contributes to: CURA-8587
 2021-12-08 10:59:28 +01:00
casper
5e35e19f21 Split PackageCard into PackageCard and PackagePage 
cura 8734
 2021-12-08 10:53:51 +01:00
Jelle Spijker
7be2da587b
Automatic abortRequest for each API request 
Defensive programming

Contributes to: CURA-8587
 2021-12-08 10:18:08 +01:00
Jelle Spijker
453de95d12
Defensive programming 
Long API calls might return after the Local or Remote
PackageList has been deconstructed. Somehow setting
the ownership in QML doesn't seem to work for this.
So we guard against this with a try catch block.

Contributes to: CURA-8587
 2021-12-08 09:58:53 +01:00
Jelle Spijker
6c976bc9b0
Introduced a Manager to centralize plugin/package management 
Should have done this from the start.
Will move other relevant scattered functions to this type.
For now it checks if the restart banner needs to show.
Taking into account that a user can toggle between enable
and disable without an actual restart. Even with multiple
plugins.

Contributes to: CURA-8587
 2021-12-08 08:06:56 +01:00
Remco Burema
a61c3e9eff
Peristance of 'Installed' text. 
part of CURA-8587
 2021-12-07 21:23:54 +01:00
Jelle Spijker
3be6747e5d
Trying to set a persistent install managebutton 
Contributes to: CURA-8587
 2021-12-07 18:25:46 +01:00
Jelle Spijker
9e4258ef8b
Set the is_recently_installed flag 
Contributes to: CURA-8587
 2021-12-07 16:22:31 +01:00
Jelle Spijker
14bc196154
Hidden other manage buttons when the other is confirmed 
Contributes to: CURA-8587
 2021-12-07 16:09:07 +01:00
Remco Burema
d2a9d7d94d
Get 'already going to be installed' status in constructor. 
Otherwise this isn't saved, and the state of 'installed, but needs restart' (as shown in the package card) won't be known to the package card (buttons), resulting in an 'Install' button when tabs are switched.

part of CURA-8587
 2021-12-07 16:02:54 +01:00
Jelle Spijker
013e0b51e9
Storing multiple ongoing_requests 
A bit of defensive programming

Contributes to: CURA-8587
 2021-12-07 15:56:35 +01:00
Jelle Spijker
dae92c354c
Marketplace doesn't need to inherit from QObject 
Review comment

Contributes to: CURA-8587
 2021-12-07 15:32:36 +01:00
Jelle Spijker
ea4ec5ca27
Removed old debug logger messages 
Contributes to: CURA-8587
 2021-12-07 15:29:05 +01:00
Jelle Spijker
bb9696c39f
Reset button if user declines license 
Contributes to: CURA-8587
 2021-12-07 15:06:46 +01:00
Jelle Spijker
5b3e9079ed
Don't show en-/disable button when un-/installed 
Contributes to: CURA-8587
 2021-12-07 12:46:45 +01:00
Jelle Spijker
ca76bcc29c
Show a conformation message after a successful manage action 
Contributes to: CURA-8587
 2021-12-07 12:23:04 +01:00
Jelle Spijker
1c0e484069
Only show manage buttons in manage tab or detail view 
Contributes to: CURA-8587
 2021-12-07 11:25:16 +01:00
Jelle Spijker
f6966c25fb
Some final tweaks and added missing documentation 
Contributes to: CURA-8587
 2021-12-07 09:48:48 +01:00
Jelle Spijker
0fefe85fca
Present restart banner if plugin has been en-/disabled 
Contributes to: CURA-8587
 2021-12-07 08:57:56 +01:00
casper
dc03a7fdcb Correctly handle accept and reject hotkeys in marketplace license dialog 
Accept license on "enter"
Reject license on "escape" or dialog close

cura 8587
 2021-12-07 08:18:26 +01:00
casper
71a43060a6 Open separate license dialog with each plugin install 
Previously the license dialog was instanciated once and re-used for each
install. As the dialog is only shown after the plugin is downloaded it
was possible to click install for multiple plugins. Plugins that finish
downloading later would override the dialog of earlier downloaded
plugins. Clicking "accept" would then only install the latest downloaded
plugin.

Now for each install a separate dialog is shown. Accepting the license
agreement would only install the recently accepted plugin.

Note: in the current form the license agreement does not show any
identification to what plugin triggered the dialog. As multiple dialogs
can be shown at once this might be unclear.

cura 8587
 2021-12-06 19:34:02 +01:00
casper
455f6f1791 Update licencing comment 
cura 8587
 2021-12-06 18:12:58 +01:00
casper
180e1e1d7a Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement 2021-12-06 18:09:01 +01:00
casper
28b21628b4 Remove unused package_name property and add package_id in license model 
The `_to_be_installed_package_id` and `_to_be_installed_package_path`
can now be removed from the class as they can requested from the model
itself. This we make sure that the we alway install the package for
which the license was recently accepted.

cura 8587
 2021-12-06 18:07:44 +01:00
casper
49a6a83fe9 Move button text inside QML element 
cura 8587
 2021-12-06 17:50:18 +01:00
casper
119b86b957 Remove page-count logic from LicenceModel title dialog 
cura 8587
 2021-12-06 17:32:10 +01:00
Ghostkeeper
a084b689b5
Add one remaining forgotten type import 
Contributes to issue CURA-8587.
 2021-12-06 17:26:12 +01:00
casper
324b456cbd Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement 2021-12-06 17:23:31 +01:00
Ghostkeeper
aec643fd44
Fix several typing issues 
Contributes to issue CURA-8587.
 2021-12-06 17:22:07 +01:00
casper
a0bb1eda94 Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement 2021-12-06 17:10:27 +01:00
casper
4848c474e8 Implement UX design for maketplace license dialog 
cura 8587
 2021-12-06 17:10:13 +01:00
Ghostkeeper
f932239b6a
Implement aesthetics of busy indicator 
Don't use the default spinner but use an image from our theme. A new image. And change the font size, colour and spacings a bit according to our designs.

Contributes to issue CURA-8587.
 2021-12-06 16:52:47 +01:00
Jelle Spijker
c73ef84395
Show the correct busy message 
Contributes to: CURA-8587
 2021-12-06 16:47:53 +01:00
Ghostkeeper
c6501d6ade
Use capital letters for busy text 
It seems though that the wrong text is shown here. In any case this looks more consistent.

Contributes to issue CURA-8587.
 2021-12-06 16:25:50 +01:00
Ghostkeeper
e3eb82b022
Align read more label to the text, not the parent box 
This is the same alignment as the ellipsis shown when the description is abbreviated. Looks correct, and it should be correct.

Contributes to issue CURA-8587.
 2021-12-06 16:21:58 +01:00
Ghostkeeper
e646d53b53
Make quit button quit Cura 
Contributes to issue CURA-8587.
 2021-12-06 16:05:48 +01:00
Ghostkeeper
3c54964417
Use same content for button as old one 
So make it dynamic based on the application name. This also causes the translation to be re-used.

Contributes to issue CURA-8587.
 2021-12-06 16:05:48 +01:00
Ghostkeeper
3cae6d80b9
Show restart banner only when a restart is required 
Contributes to issue CURA-8587.
 2021-12-06 16:05:47 +01:00
casper
0cc9d8db68 Use existing plugin registry 
Fix after merge

cura 8587
 2021-12-06 15:51:19 +01:00
casper
ec58cd2d0e Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement 
# Conflicts:
#	plugins/Marketplace/PackageList.py
 2021-12-06 15:49:21 +01:00
casper
c3665d7440 Correctly handle actions from marketplace license prompt 
Install package on accept
And stop spinner on decline

cura 8587
 2021-12-06 15:45:27 +01:00
casper
09e221d64a Add license dialog to the Marketplace 
cura 8587
 2021-12-06 14:49:50 +01:00
Jelle Spijker
1cc3d374a0
Show the uninstall button for packages which can be downgraded to the bundled version 
Contributes to: CURA-8587
 2021-12-06 14:11:31 +01:00
Jelle Spijker
28b6bfb729
Fixed the update button busy state 
Contributes to: CURA-8587
 2021-12-06 13:53:44 +01:00