Mercurial > geeqie
comparison src/layout.c @ 1335:588d96cda850
save and restore toolbar configuration
author | nadvornik |
---|---|
date | Sat, 28 Feb 2009 12:50:39 +0000 |
parents | f97450e632a1 |
children | 4179d41d1149 |
comparison
equal
deleted
inserted
replaced
1334:f97450e632a1 | 1335:588d96cda850 |
---|---|
216 | 216 |
217 menu_bar = layout_actions_menu_bar(lw); | 217 menu_bar = layout_actions_menu_bar(lw); |
218 gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, FALSE, 0); | 218 gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, FALSE, 0); |
219 gtk_widget_show(menu_bar); | 219 gtk_widget_show(menu_bar); |
220 | 220 |
221 lw->toolbar = layout_button_bar(lw); | 221 lw->toolbar = layout_actions_toolbar(lw); |
222 gtk_box_pack_start(GTK_BOX(box), lw->toolbar, FALSE, FALSE, 0); | 222 gtk_box_pack_start(GTK_BOX(box), lw->toolbar, FALSE, FALSE, 0); |
223 if (!lw->options.toolbar_hidden) gtk_widget_show(lw->toolbar); | 223 if (!lw->options.toolbar_hidden) gtk_widget_show(lw->toolbar); |
224 | 224 |
225 tabcomp = tab_completion_new_with_history(&lw->path_entry, NULL, "path_list", -1, | 225 tabcomp = tab_completion_new_with_history(&lw->path_entry, NULL, "path_list", -1, |
226 layout_path_entry_cb, lw); | 226 layout_path_entry_cb, lw); |
1969 { | 1969 { |
1970 file_data_unregister_real_time_monitor(lw->dir_fd); | 1970 file_data_unregister_real_time_monitor(lw->dir_fd); |
1971 file_data_unref(lw->dir_fd); | 1971 file_data_unref(lw->dir_fd); |
1972 } | 1972 } |
1973 | 1973 |
1974 string_list_free(lw->toolbar_actions); | |
1974 free_layout_options_content(&lw->options); | 1975 free_layout_options_content(&lw->options); |
1975 g_free(lw); | 1976 g_free(lw); |
1976 } | 1977 } |
1977 | 1978 |
1978 static gint layout_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) | 1979 static gint layout_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) |
2175 WRITE_STRING(">\n"); | 2176 WRITE_STRING(">\n"); |
2176 | 2177 |
2177 bar_sort_write_config(lw->bar_sort, outstr, indent + 1); | 2178 bar_sort_write_config(lw->bar_sort, outstr, indent + 1); |
2178 bar_write_config(lw->bar, outstr, indent + 1); | 2179 bar_write_config(lw->bar, outstr, indent + 1); |
2179 | 2180 |
2181 layout_toolbar_write_config(lw, outstr, indent + 1); | |
2182 | |
2180 WRITE_STRING("</layout>\n"); | 2183 WRITE_STRING("</layout>\n"); |
2181 } | 2184 } |
2182 | 2185 |
2183 void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names, const gchar **attribute_values) | 2186 void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names, const gchar **attribute_values) |
2184 { | 2187 { |