GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-28 23:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,636 Commits 287 Branches 260 Tags
Commit Graph

427 Commits

Author SHA1 Message Date
Jaime van Kessel
c59ff82c64 Revert "[CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only)" 
This reverts commit f9585b5fae9cdd3f56dc8d8b04f28db5fcf15434.
 2018-09-12 13:39:10 +02:00
Jaime van Kessel
00494d8301 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-12 13:38:56 +02:00
Remco Burema
f9585b5fae [CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only) 2018-09-12 13:38:15 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them. 
CURA-5618
 2018-09-11 16:05:53 +02:00
Diego Prado Gesto
e3681ddd9f Also hack the way to get the generic materials, since the tag-filtered 
calls to the api don't work yet.

Contributes to CURA-5670.
 2018-09-11 13:39:53 +02:00
Jaime van Kessel
301605c30c Added missing typing to toolbox 2018-09-11 13:20:42 +02:00
Thomas Karl Pietrowski
5139e61475 Found the dead line while reading some code 2018-09-10 09:42:47 +02:00
Lipu Fei
d6046c725a Fix Toolbox QML null object warnings 
CURA-5670
 2018-09-07 09:29:31 +02:00
Lipu Fei
b21200c6a8 Check for None before updating model 
CURA-5670
 2018-09-05 17:16:58 +02:00
Diego Prado Gesto
b638b2274a Count only the material packages by author, not all packages. 
Contributes to CURA-5670.
 2018-09-03 15:12:52 +02:00
Diego Prado Gesto
bf1d3b964f Skip loading a reply if it's not later handled. 
Contributes to CURA-5670.
 2018-09-03 14:30:05 +02:00
Ian Paschal
988b9059b9 Fix code-style 
Contributes to CURA-5670
 2018-08-31 16:55:03 +02:00
Ian Paschal
dec76a19ed Build models using reserved tags 
Contributes to CURA-5670
 2018-08-31 16:13:01 +02:00
Lipu Fei
98d8a3f3e3 Fix code style and small cleanup 
CURA-5676
 2018-08-31 13:49:10 +02:00
Lipu Fei
c4afbe7a67 Convert links to a dict 
CURA-5676

Easier to process.
 2018-08-31 13:45:04 +02:00
Lipu Fei
9433cf7c45 Change email field to show full email address 
CURA-5676
 2018-08-31 13:23:41 +02:00
Lipu Fei
e17cf3dfbf Show company website full link as text 
CURA-5676
 2018-08-31 13:20:42 +02:00
Aleksei S
9258c9a7fc Added links to toolbox 
CURA-5676
 2018-08-31 11:03:30 +02:00
Aleksei S
fe9cada459 Increase plugin API version to 5 
CURA-5627
 2018-08-27 13:59:00 +02:00
Ian Paschal
944ababa1c Copy normal tile behavior to showcase tiles 
Contributes to CURA-5604
 2018-08-03 14:48:04 +02:00
Lipu Fei
1bacdabf35 Minor refactor 2018-08-03 14:42:34 +02:00
Ian Paschal
8268419eda Remove debug print() 
Contributes to CURA-5604
 2018-08-03 14:31:30 +02:00
Ian Paschal
7856e47467 Remove old filtering 
Contributes to CURA-5604
 2018-08-03 14:30:49 +02:00
Ian Paschal
2a6da9fe8e Only show material packages when clicking an author 
Contributes to CURA-5604
 2018-08-03 14:28:45 +02:00
Ian Paschal
c47de04983 Fix bracket style 
Contributes to CURA-5598
 2018-08-03 11:41:08 +02:00
Ian Paschal
bcedef3bbe Continue scrolling over compatibility charts 
Contributes to CURA-5598
 2018-08-03 11:38:42 +02:00
Diego Prado Gesto
6694b7ac81 CURA-5541 Change is_enabled field to is_active field to be consistent 
with the fields in the PackageManager.
 2018-07-27 15:56:29 +02:00
Diego Prado Gesto
f1379135e0 CURA-5510 Add the Generic materials to the list of the bundled packages 
so that they show up as installed.

Show the installed icon on those packages as well.
 2018-07-17 13:49:17 +02:00
Ian Paschal
0bde1487e7 Add generic material packages to materials page 
Contributes to CURA-5510
 2018-07-16 16:13:43 +02:00
Diego Prado Gesto
af697c6999 CURA-5536 The api call does not return the package_count for the showcase, so we can't trust in that value. The total number of material packages by author is now calculated. 2018-07-13 15:13:38 +02:00
Diego Prado Gesto
dd7168e8b8 CURA-5536 Add the installed check also to the featured items. 2018-07-13 13:41:19 +02:00
Diego Prado Gesto
62b1d361fa CURA-5536 Set different colors indicating that all the inner packages 
are installed of just some.
 2018-07-13 13:21:38 +02:00
Diego Prado Gesto
96cc1be2ff CURA-5536 Calculate the number of installed packages by author. 2018-07-13 13:20:56 +02:00
Diego Prado Gesto
1b6c172e6d CURA-5536 Add the icon indicating when a plugin is already installed. 2018-07-13 13:20:32 +02:00
Jack Ha
2bd8350141 Added error checking, added typing, renamed function. CURA-5389 2018-07-12 14:06:34 +02:00
Lipu Fei
76417b7fb2 Hide materials belong to a to-be-removed package 2018-07-11 10:57:57 +02:00
Lipu Fei
5255d6ca2a Better height for dialog 2018-07-10 16:11:56 +02:00
Lipu Fei
3a1d57a725 Increase dialog height 2018-07-10 15:32:39 +02:00
Lipu Fei
328fd9081e Merge remote-tracking branch 'origin/master' into remove-package-check 2018-07-10 14:57:46 +02:00
Lipu Fei
cc5f35dd91 Rename some functions and variables 2018-07-10 14:57:01 +02:00
Jack Ha
aa0c7d5f0a Confirm uninstall reset dialog now has proper sizing. CURA-5389 2018-07-09 13:26:11 +02:00
Ian Paschal
ac0192f01f Improve fixes 2018-07-09 11:29:25 +02:00
Jack Ha
bff9a3afb5 Merge branch 'master' into remove-package-check 2018-07-09 11:25:19 +02:00
Jack Ha
5af5aa9e35 Added reset profiles/materials and uninstall functionality and dialog. CURA-5389 2018-07-09 09:57:31 +02:00
Ian Paschal
75d5828f5f
Merge branch 'master' into fix_tests_cura_engine_backend 2018-07-06 09:48:07 +02:00
Mark
183cd0182d
Merge pull request #4028 from Ultimaker/fix_style 
Fix code style
 2018-07-05 21:22:53 +02:00
Ian Paschal
85be9cea07 Fixes for Toolbox 2018-07-05 16:06:37 +02:00
Lipu Fei
b0f1a6d859 Use Label delegate to avoid overlapping texts 
CURA-5544
 2018-07-05 14:36:41 +02:00
Diego Prado Gesto
c738f306fb Fix style in some components 2018-07-05 14:35:12 +02:00
Andreea Scorojitu
87fd4c9e70 Add color to text in toolboxFooter, CURA-5544 
"You will need to restart Cura before changes in packages have effect." wasn't visible in Ultimaker darktheme, color has been added to the label, CURA-5544.
 2018-07-05 12:44:11 +02:00