[Xfce4-commits] [xfce/thunar] 01/01: Replace gtk_misc_set_aligment
noreply at xfce.org
noreply at xfce.org
Sat Sep 2 19:41:46 CEST 2017
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/thunar.
commit c57c4cba5730e68098f222907065ba081e3290fd
Author: Andre Miranda <andreldm at xfce.org>
Date: Sat Sep 2 14:41:08 2017 -0300
Replace gtk_misc_set_aligment
And a few other improvements
---
plugins/thunar-apr/thunar-apr-desktop-page.c | 12 +++----
plugins/thunar-apr/thunar-apr-image-page.c | 12 +++----
plugins/thunar-sbr/thunar-sbr-insert-renamer.c | 2 +-
plugins/thunar-sbr/thunar-sbr-number-renamer.c | 2 +-
plugins/thunar-sbr/thunar-sbr-remove-renamer.c | 4 +--
plugins/thunar-sbr/thunar-sbr-replace-renamer.c | 4 +--
plugins/thunar-sendto-email/main.c | 7 ++--
thunar/thunar-chooser-dialog.c | 2 +-
thunar/thunar-column-editor.c | 4 +--
thunar/thunar-dialogs.c | 15 +++++----
thunar/thunar-permissions-chooser.c | 31 +++++++++---------
thunar/thunar-preferences-dialog.c | 43 +++++++++++--------------
thunar/thunar-properties-dialog.c | 37 ++++++++++-----------
thunar/thunar-renamer-dialog.c | 2 +-
thunar/thunar-renamer-progress.c | 5 +--
thunar/thunar-size-label.c | 2 +-
thunar/thunar-window.c | 9 +++---
17 files changed, 97 insertions(+), 96 deletions(-)
diff --git a/plugins/thunar-apr/thunar-apr-desktop-page.c b/plugins/thunar-apr/thunar-apr-desktop-page.c
index 5dc00d5..bf391fe 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.c
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -150,7 +150,7 @@ thunar_apr_desktop_page_init (ThunarAprDesktopPage *desktop_page)
gtk_widget_show (table);
label = gtk_label_new (_("Description:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -173,7 +173,7 @@ thunar_apr_desktop_page_init (ThunarAprDesktopPage *desktop_page)
g_object_unref (G_OBJECT (relation));
label = gtk_label_new (_("Command:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -195,7 +195,7 @@ thunar_apr_desktop_page_init (ThunarAprDesktopPage *desktop_page)
g_object_unref (G_OBJECT (relation));
label = gtk_label_new (_("Working Directory:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -217,7 +217,7 @@ thunar_apr_desktop_page_init (ThunarAprDesktopPage *desktop_page)
g_object_unref (G_OBJECT (relation));
label = gtk_label_new (_("URL:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -239,7 +239,7 @@ thunar_apr_desktop_page_init (ThunarAprDesktopPage *desktop_page)
g_object_unref (G_OBJECT (relation));
label = gtk_label_new (_("Comment:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -266,7 +266,7 @@ thunar_apr_desktop_page_init (ThunarAprDesktopPage *desktop_page)
gtk_table_set_row_spacing (GTK_TABLE (table), 4, 24);
label = gtk_label_new (_("Options:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 6, 7, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
diff --git a/plugins/thunar-apr/thunar-apr-image-page.c b/plugins/thunar-apr/thunar-apr-image-page.c
index 2f8842f..28eabd9 100644
--- a/plugins/thunar-apr/thunar-apr-image-page.c
+++ b/plugins/thunar-apr/thunar-apr-image-page.c
@@ -129,14 +129,14 @@ thunar_apr_image_page_init (ThunarAprImagePage *image_page)
gtk_widget_show (table);
label = gtk_label_new (_("Image Type:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
image_page->type_label = gtk_label_new ("");
gtk_label_set_selectable (GTK_LABEL (image_page->type_label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (image_page->type_label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (image_page->type_label), 0.0f);
gtk_label_set_ellipsize (GTK_LABEL (image_page->type_label), PANGO_ELLIPSIZE_END);
gtk_table_attach (GTK_TABLE (table), image_page->type_label, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (image_page->type_label);
@@ -149,14 +149,14 @@ thunar_apr_image_page_init (ThunarAprImagePage *image_page)
g_object_unref (G_OBJECT (relation));
label = gtk_label_new (_("Image Size:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
image_page->dimensions_label = gtk_label_new ("");
gtk_label_set_selectable (GTK_LABEL (image_page->dimensions_label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (image_page->dimensions_label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (image_page->dimensions_label), 0.0f);
gtk_label_set_ellipsize (GTK_LABEL (image_page->dimensions_label), PANGO_ELLIPSIZE_END);
gtk_table_attach (GTK_TABLE (table), image_page->dimensions_label, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (image_page->dimensions_label);
@@ -176,14 +176,14 @@ thunar_apr_image_page_init (ThunarAprImagePage *image_page)
for (n = 0; n < G_N_ELEMENTS (TAIP_EXIF); ++n)
{
label = gtk_label_new (_(TAIP_EXIF[n].name));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, n + 3, n + 4, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
image_page->exif_labels[n] = gtk_label_new ("");
gtk_label_set_selectable (GTK_LABEL (image_page->exif_labels[n]), TRUE);
- gtk_misc_set_alignment (GTK_MISC (image_page->exif_labels[n]), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (image_page->exif_labels[n]), 0.0f);
gtk_label_set_ellipsize (GTK_LABEL (image_page->exif_labels[n]), PANGO_ELLIPSIZE_END);
gtk_table_attach (GTK_TABLE (table), image_page->exif_labels[n], 1, 2, n + 3, n + 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (image_page->exif_labels[n]);
diff --git a/plugins/thunar-sbr/thunar-sbr-insert-renamer.c b/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
index f86bfe6..fbdbf16 100644
--- a/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
@@ -195,7 +195,7 @@ thunar_sbr_insert_renamer_init (ThunarSbrInsertRenamer *insert_renamer)
g_object_unref (G_OBJECT (relation));
label = gtk_label_new_with_mnemonic (_("_At position:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 2, 1, 2, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
diff --git a/plugins/thunar-sbr/thunar-sbr-number-renamer.c b/plugins/thunar-sbr/thunar-sbr-number-renamer.c
index 91b4e3d..6b968b2 100644
--- a/plugins/thunar-sbr/thunar-sbr-number-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-number-renamer.c
@@ -256,7 +256,7 @@ thunar_sbr_number_renamer_init (ThunarSbrNumberRenamer *number_renamer)
gtk_widget_show (entry);
label = gtk_label_new_with_mnemonic (_("_Text:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
gtk_widget_show (label);
diff --git a/plugins/thunar-sbr/thunar-sbr-remove-renamer.c b/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
index 1eedbc8..2070466 100644
--- a/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
@@ -173,7 +173,7 @@ thunar_sbr_remove_renamer_init (ThunarSbrRemoveRenamer *remove_renamer)
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("Remove _From Position:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
@@ -208,7 +208,7 @@ thunar_sbr_remove_renamer_init (ThunarSbrRemoveRenamer *remove_renamer)
gtk_widget_show (combo);
label = gtk_label_new_with_mnemonic (_("_To Position:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
diff --git a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
index 201dd30..0a276f2 100644
--- a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
@@ -200,7 +200,7 @@ thunar_sbr_replace_renamer_init (ThunarSbrReplaceRenamer *replace_renamer)
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("_Search For:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
@@ -229,7 +229,7 @@ thunar_sbr_replace_renamer_init (ThunarSbrReplaceRenamer *replace_renamer)
gtk_widget_show (button);
label = gtk_label_new_with_mnemonic (_("Replace _With:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
diff --git a/plugins/thunar-sendto-email/main.c b/plugins/thunar-sendto-email/main.c
index 0ae48b8..ed0bdac 100644
--- a/plugins/thunar-sendto-email/main.c
+++ b/plugins/thunar-sendto-email/main.c
@@ -279,10 +279,11 @@ tse_progress (const gchar *working_directory,
gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
-
+
/* setup the image */
image = gtk_image_new_from_icon_name ("gnome-package", GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -293,7 +294,7 @@ tse_progress (const gchar *working_directory,
/* setup the label */
label = gtk_label_new (_("Compressing files..."));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index 0ee46d6..ea489ba 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -204,7 +204,7 @@ thunar_chooser_dialog_init (ThunarChooserDialog *dialog)
/* create the header label */
dialog->header_label = gtk_label_new ("");
- gtk_misc_set_alignment (GTK_MISC (dialog->header_label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (dialog->header_label), 0.0f);
gtk_label_set_line_wrap (GTK_LABEL (dialog->header_label), TRUE);
gtk_widget_set_size_request (dialog->header_label, 350, -1);
gtk_box_pack_start (GTK_BOX (header), dialog->header_label, FALSE, FALSE, 0);
diff --git a/thunar/thunar-column-editor.c b/thunar/thunar-column-editor.c
index e873ae7..eda5937 100644
--- a/thunar/thunar-column-editor.c
+++ b/thunar/thunar-column-editor.c
@@ -150,7 +150,7 @@ thunar_column_editor_init (ThunarColumnEditor *column_editor)
/* create the top label for the column editor dialog */
label = gtk_label_new (_("Choose the order of information to appear in the\ndetailed list view."));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -255,7 +255,7 @@ thunar_column_editor_init (ThunarColumnEditor *column_editor)
"needed to ensure the text is fully visible. If you dis-\n"
"able this behavior below the file manager will always\n"
"use the user defined column widths."));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 408fcdc..c4567ba 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -121,7 +121,7 @@ thunar_dialogs_show_rename_file (gpointer parent,
gtk_widget_show (image);
label = gtk_label_new (_("Enter the new name:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -569,7 +569,8 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
gtk_widget_show (table);
image = gtk_image_new_from_icon_name ("stock_folder-copy", GTK_ICON_SIZE_BUTTON);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
gtk_misc_set_padding (GTK_MISC (image), 6, 6);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (image);
@@ -591,7 +592,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
}
label = gtk_label_new (text);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big ());
gtk_table_attach (GTK_TABLE (table), label, 1, 3, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -605,7 +606,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
text = g_strdup_printf (Q_("ReplaceDialogPart1|Do you want to replace the existing file"));
label = gtk_label_new (text);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 1, 3, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
g_free (text);
@@ -621,7 +622,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
date_string = thunar_file_get_date_string (dst_file, THUNAR_FILE_DATE_MODIFIED, date_style);
text = g_strdup_printf ("%s %s\n%s %s", _("Size:"), size_string, _("Modified:"), date_string);
label = gtk_label_new (text);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
g_free (size_string);
@@ -636,7 +637,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
text = g_strdup_printf (Q_("ReplaceDialogPart2|with the following file?"));
label = gtk_label_new (text);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 1, 3, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
g_free (text);
@@ -652,7 +653,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
date_string = thunar_file_get_date_string (src_file, THUNAR_FILE_DATE_MODIFIED, date_style);
text = g_strdup_printf ("%s %s\n%s %s", _("Size:"), size_string, _("Modified:"), date_string);
label = gtk_label_new (text);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 2, 3, 4, 5, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
g_free (size_string);
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index 8c17521..fc0a6ef 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -219,7 +219,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_widget_show (chooser->table);
label = gtk_label_new (_("Owner:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
gtk_table_attach (GTK_TABLE (chooser->table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -229,7 +229,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_widget_show (hbox);
chooser->user_label = gtk_label_new (_("Unknown"));
- gtk_misc_set_alignment (GTK_MISC (chooser->user_label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (chooser->user_label), 0.0f);
gtk_box_pack_start (GTK_BOX (hbox), chooser->user_label, TRUE, TRUE, 0);
thunar_gtk_label_set_a11y_relation (GTK_LABEL (label), chooser->user_label);
gtk_widget_show (chooser->user_label);
@@ -237,7 +237,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
row += 1;
label = gtk_label_new_with_mnemonic (_("_Access:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
gtk_table_attach (GTK_TABLE (chooser->table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -254,14 +254,14 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
row += 1;
- separator = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
+ separator = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_table_attach (GTK_TABLE (chooser->table), separator, 0, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 6);
gtk_widget_show (separator);
row += 1;
label = gtk_label_new_with_mnemonic (_("Gro_up:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
gtk_table_attach (GTK_TABLE (chooser->table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -280,7 +280,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
row += 1;
label = gtk_label_new_with_mnemonic (_("Acce_ss:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
gtk_table_attach (GTK_TABLE (chooser->table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -297,14 +297,14 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
row += 1;
- separator = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
+ separator = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_table_attach (GTK_TABLE (chooser->table), separator, 0, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 6);
gtk_widget_show (separator);
row += 1;
label = gtk_label_new_with_mnemonic (_("O_thers:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
gtk_table_attach (GTK_TABLE (chooser->table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -321,14 +321,14 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
row += 1;
- separator = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
+ separator = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_table_attach (GTK_TABLE (chooser->table), separator, 0, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 6);
gtk_widget_show (separator);
row += 1;
label = gtk_label_new (_("Program:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
gtk_table_attach (GTK_TABLE (chooser->table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -354,7 +354,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_widget_show (image);
label = gtk_label_new (_("Allowing untrusted programs to run\npresents a security risk to your system."));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_small_italic ());
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
@@ -369,7 +369,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_widget_show (image);
chooser->fixperm_label = gtk_label_new (_("The folder permissions are inconsistent, you\nmay not be able to work with files in this folder."));
- gtk_misc_set_alignment (GTK_MISC (chooser->fixperm_label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (chooser->fixperm_label), 0.0f);
gtk_label_set_attributes (GTK_LABEL (chooser->fixperm_label), thunar_pango_attr_list_small_italic ());
exo_binding_new (G_OBJECT (chooser->fixperm_label), "visible", G_OBJECT (hbox), "visible");
gtk_box_pack_start (GTK_BOX (hbox), chooser->fixperm_label, TRUE, TRUE, 0);
@@ -526,7 +526,8 @@ thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser)
gtk_widget_show (hbox);
image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -535,13 +536,13 @@ thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser)
gtk_widget_show (vbox);
label = gtk_label_new (_("Apply recursively?"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big_bold ());
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Do you want to apply your changes recursively to\nall files and subfolders below the selected folder?"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
diff --git a/thunar/thunar-preferences-dialog.c b/thunar/thunar-preferences-dialog.c
index 0ad6bea..0c5485e 100644
--- a/thunar/thunar-preferences-dialog.c
+++ b/thunar/thunar-preferences-dialog.c
@@ -205,7 +205,6 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
GtkAdjustment *adjustment;
GtkWidget *notebook;
GtkWidget *button;
- GtkWidget *align;
GtkWidget *combo;
GtkWidget *frame;
GtkWidget *label;
@@ -263,7 +262,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_widget_show (table);
label = gtk_label_new_with_mnemonic (_("View _new folders using:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -280,7 +279,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_widget_show (combo);
label = gtk_label_new_with_mnemonic (_("Show thumbnails:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -489,32 +488,27 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_table_attach (GTK_TABLE (table), button, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_widget_show (button);
- align = gtk_alignment_new (0.0f, 0.0f, 1.0f, 1.0f);
- gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 6, 18, 0);
- exo_binding_new (G_OBJECT (button), "active", G_OBJECT (align), "sensitive");
- gtk_table_attach (GTK_TABLE (table), align, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_widget_show (align);
-
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_container_add (GTK_CONTAINER (align), hbox);
- gtk_widget_show (hbox);
-
ibox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (hbox), ibox, FALSE, FALSE, 0);
+ gtk_widget_set_hexpand (ibox, TRUE);
+ gtk_widget_set_margin_bottom (ibox, 6);
+ gtk_widget_set_margin_start (ibox, 18);
+ exo_binding_new (G_OBJECT (button), "active", G_OBJECT (ibox), "sensitive");
+ gtk_table_attach (GTK_TABLE (table), ibox, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_widget_show (ibox);
label = gtk_label_new_with_mnemonic (_("Specify the d_elay before an item gets selected\n"
"when the mouse pointer is paused over it:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.0f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.0f);
gtk_box_pack_start (GTK_BOX (ibox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
- align = g_object_new (GTK_TYPE_ALIGNMENT, "height-request", 6, NULL);
- gtk_box_pack_start (GTK_BOX (ibox), align, FALSE, FALSE, 0);
- gtk_widget_show (align);
-
range = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.0, 2000.0, 100.0);
gtk_scale_set_draw_value (GTK_SCALE (range), FALSE);
+ gtk_widget_set_margin_top (range, 6);
+ gtk_scale_add_mark (GTK_SCALE (range), 0.0, GTK_POS_BOTTOM, NULL);
+ gtk_scale_add_mark (GTK_SCALE (range), 1000.0, GTK_POS_BOTTOM, NULL);
+ gtk_scale_add_mark (GTK_SCALE (range), 2000.0, GTK_POS_BOTTOM, NULL);
gtk_widget_set_tooltip_text (range, _("When single-click activation is enabled, pausing the mouse pointer over an item "
"will automatically select that item after the chosen delay. You can disable this "
"behavior by moving the slider to the left-most position. This behavior may be "
@@ -531,22 +525,22 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (ibox), hbox, FALSE, FALSE, 0);
+ gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
gtk_widget_show (hbox);
label = gtk_label_new (_("Disabled"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_small_italic ());
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Medium"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.5f, 0.5f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_small_italic ());
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Long"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_small_italic ());
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
@@ -610,7 +604,8 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
label = gtk_label_new_with_mnemonic (_("When changing the permissions of a folder, you\n"
"can also apply the changes to the contents of the\n"
"folder. Select the default behavior below:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.0f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
@@ -649,7 +644,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_widget_show (button);
label = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
exo_binding_new (G_OBJECT (button), "active", G_OBJECT (label), "sensitive");
g_signal_connect_swapped (G_OBJECT (label), "activate-link", G_CALLBACK (thunar_preferences_dialog_configure), dialog);
gtk_label_set_markup (GTK_LABEL (label), _("<a href=\"volman-config:\">Configure</a> the management of removable drives\n"
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index 45c56c0..9b0cf45 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -286,11 +286,11 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new_with_mnemonic (_("_Name:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_box_pack_end (GTK_BOX (dialog->single_box), label, TRUE, TRUE, 0);
gtk_widget_show (label);
- dialog->name_entry = g_object_new (GTK_TYPE_ENTRY, "editable", FALSE, NULL);
+ dialog->name_entry = g_object_new (GTK_TYPE_ENTRY, "editable", FALSE, "valign", GTK_ALIGN_CENTER, NULL);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->name_entry);
g_signal_connect (G_OBJECT (dialog->name_entry), "activate", G_CALLBACK (thunar_properties_dialog_name_activate), dialog);
g_signal_connect (G_OBJECT (dialog->name_entry), "focus-out-event", G_CALLBACK (thunar_properties_dialog_name_focus_out_event), dialog);
@@ -313,12 +313,12 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new (_("Names:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_widget_show (label);
dialog->names_label = gtk_label_new ("");
- gtk_misc_set_alignment (GTK_MISC (dialog->names_label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (dialog->names_label), 0.0f);
gtk_table_attach (GTK_TABLE (table), dialog->names_label, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
gtk_label_set_ellipsize (GTK_LABEL (dialog->names_label), PANGO_ELLIPSIZE_END);
gtk_label_set_selectable (GTK_LABEL (dialog->names_label), TRUE);
@@ -333,7 +333,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
*/
label = gtk_label_new (_("Kind:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -354,7 +354,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new_with_mnemonic (_("_Open With:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -368,7 +368,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new (_("Link Target:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -386,7 +386,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
*/
label = gtk_label_new (_("Original Path:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -400,7 +400,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new (_("Location:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -413,7 +413,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
++row;
- spacer = g_object_new (GTK_TYPE_ALIGNMENT, "height-request", 12, NULL);
+ spacer = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, "height-request", 12, NULL);
gtk_table_attach (GTK_TABLE (table), spacer, 0, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (spacer);
@@ -425,7 +425,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
*/
label = gtk_label_new (_("Deleted:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -439,7 +439,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new (_("Modified:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -453,7 +453,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new (_("Accessed:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -466,7 +466,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
++row;
- spacer = g_object_new (GTK_TYPE_ALIGNMENT, "height-request", 12, NULL);
+ spacer = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, "height-request", 12, NULL);
gtk_table_attach (GTK_TABLE (table), spacer, 0, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
exo_binding_new (G_OBJECT (dialog->accessed_label), "visible", G_OBJECT (spacer), "visible");
@@ -478,7 +478,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
*/
label = gtk_label_new (_("Size:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -491,7 +491,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new (_("Volume:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -515,7 +515,8 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
label = gtk_label_new (_("Usage:"));
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ());
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.0f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0f);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.0f);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
@@ -536,7 +537,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
++row;
- spacer = g_object_new (GTK_TYPE_ALIGNMENT, "height-request", 12, NULL);
+ spacer = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, "height-request", 12, NULL);
gtk_table_attach (GTK_TABLE (table), spacer, 0, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (spacer);
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 4470c59..474d7ca 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -611,7 +611,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
label = gtk_label_new (_("No renamer modules were found on your system. Please check your\n"
"installation or contact your system administrator. If you install Thunar\n"
"from source, be sure to enable the \"Simple Builtin Renamers\" plugin."));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
diff --git a/thunar/thunar-renamer-progress.c b/thunar/thunar-renamer-progress.c
index 9ebff42..4bcdac2 100644
--- a/thunar/thunar-renamer-progress.c
+++ b/thunar/thunar-renamer-progress.c
@@ -65,7 +65,7 @@ struct _ThunarRenamerProgress
-G_DEFINE_TYPE (ThunarRenamerProgress, thunar_renamer_progress, GTK_TYPE_ALIGNMENT)
+G_DEFINE_TYPE (ThunarRenamerProgress, thunar_renamer_progress, GTK_TYPE_BOX)
@@ -87,9 +87,10 @@ thunar_renamer_progress_class_init (ThunarRenamerProgressClass *klass)
static void
thunar_renamer_progress_init (ThunarRenamerProgress *renamer_progress)
{
- gtk_alignment_set (GTK_ALIGNMENT (renamer_progress), 0.5f, 0.5f, 1.0f, 0.0f);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (renamer_progress), GTK_ORIENTATION_HORIZONTAL);
renamer_progress->bar = gtk_progress_bar_new ();
+ gtk_widget_set_hexpand (renamer_progress->bar, TRUE);
gtk_container_add (GTK_CONTAINER (renamer_progress), renamer_progress->bar);
gtk_widget_show (renamer_progress->bar);
}
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index e78f003..40fc4fe 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -174,7 +174,7 @@ thunar_size_label_init (ThunarSizeLabel *size_label)
/* add the label widget */
size_label->label = gtk_label_new (_("Calculating..."));
- gtk_misc_set_alignment (GTK_MISC (size_label->label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (size_label->label), 0.0f);
gtk_label_set_selectable (GTK_LABEL (size_label->label), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (size_label->label), PANGO_ELLIPSIZE_MIDDLE);
gtk_box_pack_start (GTK_BOX (size_label), size_label->label, TRUE, TRUE, 0);
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 17d1a53..f1950b4 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1766,7 +1766,7 @@ thunar_window_notebook_insert (ThunarWindow *window,
exo_binding_new (G_OBJECT (view), "display-name", G_OBJECT (label), "label");
exo_binding_new (G_OBJECT (view), "tooltip-text", G_OBJECT (label), "tooltip-text");
gtk_widget_set_has_tooltip (label, TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_misc_set_padding (GTK_MISC (label), 3, 3);
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_label_set_single_line_mode (GTK_LABEL (label), TRUE);
@@ -2959,7 +2959,8 @@ thunar_window_action_open_templates (GtkAction *action,
gtk_widget_show (hbox);
image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@@ -2968,7 +2969,7 @@ thunar_window_action_open_templates (GtkAction *action,
gtk_widget_show (vbox);
label = gtk_label_new (_("All files in this folder will appear in the \"Create Document\" menu."));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_big_bold ());
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
@@ -2981,7 +2982,7 @@ thunar_window_action_open_templates (GtkAction *action,
"You can then select the entry from the \"Create Document\" "
"menu and a copy of the document will be created in the "
"directory you are viewing."));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list