From 18ad1ee9552a5d15fd47377c03b2ebccf3726292 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20R=C3=B6nnquist?= Date: Wed, 16 Dec 2020 15:32:03 +0100 Subject: [PATCH] Fix building on GTK2 again, adding #ifdefs for gtk_label_set_[x,y]align gtk_label_set_[x,y]align is only available on gtk3, so to still build on gtk2 we need the old functions used back. --- src/advanced_exif.c | 4 ++++ src/bar.c | 4 ++++ src/bar_exif.c | 8 ++++++++ src/cache_maint.c | 4 ++++ src/preferences.c | 8 ++++++++ src/ui_misc.c | 8 ++++++++ src/ui_utildlg.c | 12 ++++++++++++ src/utilops.c | 24 ++++++++++++++++++++++++ src/window.c | 8 ++++++++ 9 files changed, 80 insertions(+) diff --git a/src/advanced_exif.c b/src/advanced_exif.c index 6da8b85b..9897e8db 100644 --- a/src/advanced_exif.c +++ b/src/advanced_exif.c @@ -403,8 +403,12 @@ GtkWidget *advanced_exif_new(void) ew->label_file_name = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(ew->label_file_name), PANGO_ELLIPSIZE_START); gtk_label_set_selectable(GTK_LABEL(ew->label_file_name), TRUE); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(ew->label_file_name), 0.5); gtk_label_set_yalign(GTK_LABEL(ew->label_file_name), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(ew->label_file_name), 0.5, 0.5); +#endif gtk_box_pack_start(GTK_BOX(box), ew->label_file_name, TRUE, TRUE, 0); gtk_widget_show(ew->label_file_name); diff --git a/src/bar.c b/src/bar.c index 5c7a4d7e..239cc568 100644 --- a/src/bar.c +++ b/src/bar.c @@ -706,8 +706,12 @@ GtkWidget *bar_new(LayoutWindow *lw) bd->label_file_name = gtk_label_new(""); gtk_label_set_ellipsize(GTK_LABEL(bd->label_file_name), PANGO_ELLIPSIZE_END); gtk_label_set_selectable(GTK_LABEL(bd->label_file_name), TRUE); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(bd->label_file_name), 0.5); gtk_label_set_yalign(GTK_LABEL(bd->label_file_name), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(bd->label_file_name), 0.5, 0.5); +#endif gtk_box_pack_start(GTK_BOX(box), bd->label_file_name, TRUE, TRUE, 0); gtk_widget_show(bd->label_file_name); diff --git a/src/bar_exif.c b/src/bar_exif.c index e2286ce1..5d1c2a55 100644 --- a/src/bar_exif.c +++ b/src/bar_exif.c @@ -132,8 +132,12 @@ static void bar_pane_exif_setup_entry_box(PaneExifData *ped, ExifEntry *ee) gtk_widget_show(ee->box); ee->title_label = gtk_label_new(NULL); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(ee->title_label), horizontal ? 1.0 : 0.0); gtk_label_set_yalign(GTK_LABEL(ee->title_label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(ee->title_label), horizontal ? 1.0 : 0.0, 0.5); +#endif gtk_size_group_add_widget(ped->size_group, ee->title_label); gtk_box_pack_start(GTK_BOX(ee->box), ee->title_label, FALSE, TRUE, 0); gtk_widget_show(ee->title_label); @@ -151,8 +155,12 @@ static void bar_pane_exif_setup_entry_box(PaneExifData *ped, ExifEntry *ee) // gtk_label_set_width_chars(GTK_LABEL(ee->value_widget), 20); gtk_label_set_ellipsize(GTK_LABEL(ee->value_widget), PANGO_ELLIPSIZE_END); // gtk_widget_set_size_request(ee->value_widget, 100, -1); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(ee->value_widget), 0.0); gtk_label_set_yalign(GTK_LABEL(ee->value_widget), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(ee->value_widget), 0.0, 0.5); +#endif } gtk_box_pack_start(GTK_BOX(ee->box), ee->value_widget, TRUE, TRUE, 1); diff --git a/src/cache_maint.c b/src/cache_maint.c index af1f7895..d76ee8cd 100644 --- a/src/cache_maint.c +++ b/src/cache_maint.c @@ -1197,8 +1197,12 @@ static GtkWidget *cache_manager_location_label(GtkWidget *group, const gchar *su buf = g_strdup_printf(_("Location: %s"), subdir); label = pref_label_new(group, buf); g_free(buf); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif return label; } diff --git a/src/preferences.c b/src/preferences.c index 0928026f..28b122a7 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -2667,8 +2667,12 @@ static void config_tab_metadata(GtkWidget *notebook) label = pref_label_new(group, _("Warning: Geeqie is built without Exiv2. Some options are disabled.")); #endif label = pref_label_new(group, _("Metadata are written in the following order. The process ends after first success.")); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif ct_button = pref_checkbox_new_int(group, _("1) Save metadata in image files, or sidecar files, according to the XMP standard"), options->metadata.save_in_image_file, &c_options->metadata.save_in_image_file); @@ -2681,8 +2685,12 @@ static void config_tab_metadata(GtkWidget *notebook) text = g_strdup_printf(_("3) Save metadata in Geeqie private directory '%s'"), get_metadata_cache_dir()); label = pref_label_new(group, text); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_misc_set_padding(GTK_MISC(label), 22, 0); g_free(text); diff --git a/src/ui_misc.c b/src/ui_misc.c index 3498dfcb..c2d59b88 100644 --- a/src/ui_misc.c +++ b/src/ui_misc.c @@ -89,8 +89,12 @@ GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill, gtk_widget_show(vbox); label = gtk_label_new(text); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif pref_label_bold(label, TRUE, FALSE); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); @@ -266,8 +270,12 @@ GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *stock_id, if (text) { label = gtk_label_new_with_mnemonic(text); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.5); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5); +#endif gtk_label_set_mnemonic_widget(GTK_LABEL(label), button); } diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c index a81f925d..f8649e93 100644 --- a/src/ui_utildlg.c +++ b/src/ui_utildlg.c @@ -299,8 +299,12 @@ GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock GtkWidget *image; image = gtk_image_new_from_stock(icon_stock_id, GTK_ICON_SIZE_DIALOG); +#if GTK_CHECK_VERSION(3,16,0) gtk_widget_set_halign(GTK_WIDGET(image), GTK_ALIGN_CENTER); gtk_widget_set_valign(GTK_WIDGET(image), GTK_ALIGN_START); +#else + gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.0); +#endif gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); gtk_widget_show(image); } @@ -310,14 +314,22 @@ GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock { label = pref_label_new(vbox, heading); pref_label_bold(label, TRUE, TRUE); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif } if (text) { label = pref_label_new(vbox, text); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); } diff --git a/src/utilops.c b/src/utilops.c index b115dfda..fb2f18d7 100644 --- a/src/utilops.c +++ b/src/utilops.c @@ -98,8 +98,12 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box, head = pref_label_new(vbox, header1); pref_label_bold(head, TRUE, FALSE); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(head), 0.0); gtk_label_set_yalign(GTK_LABEL(head), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(head), 0.0, 0.5); +#endif } imd = image_new(FALSE); @@ -131,8 +135,12 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box, head = pref_label_new(vbox, header2); pref_label_bold(head, TRUE, FALSE); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(head), 0.0); gtk_label_set_yalign(GTK_LABEL(head), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(head), 0.0, 0.5); +#endif } imd = image_new(FALSE); @@ -1493,8 +1501,12 @@ static void box_append_safe_delete_status(GenericDialog *gd) label = pref_label_new(gd->vbox, buf); g_free(buf); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); +#endif gtk_widget_set_sensitive(label, FALSE); } @@ -1595,8 +1607,12 @@ static void file_util_dialog_init_dest_folder(UtilityData *ud) generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL, FALSE); label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder.")); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0); if (options->with_rename) @@ -2109,8 +2125,12 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f label = gtk_label_new(title_f); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_label_set_yalign(GTK_LABEL(label), 0.0); +#else + gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.0); +#endif pref_label_bold(label, TRUE, FALSE); gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, i + 1, @@ -2120,8 +2140,12 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f label = gtk_label_new(value); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_yalign(GTK_LABEL(label), 0.0); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); +#endif gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_table_attach(GTK_TABLE(table), label, 1, 2, i, i + 1, diff --git a/src/window.c b/src/window.c index 4d1fbe1f..43d63b51 100644 --- a/src/window.c +++ b/src/window.c @@ -377,12 +377,20 @@ void help_search_window_show() help_search_window_ok_cb, TRUE); label1 = pref_label_new(GENERIC_DIALOG(gd)->vbox, _("Search engine:")); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label1), 0.0); gtk_label_set_yalign(GTK_LABEL(label1), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label1), 0.0, 0.5); +#endif label2 = pref_label_new(GENERIC_DIALOG(gd)->vbox, options->help_search_engine); +#if GTK_CHECK_VERSION(3,16,0) gtk_label_set_xalign(GTK_LABEL(label2), 0.0); gtk_label_set_yalign(GTK_LABEL(label2), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label2), 0.0, 0.5); +#endif pref_spacer(GENERIC_DIALOG(gd)->vbox, 0); table = pref_table_new(gd->vbox, 3, 1, FALSE, TRUE); -- 2.20.1