Mercurial > geeqie

comparison src/ui_utildlg.c @ 1451:0e67a5992d51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gint -> gboolean where applicable.
author zas_
date Mon, 16 Mar 2009 18:19:11 +0000
parents a3d3208b0c50
children 956aab097ea7
comparison
equal deleted inserted replaced
1450:ba0cd2792260 1451:0e67a5992d51
47 47
48 static void generic_dialog_click_cb(GtkWidget *widget, gpointer data) 48 static void generic_dialog_click_cb(GtkWidget *widget, gpointer data)
49 { 49 {
50 GenericDialog *gd = data; 50 GenericDialog *gd = data;
51 void (*func)(GenericDialog *, gpointer); 51 void (*func)(GenericDialog *, gpointer);
52 gint auto_close; 52 gboolean auto_close;
53 53
54 func = g_object_get_data(G_OBJECT(widget), "dialog_function"); 54 func = g_object_get_data(G_OBJECT(widget), "dialog_function");
55 auto_close = gd->auto_close; 55 auto_close = gd->auto_close;
56 56
57 if (func) func(gd, gd->data); 57 if (func) func(gd, gd->data);
58 if (auto_close) generic_dialog_close(gd); 58 if (auto_close) generic_dialog_close(gd);
59 } 59 }
60 60
61 static gint generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) 61 static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
62 { 62 {
63 GenericDialog *gd = data; 63 GenericDialog *gd = data;
64 64
65 if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget) 65 if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget)
66 && gd->default_cb) 66 && gd->default_cb)
67 { 67 {
68 gint auto_close; 68 gboolean auto_close;
69 69
70 auto_close = gd->auto_close; 70 auto_close = gd->auto_close;
71 gd->default_cb(gd, gd->data); 71 gd->default_cb(gd, gd->data);
72 if (auto_close) generic_dialog_close(gd); 72 if (auto_close) generic_dialog_close(gd);
73 73
81 if (!gd || !widget) return; 81 if (!gd || !widget) return;
82 g_signal_connect(G_OBJECT(widget), "key_press_event", 82 g_signal_connect(G_OBJECT(widget), "key_press_event",
83 G_CALLBACK(generic_dialog_default_key_press_cb), gd); 83 G_CALLBACK(generic_dialog_default_key_press_cb), gd);
84 } 84 }
85 85
86 static gint generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) 86 static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
87 { 87 {
88 GenericDialog *gd = data; 88 GenericDialog *gd = data;
89 89
90 if (event->keyval == GDK_Escape) 90 if (event->keyval == GDK_Escape)
91 { 91 {
94 return TRUE; 94 return TRUE;
95 } 95 }
96 return FALSE; 96 return FALSE;
97 } 97 }
98 98
99 static gint generic_dialog_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data) 99 static gboolean generic_dialog_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
100 { 100 {
101 GenericDialog *gd = data; 101 GenericDialog *gd = data;
102 gint auto_close; 102 gboolean auto_close;
103 103
104 auto_close = gd->auto_close; 104 auto_close = gd->auto_close;
105 105
106 if (gd->cancel_cb) gd->cancel_cb(gd, gd->data); 106 if (gd->cancel_cb) gd->cancel_cb(gd, gd->data);
107 if (auto_close) generic_dialog_close(gd); 107 if (auto_close) generic_dialog_close(gd);
119 119
120 g_signal_handlers_disconnect_by_func(G_OBJECT(widget), 120 g_signal_handlers_disconnect_by_func(G_OBJECT(widget),
121 G_CALLBACK(generic_dialog_show_cb), gd); 121 G_CALLBACK(generic_dialog_show_cb), gd);
122 } 122 }
123 123
124 gint generic_dialog_get_alternative_button_order(GtkWidget *widget) 124 gboolean generic_dialog_get_alternative_button_order(GtkWidget *widget)
125 { 125 {
126 GtkSettings *settings; 126 GtkSettings *settings;
127 GObjectClass *klass; 127 GObjectClass *klass;
128 gboolean alternative_order = FALSE; 128 gboolean alternative_order = FALSE;
129 129
136 136
137 return alternative_order; 137 return alternative_order;
138 } 138 }
139 139
140 GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *stock_id, const gchar *text, 140 GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *stock_id, const gchar *text,
141 void (*func_cb)(GenericDialog *, gpointer), gint is_default) 141 void (*func_cb)(GenericDialog *, gpointer), gboolean is_default)
142 { 142 {
143 GtkWidget *button; 143 GtkWidget *button;
144 gint alternative_order; 144 gboolean alternative_order;
145 145
146 button = pref_button_new(NULL, stock_id, text, FALSE, 146 button = pref_button_new(NULL, stock_id, text, FALSE,
147 G_CALLBACK(generic_dialog_click_cb), gd); 147 G_CALLBACK(generic_dialog_click_cb), gd);
148 148
149 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); 149 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
207 } 207 }
208 208
209 static void generic_dialog_setup(GenericDialog *gd, 209 static void generic_dialog_setup(GenericDialog *gd,
210 const gchar *title, 210 const gchar *title,
211 const gchar *role, 211 const gchar *role,
212 GtkWidget *parent, gint auto_close, 212 GtkWidget *parent, gboolean auto_close,
213 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data) 213 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
214 { 214 {
215 GtkWidget *vbox; 215 GtkWidget *vbox;
216 216
217 gd->auto_close = auto_close; 217 gd->auto_close = auto_close;
280 gd->default_cb = NULL; 280 gd->default_cb = NULL;
281 } 281 }
282 282
283 GenericDialog *generic_dialog_new(const gchar *title, 283 GenericDialog *generic_dialog_new(const gchar *title,
284 const gchar *role, 284 const gchar *role,
285 GtkWidget *parent, gint auto_close, 285 GtkWidget *parent, gboolean auto_close,
286 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data) 286 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
287 { 287 {
288 GenericDialog *gd; 288 GenericDialog *gd;
289 289
290 gd = g_new0(GenericDialog, 1); 290 gd = g_new0(GenericDialog, 1);
348 348
349 return fdlg; 349 return fdlg;
350 } 350 }
351 351
352 GtkWidget *file_dialog_add_button(FileDialog *fdlg, const gchar *stock_id, const gchar *text, 352 GtkWidget *file_dialog_add_button(FileDialog *fdlg, const gchar *stock_id, const gchar *text,
353 void (*func_cb)(FileDialog *, gpointer), gint is_default) 353 void (*func_cb)(FileDialog *, gpointer), gboolean is_default)
354 { 354 {
355 return generic_dialog_add_button(GENERIC_DIALOG(fdlg), stock_id, text, 355 return generic_dialog_add_button(GENERIC_DIALOG(fdlg), stock_id, text,
356 (gpointer)func_cb, is_default); 356 (gpointer)func_cb, is_default);
357 } 357 }
358 358
423 423
424 g_signal_connect(G_OBJECT(fdlg->entry), "changed", 424 g_signal_connect(G_OBJECT(fdlg->entry), "changed",
425 G_CALLBACK(file_dialog_entry_cb), fdlg); 425 G_CALLBACK(file_dialog_entry_cb), fdlg);
426 } 426 }
427 427
428 void file_dialog_add_filter(FileDialog *fdlg, const gchar *filter, const gchar *filter_desc, gint set) 428 void file_dialog_add_filter(FileDialog *fdlg, const gchar *filter, const gchar *filter_desc, gboolean set)
429 { 429 {
430 if (!fdlg->entry) return; 430 if (!fdlg->entry) return;
431 path_selection_add_filter(fdlg->entry, filter, filter_desc, set); 431 path_selection_add_filter(fdlg->entry, filter, filter_desc, set);
432 } 432 }
433 433
435 { 435 {
436 if (!fdlg->entry) return; 436 if (!fdlg->entry) return;
437 path_selection_clear_filter(fdlg->entry); 437 path_selection_clear_filter(fdlg->entry);
438 } 438 }
439 439
440 void file_dialog_sync_history(FileDialog *fdlg, gint dir_only) 440 void file_dialog_sync_history(FileDialog *fdlg, gboolean dir_only)
441 { 441 {
442 if (!fdlg->dest_path) return; 442 if (!fdlg->dest_path) return;
443 443
444 if (!dir_only || 444 if (!dir_only ||
445 (dir_only && isdir(fdlg->dest_path)) ) 445 (dir_only && isdir(fdlg->dest_path)) )