Remove deprecated GtkAlignment

Use GtkWidget:halign and GtkWidget:valign properties.

diff --git a/src/bar-exif.cc b/src/bar-exif.cc
index 03c601e..ff3dfcb 100644 (file)
--- a/src/bar-exif.cc
+++ b/src/bar-exif.cc
@@ -566,7 +566,7 @@ static void bar_pane_exif_conf_dialog(GtkWidget *widget)
                                  bar_pane_exif_edit_ok_cb, TRUE);
 
        table = pref_table_new(gd->vbox, 3, 2, FALSE, TRUE);
-       pref_table_label(table, 0, 0, _("Key:"), 1.0);
+       pref_table_label(table, 0, 0, _("Key:"), GTK_ALIGN_END);
 
        cdd->key_entry = gtk_entry_new();
        gtk_widget_set_size_request(cdd->key_entry, 300, -1);
@@ -575,7 +575,7 @@ static void bar_pane_exif_conf_dialog(GtkWidget *widget)
        generic_dialog_attach_default(gd, cdd->key_entry);
        gtk_widget_show(cdd->key_entry);
 
-       pref_table_label(table, 0, 1, _("Title:"), 1.0);
+       pref_table_label(table, 0, 1, _("Title:"), GTK_ALIGN_END);
 
        cdd->title_entry = gtk_entry_new();
        gtk_widget_set_size_request(cdd->title_entry, 300, -1);

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index 377519a..8501ad1 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -960,7 +960,7 @@ static void bar_pane_keywords_edit_dialog(PaneKeywordsData *pkd, gboolean edit_e
                                  bar_pane_keywords_edit_ok_cb, TRUE);
 
        table = pref_table_new(gd->vbox, 3, 1, FALSE, TRUE);
-       pref_table_label(table, 0, 0, _("Keyword:"), 1.0);
+       pref_table_label(table, 0, 0, _("Keyword:"), GTK_ALIGN_END);
        cdd->edit_widget = gtk_entry_new();
        gtk_widget_set_size_request(cdd->edit_widget, 300, -1);
        if (name) gtk_entry_set_text(GTK_ENTRY(cdd->edit_widget), name);

