[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 02/09: Get rid of GtkAlignment
noreply at xfce.org
noreply at xfce.org
Sat Jun 2 05:09:36 CEST 2018
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 thunar-plugins/thunar-vcs-plugin.
commit 84aad6bf0248e091e5fa907d514bf8698db6e409
Author: Andre Miranda <andreldm at xfce.org>
Date: Fri Jun 1 20:12:10 2018 -0300
Get rid of GtkAlignment
---
thunar-vcs-plugin/tvp-svn-property-page.c | 62 ++++++++++++++++++++++---------
tvp-git-helper/tgh-branch-dialog.c | 8 ++--
tvp-git-helper/tgh-log-dialog.c | 3 +-
tvp-git-helper/tgh-stash-dialog.c | 8 ++--
4 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/thunar-vcs-plugin/tvp-svn-property-page.c b/thunar-vcs-plugin/tvp-svn-property-page.c
index d29102c..ed0135d 100644
--- a/thunar-vcs-plugin/tvp-svn-property-page.c
+++ b/thunar-vcs-plugin/tvp-svn-property-page.c
@@ -115,13 +115,15 @@ tvp_svn_property_page_init (TvpSvnPropertyPage *self)
gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
label = gtk_label_new (_("URL:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
gtk_widget_show (label);
self->url = label = gtk_label_new(_("Unknown"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START);
gtk_widget_set_hexpand (label, TRUE);
@@ -129,26 +131,30 @@ tvp_svn_property_page_init (TvpSvnPropertyPage *self)
gtk_widget_show (label);
label = gtk_label_new (_("Revision:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
gtk_widget_show (label);
self->revision = label = gtk_label_new(_("Unknown"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_widget_set_hexpand (label, TRUE);
gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (_("Repository:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
gtk_widget_show (label);
self->repository = label = gtk_label_new(_("Unknown"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
gtk_widget_set_hexpand (label, TRUE);
@@ -156,31 +162,40 @@ tvp_svn_property_page_init (TvpSvnPropertyPage *self)
gtk_widget_show (label);
/* Alignment in the most simple widget to find, for just doing a size request */
- 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,
+ "hexpand", TRUE,
+ "vexpand", TRUE,
+ NULL);
gtk_grid_attach (GTK_GRID (grid), spacer, 0, 3, 2, 1);
gtk_widget_show (spacer);
label = gtk_label_new (_("Modified revision:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_grid_attach (GTK_GRID (grid), label, 0, 4, 1, 1);
gtk_widget_show (label);
self->modrev = label = gtk_label_new(_("Unknown"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_widget_set_hexpand (label, TRUE);
gtk_grid_attach (GTK_GRID (grid), label, 1, 4, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (_("Modified date:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_grid_attach (GTK_GRID (grid), label, 0, 5, 1, 1);
gtk_widget_show (label);
self->moddate = label = gtk_label_new(_("Unknown"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_widget_set_hexpand (label, TRUE);
@@ -188,31 +203,40 @@ tvp_svn_property_page_init (TvpSvnPropertyPage *self)
gtk_widget_show (label);
label = gtk_label_new (_("Author:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_grid_attach (GTK_GRID (grid), label, 0, 6, 1, 1);
gtk_widget_show (label);
self->modauthor = label = gtk_label_new(_("Unknown"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_widget_set_hexpand (label, TRUE);
gtk_grid_attach (GTK_GRID (grid), label, 1, 6, 1, 1);
gtk_widget_show (label);
/* Alignment in the most simple widget to find, for just doing a size request */
- 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,
+ "hexpand", TRUE,
+ "vexpand", TRUE,
+ NULL);
gtk_grid_attach (GTK_GRID (grid), spacer, 0, 7, 2, 1);
gtk_widget_show (spacer);
label = gtk_label_new (_("Changelist:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_grid_attach (GTK_GRID (grid), label, 0, 8, 1, 1);
gtk_widget_show (label);
self->changelist = label = gtk_label_new("");
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_widget_set_hexpand (label, TRUE);
gtk_grid_attach (GTK_GRID (grid), label, 1, 8, 1, 1);
@@ -220,13 +244,15 @@ tvp_svn_property_page_init (TvpSvnPropertyPage *self)
/* Translators: Depth as in depth of recursion */
label = gtk_label_new (_("Depth:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_attributes (GTK_LABEL (label), attr_list);
gtk_grid_attach (GTK_GRID (grid), label, 0, 9, 1, 1);
gtk_widget_show (label);
self->depth = label = gtk_label_new(_("Unknown"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_widget_set_hexpand (label, TRUE);
gtk_grid_attach (GTK_GRID (grid), label, 1, 9, 1, 1);
diff --git a/tvp-git-helper/tgh-branch-dialog.c b/tvp-git-helper/tgh-branch-dialog.c
index 8eb04e5..1820793 100644
--- a/tvp-git-helper/tgh-branch-dialog.c
+++ b/tvp-git-helper/tgh-branch-dialog.c
@@ -254,10 +254,12 @@ create_clicked (GtkButton *button, gpointer user_data)
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (name_dialog), TRUE);
label = gtk_label_new (_("Branch name:"));
- image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.0f);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+ image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
name_entry = gtk_entry_new ();
diff --git a/tvp-git-helper/tgh-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
index c4baaf8..5d02420 100644
--- a/tvp-git-helper/tgh-log-dialog.c
+++ b/tvp-git-helper/tgh-log-dialog.c
@@ -185,7 +185,8 @@ tgh_log_dialog_init (TghLogDialog *dialog)
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
dialog->revision_label = label = gtk_label_new (_("Revision"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.5f);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
gtk_widget_show (label);
diff --git a/tvp-git-helper/tgh-stash-dialog.c b/tvp-git-helper/tgh-stash-dialog.c
index cc7b277..ada9c02 100644
--- a/tvp-git-helper/tgh-stash-dialog.c
+++ b/tvp-git-helper/tgh-stash-dialog.c
@@ -383,10 +383,12 @@ save_clicked (GtkButton *button, gpointer user_data)
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (name_dialog), TRUE);
label = gtk_label_new (_("Stash description:"));
- image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0f);
+ gtk_label_set_yalign (GTK_LABEL (label), 0.0f);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+ image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
+ gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (image, GTK_ALIGN_START);
desc_entry = gtk_entry_new ();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list