static gint icon_key_pressed (GtkWidget *button,
GdkEventKey *event,
MimeView *mimeview);
-static void icon_toggled_cb (GtkToggleButton *button,
+static void toggle_icon (GtkToggleButton *button,
MimeView *mimeview);
static void icon_list_append_icon (MimeView *mimeview,
MimeInfo *mimeinfo);
static void icon_list_clear (MimeView *mimeview);
static void icon_list_toggle_by_mime_info (MimeView *mimeview,
MimeInfo *mimeinfo);
+static gboolean icon_list_select_by_number(MimeView *mimeview,
+ gint number);
static void mime_toggle_button_cb (GtkWidget *button,
MimeView *mimeview);
-static void part_button_pressed (MimeView *mimeview,
+static gboolean part_button_pressed (MimeView *mimeview,
GdkEventButton *event,
MimeInfo *partinfo);
static void icon_scroll_size_allocate_cb(GtkWidget *widget,
GTK_CAN_FOCUS);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
- gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
- GTK_SIGNAL_FUNC(mimeview_selected), mimeview);
- gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
- GTK_SIGNAL_FUNC(mimeview_button_pressed), mimeview);
- gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
- GTK_SIGNAL_FUNC(mimeview_key_pressed), mimeview);
- gtk_signal_connect(GTK_OBJECT (ctree),"start_drag",
- GTK_SIGNAL_FUNC (mimeview_start_drag), mimeview);
- gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
- GTK_SIGNAL_FUNC(mimeview_drag_data_get), mimeview);
+ g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+ G_CALLBACK(mimeview_selected), mimeview);
+ g_signal_connect(G_OBJECT(ctree), "button_press_event",
+ G_CALLBACK(mimeview_button_pressed), mimeview);
+ g_signal_connect(G_OBJECT(ctree), "key_press_event",
+ G_CALLBACK(mimeview_key_pressed), mimeview);
+ g_signal_connect(G_OBJECT (ctree),"start_drag",
+ G_CALLBACK (mimeview_start_drag), mimeview);
+ g_signal_connect(G_OBJECT(ctree), "drag_data_get",
+ G_CALLBACK(mimeview_drag_data_get), mimeview);
mime_notebook = gtk_notebook_new();
gtk_widget_show(mime_notebook);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(mime_notebook), FALSE);
- gtk_notebook_set_page(GTK_NOTEBOOK(notebook), 0);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
- icon_vbox = gtk_vbox_new(FALSE,0);
+ icon_vbox = gtk_vbox_new(FALSE, 2);
icon_scroll = gtk_layout_new(NULL, NULL);
gtk_layout_put(GTK_LAYOUT(icon_scroll), icon_vbox, 0, 0);
scrollbutton = gtk_vscrollbutton_new(gtk_layout_get_vadjustment(GTK_LAYOUT(icon_scroll)));
arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
gtk_widget_show(arrow);
gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
- gtk_signal_connect(GTK_OBJECT(mime_toggle), "toggled",
- GTK_SIGNAL_FUNC(mime_toggle_button_cb), mimeview);
+ g_signal_connect(G_OBJECT(mime_toggle), "toggled",
+ G_CALLBACK(mime_toggle_button_cb), mimeview);
icon_mainbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(icon_mainbox), icon_scroll, TRUE, TRUE, 3);
gtk_box_pack_end(GTK_BOX(icon_mainbox), scrollbutton, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(icon_mainbox), "size_allocate",
- GTK_SIGNAL_FUNC(icon_scroll_size_allocate_cb), mimeview);
+ g_signal_connect(G_OBJECT(icon_mainbox), "size_allocate",
+ G_CALLBACK(icon_scroll_size_allocate_cb), mimeview);
ctree_mainbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
set_unchecked_signature(mimeinfo);
#endif
- gtk_signal_handler_block_by_func(GTK_OBJECT(ctree), mimeview_selected,
- mimeview);
+ g_signal_handlers_block_by_func(G_OBJECT(ctree), mimeview_selected,
+ mimeview);
mimeview_set_multipart_tree(mimeview, mimeinfo, NULL);
icon_list_create(mimeview, mimeinfo);
- gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
- mimeview_selected, mimeview);
+ g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+ mimeview_selected, mimeview);
/* search first text part */
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
icon_list_toggle_by_mime_info
(mimeview, gtk_ctree_node_get_row_data(ctree, node));
gtkut_ctree_set_focus_row(ctree, node);
- gtk_widget_grab_focus(mimeview->ctree);
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mimeview->mime_toggle)))
+ gtk_widget_grab_focus(mimeview->ctree);
}
}
}
viewer->show_mimepart(viewer, mimeview->file, partinfo);
- return TRUE;
+#warning FIXME_GTK2 Is it correct?
+ return FALSE;
}
static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
g_free(mimeview->file);
mimeview->file = NULL;
+
icon_list_clear(mimeview);
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mimeview->mime_toggle)))
return TRUE;
}
-static void part_button_pressed(MimeView *mimeview, GdkEventButton *event,
- MimeInfo *partinfo)
+static gboolean part_button_pressed(MimeView *mimeview, GdkEventButton *event,
+ MimeInfo *partinfo)
{
if (event->button == 2 ||
(event->button == 1 && event->type == GDK_2BUTTON_PRESS)) {
/* call external program for image, audio or html */
mimeview_launch(mimeview);
+ return TRUE;
} else if (event->button == 3) {
if (partinfo && (partinfo->mime_type == MIME_TEXT ||
partinfo->mime_type == MIME_TEXT_HTML ||
"/Check signature",
mimeview_is_signed(mimeview));
#endif
-
+ gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo", partinfo);
+
gtk_menu_popup(GTK_MENU(mimeview->popupmenu),
NULL, NULL, NULL, NULL,
event->button, event->time);
+ return TRUE;
}
+ return FALSE;
}
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
+#warning FIXME_GTK2
+#if 0
#define KEY_PRESS_EVENT_STOP() \
if (gtk_signal_n_emissions_by_name \
(GTK_OBJECT(ctree), "key_press_event") > 0) { \
gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
"key_press_event"); \
}
+#else
+#define KEY_PRESS_EVENT_STOP()
+#endif
static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
MimeView *mimeview)
BREAK_ON_MODIFIER_KEY();
if (!GTK_CTREE_NODE_NEXT(mimeview->opened)) break;
KEY_PRESS_EVENT_STOP();
-
- gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
+ g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical",
GTK_SCROLL_STEP_FORWARD, 0.0);
return TRUE;
case GDK_p:
BREAK_ON_MODIFIER_KEY();
if (!GTK_CTREE_NODE_PREV(mimeview->opened)) break;
KEY_PRESS_EVENT_STOP();
-
- gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
+ g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical",
GTK_SCROLL_STEP_BACKWARD, 0.0);
return TRUE;
case GDK_y:
MimeView *mimeview)
{
gchar *filename, *uriname;
+ const gchar *bname;
MimeInfo *partinfo;
if (!mimeview->opened) return;
if (!partinfo->filename && !partinfo->name) return;
filename = partinfo->filename ? partinfo->filename : partinfo->name;
- filename = g_basename(filename);
- if (*filename == '\0') return;
+ bname = g_basename(filename);
+ if (*bname == '\0') return;
filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
- filename, NULL);
+ bname, NULL);
if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
alertpanel_error
if (!mimeview->opened) return;
partinfo = mimeview_get_selected_part(mimeview);
+ if (!partinfo) {
+ partinfo = (MimeInfo *) gtk_object_get_data
+ (GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo");
+ gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo", NULL);
+
+ }
g_return_if_fail(partinfo != NULL);
mimeview_show_message_part(mimeview, partinfo);
}
if (!mimeview->file) return;
partinfo = mimeview_get_selected_part(mimeview);
+ if (!partinfo) {
+ partinfo = (MimeInfo *) gtk_object_get_data
+ (GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo");
+ gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo", NULL);
+ }
g_return_if_fail(partinfo != NULL);
if (partinfo->filename)
if (!mimeview->file) return;
partinfo = mimeview_get_selected_part(mimeview);
+ if (!partinfo) {
+ partinfo = (MimeInfo *) gtk_object_get_data
+ (GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo");
+ gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo", NULL);
+ }
g_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
if (!mimeview->file) return;
partinfo = mimeview_get_selected_part(mimeview);
+ if (!partinfo) {
+ partinfo = (MimeInfo *) gtk_object_get_data
+ (GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo");
+ gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
+ "pop_partinfo", NULL);
+ }
g_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
num = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
partinfo = gtk_object_get_data(GTK_OBJECT(button), "partinfo");
- if (event->button == 1)
+ if (event->button == 1) {
icon_selected(mimeview, num, partinfo);
+ gtk_widget_grab_focus(button);
+
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
+ toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+ else
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(button), "button_press_event");
+ }
+
part_button_pressed(mimeview, event, partinfo);
- return TRUE;
+
+ return FALSE;
}
static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
}
}
+#warning FIXME_GTK2
+#if 0
+#undef KEY_PRESS_EVENT_STOP
+#define KEY_PRESS_EVENT_STOP() \
+ if (gtk_signal_n_emissions_by_name \
+ (GTK_OBJECT(button), "key_press_event") > 0) { \
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(button), \
+ "key_press_event"); \
+ }
+#endif
static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
MimeView *mimeview)
{
- gint num;
- MimeInfo *partinfo;
+ gint num;
+ MimeInfo *partinfo;
+ SummaryView *summaryview;
+ TextView *textview;
num = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
partinfo = gtk_object_get_data(GTK_OBJECT(button), "partinfo");
if (!event) return FALSE;
+ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
+ textview = mimeview->messageview->textview;
+ else
+ textview = mimeview->textview;
+
switch (event->keyval) {
- case GDK_Return:
- icon_selected(mimeview, num, partinfo);
+ case GDK_space:
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+ /* stop the button being untoggled */
+ KEY_PRESS_EVENT_STOP();
+ if (textview_scroll_page(textview, FALSE))
+ return TRUE;
+
+ if (icon_list_select_by_number(mimeview, num + 1))
+ return TRUE;
+ } else {
+ icon_selected(mimeview, num, partinfo);
+ toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+ return TRUE;
+ }
+
+ break;
+ case GDK_BackSpace:
+ textview_scroll_page(textview, TRUE);
return TRUE;
+ case GDK_Return:
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+ KEY_PRESS_EVENT_STOP();
+ textview_scroll_one_line(textview,
+ (event->state & GDK_MOD1_MASK) != 0);
+ return TRUE;
+ } else {
+ icon_selected(mimeview, num, partinfo);
+ toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+ return TRUE;
+ }
+
+ case GDK_n:
+ case GDK_N:
+ BREAK_ON_MODIFIER_KEY();
+ if (icon_list_select_by_number(mimeview, num + 1))
+ KEY_PRESS_EVENT_STOP();
+ return TRUE;
+ break;
+
+ case GDK_p:
+ case GDK_P:
+ BREAK_ON_MODIFIER_KEY();
+ if (icon_list_select_by_number(mimeview, num - 1))
+ KEY_PRESS_EVENT_STOP();
+ return TRUE;
break;
+
+ case GDK_y:
+ BREAK_ON_MODIFIER_KEY();
+ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
+ break;
+ KEY_PRESS_EVENT_STOP();
+ mimeview_save_as(mimeview);
+ return TRUE;
+ case GDK_t:
+ BREAK_ON_MODIFIER_KEY();
+ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
+ break;
+ KEY_PRESS_EVENT_STOP();
+ mimeview_display_as_text(mimeview);
+ return TRUE;
+ case GDK_l:
+ BREAK_ON_MODIFIER_KEY();
+ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
+ break;
+ KEY_PRESS_EVENT_STOP();
+ mimeview_launch(mimeview);
+ return TRUE;
default:
break;
}
- return FALSE;
+
+ if (!mimeview->messageview->mainwin) return FALSE;
+ summaryview = mimeview->messageview->mainwin->summaryview;
+ summary_pass_key_press_event(summaryview, event);
+ return TRUE;
}
-static void icon_toggled_cb(GtkToggleButton *button, MimeView *mimeview)
+static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
{
GList *child;
- if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
- return;
-
- child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+ child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
for (; child != NULL; child = g_list_next(child)) {
- if (GTK_IS_TOGGLE_BUTTON(child->data) &&
- GTK_TOGGLE_BUTTON(child->data) != button)
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(child->data)))
- gtk_toggle_button_set_active
- (GTK_TOGGLE_BUTTON(child->data),
- FALSE);
+ if (GTK_IS_TOGGLE_BUTTON(child->data) &&
+ GTK_TOGGLE_BUTTON(child->data) != button &&
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(child->data)))
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(child->data),
+ FALSE);
}
}
GtkWidget *pixmap;
GtkWidget *vbox;
GtkWidget *button;
- GtkWidget *sep;
gchar *tip;
gchar *desc = NULL;
StockPixmap stockp;
vbox = mimeview->icon_vbox;
mimeview->icon_count++;
- if (mimeview->icon_count > 1) {
- sep = gtk_hseparator_new();
- gtk_widget_show(sep);
- gtk_box_pack_start(GTK_BOX(vbox), sep, TRUE, TRUE, 3);
- }
button = gtk_toggle_button_new();
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_object_set_data(GTK_OBJECT(button), "icon_number",
gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
g_free(tip);
gtk_widget_show_all(button);
- gtk_signal_connect(GTK_OBJECT(button), "button_press_event",
- GTK_SIGNAL_FUNC(icon_clicked_cb), mimeview);
- gtk_signal_connect(GTK_OBJECT(button), "key_press_event",
- GTK_SIGNAL_FUNC(icon_key_pressed), mimeview);
- gtk_signal_connect(GTK_OBJECT(button), "toggled",
- GTK_SIGNAL_FUNC(icon_toggled_cb), mimeview);
+ g_signal_connect(G_OBJECT(button), "button_press_event",
+ G_CALLBACK(icon_clicked_cb), mimeview);
+ g_signal_connect(G_OBJECT(button), "key_press_event",
+ G_CALLBACK(icon_key_pressed), mimeview);
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
}
}
mimeview->icon_count = 0;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
- adj->value = 0;
+ adj->value = adj->lower;
+ gtk_signal_emit_by_name(GTK_OBJECT (adj), "value_changed");
}
static void icon_list_toggle_by_mime_info(MimeView *mimeview,
if (GTK_IS_TOGGLE_BUTTON(child->data) &&
gtk_object_get_data(GTK_OBJECT(child->data),
"partinfo") == (gpointer)mimeinfo) {
+ toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(child->data), TRUE);
+ }
+ }
+}
+
+/*!
+ *\brief Used to 'click' the next or previous icon.
+ *
+ *\return true if the icon 'number' exists and was selected.
+ */
+static gboolean icon_list_select_by_number(MimeView *mimeview,
+ gint number)
+{
+ GList *child;
+
+ if (number == 0) return FALSE;
+ child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+ for (; child != NULL; child = g_list_next(child)) {
+ if (GTK_IS_TOGGLE_BUTTON(child->data) &&
+ GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(child->data),
+ "icon_number")) == number) {
+ icon_selected(mimeview, number,
+ (MimeInfo*)gtk_object_get_data(GTK_OBJECT(child->data),
+ "partinfo"));
+ toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(child->data), TRUE);
+ gtk_widget_grab_focus(GTK_WIDGET(child->data));
+
+ return TRUE;
}
}
+ return FALSE;
}
static void icon_scroll_size_allocate_cb(GtkWidget *widget,
- GtkAllocation *size, MimeView *mimeview)
+ GtkAllocation *size, MimeView *mimeview)
{
GtkAllocation *mainbox_size;
GtkAllocation *vbox_size;
vbox_size = &mimeview->icon_vbox->allocation;
layout_size = &mimeview->icon_scroll->allocation;
+#warning FIXME_GTK2 /* this code cause hang up. */
+#if 0
/* centralise the vbox */
gtk_layout_move(GTK_LAYOUT(mimeview->icon_scroll), mimeview->icon_vbox,
(mainbox_size->width - vbox_size->width)/2, 0);
+#endif
gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll),
GTK_LAYOUT(mimeview->icon_scroll)->width,
gtk_widget_size_request(mimeview->icon_vbox, &size);
width = size.width + 4;
if (width > mimeview->icon_mainbox->requisition.width) {
- gtk_widget_set_usize(mimeview->icon_mainbox,
- width, -1);
+ gtk_widget_set_size_request(mimeview->icon_mainbox,
+ width, -1);
}
}
projects / claws.git / blobdiff