Skip to content

Y
yad
Commit 26c27b46 authored by Victor Ananjevsky's avatar Victor Ananjevsky
Browse files
Options

remove gtk2 code

parent d0021d0d
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 854 deletions
acinclude.m4 deleted 100644 → 0
View file @ d0021d0d
dnl Disable deprecated GTK+ features
AC_DEFUN([GTK_DISABLE_DEPRECATED],
[
AC_ARG_ENABLE(deprecated, [AC_HELP_STRING([--disable-deprecated],
[Disable deprecated GTK functions])],
,[enable_deprecated=yes])
if test x$enable_deprecated = xyes
then
DISABLE_DEPRECATED=
else
DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
fi
AC_SUBST(DISABLE_DEPRECATED)
])
configure.ac
View file @ 26c27b46
AC_INIT([YAD], [0.42.0], [https://sourceforge.net/p/yad-dialog/tickets/], yad, [https://sourceforge.net/projects/yad-dialog/])
AC_INIT([YAD], [0.99], [https://github.com/v1cont/yad/issues/], yad, [https://github.com/v1cont/yad/])
AC_CONFIG_AUX_DIR([build])
AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip])
......@@ -15,38 +15,10 @@ IT_PROG_INTLTOOL([0.40.0])
AC_PROG_CC
AC_ARG_WITH([gtk],
[AS_HELP_STRING([--with-gtk=gtk2|gtk3],[set the GTK+ version to use (default - gtk2)])],
[case "$with_gtk" in
gtk2|gtk3) ;;
*) AC_MSG_ERROR([invalid gtk version specified]) ;;
esac],
[with_gtk=gtk2])
case "$with_gtk" in
gtk3)
GTK_MODULE="gtk+-3.0"
GTK_REQUIRED="3.0.0"
GTK_PRINT="gtk+-unix-print-3.0"
WEBKIT="webkit2gtk-4.0"
SPELL="gtkspell3-3.0"
SOURCEVIEW="gtksourceview-3.0"
;;
gtk2)
GTK_MODULE="gtk+-2.0"
GTK_REQUIRED="2.16.0"
GTK_PRINT="gtk+-unix-print-2.0"
WEBKIT="webkit-1.0"
SPELL="gtkspell3-2.0"
SOURCEVIEW="gtksourceview-2.0"
;;
esac
PKG_CHECK_MODULES([GTK], [$GTK_MODULE >= $GTK_REQUIRED $GTK_PRINT])
PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.22.0 gtk+-unix-print-3.0])
AC_SUBST([GTK_CFLAGS])
AC_SUBST([GTK_LIBS])
GTK_DISABLE_DEPRECATED
dnl rgb.txt
AC_ARG_WITH([rgb],
[AS_HELP_STRING([--with-rgb=PATH],
......@@ -60,7 +32,7 @@ AC_ARG_ENABLE([html],
[Build YAD with HTML widget])],
[build_html=$enableval], [build_html=yes])
if test x$build_html = xyes; then
PKG_CHECK_MODULES([HTML], [$WEBKIT], [have_html=yes], [have_html=no])
PKG_CHECK_MODULES([HTML], [webkit2gtk-4.0], [have_html=yes], [have_html=no])
else
have_html=no
fi
......@@ -69,10 +41,7 @@ AC_SUBST([HTML_LIBS])
AM_CONDITIONAL([HTML], [test x$have_html = xyes])
if test x$have_html = xyes; then
AC_DEFINE([HAVE_HTML], [1], [Define this if you have webkit installed])
if test x$with_gtk = xgtk3; then
AC_DEFINE([USE_WEBKIT2], [1], [Define this if you use webkit2 API])
fi
AC_DEFINE([HAVE_HTML], [1], [Define this if you have webkit2gt library])
fi
dnl gio support
......@@ -95,10 +64,10 @@ fi
dnl spell check
AC_ARG_ENABLE([spell],
[AS_HELP_STRING([--enable-spell],
[Build YAD with Spell check support (default - no)])],
[with_spell=$enableval], [with_spell=no])
[Build YAD with Spell check support (default - yes)])],
[with_spell=$enableval], [with_spell=yes])
if test x$with_spell = xyes; then
PKG_CHECK_MODULES([SPELL], [$SPELL], [have_spell=yes], [have_spell=no])
PKG_CHECK_MODULES([SPELL], [gtkspell-3.0], [have_spell=yes], [have_spell=no])
else
have_spell=no
fi
......@@ -112,10 +81,10 @@ fi
dnl sourceview
AC_ARG_ENABLE([sourceview],
[AS_HELP_STRING([--enable-sourceview],
[Build YAD with GtkSourceView support (default - no)])],
[with_sourceview=$enableval], [with_sourceview=no])
[Build YAD with GtkSourceView support (default - yes)])],
[with_sourceview=$enableval], [with_sourceview=yes])
if test x$with_sourceview = xyes; then
PKG_CHECK_MODULES([SOURCEVIEW], [$SOURCEVIEW], [have_sourceview=yes], [have_sourceview=no])
PKG_CHECK_MODULES([SOURCEVIEW], [gtksourceview-3.0], [have_sourceview=yes], [have_sourceview=no])
else
have_sourceview=no
fi
......@@ -183,12 +152,11 @@ AC_OUTPUT
echo
echo "Build configuratioh:"
echo " GTK+ version - $with_gtk"
echo " Path to rgb.txt - $with_rgb"
echo " HTML widget - $have_html"
echo " Spell checking - $have_spell"
echo " GtkSourceView - $have_sourceview"
echo " Spell checking - $have_spell"
echo " GIO support - $have_gio"
echo " Path to rgb.txt - $with_rgb"
echo " pfd - $build_pfd"
echo " Icon browser - $build_ib"
echo
src/Makefile.am
View file @ 26c27b46
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(datadir)/locale"\" \
@DISABLE_DEPRECATED@
-DLOCALEDIR=\""$(datadir)/locale"\"
bin_PROGRAMS = yad
......
src/browser.c
View file @ 26c27b46
......@@ -40,11 +40,7 @@ typedef struct {
static gboolean
key_press_cb (GtkWidget * w, GdkEventKey * ev, gpointer data)
{
#if GTK_CHECK_VERSION(2,24,0)
if (ev->keyval == GDK_KEY_Escape)
#else
if (ev->keyval == GDK_Escape)
#endif
{
gtk_main_quit ();
return TRUE;
......@@ -144,11 +140,7 @@ select_icon (GtkTreeSelection * sel, IconBrowserData * data)
g_string_free (sizes, TRUE);
if (info)
#if !GTK_CHECK_VERSION(3,0,0)
gtk_icon_info_free(info);
#else
g_object_unref (info);
#endif
}
static void
......@@ -220,99 +212,54 @@ main (gint argc, gchar * argv[])
g_signal_connect (G_OBJECT (data->win), "delete-event", G_CALLBACK (gtk_main_quit), NULL);
g_signal_connect (G_OBJECT (data->win), "key-press-event", G_CALLBACK (key_press_cb), NULL);
#if !GTK_CHECK_VERSION(3,0,0)
box = gtk_vbox_new (FALSE, 5);
#else
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
#endif
gtk_container_add (GTK_CONTAINER (data->win), box);
gtk_container_set_border_width (GTK_CONTAINER (data->win), 5);
/* create icon info box */
#if !GTK_CHECK_VERSION(3,0,0)
t = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (t), 5);
gtk_table_set_row_spacings (GTK_TABLE (t), 5);
#else
t = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (t), 5);
gtk_grid_set_column_spacing (GTK_GRID (t), 5);
#endif
gtk_box_pack_start (GTK_BOX (box), t, FALSE, FALSE, 2);
data->image = gtk_image_new_from_icon_name ("image-missing", GTK_ICON_SIZE_DIALOG);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (t), data->image, 0, 1, 0, 3, GTK_FILL, 0, 0, 0);
#else
gtk_grid_attach (GTK_GRID (t), data->image, 0, 0, 1, 3);
#endif
w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (w), _("<b>Name:</b>"));
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (t), w, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
#else
gtk_label_set_xalign (GTK_LABEL (w), 0.0);
gtk_grid_attach (GTK_GRID (t), w, 1, 0, 1, 1);
#endif
data->lname = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (data->lname), TRUE);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (data->lname), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (t), data->lname, 2, 3, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
#else
gtk_label_set_xalign (GTK_LABEL (data->lname), 0.0);
gtk_grid_attach (GTK_GRID (t), data->lname, 2, 0, 1, 1);
gtk_widget_set_hexpand (data->lname, TRUE);
#endif
w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (w), _("<b>Sizes:</b>"));
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (t), w, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
#else
gtk_label_set_xalign (GTK_LABEL (w), 0.0);
gtk_grid_attach (GTK_GRID (t), w, 1, 1, 1, 1);
#endif
data->lsize = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (data->lsize), TRUE);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (data->lsize), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (t), data->lsize, 2, 3, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
#else
gtk_label_set_xalign (GTK_LABEL (data->lsize), 0.0);
gtk_grid_attach (GTK_GRID (t), data->lsize, 2, 1, 1, 1);
gtk_widget_set_hexpand (data->lsize, TRUE);
#endif
w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (w), _("<b>Filename:</b>"));
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (t), w, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
#else
gtk_label_set_xalign (GTK_LABEL (w), 0.0);
gtk_grid_attach (GTK_GRID (t), w, 1, 2, 1, 1);
#endif
data->lfile = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (data->lfile), TRUE);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (data->lfile), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (t), data->lfile, 2, 3, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
#else
gtk_label_set_xalign (GTK_LABEL (data->lfile), 0.0);
gtk_grid_attach (GTK_GRID (t), data->lfile, 2, 2, 1, 1);
gtk_widget_set_hexpand (data->lfile, TRUE);
#endif
/* create icon browser */
#if !GTK_CHECK_VERSION(3,0,0)
p = gtk_hpaned_new ();
#else
p = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
#endif
gtk_paned_set_position (GTK_PANED (p), 150);
gtk_box_pack_start (GTK_BOX (box), p, TRUE, TRUE, 2);
......@@ -357,9 +304,6 @@ main (gint argc, gchar * argv[])
data->icon_list = gtk_tree_view_new ();
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (data->icon_list), TRUE);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (data->icon_list), TRUE);
#endif
gtk_container_add (GTK_CONTAINER (w), data->icon_list);
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (data->icon_list));
......
src/color.c
View file @ 26c27b46
......@@ -98,15 +98,9 @@ create_palette ()
static void
set_color (gchar *clr)
{
#if !GTK_CHECK_VERSION(3,4,0)
GdkColor c;
if (gdk_color_parse (clr, &c))
gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (color), &c);
#else
GdkRGBA c;
if (gdk_rgba_parse (&c, clr))
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (color), &c);
#endif
GdkRGBA c;
if (gdk_rgba_parse (&c, clr))
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (color), &c);
}
static void
......@@ -128,20 +122,11 @@ color_create_widget (GtkWidget * dlg)
{
GtkWidget *w;
#if !GTK_CHECK_VERSION(3,4,0)
w = gtk_vbox_new (FALSE, 2);
color = gtk_color_selection_new ();
#else
w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
color = gtk_color_chooser_widget_new ();
#endif
gtk_widget_set_name (color, "yad-color-widget");
#if !GTK_CHECK_VERSION(3,4,0)
gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (color), options.color_data.gtk_palette);
#else
g_object_set (G_OBJECT (color), "show-editor", !options.color_data.gtk_palette, NULL);
#endif
if (options.color_data.init_color)
set_color (options.color_data.init_color);
gtk_box_pack_start (GTK_BOX (w), color, FALSE, FALSE, 2);
......@@ -169,9 +154,7 @@ color_create_widget (GtkWidget * dlg)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), options.hscroll_policy, options.vscroll_policy);
gtk_widget_set_size_request (sw, -1, 75);
gtk_container_add (GTK_CONTAINER (exp), sw);
#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_vexpand (sw, TRUE);
#endif
list = gtk_tree_view_new_with_model (model);
gtk_widget_set_name (list, "yad-color-palette");
g_object_unref (model);
......@@ -218,22 +201,11 @@ color_create_widget (GtkWidget * dlg)
void
color_print_result (void)
{
#if !GTK_CHECK_VERSION(3,4,0)
GdkColor c;
guint64 alpha;
#else
GdkRGBA c;
#endif
gchar *cs;
#if !GTK_CHECK_VERSION(3,4,0)
gtk_color_selection_get_current_color (GTK_COLOR_SELECTION (color), &c);
alpha = gtk_color_selection_get_current_alpha (GTK_COLOR_SELECTION (color));
cs = get_color (&c, alpha);
#else
gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (color), &c);
cs = get_color (&c);
#endif
if (cs)
g_printf ("%s\n", cs);
......
src/entry.c
View file @ 26c27b46
......@@ -32,11 +32,7 @@ entry_activate_cb (GtkEntry * entry, gpointer data)
static gboolean
combo_activate_cb (GtkWidget * w, GdkEventKey * ev, gpointer data)
{
#if GTK_CHECK_VERSION(2,24,0)
if (ev->keyval == GDK_KEY_Return || ev->keyval == GDK_KEY_KP_Enter)
#else
if (ev->keyval == GDK_Return || ev->keyval == GDK_KP_Enter)
#endif
{
if (options.plug == -1)
yad_exit (options.data.def_resp);
......@@ -115,11 +111,7 @@ entry_create_widget (GtkWidget * dlg)
{
GtkWidget *c, *l = NULL, *w = NULL;
#if !GTK_CHECK_VERSION(3,0,0)
w = gtk_hbox_new (FALSE, 5);
#else
w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
#endif
if (options.entry_data.entry_label)
{
......@@ -198,11 +190,7 @@ entry_create_widget (GtkWidget * dlg)
if (options.common_data.editable || settings.combo_always_editable)
{
#if GTK_CHECK_VERSION(2,24,0)
c = gtk_combo_box_text_new_with_entry ();
#else
c = gtk_combo_box_entry_new_text ();
#endif
gtk_widget_set_name (c, "yad-entry-edit-combo");
entry = gtk_bin_get_child (GTK_BIN (c));
if (options.entry_data.licon)
......@@ -222,11 +210,7 @@ entry_create_widget (GtkWidget * dlg)
}
else
{
#if GTK_CHECK_VERSION(2,24,0)
c = entry = gtk_combo_box_text_new ();
#else
c = entry = gtk_combo_box_new_text ();
#endif
gtk_widget_set_name (c, "yad-entry-combo");
is_combo = TRUE;
}
......@@ -238,22 +222,12 @@ entry_create_widget (GtkWidget * dlg)
if (options.entry_data.entry_text &&
g_ascii_strcasecmp (options.extra_data[i], options.entry_data.entry_text) == 0)
active = i;
#if GTK_CHECK_VERSION(2,24,0)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (c), options.extra_data[i]);
#else
gtk_combo_box_append_text (GTK_COMBO_BOX (c), options.extra_data[i]);
#endif
i++;
}
if (options.entry_data.entry_text && active == -1)
{
#if GTK_CHECK_VERSION(2,24,0)
gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (c), options.entry_data.entry_text);
#else
gtk_combo_box_prepend_text (GTK_COMBO_BOX (c), options.entry_data.entry_text);
#endif
}
gtk_combo_box_text_prepend_text (GTK_COMBO_BOX_TEXT (c), options.entry_data.entry_text);
/* set first iter active */
if (!options.common_data.editable)
......@@ -337,13 +311,7 @@ entry_print_result (void)
if (options.common_data.num_output)
g_print ("%d\n", gtk_combo_box_get_active (GTK_COMBO_BOX (entry)) + 1);
else
{
#if GTK_CHECK_VERSION(2,24,0)
g_print ("%s\n", gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (entry)));
#else
g_print ("%s\n", gtk_combo_box_get_active_text (GTK_COMBO_BOX (entry)));
#endif
}
g_print ("%s\n", gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (entry)));
}
else
g_print ("%s\n", gtk_entry_get_text (GTK_ENTRY (entry)));
......
src/font.c
View file @ 26c27b46
......@@ -28,11 +28,7 @@ static GtkWidget *font;
static void
realize_cb (GtkWidget * w, gpointer d)
{
#if GTK_CHECK_VERSION(3,2,0)
gtk_font_chooser_set_font (GTK_FONT_CHOOSER (w), options.common_data.font);
#else
gtk_font_selection_set_font_name (GTK_FONT_SELECTION (w), options.common_data.font);
#endif
}
GtkWidget *
......@@ -40,19 +36,11 @@ font_create_widget (GtkWidget * dlg)
{
GtkWidget *w;
#if GTK_CHECK_VERSION(3,2,0)
w = font = gtk_font_chooser_widget_new ();
#else
w = font = gtk_font_selection_new ();
#endif
gtk_widget_set_name (w, "yad-font-widget");
if (options.font_data.preview)
#if GTK_CHECK_VERSION(3,2,0)
gtk_font_chooser_set_preview_text (GTK_FONT_CHOOSER (w), options.font_data.preview);
#else
gtk_font_selection_set_preview_text (GTK_FONT_SELECTION (w), options.font_data.preview);
#endif
/* font must be set after widget inserted in toplevel */
if (options.common_data.font)
......@@ -70,15 +58,9 @@ font_print_result (void)
PangoFontFamily *family;
gint size;
#if GTK_CHECK_VERSION(3,2,0)
face = gtk_font_chooser_get_font_face (GTK_FONT_CHOOSER (font));
family = gtk_font_chooser_get_font_family (GTK_FONT_CHOOSER (font));
size = gtk_font_chooser_get_font_size (GTK_FONT_CHOOSER (font));
#else
face = gtk_font_selection_get_face (GTK_FONT_SELECTION (font));
family = gtk_font_selection_get_family (GTK_FONT_SELECTION (font));
size = gtk_font_selection_get_size (GTK_FONT_SELECTION (font));
#endif
if (options.common_data.quoted_output)
{
......@@ -99,11 +81,7 @@ font_print_result (void)
}
else
{
#if GTK_CHECK_VERSION(3,2,0)
gchar *fn = gtk_font_chooser_get_font (GTK_FONT_CHOOSER (font));
#else
gchar *fn = gtk_font_selection_get_font_name (GTK_FONT_SELECTION (font));
#endif
if (options.common_data.quoted_output)
{
......
src/form.c
View file @ 26c27b46
......@@ -87,11 +87,7 @@ expand_action (gchar * cmd)
break;
case YAD_FIELD_COMBO:
case YAD_FIELD_COMBO_ENTRY:
#if GTK_CHECK_VERSION(2,24,0)
buf = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, num)));
#else
buf = gtk_combo_box_get_active_text (GTK_COMBO_BOX (g_slist_nth_data (fields, num)));
#endif
arg = g_shell_quote (buf ? buf : "");
g_free (buf);
break;
......@@ -103,25 +99,14 @@ expand_action (gchar * cmd)
arg = g_shell_quote (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, num))));
break;
case YAD_FIELD_FONT:
#if !GTK_CHECK_VERSION(3,2,0)
arg = g_shell_quote (gtk_font_button_get_font_name (GTK_FONT_BUTTON (g_slist_nth_data (fields, num))));
#else
arg = g_shell_quote (gtk_font_chooser_get_font (GTK_FONT_CHOOSER (g_slist_nth_data (fields, num))));
#endif
break;
case YAD_FIELD_COLOR:
{
#if !GTK_CHECK_VERSION(3,4,0)
GdkColor c;
GtkColorButton *cb = GTK_COLOR_BUTTON (g_slist_nth_data (fields, num));
gtk_color_button_get_color (cb, &c);
buf = get_color (&c, gtk_color_button_get_alpha (cb));
#else
GdkRGBA c;
GtkColorChooser *cb = GTK_COLOR_CHOOSER (g_slist_nth_data (fields, num));
gtk_color_chooser_get_rgba (cb, &c);
buf = get_color (&c);
#endif
arg = g_shell_quote (buf ? buf : "");
g_free (buf);
break;
......@@ -298,11 +283,7 @@ set_field_value (guint num, gchar * value)
}
else
buf = g_strcompress (s[i]);
#if GTK_CHECK_VERSION(2,24,0)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (w), buf);
#else
gtk_combo_box_append_text (GTK_COMBO_BOX (w), buf);
#endif
g_free (buf);
i++;
}
......@@ -318,11 +299,7 @@ set_field_value (guint num, gchar * value)
break;
case YAD_FIELD_FONT:
#if !GTK_CHECK_VERSION(3,2,0)
gtk_font_button_set_font_name (GTK_FONT_BUTTON (w), value);
#else
gtk_font_chooser_set_font (GTK_FONT_CHOOSER (w), value);
#endif
break;
case YAD_FIELD_SCALE:
......@@ -331,15 +308,9 @@ set_field_value (guint num, gchar * value)
case YAD_FIELD_COLOR:
{
#if !GTK_CHECK_VERSION(3,4,0)
GdkColor c;
gdk_color_parse (value, &c);
gtk_color_button_set_color (GTK_COLOR_BUTTON (w), &c);
#else
GdkRGBA c;
gdk_rgba_parse (&c, value);
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (w), &c);
#endif
break;
}
......@@ -722,26 +693,16 @@ form_create_widget (GtkWidget * dlg)
if (n_fields % options.form_data.columns > 0)
rows++;
#if !GTK_CHECK_VERSION(3,0,0)
tbl = gtk_table_new (n_fields, 2 * options.form_data.columns, FALSE);
#else
tbl = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (tbl), 5);
gtk_grid_set_column_spacing (GTK_GRID (tbl), 5);
#endif
if (options.form_data.scroll)
{
GtkWidget *sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_NONE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), options.hscroll_policy, options.vscroll_policy);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), tbl);
#else
gtk_container_add (GTK_CONTAINER (sw), tbl);
#endif
w = sw;
}
else
......@@ -764,13 +725,8 @@ form_create_widget (GtkWidget * dlg)
else
gtk_label_set_text_with_mnemonic (GTK_LABEL (l), buf);
gtk_widget_set_name (l, "yad-form-flabel");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (l), options.common_data.align, 0.5);
gtk_table_attach (GTK_TABLE (tbl), l, col * 2, 1 + col * 2, row, row + 1, GTK_FILL, 0, 5, 5);
#else
gtk_label_set_xalign (GTK_LABEL (l), options.common_data.align);
gtk_grid_attach (GTK_GRID (tbl), l, col * 2, row, 1, 1);
#endif
g_free (buf);
}
......@@ -788,13 +744,9 @@ form_create_widget (GtkWidget * dlg)
gtk_entry_set_visibility (GTK_ENTRY (e), FALSE);
else if (fld->type == YAD_FIELD_READ_ONLY)
gtk_widget_set_sensitive (e, FALSE);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
if (fld->type == YAD_FIELD_COMPLETE)
{
GtkEntryCompletion *c = gtk_entry_completion_new ();
......@@ -819,13 +771,8 @@ form_create_widget (GtkWidget * dlg)
e = gtk_spin_button_new_with_range (0.0, 65525.0, 1.0);
gtk_entry_set_alignment (GTK_ENTRY (e), 1.0);
gtk_widget_set_name (e, "yad-form-spin");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
......@@ -835,50 +782,27 @@ form_create_widget (GtkWidget * dlg)
gchar *buf = g_strcompress (fld->name);
e = gtk_check_button_new_with_label (buf);
gtk_widget_set_name (e, "yad-form-check");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, col * 2, row, 2, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
fields = g_slist_append (fields, e);
g_free (buf);
}
break;
case YAD_FIELD_COMBO:
#if GTK_CHECK_VERSION(2,24,0)
e = gtk_combo_box_text_new ();
#else
e = gtk_combo_box_new_text ();
#endif
gtk_widget_set_name (e, "yad-form-combo");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
case YAD_FIELD_COMBO_ENTRY:
#if GTK_CHECK_VERSION(2,24,0)
e = gtk_combo_box_text_new_with_entry ();
#else
e = gtk_combo_box_entry_new_text ();
#endif
gtk_widget_set_name (e, "yad-form-edit-combo");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
......@@ -887,6 +811,10 @@ form_create_widget (GtkWidget * dlg)
e = gtk_file_chooser_button_new (_("Select file"), GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_widget_set_name (e, "yad-form-file");
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (e), g_get_current_dir ());
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
/* add preview */
if (options.common_data.preview)
......@@ -900,28 +828,14 @@ form_create_widget (GtkWidget * dlg)
for (filt = options.common_data.filters; filt; filt = filt->next)
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (e), GTK_FILE_FILTER (filt->data));
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
case YAD_FIELD_DIR:
e = gtk_file_chooser_button_new (_("Select folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
gtk_widget_set_name (e, "yad-form-file");
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (e), g_get_current_dir ());
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
......@@ -929,13 +843,8 @@ form_create_widget (GtkWidget * dlg)
case YAD_FIELD_FONT:
e = gtk_font_button_new ();
gtk_widget_set_name (e, "yad-form-font");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
......@@ -943,13 +852,8 @@ form_create_widget (GtkWidget * dlg)
case YAD_FIELD_COLOR:
e = gtk_color_button_new ();
gtk_widget_set_name (e, "yad-form-color");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
......@@ -961,13 +865,8 @@ form_create_widget (GtkWidget * dlg)
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (e), GTK_ENTRY_ICON_SECONDARY, "document-open");
g_signal_connect (G_OBJECT (e), "icon-press", G_CALLBACK (select_files_cb), GINT_TO_POINTER (fld->type));
g_signal_connect (G_OBJECT (e), "activate", G_CALLBACK (form_activate_cb), dlg);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
......@@ -979,13 +878,8 @@ form_create_widget (GtkWidget * dlg)
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (e), GTK_ENTRY_ICON_SECONDARY, "document-open");
g_signal_connect (G_OBJECT (e), "icon-press", G_CALLBACK (create_files_cb), GINT_TO_POINTER (fld->type));
g_signal_connect (G_OBJECT (e), "activate", G_CALLBACK (form_activate_cb), dlg);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
......@@ -998,32 +892,18 @@ form_create_widget (GtkWidget * dlg)
g_object_unref (pb);
g_signal_connect (G_OBJECT (e), "icon-press", G_CALLBACK (select_date_cb), e);
g_signal_connect (G_OBJECT (e), "activate", G_CALLBACK (form_activate_cb), dlg);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
case YAD_FIELD_SCALE:
#if !GTK_CHECK_VERSION(3,0,0)
e = gtk_hscale_new_with_range (0.0, 100.0, 1.0);
#else
e = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.0, 100.0, 1.0);
#endif
gtk_widget_set_name (e, "yad-form-scale");
gtk_scale_set_value_pos (GTK_SCALE (e), GTK_POS_LEFT);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, 1 + col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, 1 + col * 2, row, 1, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
break;
......@@ -1037,12 +917,8 @@ form_create_widget (GtkWidget * dlg)
gtk_button_set_alignment (GTK_BUTTON (e), 0.5, 0.5);
if (fld->type == YAD_FIELD_BUTTON)
gtk_button_set_relief (GTK_BUTTON (e), GTK_RELIEF_NONE);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, col * 2, 2 + col * 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, col * 2, row, 2, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
fields = g_slist_append (fields, e);
break;
......@@ -1058,28 +934,16 @@ form_create_widget (GtkWidget * dlg)
gtk_label_set_markup (GTK_LABEL (e), buf);
gtk_label_set_line_wrap (GTK_LABEL (e), TRUE);
gtk_label_set_selectable (GTK_LABEL (e), options.data.selectable_labels);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (e), options.common_data.align, 0.5);
#else
gtk_label_set_xalign (GTK_LABEL (e), options.common_data.align);
#endif
g_free (buf);
}
else
{
#if GTK_CHECK_VERSION(3,0,0)
e = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
#else
e = gtk_hseparator_new ();
#endif
gtk_widget_set_name (e, "yad-form-separator");
}
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), e, col * 2, 2 + col * 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), e, col * 2, row, 2, 1);
gtk_widget_set_hexpand (e, TRUE);
#endif
fields = g_slist_append (fields, e);
break;
......@@ -1088,19 +952,9 @@ form_create_widget (GtkWidget * dlg)
GtkWidget *l, *sw, *b;
gchar *ltxt = g_strcompress (fld->name);
#if !GTK_CHECK_VERSION(3,0,0)
b = gtk_vbox_new (FALSE, 2);
#else
b = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
#endif
l = gtk_label_new ("");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
#else
gtk_label_set_xalign (GTK_LABEL (l), 0.0);
#endif
if (options.data.no_markup)
gtk_label_set_text (GTK_LABEL (l), ltxt);
else
......@@ -1128,14 +982,9 @@ form_create_widget (GtkWidget * dlg)
}
#endif
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (tbl), b, col * 2, 2 + col * 2, row, row + 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 5);
#else
gtk_grid_attach (GTK_GRID (tbl), b, col * 2, row, 2, 1);
gtk_widget_set_hexpand (b, TRUE);
gtk_widget_set_vexpand (b, TRUE);
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (l), e);
fields = g_slist_append (fields, e);
......@@ -1230,24 +1079,13 @@ form_print_field (guint fn)
options.common_data.separator);
else if (options.common_data.quoted_output)
{
#if GTK_CHECK_VERSION(2,24,0)
buf = g_shell_quote (gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, fn))));
#else
buf = g_shell_quote (gtk_combo_box_get_active_text (GTK_COMBO_BOX (g_slist_nth_data (fields, fn))));
#endif
g_printf ("%s%s", buf, options.common_data.separator);
g_free (buf);
}
else
{
g_printf ("%s%s",
#if GTK_CHECK_VERSION(2,24,0)
gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, fn))),
#else
gtk_combo_box_get_active_text (GTK_COMBO_BOX (g_slist_nth_data (fields, fn))),
#endif
options.common_data.separator);
}
g_printf ("%s%s", gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, fn))),
options.common_data.separator);
break;
case YAD_FIELD_FILE:
case YAD_FIELD_DIR:
......@@ -1268,33 +1106,22 @@ form_print_field (guint fn)
break;
case YAD_FIELD_FONT:
{
gchar *fname;
#if !GTK_CHECK_VERSION(3,2,0)
fname = (gchar *) gtk_font_button_get_font_name (GTK_FONT_BUTTON (g_slist_nth_data (fields, fn)));
#else
fname = gtk_font_chooser_get_font (GTK_FONT_CHOOSER (g_slist_nth_data (fields, fn)));
#endif
gchar *fname = gtk_font_chooser_get_font (GTK_FONT_CHOOSER (g_slist_nth_data (fields, fn)));
if (options.common_data.quoted_output)
g_printf ("'%s'%s", fname, options.common_data.separator);
g_printf ("'%s'%s", fname ? fname : "", options.common_data.separator);
else
g_printf ("%s%s", fname, options.common_data.separator);
g_printf ("%s%s", fname ? fname : "", options.common_data.separator);
g_free (fname);
break;
}
case YAD_FIELD_COLOR:
{
gchar *cs;
#if !GTK_CHECK_VERSION(3,4,0)
GdkColor c;
GtkColorButton *cb = GTK_COLOR_BUTTON (g_slist_nth_data (fields, fn));
gtk_color_button_get_color (cb, &c);
cs = get_color (&c, gtk_color_button_get_alpha (cb));
#else
GdkRGBA c;
GtkColorChooser *cb = GTK_COLOR_CHOOSER (g_slist_nth_data (fields, fn));
gtk_color_chooser_get_rgba (cb, &c);
cs = get_color (&c);
#endif
if (options.common_data.quoted_output)
{
buf = g_shell_quote (cs ? cs : "");
......
src/html.c
View file @ 26c27b46
......@@ -24,21 +24,13 @@
#include <glib/gprintf.h>
#ifdef USE_WEBKIT2
#include <webkit2/webkit2.h>
#else
#include <webkit/webkit.h>
#endif
static WebKitWebView *view;
static GString *inbuf;
#ifdef USE_WEBKIT2
static gboolean is_loaded = FALSE;
#else
static gboolean is_link = FALSE;
#endif
#ifndef PATH_MAX
#define PATH_MAX 4096
......@@ -81,86 +73,6 @@ load_uri (const gchar * uri)
g_printerr ("yad_html_load_uri: cannot load uri '%s'\n", uri);
}
#ifndef USE_WEBKIT2
static gboolean
link_cb (WebKitWebView * v, WebKitWebFrame * f, WebKitNetworkRequest * r,
WebKitWebNavigationAction * act, WebKitWebPolicyDecision * pd, gpointer d)
{
gchar *uri;
if (webkit_web_navigation_action_get_reason (act) != WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED)
{
/* skip handling non clicked reasons */
webkit_web_policy_decision_use (pd);
return TRUE;
}
uri = (gchar *) webkit_network_request_get_uri (r);
if (!options.html_data.browser)
{
if (options.html_data.print_uri)
g_printf ("%s\n", uri);
else
{
gchar *cmd = g_strdup_printf (settings.open_cmd, uri);
g_spawn_command_line_async (cmd, NULL);
g_free (cmd);
}
webkit_web_policy_decision_ignore (pd);
}
else
{
if (options.html_data.uri_cmd)
{
gint ret = -1;
gchar *cmd = g_strdup_printf (options.html_data.uri_cmd, uri);
static gchar *vb = NULL, *vm = NULL;
/* set environment */
g_free (vb);
vb = g_strdup_printf ("%d", webkit_web_navigation_action_get_button (act));
g_setenv ("YAD_HTML_BUTTON", vb, TRUE);
g_free (vm);
vm = g_strdup_printf ("%d", webkit_web_navigation_action_get_modifier_state (act));
g_setenv ("YAD_HTML_KEYS", vm, TRUE);
/* run handler */
g_spawn_command_line_sync (cmd, NULL, NULL, &ret, NULL);
switch (ret)
{
case 0:
webkit_web_policy_decision_use (pd);
break;
case 1:
webkit_web_policy_decision_ignore (pd);
break;
case 2:
webkit_web_policy_decision_download (pd);
break;
default:
g_printerr ("html: undefined result of external uri handler\n");
webkit_web_policy_decision_ignore (pd);
break;
}
g_free (cmd);
}
else
webkit_web_policy_decision_use (pd);
}
return TRUE;
}
static void
link_hover_cb (WebKitWebView * v, const gchar * t, const gchar * link, gpointer * d)
{
is_link = (link != NULL);
}
#else
static void
loaded_cb (WebKitWebView *v, WebKitLoadEvent ev, gpointer d)
{
......@@ -192,8 +104,6 @@ policy_cb (WebKitWebView *v, WebKitPolicyDecision *pd, WebKitPolicyDecisionType
return TRUE;
}
#endif
static void
select_file_cb (GtkEntry * entry, GtkEntryIconPosition pos, GdkEventButton * ev, gpointer d)
{
......@@ -244,11 +154,7 @@ open_cb (GtkWidget * w, gpointer d)
cnt = gtk_dialog_get_content_area (GTK_DIALOG (dlg));
lbl = gtk_label_new (_("Enter URI or file name:"));
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
#else
gtk_label_set_xalign (GTK_LABEL (lbl), 0.0);
#endif
gtk_widget_show (lbl);
gtk_box_pack_start (GTK_BOX (cnt), lbl, TRUE, FALSE, 2);
......@@ -270,31 +176,8 @@ static gboolean
menu_cb (WebKitWebView * view, GtkWidget * menu, WebKitHitTestResult * hit, gboolean kb, gpointer d)
{
GtkWidget *mi;
#ifndef USE_WEBKIT2
if (!is_link)
{
/* add open item */
mi = gtk_separator_menu_item_new ();
gtk_widget_show (mi);
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), mi);
mi = gtk_image_menu_item_new_from_stock ("gtk-open", NULL);
gtk_widget_show (mi);
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), mi);
g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (open_cb), NULL);
/* add quit item */
mi = gtk_separator_menu_item_new ();
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
mi = gtk_image_menu_item_new_from_stock ("gtk-quit", NULL);
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
g_signal_connect (G_OBJECT (mi), "activate", G_CALLBACK (gtk_main_quit), NULL);
}
#endif
/* FIXME: add custom menu items here */
return FALSE;
}
......@@ -310,11 +193,8 @@ title_cb (GObject *obj, GParamSpec *spec, GtkWindow *dlg)
static void
icon_cb (GObject *obj, GParamSpec *spec, GtkWindow *dlg)
{
#ifdef USE_WEBKIT2
GdkPixbuf *pb = gdk_pixbuf_get_from_surface (webkit_web_view_get_favicon (view), 0, 0, -1, -1);
#else
GdkPixbuf *pb = webkit_web_view_try_get_favicon_pixbuf (view, 16, 16);
#endif
if (pb)
{
gtk_window_set_icon (dlg, pb);
......@@ -326,9 +206,7 @@ static gboolean
handle_stdin (GIOChannel * ch, GIOCondition cond, gpointer d)
{
gchar *buf;
#ifdef USE_WEBKIT2
GBytes *data;
#endif
GError *err = NULL;
switch (g_io_channel_read_line (ch, &buf, NULL, NULL, &err))
......@@ -343,14 +221,10 @@ handle_stdin (GIOChannel * ch, GIOCondition cond, gpointer d)
return FALSE;
case G_IO_STATUS_EOF:
#ifdef USE_WEBKIT2
data = g_bytes_new (inbuf->str, inbuf->len);
/*g_string_free (inbuf, TRUE); */ /* FIXME: IS THAT NEEDED ??? (and where) */
webkit_web_view_load_bytes (view, data, options.html_data.mime, options.html_data.encoding, NULL);
g_bytes_unref (data);
#else
webkit_web_view_load_string (view, inbuf->str, options.html_data.mime, options.html_data.encoding, NULL);
#endif
return FALSE;
case G_IO_STATUS_AGAIN:
......@@ -364,12 +238,7 @@ GtkWidget *
html_create_widget (GtkWidget * dlg)
{
GtkWidget *sw;
#ifdef USE_WEBKIT2
WebKitSettings *settings;
#else
WebKitWebSettings *settings;
#endif
SoupSession *sess;
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), options.hscroll_policy, options.vscroll_policy);
......@@ -377,11 +246,7 @@ html_create_widget (GtkWidget * dlg)
view = WEBKIT_WEB_VIEW (webkit_web_view_new ());
gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (view));
#ifdef USE_WEBKIT2
settings = webkit_settings_new ();
#else
settings = webkit_web_settings_new ();
#endif
g_object_set (G_OBJECT (settings), "user-agent", options.html_data.user_agent, NULL);
if (options.html_data.user_style)
......@@ -391,16 +256,9 @@ html_create_widget (GtkWidget * dlg)
}
webkit_web_view_set_settings (view, settings);
#ifdef USE_WEBKIT2
webkit_settings_set_default_charset (settings, g_get_codeset ());
g_signal_connect (view, "decide-policy", G_CALLBACK (policy_cb), NULL);
#else
g_object_set (G_OBJECT (settings), "default-encoding", g_get_codeset (), NULL);
g_signal_connect (view, "hovering-over-link", G_CALLBACK (link_hover_cb), NULL);
g_signal_connect (view, "navigation-policy-decision-requested", G_CALLBACK (link_cb), NULL);
#endif
if (options.html_data.browser)
{
......@@ -408,13 +266,8 @@ html_create_widget (GtkWidget * dlg)
if (!options.data.dialog_title)
g_signal_connect (view, "notify::title", G_CALLBACK (title_cb), dlg);
if (strcmp (options.data.window_icon, "yad") == 0)
#ifdef USE_WEBKIT2
g_signal_connect (view, "notify::favicon", G_CALLBACK (icon_cb), dlg);
#else
g_signal_connect (view, "icon-loaded", G_CALLBACK (icon_cb), dlg);
#endif
}
#ifdef USE_WEBKIT2
else
{
g_object_set (G_OBJECT(settings), "enable-caret-browsing", FALSE, NULL);
......@@ -427,13 +280,6 @@ html_create_widget (GtkWidget * dlg)
g_object_set (G_OBJECT (settings), "enable-private-browsing", TRUE, NULL);
g_signal_connect (view, "load-changed", G_CALLBACK (loaded_cb), NULL);
}
#endif
#ifndef USE_WEBKIT2
sess = webkit_get_default_session ();
soup_session_add_feature_by_type (sess, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
g_object_set (G_OBJECT (sess), SOUP_SESSION_ACCEPT_LANGUAGE_AUTO, TRUE, NULL);
#endif
gtk_widget_show_all (sw);
gtk_widget_grab_focus (GTK_WIDGET (view));
......
src/list.c
View file @ 26c27b46
......@@ -46,11 +46,7 @@ yad_list_add_row (GtkListStore *m, GtkTreeIter *it)
static gboolean
list_activate_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
{
#if GTK_CHECK_VERSION(2,24,0)
if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)
#else
if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)
#endif
{
if (options.list_data.dclick_action)
{
......@@ -915,11 +911,7 @@ popup_menu_cb (GtkWidget * w, GdkEventButton * ev, gpointer data)
gtk_widget_show (menu);
}
#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
#else
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, ev->button, ev->time);
#endif
}
return FALSE;
}
......@@ -1071,9 +1063,6 @@ list_create_widget (GtkWidget * dlg)
list_view = gtk_tree_view_new_with_model (model);
gtk_widget_set_name (list_view, "yad-list-widget");
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list_view), !options.list_data.no_headers);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list_view), options.list_data.rules_hint);
#endif
gtk_tree_view_set_grid_lines (GTK_TREE_VIEW (list_view), options.list_data.grid_lines);
gtk_tree_view_set_reorderable (GTK_TREE_VIEW (list_view), options.common_data.editable);
g_object_unref (model);
......
src/main.c
View file @ 26c27b46
......@@ -68,23 +68,14 @@ keys_cb (GtkWidget *w, GdkEventKey *ev, gpointer d)
switch (ev->keyval)
{
#if GTK_CHECK_VERSION(2,24,0)
case GDK_KEY_Escape:
#else
case GDK_Escape:
#endif
if (options.data.escape_ok)
yad_exit (options.data.def_resp);
else if (!options.data.no_escape)
yad_exit (YAD_RESPONSE_ESC);
return TRUE;
#if GTK_CHECK_VERSION(2,24,0)
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
#else
case GDK_Return:
case GDK_KP_Enter:
#endif
if (ev->state & GDK_CONTROL_MASK)
{
yad_exit (options.data.def_resp);
......@@ -143,17 +134,6 @@ unfocus_cb (GtkWidget *w, GdkEventFocus *ev, gpointer d)
return FALSE;
}
#if !GTK_CHECK_VERSION(3,0,0)
static void
text_size_allocate_cb (GtkWidget * w, GtkAllocation * al, gpointer data)
{
PangoLayout *pl = gtk_label_get_layout (GTK_LABEL (w));
if (pango_layout_is_wrapped (pl))
gtk_widget_set_size_request (w, al->width, -1);
}
#endif
void
yad_exit (gint id)
{
......@@ -186,12 +166,8 @@ create_layout (GtkWidget *dlg)
g_object_unref (pb);
gtk_widget_set_name (image, "yad-dialog-image");
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
#else
gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (image, GTK_ALIGN_START);
#endif
}
/* create text label */
......@@ -213,15 +189,8 @@ create_layout (GtkWidget *dlg)
gtk_label_set_line_wrap (GTK_LABEL (text), TRUE);
gtk_label_set_selectable (GTK_LABEL (text), options.data.selectable_labels);
gtk_label_set_justify (GTK_LABEL (text), options.data.text_align);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_state (text, GTK_STATE_NORMAL);
gtk_misc_set_alignment (GTK_MISC (text), options.data.text_align, 0.5);
if (!options.data.fixed)
g_signal_connect (G_OBJECT (text), "size-allocate", G_CALLBACK (text_size_allocate_cb), NULL);
#else
gtk_widget_set_state_flags (text, GTK_STATE_NORMAL, FALSE);
gtk_label_set_xalign (GTK_LABEL (text), options.data.text_align);
#endif
}
}
......@@ -301,13 +270,8 @@ create_layout (GtkWidget *dlg)
/* create layout */
if (options.data.image_on_top)
{
#if !GTK_CHECK_VERSION(3,0,0)
layout = gtk_vbox_new (FALSE, 5);
box = gtk_hbox_new (FALSE, 5);
#else
layout = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
#endif
if (image)
gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 2);
......@@ -320,13 +284,8 @@ create_layout (GtkWidget *dlg)
}
else
{
#if !GTK_CHECK_VERSION(3,0,0)
layout = gtk_hbox_new (FALSE, 5);
box = gtk_vbox_new (FALSE, 5);
#else
layout = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
#endif
if (text)
gtk_box_pack_start (GTK_BOX (box), text, FALSE, FALSE, 0);
......@@ -393,11 +352,7 @@ create_dialog (void)
gtk_window_set_accept_focus (GTK_WINDOW (dlg), options.data.focus);
/* create box */
#if !GTK_CHECK_VERSION(3,0,0)
vbox = gtk_vbox_new (FALSE, 2);
#else
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
#endif
gtk_container_add (GTK_CONTAINER (dlg), vbox);
layout = create_layout (dlg);
......@@ -419,51 +374,31 @@ create_dialog (void)
{
if (strcasecmp (options.data.to_indicator, "top") == 0)
{
#if !GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (topb), GTK_PROGRESS_LEFT_TO_RIGHT);
cbox = gtk_vbox_new (FALSE, 0);
#else
gtk_orientable_set_orientation (GTK_ORIENTABLE (topb), GTK_ORIENTATION_HORIZONTAL);
cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#endif
gtk_box_pack_start (GTK_BOX (cbox), topb, FALSE, FALSE, 2);
gtk_box_pack_end (GTK_BOX (cbox), layout, TRUE, TRUE, 0);
}
else if (strcasecmp (options.data.to_indicator, "bottom") == 0)
{
#if !GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (topb), GTK_PROGRESS_LEFT_TO_RIGHT);
cbox = gtk_vbox_new (FALSE, 0);
#else
gtk_orientable_set_orientation (GTK_ORIENTABLE (topb), GTK_ORIENTATION_HORIZONTAL);
cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#endif
gtk_box_pack_start (GTK_BOX (cbox), layout, TRUE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (cbox), topb, FALSE, FALSE, 2);
}
else if (strcasecmp (options.data.to_indicator, "left") == 0)
{
#if !GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (topb), GTK_PROGRESS_BOTTOM_TO_TOP);
cbox = gtk_hbox_new (FALSE, 0);
#else
gtk_orientable_set_orientation (GTK_ORIENTABLE (topb), GTK_ORIENTATION_VERTICAL);
gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (topb), TRUE);
cbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
#endif
gtk_box_pack_start (GTK_BOX (cbox), topb, FALSE, FALSE, 2);
gtk_box_pack_end (GTK_BOX (cbox), layout, TRUE, TRUE, 0);
}
else if (strcasecmp (options.data.to_indicator, "right") == 0)
{
#if !GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (topb), GTK_PROGRESS_BOTTOM_TO_TOP);
cbox = gtk_hbox_new (FALSE, 0);
#else
gtk_orientable_set_orientation (GTK_ORIENTABLE (topb), GTK_ORIENTATION_VERTICAL);
gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (topb), TRUE);
cbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
#endif
gtk_box_pack_start (GTK_BOX (cbox), layout, TRUE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (cbox), topb, FALSE, FALSE, 2);
}
......@@ -471,20 +406,14 @@ create_dialog (void)
if (settings.show_remain)
{
gchar *lbl = g_strdup_printf (_("%d sec"), options.data.timeout);
#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (topb), TRUE);
#endif
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (topb), lbl);
g_free (lbl);
}
}
else
{
#if !GTK_CHECK_VERSION(3,0,0)
cbox = gtk_vbox_new (FALSE, 0);
#else
cbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#endif
gtk_box_pack_start (GTK_BOX (cbox), layout, TRUE, TRUE, 0);
}
......@@ -507,11 +436,7 @@ create_dialog (void)
{
GtkWidget *btn;
/* create buttons container */
#if !GTK_CHECK_VERSION(3,0,0)
GtkWidget *bbox = gtk_hbutton_box_new ();
#else
GtkWidget *bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
#endif
gtk_container_set_border_width (GTK_CONTAINER (bbox), 2);
gtk_box_set_spacing (GTK_BOX (bbox), 5);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), options.data.buttons_layout);
......@@ -585,7 +510,7 @@ create_dialog (void)
/* show widgets */
gtk_widget_show_all (vbox);
#if GTK_CHECK_VERSION(3,0,0)
if (options.data.width > 0)
gtk_widget_set_size_request (vbox, options.data.width, options.data.height);
else
......@@ -594,7 +519,6 @@ create_dialog (void)
gtk_widget_get_preferred_width (vbox, &mw, &nw);
gtk_widget_set_size_request (vbox, nw, -1);
}
#endif
/* parse geometry or move window, if given. must be after showing widget */
if (!options.data.maximized && !options.data.fullscreen)
......@@ -620,11 +544,7 @@ create_dialog (void)
{
gint ww, wh, sw, sh;
gtk_window_get_size (GTK_WINDOW (dlg), &ww, &wh);
#if !GTK_CHECK_VERSION(3,0,0)
gdk_window_get_geometry (gdk_get_default_root_window (), NULL, NULL, &sw, &sh, NULL);
#else
gdk_window_get_geometry (gdk_get_default_root_window (), NULL, NULL, &sw, &sh);
#endif
/* place window to specified coordinates */
if (!options.data.use_posx)
gtk_window_get_position (GTK_WINDOW (dlg), &options.data.posx, NULL);
......@@ -765,10 +685,6 @@ main (gint argc, gchar ** argv)
textdomain (GETTEXT_PACKAGE);
#endif
#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init ();
#endif
gtk_init (&argc, &argv);
g_set_application_name ("YAD");
read_settings ();
......@@ -814,15 +730,11 @@ main (gint argc, gchar ** argv)
/* parse custom gtkrc */
if (options.gtkrc_file)
{
#if !GTK_CHECK_VERSION(3,0,0)
gtk_rc_parse (options.gtkrc_file);
#else
GtkCssProvider *css = gtk_css_provider_new ();
gtk_css_provider_load_from_path (css, options.gtkrc_file, NULL);
gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (css),
GTK_STYLE_PROVIDER_PRIORITY_USER);
g_object_unref (css);
#endif
}
/* set default icons and icon theme */
......
src/multi-progress.c
View file @ 26c27b46
......@@ -202,16 +202,9 @@ multi_progress_create_widget (GtkWidget * dlg)
if (nbars < 1)
return NULL;
#if !GTK_CHECK_VERSION(3,0,0)
if (options.common_data.vertical)
table = gtk_table_new (2, nbars, FALSE);
else
table = gtk_table_new (nbars, 2, FALSE);
#else
table = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (table), 2);
gtk_grid_set_column_spacing (GTK_GRID (table), 2);
#endif
for (b = options.multi_progress_data.bars; b; b = b->next)
{
......@@ -224,30 +217,17 @@ multi_progress_create_widget (GtkWidget * dlg)
gtk_label_set_text (GTK_LABEL (l), p->name);
else
gtk_label_set_markup (GTK_LABEL (l), p->name);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (l), options.common_data.align, 0.5);
#else
gtk_label_set_xalign (GTK_LABEL (l), options.common_data.align);
#endif
if (options.common_data.vertical)
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (table), l, i, i + 1, 1, 2, GTK_FILL, 0, 2, 2);
#else
gtk_grid_attach (GTK_GRID (table), l, i, 1, 1, 1);
#endif
else
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (table), l, 0, 1, i, i + 1, GTK_FILL, 0, 2, 2);
#else
gtk_grid_attach (GTK_GRID (table), l, 0, i, 1, 1);
#endif
/* add progress bar */
w = gtk_progress_bar_new ();
gtk_widget_set_name (w, "yad-progress-widget");
#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (w), TRUE);
#endif
if (p->type != YAD_PROGRESS_PULSE)
{
......@@ -266,41 +246,19 @@ multi_progress_create_widget (GtkWidget * dlg)
}
}
#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (w), p->type == YAD_PROGRESS_RTL);
if (options.common_data.vertical)
gtk_orientable_set_orientation (GTK_ORIENTABLE (w), GTK_ORIENTATION_VERTICAL);
#else
if (p->type == YAD_PROGRESS_RTL)
{
if (options.common_data.vertical)
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (w), GTK_PROGRESS_TOP_TO_BOTTOM);
else
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (w), GTK_PROGRESS_RIGHT_TO_LEFT);
}
else
{
if (options.common_data.vertical)
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (w), GTK_PROGRESS_BOTTOM_TO_TOP);
}
#endif
if (options.common_data.vertical)
{
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (table), w, i, i + 1, 0, 1, 0, GTK_FILL | GTK_EXPAND, 2, 2);
#else
gtk_grid_attach (GTK_GRID (table), w, i, 0, 1, 1);
gtk_widget_set_vexpand (w, TRUE);
#endif
}
else
{
#if !GTK_CHECK_VERSION(3,0,0)
gtk_table_attach (GTK_TABLE (table), w, 1, 2, i, i + 1, GTK_FILL | GTK_EXPAND, 0, 2, 2);
#else
gtk_grid_attach (GTK_GRID (table), w, 1, i, 1, 1);
gtk_widget_set_hexpand (w, TRUE);
#endif
}
progress_bars = g_slist_append (progress_bars, w);
......
src/notification.c
View file @ 26c27b46
......@@ -305,28 +305,10 @@ handle_stdin (GIOChannel * channel, GIOCondition condition, gpointer data)
}
else if (!g_ascii_strcasecmp (command, "visible"))
{
#if !GTK_CHECK_VERSION(2,22,0)
if (!g_ascii_strcasecmp (value, "blink"))
{
gboolean state = gtk_status_icon_get_blinking (status_icon);
gtk_status_icon_set_blinking (status_icon, !state);
}
else
#endif
if (!g_ascii_strcasecmp (value, "false"))
{
gtk_status_icon_set_visible (status_icon, FALSE);
#if !GTK_CHECK_VERSION(2,22,0)
gtk_status_icon_set_blinking (status_icon, FALSE);
#endif
}
gtk_status_icon_set_visible (status_icon, FALSE);
else
{
gtk_status_icon_set_visible (status_icon, TRUE);
#if !GTK_CHECK_VERSION(2,22,0)
gtk_status_icon_set_blinking (status_icon, FALSE);
#endif
}
gtk_status_icon_set_visible (status_icon, TRUE);
}
else if (!g_ascii_strcasecmp (command, "action"))
{
......
src/paned.c
View file @ 26c27b46
......@@ -46,14 +46,7 @@ paned_create_widget (GtkWidget * dlg)
exit (-1);
/* create widget */
#if !GTK_CHECK_VERSION(3,0,0)
if (options.paned_data.orient == GTK_ORIENTATION_HORIZONTAL)
paned = w = gtk_hpaned_new ();
else
paned = w = gtk_vpaned_new ();
#else
paned = w = gtk_paned_new (options.paned_data.orient);
#endif
gtk_widget_set_name (w, "yad-paned-widget");
gtk_paned_set_position (GTK_PANED (w), options.paned_data.splitter);
......
src/picture.c
View file @ 26c27b46
......@@ -224,11 +224,7 @@ button_handler (GtkWidget *w, GdkEventButton *ev, gpointer data)
{
if (ev->button == 3)
{
#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer (GTK_MENU (popup_menu), NULL);
#else
gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL, NULL, NULL, ev->button, ev->time);
#endif
return TRUE;
}
......
src/print.c
View file @ 26c27b46
......@@ -277,11 +277,7 @@ yad_print_run (void)
/* create yad's top box */
if (options.data.dialog_text || options.data.dialog_image)
{
#if !GTK_CHECK_VERSION(3,0,0)
box = gtk_hbox_new (FALSE, 0);
#else
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
#endif
if (options.data.dialog_image)
{
......@@ -306,11 +302,8 @@ yad_print_run (void)
gtk_label_set_text (GTK_LABEL (lbl), buf);
gtk_widget_set_name (lbl, "yad-dialog-label");
gtk_label_set_selectable (GTK_LABEL (lbl), options.data.selectable_labels);
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (lbl), options.data.text_align, 0.5);
#else
gtk_label_set_xalign (GTK_LABEL (lbl), options.data.text_align);
#endif
if (options.data.geometry || options.data.width != -1)
gtk_label_set_line_wrap (GTK_LABEL (lbl), TRUE);
gtk_box_pack_start (GTK_BOX (box), lbl, TRUE, TRUE, 2);
......
src/progress.c
View file @ 26c27b46
......@@ -157,11 +157,7 @@ progress_create_widget (GtkWidget * dlg)
GIOChannel *channel;
// fix it when vertical specified
#if GTK_CHECK_VERSION(3,0,0)
w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#else
w = gtk_vbox_new (FALSE, 0);
#endif
progress_bar = gtk_progress_bar_new ();
gtk_widget_set_name (progress_bar, "yad-progress-widget");
......@@ -175,12 +171,7 @@ progress_create_widget (GtkWidget * dlg)
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), options.progress_data.percentage / 100.0);
if (options.progress_data.progress_text)
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress_bar), options.progress_data.progress_text);
#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (progress_bar), options.progress_data.rtl);
#else
if (options.progress_data.rtl)
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (progress_bar), GTK_PROGRESS_RIGHT_TO_LEFT);
#endif
if (options.progress_data.log)
{
......@@ -194,9 +185,7 @@ progress_create_widget (GtkWidget * dlg)
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), options.hscroll_policy, options.vscroll_policy);
#if GTK_CHECK_VERSION(3,22,0)
gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (sw), TRUE);
#endif
gtk_container_add (GTK_CONTAINER (ex), sw);
progress_log = gtk_text_view_new ();
......@@ -211,10 +200,8 @@ progress_create_widget (GtkWidget * dlg)
gtk_text_view_set_editable (GTK_TEXT_VIEW (progress_log), FALSE);
gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (progress_log), FALSE);
}
#if GTK_CHECK_VERSION(3,0,0)
else
gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (progress_bar), TRUE);
#endif
channel = g_io_channel_unix_new (0);
g_io_channel_set_encoding (channel, NULL, NULL);
......
src/scale.c
View file @ 26c27b46
......@@ -108,20 +108,12 @@ scale_create_widget (GtkWidget * dlg)
0.0);
if (options.common_data.vertical)
{
#if GTK_CHECK_VERSION(3,0,0)
scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adj));
#else
scale = gtk_vscale_new (GTK_ADJUSTMENT (adj));
#endif
gtk_range_set_inverted (GTK_RANGE (scale), !options.scale_data.invert);
}
else
{
#if GTK_CHECK_VERSION(3,0,0)
scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adj));
#else
scale = gtk_hscale_new (GTK_ADJUSTMENT (adj));
#endif
gtk_range_set_inverted (GTK_RANGE (scale), options.scale_data.invert);
}
gtk_widget_set_name (scale, "yad-scale-widget");
......@@ -146,21 +138,9 @@ scale_create_widget (GtkWidget * dlg)
/* create container */
if (options.common_data.vertical)
{
#if GTK_CHECK_VERSION(3,0,0)
w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
#else
w = gtk_vbox_new (FALSE, 1);
#endif
}
w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
else
{
#if GTK_CHECK_VERSION(3,0,0)
w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
#else
w = gtk_hbox_new (FALSE, 1);
#endif
}
w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
/* create buttons */
if (options.scale_data.buttons)
......
src/text.c
View file @ 26c27b46
......@@ -88,11 +88,7 @@ do_search (GtkWidget * e, GtkWidget * w)
static gboolean
search_key_cb (GtkWidget * w, GdkEventKey * key, GtkWidget * win)
{
#if GTK_CHECK_VERSION(2,24,0)
if (key->keyval == GDK_KEY_Escape)
#else
if (key->keyval == GDK_Escape)
#endif
{
gtk_widget_destroy (win);
return TRUE;
......@@ -144,26 +140,14 @@ show_search ()
fev->focus_change.window = gtk_widget_get_window (e);
if (fev->focus_change.window != NULL)
g_object_ref (fev->focus_change.window);
#if GTK_CHECK_VERSION(2,22,0)
gtk_widget_send_focus_change (e, fev);
#else
g_object_ref (e);
GTK_OBJECT_FLAGS (e) |= GTK_HAS_FOCUS;
gtk_widget_event (e, fev);
g_object_notify (G_OBJECT (e), "has-focus");
g_object_unref (e);
#endif
gdk_event_free (fev);
}
static gboolean
key_press_cb (GtkWidget * w, GdkEventKey * key, gpointer data)
{
#if GTK_CHECK_VERSION(2,24,0)
if ((key->state & GDK_CONTROL_MASK) && (key->keyval == GDK_KEY_S || key->keyval == GDK_KEY_s))
#else
if ((key->state & GDK_CONTROL_MASK) && (key->keyval == GDK_S || key->keyval == GDK_s))
#endif
{
show_search ();
return TRUE;
......@@ -472,28 +456,16 @@ text_create_widget (GtkWidget * dlg)
if (options.text_data.fore)
{
#if GTK_CHECK_VERSION(3,0,0)
GdkRGBA clr;
if (gdk_rgba_parse (&clr, options.text_data.fore))
gtk_widget_override_color (text_view, GTK_STATE_FLAG_NORMAL, &clr);
#else
GdkColor clr;
if (gdk_color_parse (options.text_data.fore, &clr))
gtk_widget_modify_text (text_view, GTK_STATE_NORMAL, &clr);
#endif
}
if (options.text_data.back)
{
#if GTK_CHECK_VERSION(3,0,0)
GdkRGBA clr;
if (gdk_rgba_parse (&clr, options.text_data.back))
gtk_widget_override_background_color (text_view, GTK_STATE_FLAG_NORMAL, &clr);
#else
GdkColor clr;
if (gdk_color_parse (options.text_data.back, &clr))
gtk_widget_modify_base (text_view, GTK_STATE_NORMAL, &clr);
#endif
}
#ifdef HAVE_SOURCEVIEW
......@@ -540,11 +512,7 @@ text_create_widget (GtkWidget * dlg)
else
fd = pango_font_description_from_string ("Monospace");
#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_override_font (text_view, fd);
#else
gtk_widget_modify_font (text_view, fd);
#endif
pango_font_description_free (fd);
#ifdef HAVE_SPELL
......
src/util.c
View file @ 26c27b46
......@@ -201,33 +201,6 @@ get_pixbuf (gchar * name, YadIconSize size, gboolean force)
return pb;
}
#if !GTK_CHECK_VERSION(3,0,0)
gchar *
get_color (GdkColor *c, guint64 alpha)
{
gchar *res = NULL;
switch (options.color_data.mode)
{
case YAD_COLOR_HEX:
if (options.color_data.alpha)
res = g_strdup_printf ("#%X%X%X%X", c->red & 0xFF, c->green & 0xFF, c->blue & 0xFF, (guint) ((alpha / 256) & 0xFF));
else
res = g_strdup_printf ("#%X%X%X", c->red & 0xFF, c->green & 0xFF, c->blue & 0xFF);
break;
case YAD_COLOR_RGB:
if (options.color_data.alpha)
res = g_strdup_printf ("rgba(%.1f, %.1f, %.1f, %.1f)", (double) c->red / 255.0, (double) c->green / 255.0,
(double) c->blue / 255.0, (double) alpha / 255 / 255);
else
res = g_strdup_printf ("rgb(%.1f, %.1f, %.1f)", (double) c->red / 255.0, (double) c->green / 255.0,
(double) c->blue / 255.0);
break;
}
return res;
}
#else
gchar *
get_color (GdkRGBA *c)
{
......@@ -247,7 +220,6 @@ get_color (GdkRGBA *c)
}
return res;
}
#endif
void
update_preview (GtkFileChooser * chooser, GtkWidget *p)
......@@ -399,11 +371,7 @@ get_label (gchar * str, guint border)
a = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_container_set_border_width (GTK_CONTAINER (a), border);
#if !GTK_CHECK_VERSION(3,0,0)
t = gtk_hbox_new (FALSE, 0);
#else
t = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
#endif
gtk_container_add (GTK_CONTAINER (a), t);
vals = g_strsplit_set (str, options.common_data.item_separator, 3);
......@@ -431,11 +399,7 @@ get_label (gchar * str, guint border)
gtk_box_pack_start (GTK_BOX (t), i, FALSE, FALSE, 1);
if (l)
{
#if !GTK_CHECK_VERSION(3,0,0)
gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
#else
gtk_label_set_xalign (GTK_LABEL (l), 0.0);
#endif
gtk_box_pack_start (GTK_BOX (t), l, FALSE, FALSE, 1);
}
......
src/yad.h
View file @ 26c27b46
......@@ -28,29 +28,18 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gtk/gtkx.h>
#include <gdk/gdkkeysyms.h>
#if GTK_CHECK_VERSION(3,0,0)
#include <gtk/gtkx.h>
#endif
#include <glib/gi18n.h>
#ifdef HAVE_SPELL
#include <gtkspell/gtkspell.h>
#endif
#ifdef HAVE_SOURCEVIEW
#if GTK_CHECK_VERSION(3,0,0)
#include <gtksourceview/gtksource.h>
#else
#include <gtksourceview/gtksourceview.h>
#include <gtksourceview/gtksourcebuffer.h>
#include <gtksourceview/gtksourcelanguage.h>
#include <gtksourceview/gtksourcelanguagemanager.h>
#include <gtksourceview/gtksourcestylescheme.h>
#include <gtksourceview/gtksourcestyleschememanager.h>
#endif
#endif /* HAVE_SOURCEVIEW */
G_BEGIN_DECLS
......@@ -622,11 +611,7 @@ void write_settings (void);
void update_preview (GtkFileChooser *chooser, GtkWidget *p);
GdkPixbuf *get_pixbuf (gchar *name, YadIconSize size, gboolean force);
#if GTK_CHECK_VERSION(3,0,0)
gchar *get_color (GdkRGBA *c);
#else
gchar *get_color (GdkColor *c, guint64 alpha);
#endif
gchar **split_arg (const gchar *str);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment