Commit graph

1845 commits

Author SHA1 Message Date
Ghostkeeper
02b0242807
Fix translatability of caution message
Never put the formatting within the i18nc call. Always put the formatted string inside, but the formatting call outside of the function, like this:

    catalog.i18nc('@info', 'I am {age} years old.').format(age = my_age)

Otherwise, when looking up the translation for the string, it's going to try to look up the translation for the formatted string (with the age already filled in). It won't be able to find that because this sentence was not translated for all possible ages of a human.
In this case I can make it even easier on the translator because the list must always follow after the text.
2019-06-14 11:00:52 +02:00
Jaime van Kessel
a98f88e6a3 Also move _getMachineTypeNameFromId to DiscoveredPrintersModel
As this is only used by that model, there is no point in keeping it in the machine manager
2019-06-07 15:04:19 +02:00
Jaime van Kessel
5eee3fc368 Move hasHumanReadableMachienTypeName to discovered printers 2019-06-07 15:01:30 +02:00
Jaime van Kessel
05a5f66856 Added few more deprecation warnings for functions that bloat the machine manager 2019-06-07 14:57:32 +02:00
Jaime van Kessel
1759e01b27 Make _geSettingFromAllExtruders use zip
This is a bit cleaner to use
2019-06-07 13:40:41 +02:00
Ghostkeeper
228fb62e60
Handle functions in user or user-changes profiles
Normally the user hasn't got any of these unless he selected a setting to be copied for all extruders.
2019-06-03 14:15:40 +02:00
Jaime van Kessel
14d5fa5529 Add a bunch of tests for importing profiles 2019-05-31 13:59:54 +02:00
Jaime van Kessel
43360aace0 Add tests for ExportQualityProfile 2019-05-31 13:07:03 +02:00
Cherubim
63cd3a52ce
Don't reset all invisible settings
Why would you need to reset all invisible settings? It shouldn't matter whether a setting is visible or not.
This is causing bugs because the settings that are being reset are not necessarily extruder-type settings (as that is checked below). They are being reset to the value self._default_extruder, which is not always a valid setting value.

Fixes #4274.
2019-05-28 15:08:03 +02:00
Jaime van Kessel
76163636a1 Fix the simple create machine test 2019-05-24 16:36:39 +02:00
Lipu Fei
7c6c00df84 Merge remote-tracking branch 'origin/4.1' 2019-05-24 10:50:43 +02:00
Lipu Fei
27d6b9b53b Calculate bounding box for helper meshes 2019-05-24 10:49:35 +02:00
Lipu Fei
288770b991 Fix merge conflicts 2019-05-23 11:37:51 +02:00
Lipu Fei
fb33497ff1 Fix auto-slice for per-object settings
CURA-6539
2019-05-23 11:36:55 +02:00
Jaime van Kessel
c1818bcfbe Add test for CuraStackBuilder 2019-05-20 08:57:58 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Jaime van Kessel
915e0e2047 Only add extrudernr to used extruders if it actually exists
This can cause issues when a profile got messed up (especially when using profiles between different custom machines)
2019-05-16 15:41:52 +02:00
Jaime van Kessel
843bb6f5a3 Change some of the logging messages to info
CURA-6525
2019-05-15 17:25:31 +02:00
Lipu Fei
0023f5a45d Merge remote-tracking branch 'origin/4.1' 2019-05-07 14:32:03 +02:00
Lipu Fei
5e43e723e7 Fix activeMaterialsCompatible()
CURA-6511

Looks like a merge conflict
2019-05-07 14:28:13 +02:00
Diego Prado Gesto
5fffa200f7 Make the "Not supported" profile label translatable
Contributes to CURA-6502.
2019-05-07 12:04:19 +02:00
Jaime van Kessel
979b29400a Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 14:12:07 +02:00
Jaime van Kessel
e363f1af94 Remove hardcoded references to Ultimaker machines in QML
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
2019-05-03 14:10:21 +02:00
Jaime van Kessel
5a25f8e050 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 13:19:34 +02:00
Jaime van Kessel
2e90078ec7 Fix incorrect deprecation message 2019-05-03 13:19:17 +02:00
Lipu Fei
2601e485da Merge remote-tracking branch 'origin/4.1' 2019-05-03 10:47:16 +02:00
Lipu Fei
0cc00efa79 Add doc for group_id
CURA-6483
2019-04-30 12:53:47 +02:00
Lipu Fei
d18c11a2c1 Fix filtering in switchPrinterType()
CURA-6483
2019-04-30 12:46:35 +02:00
Jaime van Kessel
6fbbed9c06 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 10:51:33 +02:00
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
d16da3da3a Add group_id and fix remove printer
CURA-6483

 - Added a unique group_id (a GUID) to all created GlobalStack.
 - Changed version upgrade to generate unique group_ids for
   GlobalStacks.
 - RemoveMachine() now uses group_ids to remove hidden GlobalStacks.
2019-04-29 15:53:08 +02:00
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName()
CURA-6449
2019-04-29 13:28:18 +02:00
Lipu Fei
4948fad87c Merge remote-tracking branch 'origin/4.1' 2019-04-25 13:22:23 +02:00
Lipu Fei
0501ae2fbc Handle case that printer type can be human readable string
CURA-6449
2019-04-25 13:14:28 +02:00
Jaime van Kessel
b1375a9927 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-24 16:17:43 +02:00
Lipu Fei
5fc91e797e Remove mistake code 2019-04-24 13:22:53 +02:00
Lipu Fei
24f28fe03e Calculate AABB for non printing meshes
CURA-6480
2019-04-24 13:06:01 +02:00
Jaime van Kessel
c694e530be Fix changes in per object settings not triggering reslice
Contributes to #5639
2019-04-24 10:45:06 +02:00
Ghostkeeper
6b139a9dce
Merge branch 'deprecate_some_mm_funcs' 2019-04-16 16:29:14 +02:00
Jaime van Kessel
c2a00d6b53 Fix copy paste error
Simple fix that caused crash for getHasVariantBuildplates
2019-04-16 10:53:06 +02:00
Jaime van Kessel
8267ef670a Greatly decrease amount of tickles to the backend for settingOverrideDecorator 2019-04-15 17:59:27 +02:00
Jaime van Kessel
abb13e8992 Prevend unneeded tickles of the backend for setting override decorators 2019-04-15 17:52:13 +02:00
Jaime van Kessel
e8d2e070d8 Dont calculate bounding box for non printing meshes
Fixes #5603
2019-04-15 17:46:54 +02:00
Jaime van Kessel
42b1a0e028 Refactor some small bits of the setting override decorator
There was code duplication and a number of functions that should be private

contributes to #5603
2019-04-15 17:36:55 +02:00
Lipu Fei
8e579d2d68 Update default extruder when applying remote config
CURA-6452
2019-04-15 13:25:24 +02:00
Lipu Fei
ba37812793 Correct some deprecations and remove duplicated code 2019-04-15 09:47:09 +02:00
Lipu Fei
5f7f7f944f Remove use XYZ instead 2019-04-15 09:39:05 +02:00
Remco Burema
d3310be846 Deprecate some MachineManagaer functions.
Note: You need the 'handle_log_once' branch in Uranium to prevent spamming the logs!

part of CURA-6457
2019-04-12 16:19:54 +02:00
Lipu Fei
32fcc79dd8 Fix _shouldResolve()
CURA-6456
2019-04-11 16:34:57 +02:00
Lipu Fei
ad51d8f1b6 Show readable machine type in add by ip page
CURA-6057
2019-04-08 13:06:30 +02:00