75 Commits

Author	SHA1	Message	Date
Jack Ha	aa79ca1d30	Layer view menu items now have Cura colors, not the system colors.	2017-03-20 15:49:27 +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	c10dc2f07c	Set old permissions back. CURA-3321	2017-03-07 10:36:30 +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	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
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	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	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	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
Jack Ha	cd54552498	Merge branch 'master' of github.com:Ultimaker/Cura	2017-02-20 09:45:51 +01:00
Jack Ha	b229d38a88	LayerView checkboxes are not remembered; added switching Legend on for compatibility mode. CURA-3273	2017-02-20 09:45:37 +01:00
fieldOfView	9229027001	Refactor properties that start with 'get' to avoid confusion between slots & properties ... Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.	2017-02-17 13:35:01 +01:00
Jack Ha	9e973732f5	Fixed remember coloring type in Layer View. CURA-3273	2017-02-15 10:50:21 +01:00
Jack Ha	47ab49795f	Added comments, changed small layout and id thing. CURA-3273	2017-02-08 11:48:00 +01:00
Jack Ha	6c19bc1c16	Only show legend in color: line_type	2017-02-08 11:08:59 +01:00
Jack Ha	4659d8616e	Fixed some opengl 4.1 core vertex and fragment shaders, layerview anchor. CURA-3273	2017-02-01 16:29:21 +01:00
Jack Ha	aa923321f8	Fix compatibility mode layout. CURA-3273	2017-01-31 09:19:18 +01:00
Jack Ha	523211c3e8	Merge branch 'layer_view3_cleanup' into layer_view3_layout	2017-01-30 16:48:31 +01:00
Jack Ha	5a2aa8846b	Added extruder count detection to layer view. CURA-3273	2017-01-30 13:29:35 +01:00
Jack Ha	5f6ed488d1	Layerview removed Color Only Selected Extruder, cleanup 3d shader. CURA-3273	2017-01-30 11:39:59 +01:00
Jack Ha	645d188698	Merge branch 'layer_view3_cleanup' into layer_view3_layout	2017-01-30 11:26:13 +01:00
Jack Ha	2f9618f2ad	Merge branch 'master' into layer_view3_cleanup	2017-01-30 11:25:55 +01:00
Jack Ha	b1d95f3464	Layout Layer View menu, removed item, changed size. CURA-3321	2017-01-30 11:24:51 +01:00
Jack Ha	bb1fa3ae04	Started changing layout of layer view. CURA-3321	2017-01-26 17:29:39 +01:00
fieldOfView	bf3d3d46e2	Fix Rectangles that always show as white regardless of the theme	2017-01-25 15:12:57 +01:00
Jack Ha	3a2438937d	Removed crappy legend	2017-01-25 12:46:07 +01:00
Jack Ha	cd8eaf7759	minimum layer slider now works	2017-01-03 15:58:35 +01:00
Jack Ha	55dd08eff8	Somewhat better layout, added legend	2017-01-03 09:18:26 +01:00