GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,808 Commits 288 Branches 260 Tags
Commit Graph

389 Commits

Author SHA1 Message Date
Lipu Fei
cf0e3effc7 WIP: Refactor NumericTextFieldWithUnit 2019-03-18 08:48:29 +01:00
Diego Prado Gesto
0e7127f80b Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-01 14:54:10 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Diego Prado Gesto
3f8f363836 Fix the installed checkmark in Marketplace 
Show a package as completelly installed if the user has more or the same number of packages than in the list. Otherwise if the contributor removes one of the packages from the list, it seems that I don't have all the packages installed when in fact I do.
 2019-03-01 10:57:39 +01:00
Jaime van Kessel
df3485aaec Add a where to buy link underneath the install button for material 
CURA-6148
 2019-02-13 13:37:10 +01:00
Lipu Fei
4ea6e5d0df Merge remote-tracking branch 'origin/4.0' 2019-02-05 11:40:50 +01:00
Jaime van Kessel
d57d4fd277 Fix text color not being themed 2019-02-05 11:05:33 +01:00
Jaime van Kessel
f723cdc8a3 Fix typing issues 2019-01-28 14:47:03 +01:00
Jaime van Kessel
0fded58988 Add / fix typing 2019-01-25 13:35:24 +01:00
Ghostkeeper
a01063b7d8
Merge branch '4.0' 2019-01-17 16:32:18 +01:00
Remco Burema
98ce0caaef
Merge pull request #5158 from Ultimaker/marketplace_use_busy_indicator 
Remove loading gif
 2019-01-17 16:17:00 +01:00
Jaime van Kessel
662dd80a1d Add logging if the status code of toolbox request is not 200 2019-01-17 16:06:10 +01:00
Jaime van Kessel
9d94b55596 Ensure that the toolbox correctly handles multiple supported SDK versions 
CURA-6087
 2019-01-14 13:35:10 +01:00
Diego Prado Gesto
c11e0cecc8 Remove loading gif 
Instead of an external gif, use the BusyIndicator that exists in the ActionButton.
 2019-01-13 16:58:38 +01:00
Jaime van Kessel
2dead87593 Ensure that the installed & canUpdate properties get set correctly 
CURA-6053
 2019-01-11 14:43:56 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin 
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
 2019-01-10 14:58:00 +01:00
Lipu Fei
8e898148f6 Make checkboxes and texts more aligned 
CURA-6085
 2019-01-08 09:42:52 +01:00
Jaime van Kessel
b363be4afb Fix typing 2019-01-04 11:48:06 +01:00
Ghostkeeper
e15e06f29f
Make Z relative 
This way if we ever want to change the parent's Z for some other ordering requirements, the children will stay in order.
 2019-01-03 16:04:28 +01:00
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Ghostkeeper
4177faa6ea
Fix font usage in installed plug-ins 
Several different font sizes should be used here.

Contributes to issue CURA-6025.
 2018-12-31 15:37:31 +01:00
Ghostkeeper
7ef8287e52
Fix theming of back button in Marketplace 
Give it a bit more space for if the translated text is wider, and if it is wider also align it properly with the arrow.

Contributes to issue CURA-6025.
 2018-12-31 15:33:37 +01:00
Ghostkeeper
30ab1a957f
Make headers of Marketplace large 
As per the design.

Contributes to issue CURA-6025.
 2018-12-31 15:18:50 +01:00
Ghostkeeper
df0351acd4
Fix fonts of plug-in tiles 
Contributes to issue CURA-6025.
 2018-12-31 15:14:23 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Diego Prado Gesto
da69c16e09 Split the constants in to files, indicating which constants each file 
stores.

Contributes to CURA-6005.
 2018-12-18 16:14:13 +01:00
Diego Prado Gesto
3c99b69724 Merge branch '4.0' into CURA-6005_cura_drive_plugin 
Remove unused file.

Contributes to CURA-6005.
 2018-12-18 07:17:37 +01:00
Diego Prado Gesto
d6212d5a39 Add elide in the showcase title and reduce the height a bit so there are 
only 2 lines for the title.
 2018-12-17 17:29:24 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6 
Increment API version to 6
 2018-12-17 15:43:09 +01:00
Jaime van Kessel
1352193654 Ensure that the sourceSize is set correctly 2018-12-17 15:26:10 +01:00
Jaime van Kessel
53da111617 Change "Rating" to "Your rating" 2018-12-17 15:21:48 +01:00
Lipu Fei
6992fd2991 Update plugin versions to match package versions 
CURA-6019
 2018-12-17 13:03:21 +01:00
Diego Prado Gesto
e62a570210 Merge branch '4.0' into CURA-6005_cura_drive_plugin 2018-12-17 11:25:19 +01:00
Lipu Fei
efb832702b
Merge pull request #4976 from Ultimaker/CURA-6013-rate-packages 
Cura 6013 rate packages
 2018-12-17 08:32:18 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6 
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
 2018-12-14 17:29:02 +01:00
Lipu Fei
ae695b77e6 Add native rendering for QML Label 
CURA-6013
 2018-12-14 15:23:59 +01:00
Jaime van Kessel
edd4f6e1fa Fix some minor QML warnings 
CURA-6013
 2018-12-14 11:02:10 +01:00
Jaime van Kessel
7616f9c97d Make hardcoded color themeable 
CURA-6013
 2018-12-14 10:59:59 +01:00
Jaime van Kessel
450f301c8c Fix binding loop 
CURA-6013
 2018-12-14 10:56:13 +01:00
Jaime van Kessel
bb1bf14a01 Prevent rating when user is not logged in 
CURA-6013
 2018-12-14 10:46:31 +01:00
Lipu Fei
3225512851 Fix typing 
CURA-6013
 2018-12-13 15:48:06 +01:00
Lipu Fei
17c93dea80 Fix merge conflicts with 4.0 2018-12-13 14:39:28 +01:00
Diego Prado Gesto
121af7ad60 Reuse the primary button in the toolbox for the "Quit Cura" button 2018-12-13 09:41:07 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Lipu Fei
b6ea61612e Fix merge conflicts 2018-12-12 13:26:01 +01:00
Jaime van Kessel
901c19e270 Prevent QML warning 
CURA-6013
 2018-12-12 11:52:04 +01:00
Jaime van Kessel
e30ca20c54 Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages 2018-12-12 11:50:26 +01:00
Jaime van Kessel
dbf91fca7f Re-added hover on showcase tiles 
CURA-6013
 2018-12-12 11:40:51 +01:00
Jaime van Kessel
5fd0f2b5f6 Add tooltip to rating if the rating is disabled 
This makes it clearer what the user needs to do in order to rate (install package or login)

CURA-6013
 2018-12-12 11:09:58 +01:00
Lipu Fei
f302a76d3a Fix typing issue in Toolbox 
CURA-6006
 2018-12-12 10:47:18 +01:00