/*
- * (SLIK) SimpLIstic sKin functions
- * (C) 2004 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
{
GenericDialog *gd = data;
void (*func)(GenericDialog *, gpointer);
- gint auto_close;
+ gboolean auto_close;
func = g_object_get_data(G_OBJECT(widget), "dialog_function");
auto_close = gd->auto_close;
if (auto_close) generic_dialog_close(gd);
}
-static gint generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
GenericDialog *gd = data;
- if (event->keyval == GDK_Return && GTK_WIDGET_HAS_FOCUS(widget)
+ if (event->keyval == GDK_KEY_Return && gtk_widget_has_focus(widget)
&& gd->default_cb)
{
- gint auto_close;
+ gboolean auto_close;
auto_close = gd->auto_close;
gd->default_cb(gd, gd->data);
G_CALLBACK(generic_dialog_default_key_press_cb), gd);
}
-static gint generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
GenericDialog *gd = data;
+ gboolean auto_close = gd->auto_close;
- if (event->keyval == GDK_Escape)
+ if (event->keyval == GDK_KEY_Escape)
{
if (gd->cancel_cb) gd->cancel_cb(gd, gd->data);
- if (gd->auto_close) generic_dialog_click_cb(widget, data);
+ else if (auto_close) generic_dialog_click_cb(widget, data);
return TRUE;
}
return FALSE;
}
-static gint generic_dialog_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static gboolean generic_dialog_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
{
GenericDialog *gd = data;
- gint auto_close;
+ gboolean auto_close;
auto_close = gd->auto_close;
G_CALLBACK(generic_dialog_show_cb), gd);
}
-gint generic_dialog_get_alternative_button_order(GtkWidget *widget)
+gboolean generic_dialog_get_alternative_button_order(GtkWidget *widget)
{
GtkSettings *settings;
GObjectClass *klass;
- gint alternative_order = FALSE;
+ gboolean alternative_order = FALSE;
settings = gtk_settings_get_for_screen(gtk_widget_get_screen(widget));
klass = G_OBJECT_CLASS(GTK_SETTINGS_GET_CLASS(settings));
}
GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *stock_id, const gchar *text,
- void (*func_cb)(GenericDialog *, gpointer), gint is_default)
+ void (*func_cb)(GenericDialog *, gpointer), gboolean is_default)
{
GtkWidget *button;
- gint alternative_order;
+ gboolean alternative_order;
button = pref_button_new(NULL, stock_id, text, FALSE,
G_CALLBACK(generic_dialog_click_cb), gd);
- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(button, TRUE);
g_object_set_data(G_OBJECT(button), "dialog_function", func_cb);
gtk_container_add(GTK_CONTAINER(gd->hbox), button);
GtkWidget *vbox;
GtkWidget *label;
- hbox = pref_box_new(gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+ hbox = pref_box_new(gd->vbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
if (icon_stock_id)
{
GtkWidget *image;
static void generic_dialog_setup(GenericDialog *gd,
const gchar *title,
const gchar *role,
- GtkWidget *parent, gint auto_close,
+ GtkWidget *parent, gboolean auto_close,
void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
{
GtkWidget *vbox;
GtkWidget *top;
top = gtk_widget_get_toplevel(parent);
- if (GTK_IS_WINDOW(top) && GTK_WIDGET_TOPLEVEL(top)) window = GTK_WINDOW(top);
+ if (GTK_IS_WINDOW(top) && gtk_widget_is_toplevel(top)) window = GTK_WINDOW(top);
}
if (window) gtk_window_set_transient_for(GTK_WINDOW(gd->dialog), window);
GenericDialog *generic_dialog_new(const gchar *title,
const gchar *role,
- GtkWidget *parent, gint auto_close,
+ GtkWidget *parent, gboolean auto_close,
void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
{
GenericDialog *gd;
}
GtkWidget *file_dialog_add_button(FileDialog *fdlg, const gchar *stock_id, const gchar *text,
- void (*func_cb)(FileDialog *, gpointer), gint is_default)
+ void (*func_cb)(FileDialog *, gpointer), gboolean is_default)
{
return generic_dialog_add_button(GENERIC_DIALOG(fdlg), stock_id, text,
(gpointer)func_cb, is_default);
G_CALLBACK(file_dialog_entry_cb), fdlg);
}
-void file_dialog_add_filter(FileDialog *fdlg, const gchar *filter, const gchar *filter_desc, gint set)
+void file_dialog_add_filter(FileDialog *fdlg, const gchar *filter, const gchar *filter_desc, gboolean set)
{
if (!fdlg->entry) return;
path_selection_add_filter(fdlg->entry, filter, filter_desc, set);
path_selection_clear_filter(fdlg->entry);
}
-void file_dialog_sync_history(FileDialog *fdlg, gint dir_only)
+void file_dialog_sync_history(FileDialog *fdlg, gboolean dir_only)
{
if (!fdlg->dest_path) return;
projects / geeqie.git / blobdiff