1994 Commits

Author	SHA1	Message	Date
Mark	835a0fb5d3	Merge branch 'master' of github.com:Ultimaker/Cura	2017-11-23 10:39:00 +01:00
Mark	3477b902ab	Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation ... Cura 4527 view orientation	2017-11-23 09:56:26 +01:00
Diego Prado Gesto	2042cdf155	Merge branch 'master' of https://github.com/Ultimaker/Cura	2017-11-22 20:11:24 +01:00
Diego Prado Gesto	b776afaf3d	CURA-4509 Changing layout of the print time information tooltip, ... now in two lines per feature. This is for avoid trimming the labels because they depend on the language.	2017-11-22 20:09:39 +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
Aleksei S	d7b230269b	The icons changed ... CURA-4527	2017-11-22 11:10:25 +01:00
Jack Ha	602e8c0e66	Changed 'Check material compatibility' to 'Check compatibility' because it's not only materials possibly being incompatible	2017-11-21 15:12:17 +01:00
ChrisTerBeke	657a91c525	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-20 17:42:26 +01:00
Aleksei S	ce0510cee3	Hide icons if they overlap monitor button ... CURA-4527	2017-11-15 16:34:22 +01:00
Aleksei S	3d2868c336	Added icons ... CURA-4527	2017-11-15 00:43:17 +01:00
Aleksei S	7722e438c9	Changed orientation button location, adjusted call functins ... CURA-4527	2017-11-06 10:28:07 +01:00
Aleksei S	fb8bde6f76	Added view rotation for each click ... CURA-4527	2017-11-03 15:29:33 +01:00
ChrisTerBeke	142ff4e9dc	Merge pull request #2669 from fieldOfView/feature_jogging ... Jogging	2017-11-01 16:15:40 +01:00
Aleksei S	87a7bf72a8	Monitor view, "connect" button position ... CURA-4509	2017-11-01 15:57:30 +01:00
ChrisTerBeke	4326884f97	Merge branch 'master' of https://github.com/Ultimaker/Cura	2017-11-01 15:54:43 +01:00
alekseisasin	db51054984	Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area ... Cleanup save/monitor button area	2017-11-01 15:53:20 +01:00
ChrisTerBeke	e2c62a4609	Revert "Remove unnecessary properties which after update triggered view rendering" ... This reverts commit ee228155af1677f3f375fb0b28b53ecef744d4d2.	2017-11-01 15:50:23 +01:00
Diego Prado Gesto	7f76749e2c	Merge branch 'CURA-4062_layerview_laggy'	2017-11-01 13:37:44 +01:00
Mark	512541be08	Change the font of the checkbox ... CURA-4503	2017-11-01 10:44:46 +01:00
Lipu Fei	324b39fc39	Fix layout for open project dialog ... CURA-4503	2017-10-31 16:20:01 +01:00
alekseisasin	759c494aaa	Merge pull request #2703 from fieldOfView/fix_setting_text_on_focus ... Stop SettingTextField from setting values when getting/losing the focus	2017-10-31 12:47:25 +01:00
Aleksei S	f1db8ed001	Show message (hover slieder) if user selected custom quality profile in recomended mode ... CURA-4466	2017-10-31 11:07:45 +01:00
Aleksei S	f7ce4cc78a	Merge branch 'master' of github.com:Ultimaker/cura	2017-10-31 10:27:35 +01:00
Aleksei S	e0c1afe01f	Added Request package information to AboutDialog.qml ... CURA-4415	2017-10-31 10:26:42 +01:00
alekseisasin	055b6ebaab	Merge pull request #2691 from Ultimaker/cleaner_open_project_dialog ... Cleaner open project dialog & redering on partial pixels fixes	2017-10-31 09:58:52 +01:00
Lipu Fei	67c11b8cdf	Fix code style ... CURA-4503	2017-10-31 09:24:32 +01:00
fieldOfView	8dfba9a318	Stop SettingTextField from setting values when getting/losing the focus ... Fixes #2694	2017-10-30 15:31:14 +01:00
Aleksei S	22aaf64b63	Simplified version for validation need to show user agreement ... CURA-4501	2017-10-30 14:42:46 +01:00
fieldOfView	2d109090bc	Show material name instead of extruder number	2017-10-30 12:40:41 +01:00
fieldOfView	fc7d1210cf	Fix qml binding loop	2017-10-30 12:31:46 +01:00
fieldOfView	6fa4dd0a97	Fix qml binding loops	2017-10-30 12:26:02 +01:00
fieldOfView	84002a70d0	Remove binding loop by cleaning up tooltipText creation	2017-10-30 11:50:57 +01:00
Lipu Fei	c0f1af94ab	Show Add Machine dialog after User Agreement dialog is closed ... CURA-4501	2017-10-30 10:33:50 +01:00
fieldOfView	6d4ea381f0	Create cost specification tooltip	2017-10-29 11:47:49 +01:00
fieldOfView	0372475560	Rearrange print specs area ... * remove superfluous "Print time" label * format print time tooltip * add elide to cost spec * add (empty) cost spec tooltip	2017-10-29 10:09:52 +01:00
fieldOfView	6a0ba43508	Make sure monitor buttons do not extend sidebar	2017-10-29 10:07:42 +01:00
fieldOfView	208d365d51	Make sure saveRow does not extend sidebar	2017-10-29 09:20:59 +01:00
fieldOfView	177295999b	Allow richer markup in tooltips	2017-10-29 09:19:50 +01:00
Mark	334283e893	Found some more margins that wouldnt be fixed numbers and made the code more consistent	2017-10-27 14:12:35 +02:00
Mark	6c04a8be5d	same font for checkbox label and some layout anchors	2017-10-27 13:48:55 +02:00
Aleksei S	ee228155af	Remove unnecessary properties which after update triggered view rendering ... CURA-4062	2017-10-27 09:24:31 +02:00
Diego Prado Gesto	92ac7c5a15	Merge branch 'CURA-4451_not_support_container'	2017-10-26 16:55:17 +02:00
Aleksei S	938ae5af1d	Added function to catch prepare and monitor button click ... CURA-4062	2017-10-26 14:36:23 +02:00
fieldOfView	fff9330949	Merge branch 'master' into fix_is_clustersize ... # Conflicts: # plugins/UM3NetworkPrinting/UM3InfoComponents.qml # resources/qml/Menus/MaterialMenu.qml # resources/qml/Menus/NozzleMenu.qml	2017-10-26 11:09:13 +02:00
ChrisTerBeke	b1a4c3488f	Merge branch 'master' into CURA-4451_not_support_container	2017-10-26 09:48:52 +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
Lipu Fei	e4fec1f63d	Move SaveButton downwards ... CURA-4490 Move SaveButton downwards so it doesn't overlay with the estimated print time in some language.	2017-10-25 16:35:38 +02:00
Diego Prado Gesto	87ba4056ee	CURA-4485 Minor changes	2017-10-25 13:55:30 +02:00
fieldOfView	ff847aa329	Fix qml error when there is no connected printer ... Also fixes code style	2017-10-25 11:52:43 +02:00
Diego Prado Gesto	0eedfa5c18	CURA-4485 Disabling automatic material and variant when connecting to a ... printer within a cluster of more than 1 printer.	2017-10-24 15:45:20 +02:00