225 Commits

Author	SHA1	Message	Date
Lipu Fei	0171d9637c	Fix mode switching issue in LayerView ... CURA-3730	2017-05-04 15:15:38 +02:00
Lipu Fei	0b57fa0bcb	Hide Top/Bottom and Inner Wall legends in "Material Color" ... CURA-3730	2017-05-03 10:37:24 +02:00
fieldOfView	9371b28cb3	Add color swatch for "by material" view style and show proper extruder names	2017-04-25 18:55:25 +02:00
fieldOfView	49880d54ad	Remove code repetition while touching up layout	2017-04-25 18:45:43 +02:00
fieldOfView	0b9f451103	Apply color to layerview legend labels directly ... The Label style property should not be confused with e TextField style property	2017-04-25 18:15:04 +02:00
fieldOfView	2493bd6fe6	Merge branch 'master' into themed-layer-view	2017-04-25 18:06:12 +02:00
Lipu Fei	7315a09c7d	Use layer_id to determine total layer count ... CURA-3615	2017-04-04 11:45:30 +02:00
Jaime van Kessel	f82aecb7ca	Refactoring; no longer use "Printer" to identify CuraApplication	2017-03-30 20:19:05 +02:00
Jack Ha	aa79ca1d30	Layer view menu items now have Cura colors, not the system colors.	2017-03-20 15:49:27 +01:00
Jack Ha	f47ec27014	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-07 16:44:41 +01:00
Jack Ha	afec26eb62	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-07 11:47:25 +01:00
jack	3b1a15e1c4	Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2 ... Use a single draggable range slider in Layerview	2017-03-07 11:43:17 +01:00
Jack Ha	73dff09443	Travel moves now have a width of 0.1. CURA-3321	2017-03-07 10:47:34 +01:00
Jack Ha	efbc624ea8	More defensive setExtruderOpacity, removed unnecessary part. CURA-3321	2017-03-07 10:40:59 +01:00
Jack Ha	c10dc2f07c	Set old permissions back. CURA-3321	2017-03-07 10:36:30 +01:00
Jack Ha	42d939b34e	Solved merge conflict. CURA-3321	2017-03-07 10:34:53 +01:00
fieldOfView	34ac02f5bd	Use Pointing Rectangle for layer number indicator	2017-03-06 18:23:08 +01:00
fieldOfView	2b49484dc7	Hide the slider controls when there are no layers ... (and code cleanup)	2017-03-06 17:46:42 +01:00
fieldOfView	af265be900	Add up/down key navigation to layernum box	2017-03-06 17:27:37 +01:00
fieldOfView	d0c8b05314	Fix setting central value	2017-03-06 17:16:36 +01:00
fieldOfView	0fa32c3c16	Step by 10 layers with shift key down	2017-03-06 16:48:59 +01:00
fieldOfView	a6bc2b07f8	Fix setting lower value	2017-03-06 16:35:00 +01:00
fieldOfView	a664ee88b7	Fix setting upper value	2017-03-06 16:01:00 +01:00
fieldOfView	694da25bb7	Show proper values of the active handle of the slider	2017-03-06 14:35:36 +01:00
fieldOfView	a0df6bf542	Jerry-rig single slider to replace dual slider design	2017-03-06 14:33:48 +01:00
Jack Ha	b2e06bed37	Fix 'inverting slider' when switching between Layer view and a different view. CURA-3321	2017-03-06 14:03:42 +01:00
Jack Ha	1f61017946	Fix updateLegend function. CURA-3321	2017-03-06 13:20:14 +01:00
Jack Ha	1c40c94c44	Fix compatibility options. CURA-3321	2017-03-06 11:55:39 +01:00
Jack Ha	e89b1afa2c	Initial layer view color mode -> legend. CURA-3321	2017-03-02 16:55:54 +01:00
U-ULTIMAKER\j.ha	c54d5ce707	Fixed compatibility mode active extruder. CURA-3321	2017-03-02 13:15:29 +01:00
Jack Ha	bdd07bd160	Removed commented out stuff. CURA-3321	2017-03-01 14:54:12 +01:00
Jack Ha	f9a5dc885c	Solved merge conflicts #1479 CURA-3321	2017-03-01 14:47:54 +01:00
Jack Ha	f22299c80d	Added option for show_travels in compatibility mode top layers. CURA-3321	2017-02-28 14:43:46 +01:00
Jack Ha	ba6a8eb869	Legend is now in the switching layer type area, removed legend upper right. CURA-3321	2017-02-28 13:34:58 +01:00
Jack Ha	27f013fd81	Cleanup layout, finalizing	2017-02-28 11:52:51 +01:00
Jack Ha	8b7aee1664	Adjusted menu, added View Mode: Layers. CURA-3321	2017-02-27 14:16:56 +01:00
Jack Ha	fa1b332733	Moved layer view menu to left, next to sliders. CURA-3321	2017-02-27 14:06:17 +01:00
Jack Ha	8237421bcf	Undo testing QVector3D. CURA-3334	2017-02-27 13:33:55 +01:00
Jack Ha	ccac9277a9	Undo old testcode, added testcode for CURA-3334	2017-02-27 11:20:22 +01:00
Jack Ha	36476a14bb	Solved merge conflicts	2017-02-23 14:40:49 +01:00
fieldOfView	7a336bbe67	Change separator for extruder_opacities to | ... Comma as a separator might cause confusion/(user-)errors with localised floating point numbers.	2017-02-21 22:37:32 +01:00
fieldOfView	aef34d4688	Fix i18n context	2017-02-21 22:28:47 +01:00
Jack Ha	2f7644c34e	Travel moves are now flat planes, on top of the 'tubes'. CURA-3273	2017-02-21 10:00:29 +01:00
Jack Ha	24d04558f0	Merged LayerView show_adhesion and show_support into show_helpers. CURA-3273	2017-02-20 15:56:29 +01:00
fieldOfView	73253d3807	Fix loading opacities from preferences	2017-02-20 13:31:59 +01:00
fieldOfView	26fe46ce1f	Translate layerview mode types	2017-02-20 12:32:49 +01:00
fieldOfView	f8a3c3b0ba	Factor out repeated extruder visibility checkboxes	2017-02-20 12:27:37 +01:00
fieldOfView	61e0cd4ff5	Move legacy options to layerview options	2017-02-20 11:09:34 +01:00
Jack Ha	e82bb29e1d	Revert translation of listmodel text. CURA-3273	2017-02-20 09:57:25 +01:00
Jack Ha	fd2525768d	Capitalized labels, made them translatable. CURA-3273	2017-02-20 09:55:07 +01:00