Mercurial > geeqie.yaz
diff src/view_file_list.c @ 659:542bb47fef04
Merge vflist_pop_menu() and vficon_pop_menu() into vf_pop_menu().
author | zas_ |
---|---|
date | Tue, 13 May 2008 20:13:44 +0000 |
parents | dc09f544d292 |
children | db373fb1b9d8 |
line wrap: on
line diff
--- a/src/view_file_list.c Tue May 13 19:56:52 2008 +0000 +++ b/src/view_file_list.c Tue May 13 20:13:44 2008 +0000 @@ -142,7 +142,7 @@ } -static void vflist_color_set(ViewFile *vf, FileData *fd, gint color_set) +void vflist_color_set(ViewFile *vf, FileData *fd, gint color_set) { GtkTreeModel *store; GtkTreeIter iter; @@ -336,7 +336,7 @@ file_util_rename(NULL, list, vf->listview); } -static void vflist_pop_menu_thumbs_cb(GtkWidget *widget, gpointer data) +void vflist_pop_menu_thumbs_cb(GtkWidget *widget, gpointer data) { ViewFile *vf = data; @@ -368,108 +368,6 @@ } -static GtkWidget *vflist_pop_menu(ViewFile *vf) -{ - GtkWidget *menu; - GtkWidget *item; - GtkWidget *submenu; - gint active; - - vflist_color_set(vf, VFLIST_INFO(vf, click_fd), TRUE); - active = (VFLIST_INFO(vf, click_fd) != NULL); - - menu = popup_menu_short_lived(); - g_signal_connect(G_OBJECT(menu), "destroy", - G_CALLBACK(vf_popup_destroy_cb), vf); - - if (vf->clicked_mark > 0) - { - gint mark = vf->clicked_mark; - gchar *str_set_mark = g_strdup_printf(_("_Set mark %d"), mark); - gchar *str_res_mark = g_strdup_printf(_("_Reset mark %d"), mark); - gchar *str_toggle_mark = g_strdup_printf(_("_Toggle mark %d"), mark); - gchar *str_sel_mark = g_strdup_printf(_("_Select mark %d"), mark); - gchar *str_sel_mark_or = g_strdup_printf(_("_Add mark %d"), mark); - gchar *str_sel_mark_and = g_strdup_printf(_("_Intersection with mark %d"), mark); - gchar *str_sel_mark_minus = g_strdup_printf(_("_Unselect mark %d"), mark); - - g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); - - vf->active_mark = mark; - vf->clicked_mark = 0; - - menu_item_add_sensitive(menu, str_set_mark, active, - G_CALLBACK(vf_pop_menu_set_mark_sel_cb), vf); - - menu_item_add_sensitive(menu, str_res_mark, active, - G_CALLBACK(vf_pop_menu_res_mark_sel_cb), vf); - - menu_item_add_sensitive(menu, str_toggle_mark, active, - G_CALLBACK(vf_pop_menu_toggle_mark_sel_cb), vf); - - menu_item_add_divider(menu); - - menu_item_add_sensitive(menu, str_sel_mark, active, - G_CALLBACK(vf_pop_menu_sel_mark_cb), vf); - menu_item_add_sensitive(menu, str_sel_mark_or, active, - G_CALLBACK(vf_pop_menu_sel_mark_or_cb), vf); - menu_item_add_sensitive(menu, str_sel_mark_and, active, - G_CALLBACK(vf_pop_menu_sel_mark_and_cb), vf); - menu_item_add_sensitive(menu, str_sel_mark_minus, active, - G_CALLBACK(vf_pop_menu_sel_mark_minus_cb), vf); - - menu_item_add_divider(menu); - - g_free(str_set_mark); - g_free(str_res_mark); - g_free(str_toggle_mark); - g_free(str_sel_mark); - g_free(str_sel_mark_and); - g_free(str_sel_mark_or); - g_free(str_sel_mark_minus); - } - - submenu_add_edit(menu, &item, G_CALLBACK(vf_pop_menu_edit_cb), vf); - gtk_widget_set_sensitive(item, active); - - menu_item_add_stock_sensitive(menu, _("_Properties"), GTK_STOCK_PROPERTIES, active, - G_CALLBACK(vf_pop_menu_info_cb), vf); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active, - G_CALLBACK(vf_pop_menu_view_cb), vf); - - menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, active, - G_CALLBACK(vf_pop_menu_copy_cb), vf); - menu_item_add_sensitive(menu, _("_Move..."), active, - G_CALLBACK(vf_pop_menu_move_cb), vf); - menu_item_add_sensitive(menu, _("_Rename..."), active, - G_CALLBACK(vf_pop_menu_rename_cb), vf); - menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active, - G_CALLBACK(vf_pop_menu_delete_cb), vf); - if (options->show_copy_path) - menu_item_add_sensitive(menu, _("_Copy path"), active, - G_CALLBACK(vf_pop_menu_copy_path_cb), vf); - - menu_item_add_divider(menu); - - submenu = submenu_add_sort(NULL, G_CALLBACK(vf_pop_menu_sort_cb), vf, - FALSE, FALSE, TRUE, vf->sort_method); - menu_item_add_divider(submenu); - menu_item_add_check(submenu, _("Ascending"), vf->sort_ascend, - G_CALLBACK(vf_pop_menu_sort_ascend_cb), vf); - - item = menu_item_add(menu, _("_Sort"), NULL, NULL); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); - - menu_item_add_check(menu, _("View as _icons"), FALSE, - G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf); - menu_item_add_check(menu, _("Show _thumbnails"), VFLIST_INFO(vf, thumbs_enabled), - G_CALLBACK(vflist_pop_menu_thumbs_cb), vf); - menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vf_pop_menu_refresh_cb), vf); - - return menu; -} - /* *----------------------------------------------------------------------------- * callbacks @@ -562,7 +460,7 @@ VFLIST_INFO(vf, click_fd) = NULL; } - vf->popup = vflist_pop_menu(vf); + vf->popup = vf_pop_menu(vf); gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, vflist_menu_position_cb, vf, 0, GDK_CURRENT_TIME); return TRUE; @@ -605,7 +503,7 @@ if (bevent->button == MOUSE_BUTTON_RIGHT) { - vf->popup = vflist_pop_menu(vf); + vf->popup = vf_pop_menu(vf); gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, NULL, NULL, bevent->button, bevent->time); return TRUE;