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

268 Commits

Author SHA1 Message Date
Ghostkeeper
362c7d09fb
Fix displaying generic materials 
I had that commented out for debugging.
 2019-08-16 13:38:14 +02:00
Ghostkeeper
04d5423d81
Fix scrolling all the way down in Qt 5.13 
It didn't properly connect the height of the column to the scrolled length, I think. Perhaps a Qt bug. It didn't occur in 5.11 or 5.10 yet.
 2019-08-16 13:36:15 +02:00
Diego Prado Gesto
46e6baf6ae Make suggested changes 
Add anchors instead of using width

Contributes to CURA-6518.
 2019-07-23 16:17:54 +02:00
Diego Prado Gesto
1d6ba3ffb0 Merge branch 'master' into fixes_toolbox 2019-07-23 15:15:02 +02:00
Jaime van Kessel
d0cf7f04bf Don't show "Your rating" for generic materials 2019-06-05 16:45:34 +02:00
Jaime van Kessel
414e8d2b08 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 09:20:42 +02:00
Jaime van Kessel
cb68a1f100 Remove fixed height of installed plugin name label 
Fixes #5755
 2019-05-20 09:19:39 +02:00
Diego Prado Gesto
a62f4eb1d2 Fix padding in the installed tab 2019-05-09 17:04:27 +02:00
Diego Prado Gesto
6708d9da64 Merge branch '4.1' 2019-05-07 11:49:45 +02:00
Diego Prado Gesto
39aa5fedf5 Update some widgets to Qt Controls 2 
The ScrollView generated some wobbling text (mainly in macOS)
 2019-05-07 10:50:59 +02:00
Diego Prado Gesto
3390cca2d9 Clean up the ToolboxProgressButton 2019-05-07 09:31:56 +02:00
Diego Prado Gesto
5c3a608e1a Small changes in the qml code for the compatibility chart 2019-05-07 09:10:28 +02:00
Diego Prado Gesto
c3f3b8dd93 Change links and compatibility chart. 2019-05-07 08:58:45 +02:00
Lipu Fei
b09c6a4f12 Elide long website URLs 
CURA-6504
 2019-05-06 13:56:20 +02:00
Satish
18630fa2f1 Added several ids to be used in integration tests: 
-Marketplace, printer pref, add/manage printer from main mnu, print settings
 2019-05-03 09:35:17 +02:00
Remco Burema
852e7bc8f6 Fit missing font in material-vendor text. 2019-04-11 14:46:27 +02:00
Jaime van Kessel
ed503cb6ec Removed platform check that always had the same result 
The UM.Application.platform property has been removed by someone for quite some time.
I don't know why the check was in there, but it doesn't seem needed at all as the property was always undefined
 2019-04-05 17:07:12 +02:00
Jaime van Kessel
5105b67a8c Remove unused entries from the theme 2019-04-01 15:18:49 +02:00
Lipu Fei
9ae8d2f88c Use NotificationIcon and simplify code 
CURA-6151
 2019-04-01 11:52:35 +02:00
Lipu Fei
3f9b98bd0c Round size numbers 
CURA-6151
 2019-04-01 10:38:43 +02:00
Jaime van Kessel
ffd7a001fb Add notification icon to the installed tab of the toolbox 
CURA-6151
 2019-03-28 13:31:51 +01:00
Jaime van Kessel
6c26dd38ec Clean up code for the toolbox tab button 
Removed unused properies and made it use states for it's changing properties.
This makes it a lot easier to read and understand what it's actually doing

CURA-6151
 2019-03-28 13:24:25 +01:00
Jaime van Kessel
1e02a20745 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6151-Notify-updates-from-marketplace 2019-03-27 12:56:02 +01:00
Jaime van Kessel
e3f2c06542 Remove usage of canUpdate slot 
This makes it a bit cleaner, since having it as a slot is a bit weird in the first place (and forced
all kinds of hacks to ensure it got re-evaluated)

CURA-6151
 2019-03-27 12:54:20 +01:00
Diego Prado Gesto
74ffee7810 Fix typo in a previous commit 2019-03-22 18:03:01 +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
Jaime van Kessel
d57d4fd277 Fix text color not being themed 2019-02-05 11:05:33 +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
Lipu Fei
8e898148f6 Make checkboxes and texts more aligned 
CURA-6085
 2019-01-08 09:42:52 +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
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
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
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
efb832702b
Merge pull request #4976 from Ultimaker/CURA-6013-rate-packages 
Cura 6013 rate packages
 2018-12-17 08:32:18 +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
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