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

427 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
Jaime van Kessel
e630cb3480 Merge branch 'fixes_toolbox' of github.com:Ultimaker/Cura 2019-07-24 09:53:51 +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
42abece298 Fix crash when a corrupted and unkown message was returned 
This is should be pretty rare, but we got a single crash report for it.
 2019-07-23 14:54:40 +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
Jaime van Kessel
843bb6f5a3 Change some of the logging messages to info 
CURA-6525
 2019-05-15 17:25:31 +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
Jaime van Kessel
5f76070f05 Fix situation where authtoken wasnt updated for the toolbox request headers 2019-04-25 16:16:44 +02:00
Lipu Fei
4065a1204a Fix string comparisons 2019-04-12 08:52:35 +02:00
Remco Burema
852e7bc8f6 Fit missing font in material-vendor text. 2019-04-11 14:46:27 +02:00
Jaime van Kessel
9cc4665db8 Fix crash for when resetDownload is called after a long wait 
CURA-6448
 2019-04-09 17:10:18 +02:00
Jaime van Kessel
2765122b95 Fix case where aborting a download would cause a crash 2019-04-08 17:32:43 +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
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Jaime van Kessel
5105b67a8c Remove unused entries from the theme 2019-04-01 15:18:49 +02:00
Lipu Fei
9575c6b3b3 Fix merge conflicts 2019-04-01 13:28:42 +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
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01: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
Jaime van Kessel
f4f94b10d2 Move "canUpdate" logic from toolbox to PackageManager 
CURA-6151
 2019-03-27 12:48:10 +01:00
Diego Prado Gesto
74ffee7810 Fix typo in a previous commit 2019-03-22 18:03:01 +01:00
Jaime van Kessel
86f4fd65c3 Add a property that lists all ID's that have an update available 
CURA-6151
 2019-03-22 11:56:53 +01:00
Jaime van Kessel
fd015c0381 Detach the data request and the showing of the dialog from eachother. 
This way we can fetch the data without having to show the marketplace.
CURA-6151
 2019-03-22 11:30:22 +01:00
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