#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
+#include "gtk/gtksctree.h"
#include <stdlib.h>
#include <stdarg.h>
#include <sys/stat.h>
+#include "combobox.h"
+
#if HAVE_LIBCOMPFACE
# include <compface.h>
#endif
#include "manage_window.h"
#include "base64.h"
#include "manual.h"
+#include "combobox.h"
gboolean gtkut_get_font_size(GtkWidget *widget,
gint *width, gint *height)
g_return_if_fail(widget != NULL);
g_return_if_fail(widget->style != NULL);
- font_desc = pango_font_description_from_string(NORMAL_FONT);
- size = pango_font_description_get_size(font_desc);
- pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
- gtk_widget_modify_font(widget, font_desc);
- pango_font_description_free(font_desc);
+ if (prefs_common.derive_from_normal_font || !SMALL_FONT) {
+ font_desc = pango_font_description_from_string(NORMAL_FONT);
+ size = pango_font_description_get_size(font_desc);
+ pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+ gtk_widget_modify_font(widget, font_desc);
+ pango_font_description_free(font_desc);
+ } else {
+ font_desc = pango_font_description_from_string(SMALL_FONT);
+ gtk_widget_modify_font(widget, font_desc);
+ pango_font_description_free(font_desc);
+ }
}
void gtkut_convert_int_to_gdk_color(gint rgbvalue, GdkColor *color)
color->blue = (int) (((gdouble) (rgbvalue & 0x0000ff) / 255.0) * 65535.0);
}
+#define CL(x) (((gulong) (x) >> (gulong) 8) & 0xFFUL)
+#define RGB_FROM_GDK_COLOR(c) \
+ ((CL(c->red) << (gulong) 16) | \
+ (CL(c->green) << (gulong) 8) | \
+ (CL(c->blue)))
+
+gint gtkut_convert_gdk_color_to_int(GdkColor *color)
+{
+ return RGB_FROM_GDK_COLOR(color);
+}
+
void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
{
g_return_if_fail(bbox != NULL);
if (button2) {
*button2 = gtk_button_new_with_mnemonic(text2);
- gtk_button_set_image(GTK_BUTTON(*button2),
- gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
+ gtk_button_set_image(GTK_BUTTON(*button2),
+ gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
+ GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
gtk_widget_show(*button2);
}
if (button3) {
*button3 = gtk_button_new_with_mnemonic(text3);
- gtk_button_set_image(GTK_BUTTON(*button3),
- gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
+ gtk_button_set_image(GTK_BUTTON(*button3),
+ gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
+ GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
gtk_widget_show(*button3);
}
}
-static void combo_button_size_request(GtkWidget *widget,
- GtkRequisition *requisition,
- gpointer data)
-{
- ComboButton *combo = (ComboButton *)data;
-
- if (combo->arrow->allocation.height != requisition->height)
- gtk_widget_set_size_request(combo->arrow,
- -1, requisition->height);
-}
-
-static void combo_button_enter(GtkWidget *widget, gpointer data)
-{
- ComboButton *combo = (ComboButton *)data;
-
- if (GTK_WIDGET_STATE(combo->arrow) != GTK_STATE_PRELIGHT) {
- gtk_widget_set_state(combo->arrow, GTK_STATE_PRELIGHT);
- gtk_widget_queue_draw(combo->arrow);
- }
- if (GTK_WIDGET_STATE(combo->button) != GTK_STATE_PRELIGHT) {
- gtk_widget_set_state(combo->button, GTK_STATE_PRELIGHT);
- gtk_widget_queue_draw(combo->button);
- }
-}
-
-static void combo_button_leave(GtkWidget *widget, gpointer data)
-{
- ComboButton *combo = (ComboButton *)data;
-
- if (GTK_WIDGET_STATE(combo->arrow) != GTK_STATE_NORMAL) {
- gtk_widget_set_state(combo->arrow, GTK_STATE_NORMAL);
- gtk_widget_queue_draw(combo->arrow);
- }
- if (GTK_WIDGET_STATE(combo->button) != GTK_STATE_NORMAL) {
- gtk_widget_set_state(combo->button, GTK_STATE_NORMAL);
- gtk_widget_queue_draw(combo->button);
- }
-}
-
-static gint combo_button_arrow_pressed(GtkWidget *widget, GdkEventButton *event,
- gpointer data)
-{
- ComboButton *combo = (ComboButton *)data;
-
- if (!event) return FALSE;
-
- gtk_menu_popup(GTK_MENU(combo->menu), NULL, NULL,
- menu_button_position, combo->button,
- event->button, event->time);
-
- return FALSE;
-}
-
-static void combo_button_destroy(GtkWidget *widget, gpointer data)
-{
- ComboButton *combo = (ComboButton *)data;
-
- gtk_object_destroy(GTK_OBJECT(combo->factory));
- g_free(combo);
-}
-
-ComboButton *gtkut_combo_button_create(GtkWidget *button,
- GtkItemFactoryEntry *entries,
- gint n_entries, const gchar *path,
- gpointer data)
-{
- ComboButton *combo;
- GtkWidget *arrow;
-
- combo = g_new0(ComboButton, 1);
-
- combo->arrow = gtk_button_new();
- arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_widget_set_size_request(arrow, 7, -1);
- gtk_container_add(GTK_CONTAINER(combo->arrow), arrow);
- GTK_WIDGET_UNSET_FLAGS(combo->arrow, GTK_CAN_FOCUS);
- gtk_widget_show_all(combo->arrow);
-
- combo->button = button;
- combo->menu = menu_create_items(entries, n_entries, path,
- &combo->factory, data);
- combo->data = data;
-
- g_signal_connect(G_OBJECT(combo->button), "size_request",
- G_CALLBACK(combo_button_size_request), combo);
- g_signal_connect(G_OBJECT(combo->button), "enter",
- G_CALLBACK(combo_button_enter), combo);
- g_signal_connect(G_OBJECT(combo->button), "leave",
- G_CALLBACK(combo_button_leave), combo);
- g_signal_connect(G_OBJECT(combo->arrow), "enter",
- G_CALLBACK(combo_button_enter), combo);
- g_signal_connect(G_OBJECT(combo->arrow), "leave",
- G_CALLBACK(combo_button_leave), combo);
- g_signal_connect(G_OBJECT(combo->arrow), "button_press_event",
- G_CALLBACK(combo_button_arrow_pressed), combo);
- g_signal_connect(G_OBJECT(combo->arrow), "destroy",
- G_CALLBACK(combo_button_destroy), combo);
-
- return combo;
-}
-
#define CELL_SPACING 1
#define ROW_TOP_YPIXEL(clist, row) (((clist)->row_height * (row)) + \
(((row) + 1) * CELL_SPACING) + \
#define ROW_FROM_YPIXEL(clist, y) (((y) - (clist)->voffset) / \
((clist)->row_height + CELL_SPACING))
-void gtkut_ctree_node_move_if_on_the_edge(GtkCTree *ctree, GtkCTreeNode *node, gint _row)
+void gtkut_ctree_node_move_if_on_the_edge(GtkCMCTree *ctree, GtkCMCTreeNode *node, gint _row)
{
- GtkCList *clist = GTK_CLIST(ctree);
+ GtkCMCList *clist = GTK_CMCLIST(ctree);
gint row;
GtkVisibility row_visibility, prev_row_visibility, next_row_visibility;
row = (_row != -1 ? _row : g_list_position(clist->row_list, (GList *)node));
if (row < 0 || row >= clist->rows || clist->row_height == 0) return;
- row_visibility = gtk_clist_row_is_visible(clist, row);
- prev_row_visibility = gtk_clist_row_is_visible(clist, row - 1);
- next_row_visibility = gtk_clist_row_is_visible(clist, row + 1);
+ row_visibility = gtk_cmclist_row_is_visible(clist, row);
+ prev_row_visibility = gtk_cmclist_row_is_visible(clist, row - 1);
+ next_row_visibility = gtk_cmclist_row_is_visible(clist, row + 1);
if (row_visibility == GTK_VISIBILITY_NONE) {
- gtk_clist_moveto(clist, row, -1, 0.5, 0);
+ gtk_cmclist_moveto(clist, row, -1, 0.5, 0);
return;
}
if (row_visibility == GTK_VISIBILITY_FULL &&
return;
if (prev_row_visibility != GTK_VISIBILITY_FULL) {
- gtk_clist_moveto(clist, row, -1, 0.2, 0);
+ gtk_cmclist_moveto(clist, row, -1, 0.2, 0);
return;
}
if (next_row_visibility != GTK_VISIBILITY_FULL) {
- gtk_clist_moveto(clist, row, -1, 0.8, 0);
+ gtk_cmclist_moveto(clist, row, -1, 0.8, 0);
return;
}
}
#undef ROW_TOP_YPIXEL
#undef ROW_FROM_YPIXEL
-gint gtkut_ctree_get_nth_from_node(GtkCTree *ctree, GtkCTreeNode *node)
+gint gtkut_ctree_get_nth_from_node(GtkCMCTree *ctree, GtkCMCTreeNode *node)
{
g_return_val_if_fail(ctree != NULL, -1);
g_return_val_if_fail(node != NULL, -1);
- return g_list_position(GTK_CLIST(ctree)->row_list, (GList *)node);
+ return g_list_position(GTK_CMCLIST(ctree)->row_list, (GList *)node);
}
/* get the next node, including the invisible one */
-GtkCTreeNode *gtkut_ctree_node_next(GtkCTree *ctree, GtkCTreeNode *node)
+GtkCMCTreeNode *gtkut_ctree_node_next(GtkCMCTree *ctree, GtkCMCTreeNode *node)
{
- GtkCTreeNode *parent;
+ GtkCMCTreeNode *parent;
if (!node) return NULL;
- if (GTK_CTREE_ROW(node)->children)
- return GTK_CTREE_ROW(node)->children;
+ if (GTK_CMCTREE_ROW(node)->children)
+ return GTK_CMCTREE_ROW(node)->children;
- if (GTK_CTREE_ROW(node)->sibling)
- return GTK_CTREE_ROW(node)->sibling;
+ if (GTK_CMCTREE_ROW(node)->sibling)
+ return GTK_CMCTREE_ROW(node)->sibling;
- for (parent = GTK_CTREE_ROW(node)->parent; parent != NULL;
- parent = GTK_CTREE_ROW(parent)->parent) {
- if (GTK_CTREE_ROW(parent)->sibling)
- return GTK_CTREE_ROW(parent)->sibling;
+ for (parent = GTK_CMCTREE_ROW(node)->parent; parent != NULL;
+ parent = GTK_CMCTREE_ROW(parent)->parent) {
+ if (GTK_CMCTREE_ROW(parent)->sibling)
+ return GTK_CMCTREE_ROW(parent)->sibling;
}
return NULL;
}
/* get the previous node, including the invisible one */
-GtkCTreeNode *gtkut_ctree_node_prev(GtkCTree *ctree, GtkCTreeNode *node)
+GtkCMCTreeNode *gtkut_ctree_node_prev(GtkCMCTree *ctree, GtkCMCTreeNode *node)
{
- GtkCTreeNode *prev;
- GtkCTreeNode *child;
+ GtkCMCTreeNode *prev;
+ GtkCMCTreeNode *child;
if (!node) return NULL;
- prev = GTK_CTREE_NODE_PREV(node);
- if (prev == GTK_CTREE_ROW(node)->parent)
+ prev = GTK_CMCTREE_NODE_PREV(node);
+ if (prev == GTK_CMCTREE_ROW(node)->parent)
return prev;
child = prev;
- while (GTK_CTREE_ROW(child)->children != NULL) {
- child = GTK_CTREE_ROW(child)->children;
- while (GTK_CTREE_ROW(child)->sibling != NULL)
- child = GTK_CTREE_ROW(child)->sibling;
+ while (GTK_CMCTREE_ROW(child)->children != NULL) {
+ child = GTK_CMCTREE_ROW(child)->children;
+ while (GTK_CMCTREE_ROW(child)->sibling != NULL)
+ child = GTK_CMCTREE_ROW(child)->sibling;
}
return child;
}
-gboolean gtkut_ctree_node_is_selected(GtkCTree *ctree, GtkCTreeNode *node)
+gboolean gtkut_ctree_node_is_selected(GtkCMCTree *ctree, GtkCMCTreeNode *node)
{
- GtkCList *clist = GTK_CLIST(ctree);
+ GtkCMCList *clist = GTK_CMCLIST(ctree);
GList *cur;
for (cur = clist->selection; cur != NULL; cur = cur->next) {
- if (node == GTK_CTREE_NODE(cur->data))
+ if (node == GTK_CMCTREE_NODE(cur->data))
return TRUE;
}
return FALSE;
}
-GtkCTreeNode *gtkut_ctree_find_collapsed_parent(GtkCTree *ctree,
- GtkCTreeNode *node)
+GtkCMCTreeNode *gtkut_ctree_find_collapsed_parent(GtkCMCTree *ctree,
+ GtkCMCTreeNode *node)
{
if (!node) return NULL;
- while ((node = GTK_CTREE_ROW(node)->parent) != NULL) {
- if (!GTK_CTREE_ROW(node)->expanded)
+ while ((node = GTK_CMCTREE_ROW(node)->parent) != NULL) {
+ if (!GTK_CMCTREE_ROW(node)->expanded)
return node;
}
return NULL;
}
-void gtkut_ctree_expand_parent_all(GtkCTree *ctree, GtkCTreeNode *node)
+void gtkut_ctree_expand_parent_all(GtkCMCTree *ctree, GtkCMCTreeNode *node)
{
while ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
- gtk_ctree_expand(ctree, node);
+ gtk_cmctree_expand(ctree, node);
}
-gboolean gtkut_ctree_node_is_parent(GtkCTreeNode *parent, GtkCTreeNode *node)
+gboolean gtkut_ctree_node_is_parent(GtkCMCTreeNode *parent, GtkCMCTreeNode *node)
{
- GtkCTreeNode *tmp;
+ GtkCMCTreeNode *tmp;
g_return_val_if_fail(node != NULL, FALSE);
g_return_val_if_fail(parent != NULL, FALSE);
tmp = node;
while (tmp) {
- if(GTK_CTREE_ROW(tmp)->parent && GTK_CTREE_ROW(tmp)->parent == parent)
+ if(GTK_CMCTREE_ROW(tmp)->parent && GTK_CMCTREE_ROW(tmp)->parent == parent)
return TRUE;
- tmp = GTK_CTREE_ROW(tmp)->parent;
+ tmp = GTK_CMCTREE_ROW(tmp)->parent;
}
return FALSE;
}
-void gtkut_ctree_set_focus_row(GtkCTree *ctree, GtkCTreeNode *node)
+void gtkut_ctree_set_focus_row(GtkCMCTree *ctree, GtkCMCTreeNode *node)
{
if (node == NULL)
return;
- gtkut_clist_set_focus_row(GTK_CLIST(ctree),
+ gtkut_clist_set_focus_row(GTK_CMCLIST(ctree),
gtkut_ctree_get_nth_from_node(ctree, node));
}
-void gtkut_clist_set_focus_row(GtkCList *clist, gint row)
+void gtkut_clist_set_focus_row(GtkCMCList *clist, gint row)
{
clist->focus_row = row;
GTKUT_CTREE_REFRESH(clist);
}
-void gtkut_combo_set_items(GtkCombo *combo, const gchar *str1, ...)
-{
- va_list args;
- gchar *s;
- GList *combo_items = NULL;
-
- g_return_if_fail(str1 != NULL);
-
- combo_items = g_list_append(combo_items, (gpointer)str1);
- va_start(args, str1);
- s = va_arg(args, gchar*);
- while (s) {
- combo_items = g_list_append(combo_items, (gpointer)s);
- s = va_arg(args, gchar*);
- }
- va_end(args);
-
- gtk_combo_set_popdown_strings(combo, combo_items);
-
- g_list_free(combo_items);
-}
-
-gchar *gtkut_editable_get_selection(GtkEditable *editable)
-{
- guint start_pos, end_pos;
- gboolean found;
-
- g_return_val_if_fail(GTK_IS_EDITABLE(editable), NULL);
-
- found = gtk_editable_get_selection_bounds(editable,
- &start_pos, &end_pos);
- if (found)
- return gtk_editable_get_chars(editable, start_pos, end_pos);
- else
- return NULL;
-}
-
-void gtkut_editable_disable_im(GtkEditable *editable)
-{
- g_return_if_fail(editable != NULL);
-
-#if USE_XIM
- if (editable->ic) {
- gdk_ic_destroy(editable->ic);
- editable->ic = NULL;
- }
- if (editable->ic_attr) {
- gdk_ic_attr_destroy(editable->ic_attr);
- editable->ic_attr = NULL;
- }
-#endif
-}
-
void gtkut_container_remove(GtkContainer *container, GtkWidget *widget)
{
gtk_container_remove(container, widget);
}
-gboolean gtkut_text_buffer_match_string(GtkTextBuffer *textbuf,
+static gboolean gtkut_text_buffer_match_string(GtkTextBuffer *textbuf,
const GtkTextIter *iter,
gunichar *wcs, gint len,
gboolean case_sens)
return FALSE;
}
-gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter *iter,
+static gboolean gtkut_text_buffer_find(GtkTextBuffer *buffer, const GtkTextIter *iter,
const gchar *str, gboolean case_sens,
GtkTextIter *match_pos)
{
return found;
}
-gboolean gtkut_text_buffer_find_backward(GtkTextBuffer *buffer,
+static gboolean gtkut_text_buffer_find_backward(GtkTextBuffer *buffer,
const GtkTextIter *iter,
const gchar *str, gboolean case_sens,
GtkTextIter *match_pos)
gtk_text_iter_forward_chars(&end, len);
/* place "insert" at the last character */
gtk_text_buffer_select_range(buffer, &end, &match_pos);
- gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
+ gtk_text_view_scroll_to_mark(text, mark, 0.0, TRUE, 0.0, 0.5);
return TRUE;
}
gtk_text_iter_forward_chars(&end, len);
gtk_text_buffer_select_range(buffer, &match_pos, &end);
- gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
+ gtk_text_view_scroll_to_mark(text, mark, 0.0, TRUE, 0.0, 0.5);
return TRUE;
}
GtkBindingSet *binding_set;
binding_set = gtk_binding_set_by_class
- (GTK_CLIST_GET_CLASS(clist));
+ (GTK_CMCLIST_GET_CLASS(clist));
gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
"scroll_vertical", 2,
{
GtkWidget *clist;
- clist = gtk_clist_new(1);
- gtk_object_ref(GTK_OBJECT(clist));
- gtk_object_sink(GTK_OBJECT(clist));
+ clist = gtk_cmclist_new(1);
+ g_object_ref(G_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+ g_object_ref_sink (G_OBJECT(clist));
+#else
+ gtk_object_ref (G_OBJECT(clist));
+ gtk_object_sink (G_OBJECT(clist));
+#endif
gtkut_clist_bindings_add(clist);
- gtk_object_unref(GTK_OBJECT(clist));
+ g_object_unref(G_OBJECT(clist));
- clist = gtk_ctree_new(1, 0);
- gtk_object_ref(GTK_OBJECT(clist));
- gtk_object_sink(GTK_OBJECT(clist));
+ clist = gtk_cmctree_new(1, 0);
+ g_object_ref(G_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+ g_object_ref_sink (G_OBJECT(clist));
+#else
+ gtk_object_ref (G_OBJECT(clist));
+ gtk_object_sink (G_OBJECT(clist));
+#endif
gtkut_clist_bindings_add(clist);
- gtk_object_unref(GTK_OBJECT(clist));
+ g_object_unref(G_OBJECT(clist));
clist = gtk_sctree_new_with_titles(1, 0, NULL);
- gtk_object_ref(GTK_OBJECT(clist));
- gtk_object_sink(GTK_OBJECT(clist));
+ g_object_ref(G_OBJECT(clist));
+#if GLIB_CHECK_VERSION(2,10,0)
+ g_object_ref_sink (G_OBJECT(clist));
+#else
+ gtk_object_ref (G_OBJECT(clist));
+ gtk_object_sink (G_OBJECT(clist));
+#endif
gtkut_clist_bindings_add(clist);
- gtk_object_unref(GTK_OBJECT(clist));
+ g_object_unref(G_OBJECT(clist));
}
void gtkut_widget_set_app_icon(GtkWidget *widget)
{
-#include "pixmaps/claws-mail.xpm"
- static GdkPixmap *sylpheedclawsxpm;
- static GdkBitmap *sylpheedclawsxpmmask;
+ static GdkPixbuf *icon = NULL;
g_return_if_fail(widget != NULL);
g_return_if_fail(widget->window != NULL);
- if (!sylpheedclawsxpm) {
- PIXMAP_CREATE(widget, sylpheedclawsxpm, sylpheedclawsxpmmask,
- claws_mail_xpm);
+ if (!icon) {
+ stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
}
- gdk_window_set_icon(widget->window, NULL, sylpheedclawsxpm, sylpheedclawsxpmmask);
+ if (icon)
+ gtk_window_set_icon(GTK_WINDOW(widget), icon);
}
void gtkut_widget_set_composer_icon(GtkWidget *widget)
{
- static GdkPixmap *xpm;
- static GdkBitmap *bmp;
-
+ static GdkPixbuf *icon = NULL;
+
g_return_if_fail(widget != NULL);
g_return_if_fail(widget->window != NULL);
- if (!xpm) {
- stock_pixmap_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &xpm, &bmp);
- }
- gdk_window_set_icon(widget->window, NULL, xpm, bmp);
+ if (!icon) {
+ stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
+ }
+ if (icon)
+ gtk_window_set_icon(GTK_WINDOW(widget), icon);
}
static gboolean move_bar = FALSE;
}
GtkWidget *gtkut_account_menu_new(GList *ac_list,
- GCallback callback,
- gpointer data)
+ GCallback callback,
+ gpointer data)
{
GList *cur_ac;
- GtkWidget *menu;
+ GtkWidget *optmenu;
+ GtkListStore *menu;
+ GtkTreeIter iter;
+ PrefsAccount *account;
+ gchar *name;
g_return_val_if_fail(ac_list != NULL, NULL);
- menu = gtk_menu_new();
+ optmenu = gtkut_sc_combobox_create(NULL, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
for (cur_ac = ac_list; cur_ac != NULL; cur_ac = cur_ac->next) {
- gchar *name;
- GtkWidget *menuitem;
- PrefsAccount *account;
-
account = (PrefsAccount *) cur_ac->data;
if (account->name)
name = g_strdup_printf("%s: %s <%s>",
name = g_strdup_printf("%s: %s",
account->account_name,
account->address);
- MENUITEM_ADD(menu, menuitem, name, account->account_id);
+ COMBOBOX_ADD_ESCAPED(menu, name, account->account_id);
g_free(name);
- if (callback != NULL)
- g_signal_connect(G_OBJECT(menuitem), "activate",
- callback, data);
}
- return menu;
+ gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), 0);
+
+ if( callback != NULL )
+ g_signal_connect(G_OBJECT(optmenu), "changed", callback, data);
+
+ return optmenu;
}
void gtkut_set_widget_bgcolor_rgb(GtkWidget *widget, guint rgbvalue)
pixmap = gdk_pixmap_create_from_xpm_d
(window, &mask,
background, xpm_xface);
- return gtk_image_new_from_pixmap(pixmap, mask);
+ return gtk_image_new_from_pixbuf(
+ gdk_pixbuf_new_from_xpm_data((const char **)xpm_xface));
}
#endif
gchar *url = (gchar *)data;
gtk_button_set_relief(button, GTK_RELIEF_NONE);
gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
- open_uri(url, prefs_common.uri_cmd);
+ open_uri(url, prefs_common_get_uri_cmd());
}
static void link_btn_unrealize(GtkButton *button, gpointer data)
btn = gtk_button_new_with_label(label?label:url);
gtk_button_set_relief(GTK_BUTTON(btn), GTK_RELIEF_NONE);
- btn_label = GTK_BIN(btn)->child;
+ btn_label = gtk_bin_get_child(GTK_BIN((btn)));
cmap = gdk_drawable_get_colormap(window->window);
gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
if (success[0] == TRUE && success[1] == TRUE) {
return btn;
}
+static gboolean _combobox_separator_func(GtkTreeModel *model,
+ GtkTreeIter *iter, gpointer data)
+{
+ gchar *txt = NULL;
+
+ g_return_val_if_fail(model != NULL, FALSE);
+
+ gtk_tree_model_get(model, iter, COMBOBOX_TEXT, &txt, -1);
+
+ if( txt == NULL )
+ return TRUE;
+ return FALSE;
+}
+
GtkWidget *gtkut_sc_combobox_create(GtkWidget *eventbox, gboolean focus_on_click)
{
GtkWidget *combobox;
GtkListStore *menu;
GtkCellRenderer *rend;
- menu = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
+ menu = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
combobox = gtk_combo_box_new_with_model(GTK_TREE_MODEL(menu));
rend = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), rend, TRUE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox), rend,
- "markup", 0,
+ "markup", COMBOBOX_TEXT,
+ "sensitive", COMBOBOX_SENS,
NULL);
if( eventbox != NULL )
#if GTK_CHECK_VERSION(2,6,0)
gtk_combo_box_set_focus_on_click(GTK_COMBO_BOX(combobox), focus_on_click);
#endif
+
+ gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combobox),
+ (GtkTreeViewRowSeparatorFunc)_combobox_separator_func, NULL, NULL);
+
return combobox;
}
return gtk_tree_model_iter_nth_child(model, iter, NULL, count - 1);
}
-#ifdef MAEMO
-HildonWindow *gtkut_window_new (GtkWindowType type,
- const gchar *class)
-{
- HildonWindow *window = HILDON_WINDOW(hildon_window_new());
- gtk_window_set_role(GTK_WINDOW(window), class);
- hildon_program_add_window(hildon_program(), window);
- return window;
-}
-#else
GtkWidget *gtkut_window_new (GtkWindowType type,
const gchar *class)
{
+#ifndef MAEMO
GtkWidget *window = gtk_window_new(type);
+#else
+ GtkWidget *window = hildon_window_new();
+ hildon_program_add_window(hildon_program, HILDON_WINDOW(window));
+#endif
gtk_window_set_role(GTK_WINDOW(window), class);
return window;
}
-#endif
-gboolean gtkut_tree_iter_comp(GtkTreeModel *model,
+static gboolean gtkut_tree_iter_comp(GtkTreeModel *model,
GtkTreeIter *iter1,
GtkTreeIter *iter2)
{
return TRUE;
}
+static GtkUIManager *gui_manager = NULL;
+
+GtkUIManager *gtkut_create_ui_manager(void)
+{
+ g_return_val_if_fail(gui_manager == NULL, gui_manager);
+ return (gui_manager = gtk_ui_manager_new());
+}
+
+GtkUIManager *gtkut_ui_manager(void)
+{
+ return gui_manager;
+}
+
+#define READ_CONDITION (G_IO_IN | G_IO_HUP | G_IO_ERR)
+#define WRITE_CONDITION (G_IO_OUT | G_IO_ERR)
+#define EXCEPTION_CONDITION (G_IO_PRI)
+typedef struct _ClawsIOClosure ClawsIOClosure;
+
+struct _ClawsIOClosure
+{
+ GdkInputFunction function;
+ GdkInputCondition condition;
+ GDestroyNotify notify;
+ gpointer data;
+};
+
+static gboolean
+claws_io_invoke (GIOChannel *source,
+ GIOCondition condition,
+ gpointer data)
+{
+ ClawsIOClosure *closure = data;
+ GdkInputCondition gdk_cond = 0;
+
+ if (condition & READ_CONDITION)
+ gdk_cond |= GDK_INPUT_READ;
+ if (condition & WRITE_CONDITION)
+ gdk_cond |= GDK_INPUT_WRITE;
+ if (condition & EXCEPTION_CONDITION)
+ gdk_cond |= GDK_INPUT_EXCEPTION;
+
+ if (closure->condition & gdk_cond)
+ closure->function (closure->data, g_io_channel_unix_get_fd (source), gdk_cond);
+
+ return TRUE;
+}
+
+static void
+claws_io_destroy (gpointer data)
+{
+ ClawsIOClosure *closure = data;
+
+ if (closure->notify)
+ closure->notify (closure->data);
+
+ g_free (closure);
+}
+
+gint
+claws_input_add (gint source,
+ GdkInputCondition condition,
+ GdkInputFunction function,
+ gpointer data,
+ gboolean is_sock)
+{
+ guint result;
+ ClawsIOClosure *closure = g_new (ClawsIOClosure, 1);
+ GIOChannel *channel;
+ GIOCondition cond = 0;
+
+ closure->function = function;
+ closure->condition = condition;
+ closure->notify = NULL;
+ closure->data = data;
+
+ if (condition & GDK_INPUT_READ)
+ cond |= READ_CONDITION;
+ if (condition & GDK_INPUT_WRITE)
+ cond |= WRITE_CONDITION;
+ if (condition & GDK_INPUT_EXCEPTION)
+ cond |= EXCEPTION_CONDITION;
+
+#ifndef G_OS_WIN32
+ channel = g_io_channel_unix_new (source);
+#else
+ if (is_sock)
+ channel = g_io_channel_win32_new_socket(source);
+ else
+ channel = g_io_channel_win32_new_fd(source);
+#endif
+ result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond,
+ claws_io_invoke,
+ closure, claws_io_destroy);
+ g_io_channel_unref (channel);
+
+ return result;
+}