Skip to content

Commit

Permalink
Add some wrapper functions for not yet common code.
Browse files Browse the repository at this point in the history
  • Loading branch information
Laurent Monin committed May 12, 2008
1 parent 98e4659 commit 99a5012
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 16 deletions.
43 changes: 43 additions & 0 deletions src/view_file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,17 @@ void vf_pop_menu_info_cb(GtkWidget *widget, gpointer data)
info_window_new(NULL, vf_pop_menu_file_list(vf), NULL);
}

void vf_pop_menu_view_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

switch(vf->type)
{
case FILEVIEW_LIST: vflist_pop_menu_view_cb(widget, data); break;
case FILEVIEW_ICON: vficon_pop_menu_view_cb(widget, data); break;
}
}

void vf_pop_menu_copy_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
Expand All @@ -332,6 +343,17 @@ void vf_pop_menu_move_cb(GtkWidget *widget, gpointer data)
file_util_move(NULL, vf_pop_menu_file_list(vf), NULL, vf->listview);
}

void vf_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

switch(vf->type)
{
case FILEVIEW_LIST: vflist_pop_menu_rename_cb(widget, data); break;
case FILEVIEW_ICON: vficon_pop_menu_rename_cb(widget, data); break;
}
}

void vf_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
Expand Down Expand Up @@ -441,6 +463,27 @@ void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data)
}
}

void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

switch(vf->type)
{
case FILEVIEW_LIST: vflist_pop_menu_refresh_cb(widget, data); break;
case FILEVIEW_ICON: vficon_pop_menu_refresh_cb(widget, data); break;
}
}

void vf_popup_destroy_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

switch(vf->type)
{
case FILEVIEW_LIST: vflist_popup_destroy_cb(widget, data); break;
case FILEVIEW_ICON: vficon_popup_destroy_cb(widget, data); break;
}
}



Expand Down
4 changes: 4 additions & 0 deletions src/view_file.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ void vf_sort_set(ViewFile *vf, SortType type, gint ascend);
GList *vf_pop_menu_file_list(ViewFile *vf);
void vf_pop_menu_edit_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_info_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_view_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_copy_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_move_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_rename_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_delete_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_sort_cb(GtkWidget *widget, gpointer data);
Expand All @@ -47,6 +49,8 @@ void vf_pop_menu_set_mark_sel_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_res_mark_sel_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_toggle_mark_sel_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data);
void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data);
void vf_popup_destroy_cb(GtkWidget *widget, gpointer data);

FileData *vf_index_get_data(ViewFile *vf, gint row);
gint vf_index_by_path(ViewFile *vf, const gchar *path);
Expand Down
14 changes: 7 additions & 7 deletions src/view_file_icon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ GList *vficon_pop_menu_file_list(ViewFile *vf)
return g_list_append(NULL, file_data_ref(VFICON_INFO(vf, click_id)->fd));
}

static void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

Expand All @@ -196,7 +196,7 @@ static void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
}
}

static void vficon_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
void vficon_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

Expand All @@ -210,14 +210,14 @@ static void vficon_pop_menu_show_names_cb(GtkWidget *widget, gpointer data)
vficon_toggle_filenames(vf);
}

static void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

vf_refresh(vf);
}

static void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data)
void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
vficon_selection_remove(vf, VFICON_INFO(vf, click_id), SELECTION_PRELIGHT, NULL);
Expand All @@ -234,7 +234,7 @@ static GtkWidget *vficon_pop_menu(ViewFile *vf, gint active)
menu = popup_menu_short_lived();

g_signal_connect(G_OBJECT(menu), "destroy",
G_CALLBACK(vficon_popup_destroy_cb), vf);
G_CALLBACK(vf_popup_destroy_cb), vf);

