GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,264 Commits 294 Branches 267 Tags
Commit Graph

255 Commits

Author SHA1 Message Date
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings 
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
 2018-10-08 15:03:21 +02:00
Diego Prado Gesto
075a9a161f Create a component for the Views selector. This component contains the 
list of the views and also the shortcuts for the camera position.

The theme colors, sizes and the styles have been updated.

Contributes to CURA-5784.
 2018-10-08 12:57:16 +02:00
Diego Prado Gesto
a4e02a6eae Revert "Update date format" 
This reverts commit 959f698b038a189238c59eff69035a446382d74a.
 2018-10-03 16:27:30 +02:00
Diego Prado Gesto
e3721fe539 Revert "Format date strings to ISO YYYY/MM/DD in Toolbox" 
This reverts commit 254106bb264699174a8edcfc20e50e22c455ef32.
 2018-10-03 16:27:13 +02:00
Lipu Fei
254106bb26 Format date strings to ISO YYYY/MM/DD in Toolbox 
CURA-5762
 2018-10-03 15:39:25 +02:00
Aleksei S
959f698b03 Update date format 
CURA-5762
 2018-10-03 13:23:37 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Diego Prado Gesto
77fd05ac70 Disable other buttons while toolbox is downloading to avoid crashes. 
I did it that way to not be risky because we're close to the release.

Contributes to CURA-5778.
 2018-10-01 17:21:34 +02:00
Lipu Fei
3b62284276 Merge remote-tracking branch 'origin/3.5' 2018-09-18 16:15:55 +02:00
Lipu Fei
a33ce8178a Support mulitple bundled_packages JSON files 
CURA-5718
 2018-09-18 15:53:56 +02:00
Lipu Fei
4777c3f41d Merge remote-tracking branch 'origin/CURA-5718_fix_upgrade_for_bundled_plugins' 2018-09-17 17:27:32 +02:00
Lipu Fei
da047ea674 isInstalled() should check old plugins as a fallback 2018-09-17 17:26:38 +02:00
Lipu Fei
15657f4cfc Remove unneeded code 2018-09-17 17:26:19 +02:00
Lipu Fei
4db213c55a Fix missing import 2018-09-17 16:24:10 +02:00
Lipu Fei
a4b20e046d Merge remote-tracking branch 'origin/3.5' into CURA-5718_fix_upgrade_for_bundled_plugins 2018-09-17 16:22:22 +02:00
Lipu Fei
6929d96119 Merge remote-tracking branch 'origin/3.5' 2018-09-17 16:14:49 +02:00
Lipu Fei
6d1db55072 Fix SDK version comparison 2018-09-17 16:14:28 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Lipu Fei
3ac5a316d3 Check package upgradable using PM first, old plugins later 
CURA-5718

For package upgradable, we need to check if a package is installed
local. For that, we first check in the package manager, if nothing, then
we fall back to check the old plugins.
 2018-09-17 12:05:10 +02:00
Lipu Fei
1064d837ed Exclude bundled plugins in the old plugins list 2018-09-17 12:05:10 +02:00
Ghostkeeper
9e21af65b4
Merge branch '3.5' 2018-09-17 10:54:44 +02:00
Jaime van Kessel
4c460b6fa5 Prevent crash if sdk_version is "dev" 2018-09-14 16:15:56 +02:00
Ghostkeeper
5a374f31ef
Merge branch '3.5' 2018-09-13 16:27:49 +02:00
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Lipu Fei
b39d6c7d87 Package upgrade should also check SDK version 2018-09-13 13:42:53 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning 
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
 2018-09-12 16:58:22 +02:00
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