2277 Commits

Author	SHA1	Message	Date
Jack Ha	4b5097f998	Objects menu now collapses animated and it has a border. CURA-4525	2017-12-21 12:41:06 +01:00
Jack Ha	1ca6fa0daa	Different arrow for collapsing. CURA-4525	2017-12-21 11:40:59 +01:00
Jack Ha	a47107448e	Moved objects menu to lower left and made it collapsible. CURA-4525	2017-12-21 11:39:37 +01:00
Jack Ha	5152b2ae65	Solved merge conflicts. CURA-4525	2017-12-21 10:52:51 +01:00
Jaime van Kessel	89004b8df5	Fixed some QML warnings ... CL-541	2017-12-19 17:19:04 +01:00
fieldOfView	57a9b709e7	Select text when gaining focus	2017-12-19 12:14:58 +01:00
Jaime van Kessel	bc8741ef08	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2017-12-19 10:40:32 +01:00
Diego Prado Gesto	4a211c6ac6	CURA-4495 Change property name and add default values	2017-12-18 11:58:34 +01:00
Diego Prado Gesto	c3ce3724e5	Fix small issue when resetHandler is not defined	2017-12-18 10:00:08 +01:00
ChrisTerBeke	876ad01597	Directly use CuraApplication.backend instead of via property	2017-12-15 13:32:45 +01:00
ChrisTerBeke	79028388a2	Add option for custom reset handler in setting item	2017-12-15 11:05:42 +01:00
ChrisTerBeke	cac561600e	Use pyqtProperty instead of slot to bind backend	2017-12-14 15:44:11 +01:00
ChrisTerBeke	9db320bf35	Remove unused backend property	2017-12-14 15:34:58 +01:00
ChrisTerBeke	47e5303a89	Catch situations where backend is not correctly set	2017-12-14 15:16:17 +01:00
ChrisTerBeke	c056fcb23d	Fix monitor sidebar machine selection - CURA-4234	2017-12-14 14:58:51 +01:00
Jack Ha	cda6aa2547	CURA-4234 splitted MachineSelection into a separate file and add it to PrintMonitor as well, because now it's part of the sidebar	2017-12-14 14:49:18 +01:00
Jaime van Kessel	24bd32477a	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2017-12-14 13:03:02 +01:00
Jack Ha	f3a6f50e2c	CURA-4234 fix topbar resize issues and removed hard coding numbers	2017-12-13 16:47:38 +01:00
Jack Ha	3605edc565	CURA-4234 remove debugging logline	2017-12-13 14:16:35 +01:00
Jack Ha	63eec848fc	CURA-4234 view mode button now also moves with the sidebar	2017-12-13 14:15:27 +01:00
Jack Ha	4519f9b46a	CURA-4234 rename to cura/sidebar_collapse, fix spelling errors, styling	2017-12-13 14:04:02 +01:00
Jack Ha	f28846acb9	Merge branch 'master' into CURA-4234_expand_collapse	2017-12-12 15:43:32 +01:00
Aleksei S	3516d01f3d	Move back machine selection ... CURA-4234	2017-12-12 15:30:19 +01:00
Aleksei S	6968c089db	Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar ... CURA-4234	2017-12-12 11:26:17 +01:00
ChrisTerBeke	ca413e0496	Add extra checks to ensure backend exists, use same state everywhere	2017-12-12 11:16:40 +01:00
ChrisTerBeke	84aa9367c7	Cleanup	2017-12-12 10:54:54 +01:00
Aleksei S	00529f37d9	After sidebar expanding the builplate stays in center of the screen ... CURA-4234	2017-12-11 18:51:53 +01:00
Ghostkeeper	75df653d47	Merge branch 'feature_local_container_server'	2017-12-11 15:51:17 +01:00
Aleksei S	300f29e11b	Add expand button to menu ... CURA-4234	2017-12-11 15:30:13 +01:00
Aleksei S	a5cb4cd316	Expand/Collapse sidebar ... CURA-4234	2017-12-11 10:53:48 +01:00
Jaime van Kessel	1719a7b2fe	Fixed preheating for Legacy UM3 ... CL-541	2017-12-08 17:16:59 +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
ChrisTerBeke	c4d7a33c31	Monitor view component loader should have width and height from parent	2017-12-08 14:56:03 +01:00
ChrisTerBeke	8cd9439497	ignore octoprint plugin	2017-12-08 14:33:21 +01:00
Jaime van Kessel	c28c20dbd7	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2017-12-08 10:22:16 +01:00
ChrisTerBeke	c6e72abfbe	Add switch to monitor support for legacy plugin that emit signal to switch	2017-12-07 12:00:07 +01:00
ChrisTerBeke	acbef72b68	Cleanup	2017-12-07 11:52:15 +01:00
ChrisTerBeke	faf77b2795	Cleanup	2017-12-07 11:50:01 +01:00
ChrisTerBeke	7a6d75fd08	Fix sidebar top margin for um3 network monitor controls	2017-12-07 11:02:52 +01:00
ChrisTerBeke	71ae78f7b6	Fix monitoring sidebar top margin	2017-12-07 10:45:54 +01:00
ChrisTerBeke	f91a4db617	Set stage icon for monitor depending on output device state, prevent crash when accessing back-end from unloaded component	2017-12-07 10:38:06 +01:00
ChrisTerBeke	f6b570e299	Back to QUrl, fix monitor view overlay	2017-12-07 09:13:46 +01:00
ChrisTerBeke	9e3c681d66	Fix top bar tab layout when it has an icon	2017-12-06 18:47:11 +01:00
ChrisTerBeke	548761fcc3	Some cleanup	2017-12-06 18:15:17 +01:00
ChrisTerBeke	28c5debd61	Fix hiding topbar buttons in monitor stage	2017-12-06 18:11:46 +01:00
ChrisTerBeke	9702ffb794	Small fixes to sidebar layout after refactoring	2017-12-06 18:09:02 +01:00
ChrisTerBeke	ee643610e5	Fix sidebar loading and unloading depending on active stage	2017-12-06 17:46:18 +01:00
Jaime van Kessel	aba8bd89c3	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2017-12-06 13:33:20 +01:00
ChrisTerBeke	2d044a37ae	Sidebar and main view via loader	2017-12-06 13:33:05 +01:00