245 Commits

Author	SHA1	Message	Date
Lipu Fei	fd2abdd9fb	Merge pull request #3507 from guillemavila/Copy-all-values-to-all-extruders ... add Copy all values to all extruders	2018-03-22 16:16:30 +01:00
Guillem	faf8ed3ba6	Replace only user changed values ... removed machine_settings and settable_per_extruder_check. Not needed.	2018-03-19 14:57:31 +01:00
Lipu Fei	2660d15857	Make "show all settings" work ... CURA-5088 "Show All Settings" in setting visibility menu now sets all settings to be visible.	2018-03-19 10:58:56 +01:00
Lipu Fei	b1c1b04f0d	Restore change to SettingView removeUnusedValue	2018-03-15 16:09:01 +01:00
Lipu Fei	83175b00c2	Change SettingVisibilityPresetsModel to non-singleton ... CURA-5088	2018-03-15 14:41:34 +01:00
Lipu Fei	984e6ddd08	Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles ... Setting Visibility Presets sidebar menu	2018-03-14 13:25:59 +01:00
Guillem	1bb5b8ff3e	add Copy all values to all extruders ... context menu option	2018-03-13 12:31:03 +01:00
Aleksei S	7574ab0883	Connect infill Lines checkbox did not work	2018-03-12 15:52:16 +01:00
Aleksei S	c3b659c5d4	Fix: reset icon dissapears for default values ... CURA-5059	2018-03-12 15:15:19 +01:00
fieldOfView	7123441db8	Fix keeping settings visible when showing all settings	2018-03-09 16:51:46 +01:00
fieldOfView	d9eb4406bf	Speed up showing all settings	2018-03-05 23:49:06 +01:00
fieldOfView	97d7354839	Merge branch 'master' into feature_setting_visibility_profiles	2018-03-05 23:09:51 +01:00
Lipu Fei	93190dde9b	Merge remote-tracking branch 'origin/master' into refactoring_machine_manager	2018-03-02 09:55:14 +01:00
Diego Prado Gesto	ae57e23eec	Create a mouse area around the sidebar to avoid propagating mouse wheel events. ... Contributes to CURA-4495	2018-03-01 19:48:41 +01:00
Lipu Fei	6e5fed6b5e	WIP: Fix quality name in SettingView	2018-02-21 11:21:16 +01:00
Jack Ha	c3349baf39	CURA-4606 fix bug concerning activeMaterialsCompatible; factor out activeQualityName	2018-02-21 10:36:51 +01:00
Jack Ha	ad6548a5dc	CURA-4606 factored activeMaterialName out	2018-02-21 10:35:17 +01:00
fieldOfView	a17160f52d	Merge branch 'master' into feature_setting_visibility_profiles ... # Conflicts: # resources/qml/Settings/SettingView.qml	2018-02-15 11:54:45 +01:00
Ghostkeeper	ee9de1f11b	Merge branch '3.2' ... Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.	2018-02-14 10:53:51 +01:00
Mark	b531c0550d	Change Math.floor to Math.round as a last try to fix garbled fonts ... CURA-4941	2018-02-14 09:28:47 +01:00
Mark	12b2348309	Revert "Use QTQuick 2.2 to fix garbled fonts" ... This reverts commit 0d5bb952efc468522b55cbf903349aaf7f979af9.	2018-02-13 14:37:05 +01:00
Mark	0d5bb952ef	Use QTQuick 2.2 to fix garbled fonts ... CURA-4941	2018-02-13 12:42:31 +01:00
Mark	466926fecd	Increased the version of QtQuick	2018-02-13 11:07:14 +01:00
Mark	7493fae667	Fix to make sure margins cant have partial values ... CURA-4941	2018-02-13 07:32:10 +01:00
Mark	7ea654df3d	Fix to make sure margins cant have partial values ... CURA-4941	2018-02-13 07:31:02 +01:00
Ghostkeeper	03b4213e92	Merge branch '3.2' ... Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...	2018-02-12 13:10:24 +01:00
Mark	461da709ff	Checked all divisions (again..) and multiplications on rounding errors ... CURA-4941	2018-02-10 12:45:36 +01:00
fieldOfView	74fe281e1d	Sync currently selected preset between visibility-page and -menu	2018-02-09 18:54:04 +01:00
fieldOfView	f79e787f2c	Refactor SettingVisibilityProfiles to SettingVisibilityPresets ... This is closer to the current Cura intend	2018-02-09 09:01:39 +01:00
fieldOfView	080979caeb	Move setting visibility presets into a model ... Handling of "Custom" is still under consideration	2018-02-08 23:07:45 +01:00
fieldOfView	872efd16b2	Fix selecting presets from menu ... Switching back to Custom is not yet implemented, and the menu selection does not yet change if the preset is changed in the preferences	2018-02-08 17:13:59 +01:00
fieldOfView	69d7bf4130	Merge branch 'master' into feature_setting_visibility_profiles	2018-02-08 16:06:48 +01:00
Ghostkeeper	e7c5120f9c	Merge branch '3.2'	2018-01-15 16:52:28 +01:00
Lipu Fei	616615067c	Fix quality name in selected profile box ... CURA-4796	2018-01-15 15:17:15 +01:00
Ian Paschal	dac67ef2fc	Merge pull request #3134 from Ultimaker/3.2 ... Fix for CURA-4789	2018-01-15 14:41:23 +01:00
Lipu Fei	03bd4d8d22	Fix profile menu text for custom profiles based on not supported ... CURA-4796	2018-01-15 14:29:52 +01:00
Jaime van Kessel	ed9634ebe0	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2018-01-08 10:56:12 +01:00
Lipu Fei	84adbc5f41	Use the 5.8 versions of QtQuick modules in QMLs ... CURA-4758	2018-01-04 13:26:14 +01:00
fieldOfView	3f11b8a756	Merge branch 'master' into feature_setting_visibility_profiles	2018-01-04 11:06:51 +01:00
Lipu Fei	392be23281	Fix SettingView stakc ID binding ... CURA-4708	2018-01-03 15:58:30 +01:00
Lipu Fei	f6168c07f0	Fix material_diameter bindings for metarial menu and page ... CURA-4708	2018-01-03 11:27:30 +01:00
Diego Prado Gesto	4a211c6ac6	CURA-4495 Change property name and add default values	2017-12-18 11:58:34 +01:00
ChrisTerBeke	b74ebc57b4	Fix per extruder setting value depending on extruder count - CURA-4627	2017-11-27 17:00:57 +01:00
ChrisTerBeke	657a91c525	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-20 17:42:26 +01:00
fieldOfView	5638ebe8cf	Tweak appearance of the menu button	2017-10-26 11:05:59 +02:00
Chris ter Beke	b95ba24530	Remove some changes, debugging - CURA-4451 ... WIP - CURA-4451 correctly show not supported when any of the extruders has a not supported profile - CURA-4451 Clean up and add comments - CURA-4451	2017-10-26 09:23:27 +02:00
fieldOfView	078fd074e5	Add initial menu stub	2017-10-26 00:00:07 +02:00
fieldOfView	4bb67fbd82	Add setting visibility profile menu button	2017-10-25 17:04:23 +02:00
ChrisTerBeke	35684e0aa4	Move profiles dropdown text generator to separate method	2017-10-24 09:57:48 +02:00
Mark	eaa7b75f0e	Changed parseInt to Math.floor	2017-10-11 16:47:40 +02:00