submenu_add_edit(menu, &item, G_CALLBACK(vf_pop_menu_edit_cb), vf);
gtk_widget_set_sensitive(item, active);
Expand All @@ -251,7 +251,7 @@ static GtkWidget *vficon_pop_menu(ViewFile *vf, gint active)
menu_item_add_sensitive(menu, _("_Move..."), active,
G_CALLBACK(vf_pop_menu_move_cb), vf);
menu_item_add_sensitive(menu, _("_Rename..."), active,
G_CALLBACK(vficon_pop_menu_rename_cb), vf);
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)
Expand All @@ -272,7 +272,7 @@ static GtkWidget *vficon_pop_menu(ViewFile *vf, gint active)
G_CALLBACK(vf_pop_menu_toggle_view_type_cb), vf);
menu_item_add_check(menu, _("Show filename _text"), VFICON_INFO(vf, show_text),
G_CALLBACK(vficon_pop_menu_show_names_cb), vf);
menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vficon_pop_menu_refresh_cb), vf);
menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vf_pop_menu_refresh_cb), vf);

return menu;
}
Expand Down
5 changes: 4 additions & 1 deletion src/view_file_icon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ gint vficon_refresh(ViewFile *vf);
void vficon_sort_set(ViewFile *vf, SortType type, gint ascend);

GList *vficon_pop_menu_file_list(ViewFile *vf);

void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data);
void vficon_pop_menu_rename_cb(GtkWidget *widget, gpointer data);
void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data);
void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data);

FileData *vficon_index_get_data(ViewFile *vf, gint row);
gint vficon_index_by_path(ViewFile *vf, const gchar *path);
Expand Down
16 changes: 8 additions & 8 deletions src/view_file_list.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ GList *vflist_pop_menu_file_list(ViewFile *vf)
return g_list_append(NULL, file_data_ref(VFLIST_INFO(vf, click_fd)));
}

static void vflist_pop_menu_view_cb(GtkWidget *widget, gpointer data)
void vflist_pop_menu_view_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

Expand All @@ -307,7 +307,7 @@ static void vflist_pop_menu_view_cb(GtkWidget *widget, gpointer data)
}
}

static void vflist_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
void vflist_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
GList *list;
Expand Down Expand Up @@ -353,15 +353,15 @@ static void vflist_pop_menu_thumbs_cb(GtkWidget *widget, gpointer data)
}
}

static void vflist_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
void vflist_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;

vflist_color_set(vf, VFLIST_INFO(vf, click_fd), FALSE);
vf_refresh(vf);
}

static void vflist_popup_destroy_cb(GtkWidget *widget, gpointer data)
void vflist_popup_destroy_cb(GtkWidget *widget, gpointer data)
{
ViewFile *vf = data;
vflist_color_set(vf, VFLIST_INFO(vf, click_fd), FALSE);
Expand All @@ -382,7 +382,7 @@ static GtkWidget *vflist_pop_menu(ViewFile *vf, FileData *fd, gint col_idx)

menu = popup_menu_short_lived();
g_signal_connect(G_OBJECT(menu), "destroy",
G_CALLBACK(vflist_popup_destroy_cb), vf);
G_CALLBACK(vf_popup_destroy_cb), vf);

if (col_idx >= FILE_COLUMN_MARKS && col_idx <= FILE_COLUMN_MARKS_LAST)
{
Expand Down Expand Up @@ -434,15 +434,15 @@ static GtkWidget *vflist_pop_menu(ViewFile *vf, FileData *fd, gint col_idx)
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(vflist_pop_menu_view_cb), vf);
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(vflist_pop_menu_rename_cb), vf);
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)
Expand All @@ -464,7 +464,7 @@ static GtkWidget *vflist_pop_menu(ViewFile *vf, FileData *fd, gint col_idx)
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(vflist_pop_menu_refresh_cb), vf);
menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vf_pop_menu_refresh_cb), vf);

return menu;
}
Expand Down
4 changes: 4 additions & 0 deletions src/view_file_list.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ void vflist_marks_set(ViewFile *vf, gint enable);
void vflist_sort_set(ViewFile *vf, SortType type, gint ascend);

GList *vflist_pop_menu_file_list(ViewFile *vf);
void vflist_pop_menu_view_cb(GtkWidget *widget, gpointer data);
void vflist_pop_menu_rename_cb(GtkWidget *widget, gpointer data);
void vflist_pop_menu_refresh_cb(GtkWidget *widget, gpointer data);
void vflist_popup_destroy_cb(GtkWidget *widget, gpointer data);

FileData *vflist_index_get_data(ViewFile *vf, gint row);
gint vflist_index_by_path(ViewFile *vf, const gchar *path);
Expand Down

0 comments on commit 99a5012

Please sign in to comment.