diff --git a/src/cache-maint.cc b/src/cache-maint.cc
index 9eebb30..d2f02e4 100644 (file)
--- a/src/cache-maint.cc
+++ b/src/cache-maint.cc
@@ -1720,12 +1720,12 @@ void cache_manager_show()
        button = pref_table_button(table, 0, 0, GQ_ICON_CLEAR, _("Clean up"),
                                   G_CALLBACK(cache_manager_main_clean_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 0, _("Remove orphaned or outdated thumbnails and sim. files."), 0.0);
+       pref_table_label(table, 1, 0, _("Remove orphaned or outdated thumbnails and sim. files."), GTK_ALIGN_START);
 
        button = pref_table_button(table, 0, 1, GQ_ICON_DELETE, _("Clear cache"),
                                   G_CALLBACK(cache_manager_main_clear_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 1, _("Delete all cached data."), 0.0);
+       pref_table_label(table, 1, 1, _("Delete all cached data."), GTK_ALIGN_START);
 
 
        group = pref_group_new(gd->vbox, FALSE, _("Shared thumbnail cache"), GTK_ORIENTATION_VERTICAL);
@@ -1739,12 +1739,12 @@ void cache_manager_show()
        button = pref_table_button(table, 0, 0, GQ_ICON_CLEAR, _("Clean up"),
                                   G_CALLBACK(cache_manager_standard_clean_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 0, _("Remove orphaned or outdated thumbnails."), 0.0);
+       pref_table_label(table, 1, 0, _("Remove orphaned or outdated thumbnails."), GTK_ALIGN_START);
 
        button = pref_table_button(table, 0, 1, GQ_ICON_DELETE, _("Clear cache"),
                                   G_CALLBACK(cache_manager_standard_clear_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 1, _("Delete all cached thumbnails."), 0.0);
+       pref_table_label(table, 1, 1, _("Delete all cached thumbnails."), GTK_ALIGN_START);
 
        group = pref_group_new(gd->vbox, FALSE, _("Create thumbnails"), GTK_ORIENTATION_VERTICAL);
 
@@ -1753,7 +1753,7 @@ void cache_manager_show()
        button = pref_table_button(table, 0, 1, GQ_ICON_RUN, _("Render"),
                                   G_CALLBACK(cache_manager_render_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 1, _("Render thumbnails for a specific folder."), 0.0);
+       pref_table_label(table, 1, 1, _("Render thumbnails for a specific folder."), GTK_ALIGN_START);
        gtk_widget_set_sensitive(group, options->thumbnails.enable_caching);
 
        group = pref_group_new(gd->vbox, FALSE, _("File similarity cache"), GTK_ORIENTATION_VERTICAL);
@@ -1763,7 +1763,7 @@ void cache_manager_show()
        button = pref_table_button(table, 0, 0, GQ_ICON_RUN, _("Create"),
                                   G_CALLBACK(cache_manager_sim_load_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 0, _("Create sim. files recursively."), 0.0);
+       pref_table_label(table, 1, 0, _("Create sim. files recursively."), GTK_ALIGN_START);
        gtk_widget_set_sensitive(group, options->thumbnails.enable_caching);
 
        group = pref_group_new(gd->vbox, FALSE, _("Metadata"), GTK_ORIENTATION_VERTICAL);
@@ -1775,7 +1775,7 @@ void cache_manager_show()
        button = pref_table_button(table, 0, 0, GQ_ICON_CLEAR, _("Clean up"),
                                   G_CALLBACK(cache_manager_metadata_clean_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 0, _("Remove orphaned keywords and comments."), 0.0);
+       pref_table_label(table, 1, 0, _("Remove orphaned keywords and comments."), GTK_ALIGN_START);
 
        group = pref_group_new(gd->vbox, FALSE, _("Background cache maintenance"), GTK_ORIENTATION_VERTICAL);
 
@@ -1784,7 +1784,7 @@ void cache_manager_show()
        button = pref_table_button(table, 0, 0, GQ_ICON_RUN, _("Select"),
                                   G_CALLBACK(cache_manager_cache_maintenance_load_cb), cache_manager);
        gtk_size_group_add_widget(sizegroup, button);
-       pref_table_label(table, 1, 0, _("Run cache maintenance as a background job."), 0.0);
+       pref_table_label(table, 1, 0, _("Run cache maintenance as a background job."), GTK_ALIGN_START);
        gtk_widget_set_sensitive(group, options->thumbnails.enable_caching);
 
        gtk_widget_show(cache_manager->dialog->dialog);

diff --git a/src/preferences.cc b/src/preferences.cc
index ac77037..e93a665 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -650,7 +650,7 @@ static void add_quality_menu(GtkWidget *table, gint column, gint row, const gcha
 
        *option_c = option;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
 
@@ -677,7 +677,7 @@ static void add_dnd_default_action_selection_menu(GtkWidget *table, gint column,
 
        *option_c = option;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
 
@@ -705,7 +705,7 @@ static void add_clipboard_selection_menu(GtkWidget *table, gint column, gint row
 
        *option_c = option;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
 
@@ -749,7 +749,7 @@ static void add_zoom_style_selection_menu(GtkWidget *table, gint column, gint ro
 
        *option_c = option;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
 
@@ -879,7 +879,7 @@ static void add_mouse_selection_menu(GtkWidget *table, gint column, gint row, co
 
        *option_c = option;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
 
@@ -933,7 +933,7 @@ static void add_thumb_size_menu(GtkWidget *table, gint column, gint row, gchar *
        c_options->thumbnails.max_width = options->thumbnails.max_width;
        c_options->thumbnails.max_height = options->thumbnails.max_height;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
 
@@ -1035,7 +1035,7 @@ static void add_stereo_mode_menu(GtkWidget *table, gint column, gint row, const
 
        *option_c = option;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
 
@@ -1117,7 +1117,7 @@ static void add_video_menu(GtkWidget *table, gint column, gint row, const gchar
 
        *option_c = option;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
        g_list_foreach(eds,video_menu_populate,combo);
@@ -3332,7 +3332,7 @@ static void add_intent_menu(GtkWidget *table, gint column, gint row, const gchar
 
        *option_c = option;
 
-       pref_table_label(table, column, row, text, 0.0);
+       pref_table_label(table, column, row, text, GTK_ALIGN_START);
 
        combo = gtk_combo_box_text_new();
 
@@ -3376,13 +3376,13 @@ static void config_tab_color(GtkWidget *notebook)
        table = pref_table_new(group, 3, COLOR_PROFILE_INPUTS + 1, FALSE, FALSE);
        gtk_table_set_col_spacings(GTK_TABLE(table), PREF_PAD_GAP);
 
-       label = pref_table_label(table, 0, 0, _("Type"), 0.0);
+       label = pref_table_label(table, 0, 0, _("Type"), GTK_ALIGN_START);
        pref_label_bold(label, TRUE, FALSE);
 
-       label = pref_table_label(table, 1, 0, _("Menu name"), 0.0);
+       label = pref_table_label(table, 1, 0, _("Menu name"), GTK_ALIGN_START);
        pref_label_bold(label, TRUE, FALSE);
 
-       label = pref_table_label(table, 2, 0, _("File"), 0.0);
+       label = pref_table_label(table, 2, 0, _("File"), GTK_ALIGN_START);
        pref_label_bold(label, TRUE, FALSE);
 
        for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
@@ -3391,7 +3391,7 @@ static void config_tab_color(GtkWidget *notebook)
                gchar *buf;
 
                buf = g_strdup_printf(_("Input %d:"), i + COLOR_PROFILE_FILE);
-               pref_table_label(table, 0, i + 1, buf, 1.0);
+               pref_table_label(table, 0, i + 1, buf, GTK_ALIGN_END);
                g_free(buf);
 
                entry = gtk_entry_new();
@@ -3423,7 +3423,7 @@ static void config_tab_color(GtkWidget *notebook)
 
        table = pref_table_new(group, 2, 1, FALSE, FALSE);
 
-       pref_table_label(table, 0, 0, _("Screen:"), 1.0);
+       pref_table_label(table, 0, 0, _("Screen:"), GTK_ALIGN_END);
        tabcomp = tab_completion_new(&color_profile_screen_file_entry,
                                     options->color_profile.screen_file, nullptr, ".icc", "ICC Files", nullptr);
        tab_completion_add_select_button(color_profile_screen_file_entry, _("Select color profile"), FALSE);

diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc
index 1af9a4f..30b7c9d 100644 (file)
--- a/src/ui-bookmark.cc
+++ b/src/ui-bookmark.cc
@@ -279,7 +279,7 @@ static void bookmark_edit(const gchar *key, const gchar *text, GtkWidget *parent
                                  bookmark_edit_ok_cb, TRUE);
 
        table = pref_table_new(gd->vbox, 3, 2, FALSE, TRUE);
-       pref_table_label(table, 0, 0, _("Name:"), 1.0);
+       pref_table_label(table, 0, 0, _("Name:"), GTK_ALIGN_END);
 
        p->name_entry = gtk_entry_new();
        gtk_widget_set_size_request(p->name_entry, 300, -1);
@@ -288,7 +288,7 @@ static void bookmark_edit(const gchar *key, const gchar *text, GtkWidget *parent
        generic_dialog_attach_default(gd, p->name_entry);
        gtk_widget_show(p->name_entry);
 
-       pref_table_label(table, 0, 1, _("Path:"), 1.0);
+       pref_table_label(table, 0, 1, _("Path:"), GTK_ALIGN_END);
 
        label = tab_completion_new_with_history(&p->path_entry, p->bb->path,
                                                "bookmark_path", -1, nullptr, nullptr);
@@ -297,7 +297,7 @@ static void bookmark_edit(const gchar *key, const gchar *text, GtkWidget *parent
        generic_dialog_attach_default(gd, p->path_entry);
        gtk_widget_show(label);
 
-       pref_table_label(table, 0, 2, _("Icon:"), 1.0);
+       pref_table_label(table, 0, 2, _("Icon:"), GTK_ALIGN_END);
 
        icon = p->bb->icon;
        if (!icon) icon = "";

diff --git a/src/ui-misc.cc b/src/ui-misc.cc
index 866b884..2e82a34 100644 (file)
--- a/src/ui-misc.cc
+++ b/src/ui-misc.cc
@@ -586,17 +586,15 @@ GtkWidget *pref_table_box(GtkWidget *table, gint column, gint row,
 }
 
 GtkWidget *pref_table_label(GtkWidget *table, gint column, gint row,
-                           const gchar *text, gfloat alignment)
+                           const gchar *text, GtkAlign alignment)
 {
        GtkWidget *label;
-       GtkWidget *align;
 
-       align = gtk_alignment_new(alignment, 0.50, 0.0, 0.0);
-       gtk_table_attach(GTK_TABLE(table), align, column, column + 1, row, row + 1,
-                        GTK_FILL, static_cast<GtkAttachOptions>(0), 0, 0);
-       gtk_widget_show(align);
        label = gtk_label_new(text);
-       gtk_container_add(GTK_CONTAINER(align), label);
+       gtk_widget_set_halign(label, alignment);
+       gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
+       gtk_table_attach(GTK_TABLE(table), label, column, column + 1, row, row + 1,
+                        GTK_FILL, static_cast<GtkAttachOptions>(0), 0, 0);
        gtk_widget_show(label);
 
        return label;
@@ -636,7 +634,7 @@ GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row,
 
        if (text)
                {
-               label = pref_table_label(table, column, row, text, 1.0);
+               label = pref_table_label(table, column, row, text, GTK_ALIGN_END);
                pref_link_sensitivity(label, spin);
                column++;
                }

diff --git a/src/ui-misc.h b/src/ui-misc.h
index aaed09d..b74ba2d 100644 (file)
--- a/src/ui-misc.h
+++ b/src/ui-misc.h
@@ -162,7 +162,7 @@ GtkWidget *pref_table_box(GtkWidget *table, gint column, gint row,
                          GtkOrientation orientation, const gchar *text);
 
 GtkWidget *pref_table_label(GtkWidget *table, gint column, gint row,
-                           const gchar *text, gfloat alignment);
+                           const gchar *text, GtkAlign alignment);
 
 GtkWidget *pref_table_button(GtkWidget *table, gint column, gint row,
                             const gchar *stock_id, const gchar *text,

diff --git a/src/utilops.cc b/src/utilops.cc
index 35bb108..14dd3eb 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -1714,10 +1714,10 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
 
        table = pref_table_new(page, 2, 2, FALSE, FALSE);
 
-       pref_table_label(table, 0, 0, _("Original name:"), 1.0);
-       ud->rename_label = pref_table_label(table, 1, 0, "", 0.0);
+       pref_table_label(table, 0, 0, _("Original name:"), GTK_ALIGN_END);
+       ud->rename_label = pref_table_label(table, 1, 0, "", GTK_ALIGN_START);
 
-       pref_table_label(table, 0, 1, _("New name:"), 1.0);
+       pref_table_label(table, 0, 1, _("New name:"), GTK_ALIGN_END);
 
        ud->rename_entry = gtk_entry_new();
        gtk_table_attach(GTK_TABLE(table), ud->rename_entry, 1, 2, 1, 2, static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(0), 0, 0);

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index 7b2ac23..ea1b8f9 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -907,7 +907,7 @@ static gboolean vf_marks_tooltip_cb(GtkWidget *widget,
                                  vf_marks_tooltip_help_cb, FALSE);
 
        table = pref_table_new(mte->gd->vbox, 3, 1, FALSE, TRUE);
-       pref_table_label(table, 0, 0, g_strdup_printf("%s%d", _("Mark "), mte->mark_no + 1), 1.0);
+       pref_table_label(table, 0, 0, g_strdup_printf("%s%d", _("Mark "), mte->mark_no + 1), GTK_ALIGN_END);
        mte->edit_widget = gtk_entry_new();
        gtk_widget_set_size_request(mte->edit_widget, 300, -1);
        if (mte->text_entry)

diff --git a/src/window.cc b/src/window.cc
index fc80801..81c9733 100644 (file)
--- a/src/window.cc
+++ b/src/window.cc
@@ -384,7 +384,7 @@ void help_search_window_show()
        pref_spacer(GENERIC_DIALOG(gd)->vbox, 0);
 
        table = pref_table_new(gd->vbox, 3, 1, FALSE, TRUE);
-       pref_table_label(table, 0, 0, _("Search terms:"), 1.0);
+       pref_table_label(table, 0, 0, _("Search terms:"), GTK_ALIGN_END);
        hsd->edit_widget = gtk_entry_new();
        gtk_widget_set_size_request(hsd->edit_widget, 300, -1);
        gtk_table_attach_defaults(GTK_TABLE(table), hsd->edit_widget, 1, 2, 0, 1);