#include <stdarg.h>
#include <sys/stat.h>
+#include "combobox.h"
+
#if HAVE_LIBCOMPFACE
# include <compface.h>
#endif
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(*button1, GTK_CAN_DEFAULT);
+ 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) + \
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)
}
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
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;
#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)
{
projects / claws.git / blobdiff