Skip to content

Commit

Permalink
Implementing CTRL-W to close advanced exif window
Browse files Browse the repository at this point in the history
In fact, this implements keypress event handling in the advanced exif
window to handle CTRL-W event.
  • Loading branch information
mowgli committed Apr 11, 2009
1 parent f43df74 commit e91e0ff
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
29 changes: 24 additions & 5 deletions src/advanced_exif.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,14 +301,11 @@ static void advanced_exif_add_column(GtkWidget *listview, const gchar *title, gi
gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column);
}

void advanced_exif_close(GtkWidget *window)
void advanced_exif_close(ExifWin *ew)
{
ExifWin *ew;

ew = g_object_get_data(G_OBJECT(window), "advanced_exif_data");
if (!ew) return;

gtk_widget_destroy(ew->vbox);
gtk_widget_destroy(ew->window);
}

static void advanced_exif_destroy(GtkWidget *widget, gpointer data)
Expand Down Expand Up @@ -359,6 +356,25 @@ static gint advanced_exif_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIt
return ret;
}

static gboolean advanced_exif_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
ExifWin *ew = data;
gboolean stop_signal = FALSE;

if (event->state & GDK_CONTROL_MASK)
{
switch (event->keyval)
{
case 'W': case 'w':
advanced_exif_close(ew);
stop_signal = TRUE;
break;
}
} // if (event->state & GDK_CONTROL...

return stop_signal;
} // static gboolean advanced_exif_...

GtkWidget *advanced_exif_new(void)
{
ExifWin *ew;
Expand Down Expand Up @@ -437,6 +453,9 @@ GtkWidget *advanced_exif_new(void)
g_signal_connect(G_OBJECT(ew->listview), "drag_begin",
G_CALLBACK(advanced_exif_dnd_begin), ew);

g_signal_connect(G_OBJECT(ew->window), "key_press_event",
G_CALLBACK(advanced_exif_keypress), ew);

ew->scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ew->scrolled), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ew->scrolled),
Expand Down
1 change: 0 additions & 1 deletion src/advanced_exif.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@


GtkWidget *advanced_exif_new(void);
void advanced_exif_close(GtkWidget *bar);

void advanced_exif_set_fd(GtkWidget *bar, FileData *fd);

Expand Down

0 comments on commit e91e0ff

Please sign in to comment.