ITEM_SEPARATOR = 2
};
+static const gint ToolbarIcons[] =
+{
+ STOCK_PIXMAP_ADDRESS_BOOK,
+ STOCK_PIXMAP_ADDRESS_SEARCH,
+ STOCK_PIXMAP_BOOK,
+ STOCK_PIXMAP_CATEGORY,
+ STOCK_PIXMAP_CHECK_SPELLING,
+ STOCK_PIXMAP_CLOSE,
+ STOCK_PIXMAP_DOWN_ARROW,
+ STOCK_PIXMAP_UP_ARROW,
+ STOCK_PIXMAP_EDIT_EXTERN,
+ STOCK_PIXMAP_ERROR,
+ STOCK_PIXMAP_EXEC,
+ STOCK_PIXMAP_GROUP,
+ STOCK_PIXMAP_INSERT_FILE,
+ STOCK_PIXMAP_INTERFACE,
+ STOCK_PIXMAP_JPILOT,
+ STOCK_PIXMAP_LDAP,
+ STOCK_PIXMAP_LINEWRAP_CURRENT,
+ STOCK_PIXMAP_LINEWRAP_ALL,
+ STOCK_PIXMAP_MAIL,
+ STOCK_PIXMAP_MAIL_ATTACH,
+ STOCK_PIXMAP_MAIL_COMPOSE,
+ STOCK_PIXMAP_MAIL_FORWARD,
+ STOCK_PIXMAP_MAIL_RECEIVE,
+ STOCK_PIXMAP_MAIL_RECEIVE_ALL,
+ STOCK_PIXMAP_MAIL_REPLY,
+ STOCK_PIXMAP_MAIL_REPLY_TO_ALL,
+ STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR,
+ STOCK_PIXMAP_MAIL_SEND,
+ STOCK_PIXMAP_MAIL_SEND_QUEUE,
+ STOCK_PIXMAP_MAIL_SIGN,
+ STOCK_PIXMAP_OPEN_MAIL,
+ STOCK_PIXMAP_NEWS_COMPOSE,
+ STOCK_PIXMAP_PASTE,
+ STOCK_PIXMAP_PREFERENCES,
+ STOCK_PIXMAP_PROPERTIES,
+ STOCK_PIXMAP_VCARD,
+ STOCK_PIXMAP_ONLINE,
+ STOCK_PIXMAP_OFFLINE,
+ STOCK_PIXMAP_NOTICE_WARN, /* small warning */
+ STOCK_PIXMAP_NOTICE_ERROR, /* small error */
+ STOCK_PIXMAP_NOTICE_NOTE, /* small message */
+ STOCK_PIXMAP_GO_FOLDERS,
+ STOCK_PIXMAP_MIME_TEXT_PLAIN,
+ STOCK_PIXMAP_MIME_TEXT_HTML,
+ STOCK_PIXMAP_MIME_APPLICATION,
+ STOCK_PIXMAP_MIME_IMAGE,
+ STOCK_PIXMAP_MIME_AUDIO,
+ STOCK_PIXMAP_MIME_TEXT_ENRICHED,
+ STOCK_PIXMAP_MIME_UNKNOWN,
+ STOCK_PIXMAP_MIME_PDF,
+ STOCK_PIXMAP_MIME_PS,
+ STOCK_PIXMAP_MIME_TEXT_CALENDAR,
+ STOCK_PIXMAP_MIME_PGP_SIG,
+ STOCK_PIXMAP_PRINTER,
+ STOCK_PIXMAP_PRIVACY_SIGNED,
+ STOCK_PIXMAP_PRIVACY_PASSED,
+ STOCK_PIXMAP_PRIVACY_FAILED,
+ STOCK_PIXMAP_PRIVACY_UNKNOWN,
+ STOCK_PIXMAP_PRIVACY_EXPIRED,
+ STOCK_PIXMAP_PRIVACY_WARN,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_SIGNED,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_PASSED,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_FAILED,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_WARN,
+ STOCK_PIXMAP_MIME_MESSAGE,
+ STOCK_PIXMAP_SPAM_BTN,
+ STOCK_PIXMAP_HAM_BTN,
+ STOCK_PIXMAP_EMPTY, /* last entry */
+};
+
typedef struct _ToolbarPage
{
PrefsPage page;
GtkWidget *icon_button; /* item icon chooser widget */
GtkWidget *icon_chooser_win;
- GtkWidget *icon_chooser_list;
+ GtkWidget *icon_chooser_view;
gchar *item_icon_file; /* item icon file */
static void prefs_toolbar_down (GtkButton *button,
ToolbarPage *prefs_toolbar);
+static void action_selection_changed (GtkComboBox *action_combo,
+ ToolbarPage *prefs_toolbar);
+
+static void func_selection_changed (GtkComboBox *action_combo,
+ ToolbarPage *prefs_toolbar);
+
static void prefs_toolbar_create (ToolbarPage *prefs_toolbar);
static GtkWidget *create_set_list_view (ToolbarPage *prefs_toolbar);
GdkPixbuf *pixbuf;
gchar *event, *text;
+ if (prefs_toolbar->item_icon_file == NULL) {
+ alertpanel_error(ERROR_MSG_NO_ICON);
+ return;
+ }
stock_pixbuf_gdk(prefs_toolbar->window,
stock_pixmap_get_icon(prefs_toolbar->item_icon_file),
&pixbuf);
GdkPixbuf *pixbuf;
gchar *icon_event, *set_event, *text;
+ if (prefs_toolbar->item_icon_file == NULL) {
+ alertpanel_error(ERROR_MSG_NO_ICON);
+ return;
+ }
stock_pixbuf_gdk(prefs_toolbar->window,
stock_pixmap_get_icon(prefs_toolbar->item_icon_file),
&pixbuf);
gtk_combo_box_set_active(
GTK_COMBO_BOX(prefs_toolbar->item_func_combo), 0);
gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button), "");
- gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), "");
gtk_widget_set_sensitive(prefs_toolbar->item_text_entry, TRUE);
gtk_widget_set_sensitive(prefs_toolbar->item_func_combo, TRUE);
gtk_widget_set_sensitive(prefs_toolbar->icon_button, TRUE);
+
+ func_selection_changed(GTK_COMBO_BOX(prefs_toolbar->item_func_combo),
+ prefs_toolbar);
break;
case ITEM_USER_ACTION:
gtk_widget_show(prefs_toolbar->item_action_combo);
gtk_widget_set_sensitive(prefs_toolbar->item_action_combo, TRUE);
gtk_widget_set_sensitive(prefs_toolbar->icon_button, TRUE);
- gchar *text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(
- prefs_toolbar->item_action_combo));
- gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), text);
- g_free(text);
-
+ action_selection_changed(GTK_COMBO_BOX(prefs_toolbar->item_action_combo),
+ prefs_toolbar);
break;
case ITEM_SEPARATOR:
gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button), _("None"));
gtk_button_set_image(GTK_BUTTON(prefs_toolbar->icon_button), NULL);
+ g_free(prefs_toolbar->item_icon_file);
+ prefs_toolbar->item_icon_file = NULL;
gtk_combo_box_set_active(
GTK_COMBO_BOX(prefs_toolbar->item_func_combo), -1);
gtk_combo_box_set_active(
gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry),
toolbar_get_short_text(action));
g_free(text);
+ if (action >= 0) {
+ StockPixmap stockp = toolbar_get_icon(action);
+ if (stockp >= 0) {
+ g_free(prefs_toolbar->item_icon_file);
+ prefs_toolbar->item_icon_file = g_strdup(stock_pixmap_get_name(stockp));
+
+ gtk_button_set_image(GTK_BUTTON(prefs_toolbar->icon_button),
+ stock_pixmap_widget(prefs_toolbar->window, stockp));
+ }
+ }
}
}
if (g_utf8_collate(toolbar_ret_descr_from_val(A_SEPARATOR), descr) == 0) {
gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button),
_("None"));
+ g_free(prefs_toolbar->item_icon_file);
+ prefs_toolbar->item_icon_file = NULL;
gtk_combo_box_set_active(GTK_COMBO_BOX(prefs_toolbar->item_type_combo),
ITEM_SEPARATOR);
g_free(icon_text);
{
GtkTreeModel *model;
GtkTreeIter iter;
+ GList *list;
GdkPixbuf *pix;
gchar *icon_file;
g_return_if_fail(prefs_toolbar != NULL);
+
+ model = gtk_icon_view_get_model(GTK_ICON_VIEW(prefs_toolbar->icon_chooser_view));
+ list = gtk_icon_view_get_selected_items(GTK_ICON_VIEW(prefs_toolbar->icon_chooser_view));
+ if(list == NULL)
+ return;
- if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
- (GTK_TREE_VIEW(prefs_toolbar->icon_chooser_list)),
- &model, &iter))
+ if(!gtk_tree_model_get_iter(model, &iter, (GtkTreePath *)list->data)) {
+ gtk_tree_path_free(list->data);
+ g_list_free(list);
return;
+ }
gtk_tree_model_get(model, &iter,
SET_ICON, &pix,
g_free(prefs_toolbar->item_icon_file);
prefs_toolbar->item_icon_file = icon_file;
-
gtk_button_set_image(GTK_BUTTON(prefs_toolbar->icon_button),
gtk_image_new_from_pixbuf(pix));
gtk_widget_destroy(prefs_toolbar->icon_chooser_win);
prefs_toolbar->icon_chooser_win = NULL;
- prefs_toolbar->icon_chooser_list = NULL;
+ prefs_toolbar->icon_chooser_view = NULL;
+
+ gtk_tree_path_free(list->data);
+ g_list_free(list);
}
static void icon_chooser_cancel_clicked(GtkButton *button,
gtk_widget_destroy(prefs_toolbar->icon_chooser_win);
prefs_toolbar->icon_chooser_win = NULL;
- prefs_toolbar->icon_chooser_list = NULL;
+ prefs_toolbar->icon_chooser_view = NULL;
+}
+
+static gboolean icon_chooser_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ ToolbarPage *prefs_toolbar)
+{
+ if (event && event->keyval == GDK_Escape) {
+ icon_chooser_cancel_clicked(NULL, prefs_toolbar);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean icon_list_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ ToolbarPage *prefs_toolbar)
+{
+ if (event) {
+ if (event->keyval == GDK_KP_Enter ||
+ event->keyval == GDK_Return ||
+ event->keyval == GDK_space) {
+ icon_chooser_ok_clicked(NULL, prefs_toolbar);
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+static gboolean ok_cb(gpointer data)
+{
+ ToolbarPage *prefs_toolbar = (ToolbarPage *)data;
+ icon_chooser_ok_clicked(NULL, prefs_toolbar);
+ return FALSE;
+}
+
+static gboolean icon_list_button_release(GtkWidget *widget,
+ GdkEventButton *event,
+ ToolbarPage *prefs_toolbar )
+{
+ static guint id = -1;
+ if (id >= 0) {
+ g_source_remove(id);
+ id = -1;
+ }
+ id = g_timeout_add(100, ok_cb, prefs_toolbar);
+ return FALSE;
+}
+
+static gboolean icon_window_button_press(GtkWidget *widget,
+ GdkEventButton *event,
+ ToolbarPage *prefs_toolbar )
+{
+ GtkWidget *event_widget, *button;
+ gboolean restore = TRUE;
+
+ button = prefs_toolbar->icon_button;
+
+ /* Test where mouse was clicked */
+ event_widget = gtk_get_event_widget((GdkEvent *)event);
+ if (event_widget != widget) {
+ while (event_widget) {
+ if (event_widget == widget)
+ return FALSE;
+ else if (event_widget == prefs_toolbar->icon_chooser_win) {
+ restore = FALSE;
+ break;
+ }
+ event_widget = event_widget->parent;
+ }
+ }
+
+ if (restore) {
+ icon_chooser_cancel_clicked(NULL, prefs_toolbar);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static void icon_chooser_activated(GtkTreeView *treeview, GtkTreePath *path,
+ ToolbarPage *prefs_toolbar)
+{
+ icon_chooser_ok_clicked(NULL, prefs_toolbar);
}
static void icon_chooser_create(GtkButton *button, ToolbarPage *prefs_toolbar)
{
- static GtkWidget *icon_chooser_win;
- GtkWidget *label;
+ GtkWidget *icon_chooser_win;
GtkWidget *scrollwin;
- GtkWidget *vbox;
- GtkWidget *confirm_area;
- GtkWidget *ok_btn;
- GtkWidget *cancel_btn;
- GtkTreeView *list_view;
+ GtkWidget *icon_view;
GtkListStore *store;
- GtkTreeSelection *selector;
- GtkTreeViewColumn *column;
- GtkCellRenderer *renderer;
GtkTreeIter iter;
- gint i;
+ gint i, x, y;
store = gtk_list_store_new(2,
GDK_TYPE_PIXBUF,
gtk_list_store_clear(store);
- for (i = 0; i < STOCK_PIXMAP_EMPTY; i++) {
+ for (i = 0; ToolbarIcons[i] != STOCK_PIXMAP_EMPTY; i++) {
GdkPixbuf *pixbuf;
- if (i == STOCK_PIXMAP_CLAWS_MAIL_LOGO) /* that's too big */
- continue;
-
- stock_pixbuf_gdk(prefs_toolbar->window, i, &pixbuf);
+ stock_pixbuf_gdk(prefs_toolbar->window, ToolbarIcons[i], &pixbuf);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
SET_ICON, pixbuf,
- SET_FILENAME, stock_pixmap_get_name((StockPixmap) i),
+ SET_FILENAME, stock_pixmap_get_name((StockPixmap) ToolbarIcons[i]),
-1);
}
icon_chooser_win = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_toolbar");
gtk_window_set_title(GTK_WINDOW(icon_chooser_win), _("Toolbar item icon"));
- gtk_window_set_position(GTK_WINDOW(icon_chooser_win), GTK_WIN_POS_CENTER);
+ gtk_window_set_decorated(GTK_WINDOW(icon_chooser_win), FALSE);
+ gdk_window_get_origin(GTK_WIDGET(prefs_toolbar->icon_button)->window,
+ &x, &y);
+ x += GTK_WIDGET(prefs_toolbar->icon_button)->allocation.x;
+ y += GTK_WIDGET(prefs_toolbar->icon_button)->allocation.y;
+ y += 50;
+ x -= 300-50;
+ gtk_window_move(GTK_WINDOW(icon_chooser_win), x, y);
gtk_window_set_resizable(GTK_WINDOW(icon_chooser_win), FALSE);
- gtk_widget_set_size_request(icon_chooser_win, 300, 250);
-
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_widget_show(vbox);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
- gtk_container_add(GTK_CONTAINER(icon_chooser_win), vbox);
-
- label = gtk_label_new(_("Choose icon:"));
- gtk_widget_show(label);
- gtk_misc_set_alignment(GTK_MISC(label), 0, -1);
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_widget_set_size_request(icon_chooser_win, 300, 320);
scrollwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_container_add(GTK_CONTAINER(icon_chooser_win), scrollwin);
gtk_widget_show(scrollwin);
- gtk_box_pack_start(GTK_BOX(vbox), scrollwin, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
- list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
- gtk_widget_show(GTK_WIDGET(list_view));
-
- column = gtk_tree_view_column_new();
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin),
+ GTK_SHADOW_OUT);
+
+ icon_view = gtk_icon_view_new_with_model(GTK_TREE_MODEL(store));
+ gtk_icon_view_set_selection_mode(GTK_ICON_VIEW(icon_view), GTK_SELECTION_SINGLE);
+ gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(icon_view), SET_ICON);
+ gtk_container_add(GTK_CONTAINER(scrollwin), GTK_WIDGET(icon_view));
+
+ g_signal_connect(G_OBJECT(icon_chooser_win), "key_press_event",
+ G_CALLBACK(icon_chooser_key_pressed), prefs_toolbar);
+ g_signal_connect(G_OBJECT(icon_view), "item-activated",
+ G_CALLBACK(icon_chooser_activated), prefs_toolbar);
+ g_signal_connect(G_OBJECT(icon_chooser_win),
+ "button-press-event",
+ G_CALLBACK(icon_window_button_press),
+ prefs_toolbar );
+ g_signal_connect(G_OBJECT(icon_view),
+ "button-release-event",
+ G_CALLBACK(icon_list_button_release),
+ prefs_toolbar );
+ g_signal_connect(G_OBJECT(icon_view), "key_press_event",
+ G_CALLBACK(icon_list_key_pressed), prefs_toolbar);
- renderer = gtk_cell_renderer_pixbuf_new();
- gtk_tree_view_column_pack_start(column, renderer, FALSE);
- gtk_tree_view_column_set_attributes(column, renderer,
- "pixbuf", SET_ICON,
- NULL);
-
- gtk_tree_view_append_column(list_view, column);
-
- column = gtk_tree_view_column_new();
- renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_column_pack_start(column, renderer, TRUE);
- gtk_tree_view_column_set_attributes(column, renderer,
- "text", SET_FILENAME,
- NULL);
-
- gtk_tree_view_append_column(list_view, column);
-
- gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
- gtk_tree_view_set_headers_visible(list_view, FALSE);
-
- selector = gtk_tree_view_get_selection(list_view);
- gtk_tree_selection_set_mode(selector, GTK_SELECTION_SINGLE);
-
- gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
- gtk_tree_selection_select_iter(gtk_tree_view_get_selection
- (list_view), &iter);
- gtk_container_add(GTK_CONTAINER(scrollwin), GTK_WIDGET(list_view));
-
- gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
- &ok_btn, GTK_STOCK_OK, NULL, NULL);
-
- gtk_box_pack_start(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
- gtk_widget_show(confirm_area);
- gtk_widget_grab_default(ok_btn);
-
- g_signal_connect(G_OBJECT(ok_btn), "clicked",
- G_CALLBACK(icon_chooser_ok_clicked), prefs_toolbar);
- g_signal_connect(G_OBJECT(cancel_btn), "clicked",
- G_CALLBACK(icon_chooser_cancel_clicked), prefs_toolbar);
-
gtk_widget_show_all(icon_chooser_win);
+ gtk_widget_grab_focus(GTK_WIDGET(icon_view));
gtk_window_set_modal(GTK_WINDOW(icon_chooser_win), TRUE);
prefs_toolbar->icon_chooser_win = icon_chooser_win;
- prefs_toolbar->icon_chooser_list = GTK_WIDGET(list_view);
+ prefs_toolbar->icon_chooser_view = icon_view;
}
projects / claws.git / blobdiff