597 Commits

Author	SHA1	Message	Date
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
Lipu Fei	dbf0cf347c	Default to 0 if we cannot find the theme ... CURA-3873	2017-06-23 13:59:05 +02:00
Ghostkeeper	bc219a06fe	Add MaterialsModel to make material list update upon metadata change ... This new model inherits from InstanceContainersModel. The only change is that it updates when the metadata of a material container changes. This is needed to make the list of materials update when the material diameter changes. Contributes to issue CURA-2822.	2017-06-22 18:17:16 +02:00
Ghostkeeper	0e23930bfe	Fix checking whether the old material diameter was the same ... Getting the old material diameter wasn't working properly. Contributes to issue CURA-2822.	2017-06-22 18:17:16 +02:00
Ghostkeeper	1d048f39db	Fix getting old material diameter ... This diameter works. I still don't know why the properties/diameter one didn't work, but this is good too since they are now equal. Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	b37fa6f718	Implement warning message when you change material diameter ... The undo functionality currently gives an error though. Investigating... Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	1d23d659f0	Merge branch '2.6'	2017-06-21 12:29:23 +02:00
Ghostkeeper	e7d5618148	Re-enable Japanese translation ... Note that this only includes the setting descriptions. Contributes to issue CURA-3950.	2017-06-21 11:30:16 +02:00
Ghostkeeper	24b19fa0a5	Convert tab to spaces ... We indent with spaces, not tab. This one was mixed.	2017-06-21 11:29:35 +02:00
Ghostkeeper	9acaef8ecc	Merge branch 'feature_lsit_themes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_lsit_themes	2017-06-19 11:05:20 +02:00
Ghostkeeper	29b90d26b8	Re-enable centre camera on selection ... With Qt 5.8 it works again on Windows.	2017-06-15 16:16:56 +02:00
Ghostkeeper	4c8d65a2f4	Re-enable Brazillian Portuguese translation ... It's complete again. Thanks Patola. Contributes to issue CURA-3885.	2017-06-15 09:42:30 +02:00
fieldOfView	49f2fb2cea	Fix filtering maerials after editing materials ... NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.	2017-06-14 10:42:04 +02:00
fieldOfView	ed6f4d851c	Update documentation	2017-06-14 10:41:39 +02:00
fieldOfView	1f49a87acb	Update material_diameter when editing the material in MaterialView.qml	2017-06-14 10:41:02 +02:00
Ghostkeeper	baef713f50	Disable incomplete languages ... These translations are incomplete for the 2.6 release. Contributes to issue CURA-3885.	2017-06-14 09:37:55 +02:00
Mark	8ab5c7e4cd	Merge pull request #1910 from Ultimaker/fix_dialog_sizes ... Fix dialog sizes. Tested on different OSes and screens, all looked good.	2017-06-13 13:14:44 +02:00
fieldOfView	817de9d39e	Get a list of available themes instead of the hardcoded list	2017-05-24 17:42:11 +02:00
jack	85a29e967f	Merge pull request #1757 from fieldOfView/fix_material_uniqueness ... Fix material uniqueness	2017-05-16 09:44:10 +02:00
Ghostkeeper	4b28e9bf43	Re-enable Japanese from language selection menu ... Contributes to issue CURA-3817.	2017-05-16 09:38:39 +02:00
fieldOfView	a727e4ffd0	Make sure all materials are shown ... Without this workaround, some materials that are listed above the generic materials do not show up untill the user scrolls the scrollview.	2017-05-11 18:17:11 +02:00
fieldOfView	6fa83a9110	Fix selecting a material when an edit field has the focus	2017-05-11 13:22:14 +02:00
fieldOfView	e45f04f391	Merge branch 'master' into fix_material_uniqueness	2017-05-11 12:23:01 +02:00
Mark	04611b06af	Fix two spelling errors ... TRI-1450	2017-05-10 20:14:03 +02:00
fieldOfView	8f792b2504	Tweak Print Settings layout to match the rest of the UI.	2017-05-09 13:03:49 +02:00
fieldOfView	836cf27266	Keep material selected when editing its name, brand or type ... Editing a material name, brand or type may change its position in the materials list. We now reselect the material after editing one of these values.	2017-05-08 11:37:19 +02:00
fieldOfView	b4f56d10d7	Set currentIndex to a more logical successor when deleting a material	2017-05-08 11:17:10 +02:00
fieldOfView	00f3cf409b	Select newly created material	2017-05-08 10:38:25 +02:00
Mark	0e1748b705	Small layout fix so the comboboxes are aligned	2017-05-02 12:55:37 +02:00
Mark	be21cd7f7d	Fix preference category double name	2017-05-01 13:25:13 +02:00
fieldOfView	577a8d0a3e	Fix MaterialView layout issues ... Make scrollview look more in line with the scrollview on the profiles page	2017-04-30 10:28:03 +02:00
fieldOfView	a1d9b1a37f	Force update after unlinking material.	2017-04-29 21:19:54 +02:00
fieldOfView	67b8302d40	Add a notice to linked materials and allow "unlinking" a material.	2017-04-29 21:08:48 +02:00
fieldOfView	23cd6b1c2c	Fix rendering of readonly description/adhesion info	2017-04-29 16:43:26 +02:00
Lipu Fei	37ec14c239	Merge pull request #1710 from alephobjects/theme-picker ... Theme picker	2017-04-27 15:32:14 +02:00
Victor Larchenko	58a857403c	Added resetting of theme	2017-04-27 16:37:01 +06:00
fieldOfView	02b978272f	Add "Create" button to create a new, unique material. ... The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.	2017-04-27 11:19:46 +02:00
fieldOfView	c1fa927118	Make the general settings page options draggable only in the vertical direction ... ... to match other scrollviews. Fixes #1723	2017-04-22 23:07:13 +02:00
Victor Larchenko	e5eb0c9a14	Merge remote-tracking branch 'um/master' into theme-picker	2017-04-21 14:29:01 +06:00
Mark	2d14052f4e	Change Label to Text to fix ugly fonts ... CURA-3389	2017-04-18 13:35:39 +02:00
Lipu Fei	865ab7135a	Merge pull request #1686 from fieldOfView/fix_material_nan ... Fix NaN values on material print settings tab	2017-04-18 09:52:38 +02:00
Jaime van Kessel	397b08ce6d	Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura	2017-04-14 11:22:35 +02:00
Ghostkeeper	f35124400b	Merge branch '2.5'	2017-04-13 09:50:27 +02:00
Ghostkeeper	cf25eeea5f	Remove Japanese and Korean translations ... They are not complete (by far). Contributes to issue CURA-3487.	2017-04-13 09:39:10 +02:00
fieldOfView	5e50a8fe0b	Show value from definition if it is not defined in the material profile ... This way you get sane defaults if no value is provided in the material xml file, instead of 0s	2017-04-13 00:53:47 +02:00
fieldOfView	c97f8679c2	Fix NaN values on material print settings tab	2017-04-13 00:25:38 +02:00