992 Commits

Author	SHA1	Message	Date
ChrisTerBeke	3de4940d69	Simplify creating, duplicating materials in preferences, extract logic to python, code-style fixes	2018-01-09 16:19:29 +01:00
ChrisTerBeke	f9286d4bd5	Fix color swatch not being updated after color selection change - CURA-4774	2018-01-09 15:50:32 +01:00
Jack Ha	733d6234e6	CURA-4525 moved experimental preferences to bottom with its own label; all settings are by default off	2018-01-08 11:13:16 +01:00
Jack Ha	bfa33c721c	CURA-4525 solved merge conflicts	2018-01-03 13:52:55 +01:00
Lipu Fei	f6168c07f0	Fix material_diameter bindings for metarial menu and page ... CURA-4708	2018-01-03 11:27:30 +01:00
Ghostkeeper	c786f7a69b	Add Portuguese to language drop-down ... So that we can select it. Contributes to issue CURA-4692.	2017-12-29 11:53:58 +01:00
Jack Ha	5152b2ae65	Solved merge conflicts. CURA-4525	2017-12-21 10:52:51 +01:00
Ghostkeeper	75df653d47	Merge branch 'feature_local_container_server'	2017-12-11 15:51:17 +01:00
Ghostkeeper	1029d4509c	Merge branch 'master' into feature_local_container_server	2017-12-08 16:03:05 +01:00
ChrisTerBeke	2986a17c1d	Fix for showing printer connect button on component load, use newer CuraApplication as target	2017-12-08 16:02:22 +01:00
Jack Ha	eb171231c2	Fix removeMaterial. ... The base_file must be removed first, or it gets loaded halfway during remove containers. Contributes to issue CURA-4243.	2017-12-06 11:02:50 +01:00
Ghostkeeper	1f6510a82f	Re-enable Russian and disable Finnish ... Russian has been translated by Bothof now so it's complete again. Finnish has been officially dropped now so we'll disable that language. Contributes to issue CURA-4601.	2017-12-01 15:40:36 +01:00
Ghostkeeper	62185a8ef0	Add Traditional Chinese language option ... Contributes to issue CURA-4370.	2017-12-01 15:06:03 +01:00
Ghostkeeper	dad99f5292	Merge branch 'master' into feature_local_container_server ... Contributes to issue CURA-4243.	2017-11-29 13:06:08 +01:00
Lipu Fei	dad2dfda89	No need to set currentItem after a material is imported ... CURA-4546	2017-11-23 14:08:10 +01:00
Ghostkeeper	3823cca936	Disable Russian translation since it's incomplete ... The maintainer of this translation didn't want to continue spending time to keep his translation up-to-date. Contributes to issue CURA-4601.	2017-11-22 12:45:21 +01:00
ChrisTerBeke	657a91c525	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-20 17:42:26 +01:00
Jack Ha	e2a663992c	CURA-4525 Added an option to turn on the UI elements of multi build plate	2017-11-15 17:00:19 +01:00
Jack Ha	e21acd1a07	CURA-4525 first multi slice + multi layer data, added filter on build plate, added option arrange on load, visuals like convex hull are now correct	2017-11-09 17:03:20 +01:00
Ghostkeeper	839c8ccc52	Fix 'Could not get metadata of container <empty string>' ... Turns out that the side bar header was requesting the metadata before the active material was set. Now I'm just saying that if the active material was not set, it should not be compatible. Contributes to issue CURA-4243, side-ways.	2017-10-30 11:15:41 +01:00
Lipu Fei	946b8ae92d	Remove executable bit for non-executable files	2017-10-19 10:28:57 +02:00
Mark	eaa7b75f0e	Changed parseInt to Math.floor	2017-10-11 16:47:40 +02:00
Mark	d4a8dbdee7	Change Text to Label and cast all sizes to int ... CURA-4437	2017-10-11 12:48:42 +02:00
Lipu Fei	7b6faf0030	Adjust column width for Materials "Print Settings" page ... CURA-4428	2017-10-10 08:03:08 +02:00
Mark	9a193ad5c5	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
fieldOfView	c5fd0e6c80	Use screenScaleFactor to consistently adapt sizes to display pixel ratio	2017-09-25 22:07:12 +02:00
Ruben D	08d0d90389	Change Pirate language to en_7S ... Since it's English from the seven seas. Contributes to issue CURA-4263.	2017-09-10 14:01:07 +02:00
Ruben D	48778a2801	Update language codes ... The folders were renamed, so they should get renamed here as well. Contributes to issue CURA-4263.	2017-09-10 14:00:57 +02:00
Miro Hrončok	e394811ce1	Relocate locales to proper locations ... Fixes https://github.com/Ultimaker/Uranium/issues/246 Fixes https://github.com/Ultimaker/Uranium/issues/277	2017-09-10 14:00:05 +02:00
Ghostkeeper	7a8956fd0e	Merge branch '2.7'	2017-08-28 16:21:40 +02:00
Ghostkeeper	22b808afb3	Merge branch 'master' of https://github.com/PCDotFan/Cura into PCDotFan-master	2017-08-28 15:29:45 +02:00
Lipu Fei	e17a88fe11	Merge branch '2.7'	2017-08-22 16:06:36 +02:00
Ghostkeeper	7ab6a551c1	Clarify that XML material tags don't get translated ... Some of the translators got this wrong last time. Let's see how good they read this next time... Contributes to issue CURA-4113.	2017-08-14 13:54:11 +02:00
Ghostkeeper	5f057f46ea	Add Pirate language only on Talk Like a Pirate Day ... Let's see who finds this.	2017-08-10 20:26:35 +02:00
Jaime van Kessel	021425ee06	Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura	2017-07-26 16:49:28 +02:00
Ghostkeeper	54ef959cfc	Fix translation of 'Polish' ... Yeah, Wikipedia wasn't very clear on that. Contributes to issue CURA-3998.	2017-07-18 14:06:44 +02:00
Ghostkeeper	b2853ef139	Add Polish language to drop-down ... The translation is complete for 2.6 (albeit apparently wrong in several places). It is not yet complete for master, but that will come during the translation update for the 2.7 beta. Contributes to issue CURA-3998.	2017-07-18 13:46:10 +02:00
fieldOfView	b5d7ec5bd2	Round fractional widths and heights in system-themed qml	2017-07-14 12:58:07 +02:00
Jaime van Kessel	549e2c12c8	Calculated values now show calculated instead of a formula ... CURA-3385	2017-07-14 11:39:10 +02:00
PCDotFan	bca7c75cd2	Merge remote-tracking branch 'Ultimaker/master'	2017-07-08 09:47:49 +08:00
Lipu Fei	89c5fb2d15	Merge pull request #2037 from Ultimaker/feature_zoom_to_mouse ... Added zoom to mouse preference	2017-07-07 11:40:26 +02:00
Ghostkeeper	ef89fab126	Fix spaces after comma according to code style ... Contributes to issue CURA-3587.	2017-07-06 16:13:42 +02:00
Ghostkeeper	9dd3527504	Blur setting text fields when clicking buttons ... Otherwise the setting is not applied yet by the time you duplicate or export a profile. Contributes to issue CURA-4011.	2017-07-05 16:04:11 +02:00
Ghostkeeper	b8b23055ba	Fix getting new material diameter ... Same problem, it's not been updated yet at this point. Contributes to issue CURA-2822.	2017-06-29 16:50:15 +02:00
Ghostkeeper	27bcb11dc9	Store old approximate diameter in variable ... Shorter line, easier to read. Contributes to issue CURA-2822.	2017-06-29 16:41:24 +02:00
Ghostkeeper	b3e49f0c12	Fix getting the old approximate diameter ... The properties.approximate_diameter gets updated later via signals, so at this point it's not correct yet. Contributes to issue CURA-2822.	2017-06-29 16:28:01 +02:00
Jaime van Kessel	4370e3a13c	Added zoom to mouse preference ... https://github.com/Ultimaker/Cura/issues/1572	2017-06-27 15:41:17 +02:00
PCDotFan	17a7bd7ae9	Add 简体中文 to GeneralPage.qml	2017-06-27 10:29:21 +08:00
Ghostkeeper	6088617453	Merge branch '2.6'	2017-06-26 10:34:58 +02:00
Ghostkeeper	8c9d051479	Re-enable Korean translations ... They are complete now, as far as we agreed on (only the setting descriptions). They may now be re-enabled. Contributes to issue CURA-3950.	2017-06-23 16:42:47 +02:00