comparison src/layout.c @ 556:fe675761d091

Replace Layout icon_view field by more generic file_view_type. Replace option layout.view_as_icons by layout.file_view_type.

555:cca1c3b1b948

#include "menu.h"
#include "pixbuf-renderer.h"
#include "pixbuf_util.h"
#include "utilops.h"
#include "view_dir.h"
#include "view_file_list.h"
#include "view_file_icon.h"
#include "ui_bookmark.h"
#include "ui_fileops.h"
#include "ui_menu.h"

	layout_status_update_progress(lw, val, text);
}

static GtkWidget *layout_list_new(LayoutWindow *lw)
{
	if (lw->icon_view)
		{
		lw->vfi = vficon_new(NULL);
		vficon_set_layout(lw->vfi, lw);

		vficon_set_status_func(lw->vfi, layout_icon_status_cb, lw);
		vficon_set_thumb_status_func(lw->vfi, layout_icon_thumb_cb, lw);
		/* FIXME vficon_marks_set(lw->vfi, lw->marks_enabled); */

		return lw->vfi->widget;
		}

	lw->vfl = vflist_new(NULL);
	vflist_set_layout(lw->vfl, lw);

	vflist_set_status_func(lw->vfl, layout_list_status_cb, lw);
	vflist_set_thumb_status_func(lw->vfl, layout_list_thumb_cb, lw);

	vflist_marks_set(lw->vfl, lw->marks_enabled);
	vflist_thumbs_set(lw->vfl, lw->thumbs_enabled);

	return lw->vfl->widget;
}

static void layout_list_sync_thumb(LayoutWindow *lw)
{
	if (lw->vfl) vflist_thumb_set(lw->vfl, lw->thumbs_enabled);

		}

	return TRUE;
}

void layout_views_set(LayoutWindow *lw, DirViewType type, gint icons)
{
	if (!layout_valid(&lw)) return;

	if (lw->dir_view_type == type && lw->icon_view == icons) return;

	lw->dir_view_type = type;
	lw->icon_view = icons;

	layout_style_set(lw, -1, NULL);
}

gint layout_views_get(LayoutWindow *lw, DirViewType *type, gint *icons)
{
	if (!layout_valid(&lw)) return FALSE;

	*type = lw->dir_view_type;
	*icons = lw->icon_view;

	return TRUE;
}

/*

	/* default layout */

	layout_config_parse(options->layout.style, options->layout.order,
			    &lw->dir_location,  &lw->file_location, &lw->image_location);
	lw->dir_view_type = CLAMP(options->layout.dir_view_type, 0, VIEW_DIR_TYPES_COUNT - 1);
	lw->icon_view = options->layout.view_as_icons;

	/* divider positions */

	if (options->layout.save_window_positions)
		{

556:fe675761d091

#include "menu.h"
#include "pixbuf-renderer.h"
#include "pixbuf_util.h"
#include "utilops.h"
#include "view_dir.h"
#include "view_file.h"
#include "view_file_list.h"
#include "view_file_icon.h"
#include "ui_bookmark.h"
#include "ui_fileops.h"
#include "ui_menu.h"

	layout_status_update_progress(lw, val, text);
}

static GtkWidget *layout_list_new(LayoutWindow *lw)
{
	GtkWidget *widget = NULL;

	switch (lw->file_view_type)
	{
	case FILEVIEW_ICON:
		{
		lw->vfi = vficon_new(NULL);
		vficon_set_layout(lw->vfi, lw);

		vficon_set_status_func(lw->vfi, layout_icon_status_cb, lw);
		vficon_set_thumb_status_func(lw->vfi, layout_icon_thumb_cb, lw);
		/* FIXME vficon_marks_set(lw->vfi, lw->marks_enabled); */

		widget = lw->vfi->widget;
		}
		break;
	case FILEVIEW_LIST:
		{
		lw->vfl = vflist_new(NULL);
		vflist_set_layout(lw->vfl, lw);

		vflist_set_status_func(lw->vfl, layout_list_status_cb, lw);
		vflist_set_thumb_status_func(lw->vfl, layout_list_thumb_cb, lw);

		vflist_marks_set(lw->vfl, lw->marks_enabled);
		vflist_thumbs_set(lw->vfl, lw->thumbs_enabled);

		widget = lw->vfl->widget;
		}
		break;
	}

	return widget;
}

static void layout_list_sync_thumb(LayoutWindow *lw)
{
	if (lw->vfl) vflist_thumb_set(lw->vfl, lw->thumbs_enabled);

		}

	return TRUE;
}

void layout_views_set(LayoutWindow *lw, DirViewType dir_view_type, FileViewType file_view_type)
{
	if (!layout_valid(&lw)) return;

	if (lw->dir_view_type == dir_view_type && lw->file_view_type == file_view_type) return;

	lw->dir_view_type = dir_view_type;
	lw->file_view_type = file_view_type;

	layout_style_set(lw, -1, NULL);
}

gint layout_views_get(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type)
{
	if (!layout_valid(&lw)) return FALSE;

	*dir_view_type = lw->dir_view_type;
	*file_view_type = lw->file_view_type;

	return TRUE;
}

/*

	/* default layout */

	layout_config_parse(options->layout.style, options->layout.order,
			    &lw->dir_location,  &lw->file_location, &lw->image_location);
	lw->dir_view_type = CLAMP(options->layout.dir_view_type, 0, VIEW_DIR_TYPES_COUNT - 1);
	lw->file_view_type = CLAMP(options->layout.file_view_type, 0, VIEW_FILE_TYPES_COUNT - 1);

	/* divider positions */

	if (options->layout.save_window_positions)
		{