#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkctree.h>
#include <gtk/gtkvbox.h>
-#include <gtk/gtkhpaned.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkvpaned.h>
#include <gtk/gtktext.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkselection.h>
#include <gtk/gtktooltips.h>
#include <gtk/gtkcontainer.h>
+#include <gtk/gtkbutton.h>
#include <stdio.h>
#ifndef HAVE_APACHE_FNMATCH
} MimeViewColumnPos;
#define N_MIMEVIEW_COLS 3
-#define ICONBOX_DEFAULT_WIDTH 36
static void mimeview_set_multipart_tree (MimeView *mimeview,
MimeInfo *mimeinfo,
static gboolean icon_clicked_cb (GtkWidget *button,
GdkEventButton *event,
MimeView *mimeview);
+static void icon_selected (MimeView *mimeview,
+ gint num,
+ MimeInfo *partinfo);
+static gint icon_key_pressed (GtkWidget *button,
+ GdkEventKey *event,
+ MimeView *mimeview);
+static void toggle_icon (GtkToggleButton *button,
+ MimeView *mimeview);
static void icon_list_append_icon (MimeView *mimeview,
MimeInfo *mimeinfo);
static void icon_list_create (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,
GtkWidget *icon_vbox;
GtkWidget *arrow;
GtkWidget *scrollbutton;
+ GtkWidget *hbox;
GtkTooltips *tooltips;
GtkItemFactory *popupfactory;
gchar *titles[N_MIMEVIEW_COLS];
gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_SIZE,
GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_MIMETYPE, 200);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_SIZE, 50);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_NAME, 200);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), COL_MIMETYPE, 240);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), COL_SIZE, 90);
for (i = 0; i < N_MIMEVIEW_COLS; i++)
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
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_container_add(GTK_CONTAINER(notebook), mime_notebook);
- 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);
- gtk_widget_set_usize(icon_mainbox, ICONBOX_DEFAULT_WIDTH, -1);
+ g_signal_connect(G_OBJECT(icon_mainbox), "size_allocate",
+ G_CALLBACK(icon_scroll_size_allocate_cb), mimeview);
- ctree_mainbox = gtk_vbox_new(FALSE, 0);
+ ctree_mainbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
n_entries = sizeof(mimeview_popup_entries) /
tooltips = gtk_tooltips_new();
gtk_tooltips_set_delay(tooltips, 0);
- paned = gtk_hpaned_new();
- gtk_paned_set_gutter_size(GTK_PANED(paned), 0);
- gtk_paned_pack1(GTK_PANED(paned), notebook, TRUE, TRUE);
- gtk_paned_pack2(GTK_PANED(paned), icon_mainbox, FALSE, FALSE);
-
+ paned = gtk_vpaned_new();
+ gtk_paned_set_gutter_size(GTK_PANED(paned), 6);
+ gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
+ gtk_paned_pack2(GTK_PANED(paned), mime_notebook, TRUE, TRUE);
+ gtk_container_add(GTK_CONTAINER(notebook), paned);
- gtk_widget_ref(icon_mainbox);
- gtk_widget_ref(ctree_mainbox);
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), notebook, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), icon_mainbox, FALSE, FALSE, 0);
- gtk_widget_show_all(paned);
- gtk_widget_show_all(icon_mainbox);
- gtk_widget_show_all(ctree_mainbox);
+ gtk_widget_show_all(hbox);
+ gtk_widget_hide(ctree_mainbox);
mimeview->notebook = notebook;
mimeview->vbox = vbox;
+ mimeview->hbox = hbox;
mimeview->paned = paned;
mimeview->scrolledwin = scrolledwin;
mimeview->ctree = ctree;
mimeview->icon_count = 0;
mimeview->mainwin = mainwin;
mimeview->tooltips = tooltips;
- mimeview->oldsize = 160;
+ mimeview->oldsize = 60;
mimeview->mime_toggle = mime_toggle;
mimeview->target_list = gtk_target_list_new(mimeview_mime_types, 1);
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);
if (node) {
gtk_ctree_select(ctree, node);
+ 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);
}
}
mimeviews = g_slist_remove(mimeviews, mimeview);
- gtk_widget_unref(mimeview->icon_mainbox);
- gtk_widget_unref(mimeview->ctree_mainbox);
}
MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
}
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)))
"/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);
#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);
static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeView *mimeview)
{
- gint num;
+ gint num;
MimeInfo *partinfo;
- GtkCTreeNode *node;
- num = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
+
+ 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 (num == 1 && (partinfo->mime_type == MIME_TEXT ||
- partinfo->mime_type == MIME_TEXT_HTML)) {
- gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0);
- /* don't set the ctree, as it will unload the plugin, and
- * we want to be able to switch quickly between the text
- * part and the attachment */
- } else {
- gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 1);
- node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
- if (node)
- gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
- }
+ 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;
+}
+
+static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
+{
+ if (num == 1 && (partinfo->mime_type == MIME_TEXT ||
+ partinfo->mime_type == MIME_TEXT_HTML)) {
+ gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0);
+ /* don't set the ctree, as it will unload the plugin, and
+ * we want to be able to switch quickly between the text
+ * part and the attachment */
+ } else {
+ GtkCTreeNode *node;
+ gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 1);
+ node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
+ if (node)
+ gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
+ }
+}
+
+#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;
+ 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_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;
+ }
+
+ if (!mimeview->messageview->mainwin) return FALSE;
+ summaryview = mimeview->messageview->mainwin->summaryview;
+ summary_pass_key_press_event(summaryview, event);
return TRUE;
}
+static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
+{
+ GList *child;
+
+ 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 &&
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(child->data)))
+ gtk_toggle_button_set_active
+ (GTK_TOGGLE_BUTTON(child->data),
+ FALSE);
+ }
+}
+
static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
{
GtkWidget *pixmap;
GtkWidget *vbox;
GtkWidget *button;
- GtkWidget *sep;
gchar *tip;
gchar *desc = NULL;
- gint width;
StockPixmap stockp;
vbox = mimeview->icon_vbox;
mimeview->icon_count++;
- if (mimeview->icon_count > 1) {
- sep = gtk_hseparator_new();
- gtk_widget_show(sep);
- gtk_widget_set_usize(sep, ICONBOX_DEFAULT_WIDTH, -1);
- gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 3);
- }
- button = gtk_event_box_new();
+ button = gtk_toggle_button_new();
+ gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_object_set_data(GTK_OBJECT(button), "icon_number",
GINT_TO_POINTER(mimeview->icon_count));
gtk_object_set_data(GTK_OBJECT(button), "partinfo",
pixmap = stock_pixmap_widget(mimeview->mainwin->window, stockp);
gtk_container_add(GTK_CONTAINER(button), pixmap);
- width = MAX(ICONBOX_DEFAULT_WIDTH, pixmap->requisition.width);
- if (width > mimeview->icon_mainbox->requisition.width) {
- gtk_widget_set_usize(mimeview->icon_mainbox,
- width, -1);
- }
if (!desc) {
if (prefs_common.attach_desc)
desc = get_part_description(mimeinfo);
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);
+ 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);
-
+
}
static void icon_list_clear (MimeView *mimeview)
}
mimeview->icon_count = 0;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
- adj->value = 0;
- gtk_adjustment_value_changed(adj);
- gtk_signal_handler_block_by_func(GTK_OBJECT(mimeview->icon_mainbox),
- GTK_SIGNAL_FUNC(icon_scroll_size_allocate_cb), mimeview);
- gtk_widget_set_usize(mimeview->icon_mainbox, ICONBOX_DEFAULT_WIDTH, -1);
- gtk_signal_handler_unblock_by_func(GTK_OBJECT(mimeview->icon_mainbox),
- GTK_SIGNAL_FUNC(icon_scroll_size_allocate_cb), mimeview);
+ adj->value = adj->lower;
+ gtk_signal_emit_by_name(GTK_OBJECT (adj), "value_changed");
+}
+
+static void icon_list_toggle_by_mime_info(MimeView *mimeview,
+ MimeInfo *mimeinfo)
+{
+ GList *child;
+ child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+ for (; child != NULL; child = g_list_next(child)) {
+ 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,
static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
{
+ GtkRequisition size;
+ gint width;
g_return_if_fail(mimeinfo != NULL);
if (mimeinfo->children)
icon_list_append_icon(mimeview, mimeinfo);
mimeinfo = mimeinfo->next;
}
+ gtk_widget_size_request(mimeview->icon_vbox, &size);
+ width = size.width + 4;
+ if (width > mimeview->icon_mainbox->requisition.width) {
+ gtk_widget_set_size_request(mimeview->icon_mainbox,
+ width, -1);
+ }
+
}
static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview)
{
- GtkWidget *paned = mimeview->paned;
gtk_widget_ref(button);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_RIGHT,
GTK_SHADOW_NONE);
- gtkut_container_remove(GTK_CONTAINER(paned),
- mimeview->icon_mainbox);
- gtk_paned_pack2(GTK_PANED(paned),
- mimeview->ctree_mainbox,
- FALSE, TRUE);
- gtk_paned_set_gutter_size(GTK_PANED(paned), -1);
- gtk_widget_set_usize(mimeview->ctree_mainbox, mimeview->oldsize, -1);
- gtk_paned_set_position(GTK_PANED(paned), paned->allocation.width
- - mimeview->oldsize
- - GTK_PANED (paned)->gutter_size);
-
+ gtk_widget_hide(mimeview->icon_mainbox);
+ gtk_widget_show(mimeview->ctree_mainbox);
+ gtk_paned_set_position(GTK_PANED(mimeview->paned), mimeview->oldsize);
+
gtkut_container_remove(GTK_CONTAINER(mimeview->icon_mainbox),
button);
- gtk_box_pack_start(GTK_BOX(mimeview->ctree_mainbox),
+ gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox),
button, FALSE, FALSE, 0);
gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 1);
} else {
gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_LEFT,
GTK_SHADOW_NONE);
- mimeview->oldsize = mimeview->ctree_mainbox->allocation.width;
- gtkut_container_remove(GTK_CONTAINER(paned),
- mimeview->ctree_mainbox);
- gtk_paned_pack2(GTK_PANED(paned), mimeview->icon_mainbox,
- FALSE, FALSE);
- gtk_paned_set_gutter_size(GTK_PANED(paned), 0);
- gtk_paned_set_position(GTK_PANED(paned), -1);
+ mimeview->oldsize = mimeview->ctree_mainbox->allocation.height;
+ gtk_widget_hide(mimeview->ctree_mainbox);
+ gtk_widget_show(mimeview->icon_mainbox);
+ gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
gtkut_container_remove(GTK_CONTAINER(mimeview->ctree_mainbox),
button);
gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox),
button, FALSE, FALSE, 0);
+ gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
+ if (mimeview->opened)
+ icon_list_toggle_by_mime_info
+ (mimeview, gtk_ctree_node_get_row_data(GTK_CTREE(mimeview->ctree),
+ mimeview->opened));
+
}
-
+ gtk_widget_grab_focus(button);
gtk_widget_unref(button);
- gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
}
projects / claws.git / blobdiff