143 Commits

Author	SHA1	Message	Date
Lipu Fei	25dd63dc21	WIP: Cleanup MachineManager	2018-02-22 13:45:46 +01:00
Jack Ha	8854a28d56	CURA-4525 solved merge conflict	2018-01-04 10:24:30 +01:00
Aleksei S	49ae078396	Adjust 3d view and add Camera View to the menu bar ... CURA-4642	2018-01-03 16:45:26 +01:00
Jack Ha	663ceab069	Undo emit transformationChanges (caused a crash), themed objects in objects list. CURA-4525	2017-12-21 16:53:43 +01:00
Jack Ha	5152b2ae65	Solved merge conflicts. CURA-4525	2017-12-21 10:52:51 +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
Aleksei S	a5cb4cd316	Expand/Collapse sidebar ... CURA-4234	2017-12-11 10:53:48 +01:00
Jack Ha	228039545b	CURA-4525 send active build plate to legacy UM3 with Print over network	2017-11-16 09:58:53 +01:00
Jack Ha	864f417723	CURA-4525 Fix load and save projects. Not storing build plates or object names yet.	2017-11-15 16:03:32 +01:00
Jack Ha	41d5ec86a3	CURA-4525 updated scene node menu and added multi buildplate arrange	2017-11-08 14:07:40 +01:00
Jaime van Kessel	fbdc9ed223	Added reload qml action	2017-10-27 16:35:09 +02:00
Lipu Fei	946b8ae92d	Remove executable bit for non-executable files	2017-10-19 10:28:57 +02:00
ChrisTerBeke	b0fa87231c	CURA-4390 add new menu item for plugins	2017-10-03 17:33:24 +02:00
Mark	9a193ad5c5	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
fieldOfView	3f903d2c76	Add menu item to reset the camera	2017-09-16 10:05:45 +02:00
Jack Ha	0b0011fc88	Multiply dialog now has focus on #, added shortcut Ctrl-M	2017-05-04 16:31:33 +02:00
Arjen Hiemstra	03ccdec861	Call the right methods of CuraActions in Actions.qml ... Contributes to CURA-3609	2017-04-20 17:42:06 +02:00
Arjen Hiemstra	dd73c53ece	Introduce center and multiply actions that work on the entire selection ... Instead of working on a single object. Contributes to CURA-3609	2017-04-20 17:41:53 +02:00
Jaime van Kessel	ecf905f580	Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura	2017-04-05 10:45:42 +02:00
Jack Ha	a83b1dd638	Split ShapeArray from Arranger. CURA-3239	2017-04-03 14:48:31 +02:00
Jack Ha	abb5d1e76e	Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239	2017-04-03 10:40:04 +02:00
Jaime van Kessel	f82aecb7ca	Refactoring; no longer use "Printer" to identify CuraApplication	2017-03-30 20:19:05 +02:00
Jack Ha	bf08d30e7d	Added first arrange function and smart placement after loading. CURA-3239	2017-03-28 14:27:22 +02:00
Lipu Fei	e00c68344a	CURA-3495 open project/models in one dialog	2017-03-16 13:37:06 +01:00
Jaime van Kessel	66afc2a391	Added new project option ... CURA-3494	2017-03-10 11:02:27 +01:00
Ghostkeeper	c0b4d43995	Add hotkey for reload all models ... Small change. I can't be bothered to make an issue for this.	2017-03-02 15:42:57 +01:00
Jaime van Kessel	8f023524d2	Small textual changes for project handling ... CURA-1263	2016-12-05 11:44:42 +01:00
Jaime van Kessel	5119ee9a93	Use correct descriptor for project open ... CURA-1263	2016-12-02 11:13:21 +01:00
Jaime van Kessel	4cf454757f	Change import & export back to save & open ... CURA-1263	2016-12-02 10:43:02 +01:00
Jaime van Kessel	86019c2df0	Renamed load&save workspace to import&export project ... CURA-1263	2016-11-30 12:59:09 +01:00
Jack Ha	b88ed76b7c	Solve merge conflict PrinterOutputDevice. CURA-1263	2016-11-24 13:55:22 +01:00
Jack Ha	c3320bb1a4	Change settings to settings/overrides in selected messages. CURA-2898	2016-11-23 13:33:12 +01:00
Jaime van Kessel	9539774c0b	Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler	2016-11-17 10:27:28 +01:00
Jaime van Kessel	a39d682476	Renamed Load workspace to open Workspace ... CURA-1263	2016-11-16 16:07:18 +01:00
fieldOfView	eeff3b65ec	Change wording from "duplicate" to "multiply"	2016-11-09 09:27:44 +01:00
Jaime van Kessel	a859c9883c	Added loadWorkspace option to menu ... CURA-1263	2016-11-08 15:33:31 +01:00
fieldOfView	0ce4b5f2de	Add "..." to Duplicate Model menu entry to indicate there is a dialog	2016-11-07 14:07:06 +01:00
Jaime van Kessel	450eb5443f	Updated text to be more clear ... CURA-2726	2016-11-03 14:21:13 +01:00
Simon Edwards	cadf2115ac	Merge pull request #1058 from Ultimaker/cura-2730 ... Changed MachineManager.isActiveStackValid to areStacksValid. CURA-2730	2016-11-01 16:17:04 +01:00
Ghostkeeper	32653c2df4	Blur settings upon discarding current settings ... Otherwise the currently selected setting doesn't get discarded. Contributes to issue CURA-2866.	2016-11-01 16:06:56 +01:00
Jack Ha	d308cd45bc	Moved function out of MachineManager, changed "Valid" to "HaveErrors". ... CURA-2730	2016-10-20 16:16:33 +02:00
Jack Ha	98688bf013	Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730	2016-10-19 15:46:22 +02:00
Simon Edwards	c3cf762451	Show the warning color for unsupported materials/qualities by using the new 'supported' metadata flag. ... CURA-2271	2016-10-12 15:57:50 +02:00
fieldOfView	95fabbaf6d	Don't allow creating profiles based on empty_profile ... ...because empty_profile has no quality_type CURA-2271	2016-10-11 15:22:17 +02:00
fieldOfView	8d6f7c06c1	Replace "Show Engine Log" with "Show Configuration Folder" ... inb4 string freeze	2016-09-13 10:46:33 +02:00
Jaime van Kessel	c7126775d5	Fix spelling mistake	2016-08-25 20:46:36 +02:00
Jack Ha	8c0837d75d	Merge master. CURA-2006	2016-08-16 15:08:25 +02:00
fieldOfView	85a58a22cb	Change "Bed"/"Platform" to "Build Plate" ... UXD-76	2016-08-10 17:57:05 +02:00
fieldOfView	7aab8ad397	Change "object" to "model" ... UXD-83	2016-08-10 17:55:51 +02:00
Arjen Hiemstra	4eb4a90ded	Call the new clearUserContainers/updateQualityChanges from the relevant actions ... Contributes to CURA-2006	2016-08-04 02:13:24 +02:00