Mercurial > geeqie.yaz

comparison src/layout.c @ 1293:48e064b37ba6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
separated "normal" and advanced exif, "Normal" exif is now in the generic bar, advanced exif is in separate window.
author nadvornik
date Sun, 15 Feb 2009 09:36:53 +0000
parents 50ae02a4a675
children cfe814fc8e74
comparison
equal deleted inserted replaced
1292:4a3ae0e6f1eb 1293:48e064b37ba6
1919 { 1919 {
1920 if (!lw) return; 1920 if (!lw) return;
1921 1921
1922 layout_window_list = g_list_remove(layout_window_list, lw); 1922 layout_window_list = g_list_remove(layout_window_list, lw);
1923 1923
1924 1924 if (lw->exif_window) g_signal_handlers_disconnect_matched(G_OBJECT(lw->exif_window), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, lw);
1925
1925 layout_bars_close(lw); 1926 layout_bars_close(lw);
1926 1927
1927 gtk_widget_destroy(lw->window); 1928 gtk_widget_destroy(lw->window);
1928 1929
1929 if (lw->split_image_sizegroup) g_object_unref(lw->split_image_sizegroup); 1930 if (lw->split_image_sizegroup) g_object_unref(lw->split_image_sizegroup);
1973 1974
1974 lw->utility_box = NULL; 1975 lw->utility_box = NULL;
1975 lw->bar_sort = NULL; 1976 lw->bar_sort = NULL;
1976 lw->bar_sort_enabled = options->panels.sort.enabled; 1977 lw->bar_sort_enabled = options->panels.sort.enabled;
1977 1978
1978 lw->bar_exif = NULL;
1979 lw->bar_exif_enabled = options->panels.exif.enabled;
1980 lw->bar_exif_advanced = FALSE;
1981
1982 lw->bar = NULL; 1979 lw->bar = NULL;
1983 lw->bar_enabled = options->panels.info.enabled; 1980 lw->bar_enabled = options->panels.info.enabled;
1984 1981
1982 lw->exif_window = NULL;
1985 /* default layout */ 1983 /* default layout */
1986 1984
1987 layout_config_parse(options->layout.style, options->layout.order, 1985 layout_config_parse(options->layout.style, options->layout.order,
1988 &lw->dir_location, &lw->file_location, &lw->image_location); 1986 &lw->dir_location, &lw->file_location, &lw->image_location);
1989 lw->dir_view_type = options->layout.dir_view_type; 1987 lw->dir_view_type = options->layout.dir_view_type;
1996 if (options->layout.save_window_positions) 1994 if (options->layout.save_window_positions)
1997 { 1995 {
1998 lw->div_h = options->layout.main_window.hdivider_pos; 1996 lw->div_h = options->layout.main_window.hdivider_pos;
1999 lw->div_v = options->layout.main_window.vdivider_pos; 1997 lw->div_v = options->layout.main_window.vdivider_pos;
2000 lw->div_float = options->layout.float_window.vdivider_pos; 1998 lw->div_float = options->layout.float_window.vdivider_pos;
2001 lw->bar_exif_width = options->panels.exif.width;
2002 lw->bar_width = options->panels.info.width; 1999 lw->bar_width = options->panels.info.width;
2003 } 2000 }
2004 else 2001 else
2005 { 2002 {
2006 lw->div_h = MAIN_WINDOW_DIV_HPOS; 2003 lw->div_h = MAIN_WINDOW_DIV_HPOS;
2007 lw->div_v = MAIN_WINDOW_DIV_VPOS; 2004 lw->div_v = MAIN_WINDOW_DIV_VPOS;
2008 lw->div_float = MAIN_WINDOW_DIV_VPOS; 2005 lw->div_float = MAIN_WINDOW_DIV_VPOS;
2009 lw->bar_exif_width = PANEL_DEFAULT_WIDTH;
2010 lw->bar_width = PANEL_DEFAULT_WIDTH; 2006 lw->bar_width = PANEL_DEFAULT_WIDTH;
2011 } 2007 }
2012 2008
2013 /* window */ 2009 /* window */
2014 2010