#define N_MIMEVIEW_COLS 3
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void mimeview_set_multipart_tree (MimeView *mimeview,
MimeInfo *mimeinfo,
GtkCMCTreeNode *parent);
static GtkCMCTreeNode *mimeview_append_part (MimeView *mimeview,
MimeInfo *partinfo,
GtkCMCTreeNode *parent);
+#endif
static void mimeview_show_message_part (MimeView *mimeview,
MimeInfo *partinfo);
static void mimeview_change_view_type (MimeView *mimeview,
static gboolean mimeview_write_part (const gchar *filename,
MimeInfo *partinfo);
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void mimeview_selected (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gint column,
MimeView *mimeview);
+#endif
static void mimeview_start_drag (GtkWidget *widget,
gint button,
GdkEvent *event,
mimeview_select_next_part((MimeView *)data);
}
+static void mimeview_select_prev_part_cb(GtkAction *action, gpointer data)
+{
+ mimeview_select_prev_part((MimeView *)data);
+}
+
static GtkActionEntry mimeview_menu_actions[] = {
{ "MimeView", NULL, "MimeView" },
{ "MimeView/Open", NULL, N_("_Open (l)"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
{ "MimeView/DisplayAsText", NULL, N_("_Display as text (t)"), NULL, "Display as text", G_CALLBACK(mimeview_display_as_text_cb) },
{ "MimeView/SaveAs", NULL, N_("_Save as (y)..."), NULL, "Save as", G_CALLBACK(mimeview_save_as_cb) },
{ "MimeView/SaveAll", NULL, N_("Save _all..."), NULL, "Save all parts", G_CALLBACK(mimeview_save_all_cb) },
- { "MimeView/NextPart", NULL, N_("Next part (a)"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) }
+ { "MimeView/NextPart", NULL, N_("Next part (a)"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) },
+ { "MimeView/PrevPart", NULL, N_("Previous part (z)"), NULL, "Previous part", G_CALLBACK(mimeview_select_prev_part_cb) }
};
static GtkTargetEntry mimeview_mime_types[] =
GdkEventVisibility *event,
MimeView *mimeview)
{
- gdk_window_set_cursor(widget->window, hand_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
return FALSE;
}
GdkEventCrossing *event,
MimeView *mimeview)
{
- gdk_window_set_cursor(widget->window, NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
return FALSE;
}
GdkEventCrossing *event,
MimeView *mimeview)
{
- gdk_window_set_cursor(widget->window, hand_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
return FALSE;
}
gchar *titles[N_MIMEVIEW_COLS];
gint i;
- CLAWS_TIP_DECL();
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "NextPart", "MimeView/NextPart",
GTK_UI_MANAGER_MENUITEM);
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "PrevPart", "MimeView/PrevPart",
+ GTK_UI_MANAGER_MENUITEM);
popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
gtk_ui_manager_get_widget(mimeview->ui_manager, "/Menus/MimeView")) );
if (!partinfo) return;
/* ungrab the mouse event */
- if (gtkut_widget_has_grab(GTK_WIDGET(ctree))) {
+ if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
gtk_grab_remove(GTK_WIDGET(ctree));
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
cm_return_if_fail(mimeview != NULL);
partinfo = mimeview_get_selected_part(mimeview);
- if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
+ if (partinfo == NULL ||
+ partinfo->disposition == DISPOSITIONTYPE_INLINE)
+ return;
context = gtk_drag_begin(widget, mimeview->target_list,
GDK_ACTION_COPY, button, event);
}
-void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
+gboolean mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
{
- mimeview_key_pressed(mimeview->ctree, event, mimeview);
+ return mimeview_key_pressed(mimeview->ctree, event, mimeview);
}
static void mimeview_select_next_part(MimeView *mimeview)
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-#define KEY_PRESS_EVENT_STOP() \
- g_signal_stop_emission_by_name(G_OBJECT(ctree), \
- "key_press_event");
-
static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
MimeView *mimeview)
{
SummaryView *summaryview;
- GtkCMCTree *ctree = GTK_CMCTREE(widget);
if (!event) return FALSE;
if (!mimeview->opened) return FALSE;
return FALSE;
switch (event->keyval) {
- case GDK_Page_Down:
- case GDK_space:
+ case GDK_KEY_Page_Down:
+ case GDK_KEY_space:
if (mimeview_scroll_page(mimeview,
(event->state & GDK_SHIFT_MASK) != 0))
return TRUE;
if (!(event->state & GDK_SHIFT_MASK))
mimeview_select_next_part(mimeview);
return TRUE;
- case GDK_Page_Up:
- case GDK_BackSpace:
+ case GDK_KEY_Page_Up:
+ case GDK_KEY_BackSpace:
mimeview_scroll_page(mimeview, TRUE);
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
- case GDK_Up:
- case GDK_Down:
- mimeview_scroll_one_line(mimeview, (event->keyval == GDK_Up));
- return TRUE;
- case GDK_n:
- case GDK_N:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_next_part(mimeview);
- return TRUE;
-
- case GDK_p:
- case GDK_P:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_prev_part(mimeview);
+ case GDK_KEY_Up:
+ case GDK_KEY_Down:
+ mimeview_scroll_one_line(mimeview, (event->keyval == GDK_KEY_Up));
return TRUE;
-
- case GDK_y:
+ case GDK_KEY_y:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_save_as(mimeview);
return TRUE;
- case GDK_t:
+ case GDK_KEY_t:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_display_as_text(mimeview);
return TRUE;
- case GDK_l:
+ case GDK_KEY_l:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_launch(mimeview, NULL);
return TRUE;
- case GDK_o:
+ case GDK_KEY_o:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
#ifndef G_OS_WIN32
mimeview_open_with(mimeview);
#endif
return TRUE;
- case GDK_c:
+ case GDK_KEY_c:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_check_signature(mimeview);
return TRUE;
- case GDK_a:
+ case GDK_KEY_a:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_select_next_part(mimeview);
return TRUE;
+ case GDK_KEY_z:
+ BREAK_ON_MODIFIER_KEY();
+ mimeview_select_prev_part(mimeview);
+ return TRUE;
default:
break;
}
- if (!mimeview->messageview->mainwin) return FALSE;
+ if (mimeview->messageview->new_window) return FALSE;
- summary_pass_key_press_event(summaryview, event);
- return TRUE;
+ return summary_pass_key_press_event(summaryview, event);
}
static void mimeview_drag_data_get(GtkWidget *widget,
uriname = g_strconcat(tmp, "\r\n", NULL);
g_free(tmp);
- gtk_selection_data_set(selection_data, selection_data->target, 8,
+ gtk_selection_data_set(selection_data,
+ gtk_selection_data_get_target(selection_data), 8,
(guchar *)uriname, strlen(uriname));
g_free(uriname);
textview = mimeview->textview;
switch (event->keyval) {
- case GDK_space:
+ case GDK_KEY_space:
if (mimeview_scroll_page(mimeview, FALSE))
return TRUE;
return TRUE;
break;
- case GDK_BackSpace:
+ case GDK_KEY_BackSpace:
mimeview_scroll_page(mimeview, TRUE);
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
-
- case GDK_n:
- case GDK_N:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_next_part(mimeview);
- return TRUE;
-
- case GDK_p:
- case GDK_P:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_prev_part(mimeview);
- break;
-
- case GDK_y:
+ case GDK_KEY_y:
BREAK_ON_MODIFIER_KEY();
mimeview_save_as(mimeview);
return TRUE;
- case GDK_t:
+ case GDK_KEY_t:
BREAK_ON_MODIFIER_KEY();
mimeview_display_as_text(mimeview);
return TRUE;
- case GDK_l:
+ case GDK_KEY_l:
BREAK_ON_MODIFIER_KEY();
mimeview_launch(mimeview, NULL);
return TRUE;
#ifndef G_OS_WIN32
- case GDK_o:
+ case GDK_KEY_o:
BREAK_ON_MODIFIER_KEY();
mimeview_open_with(mimeview);
return TRUE;
#endif
- case GDK_c:
+ case GDK_KEY_c:
BREAK_ON_MODIFIER_KEY();
mimeview_check_signature(mimeview);
return TRUE;
- case GDK_a:
+ case GDK_KEY_a:
BREAK_ON_MODIFIER_KEY();
mimeview_select_next_part(mimeview);
return TRUE;
content_type = procmime_get_content_type_str(mimeinfo->type,
mimeinfo->subtype);
-#if GTK_CHECK_VERSION(2,12,0)
tip = g_strconcat("<b>", _("Type:"), " </b>", content_type,
"\n<b>", _("Size:"), " </b>",
to_human_readable((goffset)mimeinfo->length), NULL);
-#else
- tip = g_strconcat(_("Type:"), " ", content_type,
- "\n", _("Size:"), " ",
- to_human_readable((goffset)mimeinfo->length), NULL);
-#endif
g_free(content_type);
if (desc && *desc) {
gchar *tmp = NULL;
} else {
tmp = g_strdup(desc);
}
-#if GTK_CHECK_VERSION(2,12,0)
tiptmp = g_strconcat(tip, "\n<b>",
prefs_common.attach_desc && mimeinfo->description ?
_("Description:") : _("Filename:"),
" </b>", tmp, NULL);
-#else
- tiptmp = g_strconcat(tip, "\n",
- prefs_common.attach_desc && mimeinfo->description ?
- _("Description:") : _("Filename:"),
- " ", tmp, NULL);
-#endif
g_free(tip);
tip = tiptmp;
g_free(tmp);
}
if (sigshort && *sigshort) {
- tiptmp = g_strjoin("\n", tip, sigshort, NULL);
+ tiptmp = g_strjoin("\n", tip, g_markup_escape_text(sigshort, -1), NULL);
g_free(tip);
tip = tiptmp;
}
g_free(sigshort);
-#if GTK_CHECK_VERSION(2,12,0)
gtk_widget_set_tooltip_markup(button, tip);
-#else
- CLAWS_SET_TIP(button, tip);
-#endif
g_free(tip);
gtk_widget_show_all(button);
gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
g_list_free(orig);
mimeview->icon_count = 0;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
- gtk_adjustment_set_value(adj, adj->lower);
+ gtk_adjustment_set_value(adj, gtk_adjustment_get_lower(adj));
gtk_adjustment_changed(adj);
}
static void icon_scroll_size_allocate_cb(GtkWidget *widget,
GtkAllocation *size, MimeView *mimeview)
{
- GtkAllocation *mainbox_size;
- GtkAllocation *vbox_size;
- GtkAllocation *layout_size;
+ GtkAllocation vbox_size;
+ GtkAllocation layout_size;
GtkAdjustment *adj;
+ guint width;
+ guint height;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
- mainbox_size = &mimeview->icon_mainbox->allocation;
- vbox_size = &mimeview->icon_vbox->allocation;
- layout_size = &mimeview->icon_scroll->allocation;
+ gtk_widget_get_allocation(mimeview->icon_vbox, &vbox_size);
+ gtk_widget_get_allocation(mimeview->icon_scroll, &layout_size);
+ gtk_layout_get_size(GTK_LAYOUT(mimeview->icon_scroll), &width, &height);
gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll),
- GTK_LAYOUT(mimeview->icon_scroll)->width,
- MAX(vbox_size->height, layout_size->height));
- adj->step_increment = 10;
+ width,
+ MAX(vbox_size.height, layout_size.height));
+ gtk_adjustment_set_step_increment(adj, 10);
}
static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
{
GtkRequisition size;
+ GtkRequisition requisition;
cm_return_if_fail(mimeinfo != NULL);
: NULL;
}
gtk_widget_size_request(mimeview->icon_vbox, &size);
- if (size.width > mimeview->icon_mainbox->requisition.width) {
+ gtk_widget_get_requisition(mimeview->icon_mainbox, &requisition);
+ if (size.width > requisition.width) {
gtk_widget_set_size_request(mimeview->icon_mainbox,
size.width, -1);
}
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
MimeView *mimeview)
{
+ GtkAllocation allocation;
g_object_ref(button);
mimeview_leave_notify(button, NULL, NULL);
} else {
gtk_arrow_set(GTK_ARROW(gtk_bin_get_child(GTK_BIN((button)))), GTK_ARROW_LEFT,
GTK_SHADOW_NONE);
- mimeview->oldsize = mimeview->ctree_mainbox->allocation.height;
+ gtk_widget_get_allocation(mimeview->ctree_mainbox, &allocation);
+ mimeview->oldsize = allocation.height;
gtk_widget_hide(mimeview->ctree_mainbox);
gtk_widget_show(mimeview->icon_mainbox);
gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
button);
gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox),
button, FALSE, FALSE, 0);
- gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
+ gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(button)), button, 0);
if (mimeview->opened)
icon_list_toggle_by_mime_info
(mimeview, gtk_cmctree_node_get_row_data(GTK_CMCTREE(mimeview->ctree),
projects / claws.git / blobdiff