GNOME.org
 

[glade] Removed use of deprecated GtkMisc API

commit a4a444174e025779a6925678fb4e1f826cd45bdd
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Thu May 15 15:43:35 2014 -0300

    Removed use of deprecated GtkMisc API

 gladeui/glade-base-editor.c               |   12 ++++++++----
 gladeui/glade-editor-property.c           |   14 +++++++-------
 gladeui/glade-editor-table.c              |    2 +-
 gladeui/glade-editor.c                    |    4 ++--
 gladeui/glade-named-icon-chooser-dialog.c |    6 +++---
 gladeui/glade-palette.c                   |    4 ++--
 gladeui/glade-project-properties.c        |    2 +-
 plugins/gtk+/glade-column-types.c         |    3 +--
 plugins/gtk+/glade-gtk-menu-item.c        |    2 +-
 plugins/gtk+/glade-model-data.c           |    3 +--
 src/glade-window.c                        |    3 +--
 11 files changed, 28 insertions(+), 27 deletions(-)
---
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index 019342e..c8ef558 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -2018,7 +2018,8 @@ glade_base_editor_add_default_properties (GladeBaseEditor *editor,
 
   /* Name */
   label = gtk_label_new (_("Name:"));
-  gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.0);
+  gtk_widget_set_halign (label, GTK_ALIGN_END);
+  gtk_widget_set_valign (label, GTK_ALIGN_START);
 
   entry = gtk_entry_new ();
   gtk_entry_set_text (GTK_ENTRY (entry), glade_widget_get_name (gchild));
@@ -2033,7 +2034,8 @@ glade_base_editor_add_default_properties (GladeBaseEditor *editor,
     {
       /* Type */
       label = gtk_label_new (_("Type:"));
-      gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.0);
+      gtk_widget_set_halign (label, GTK_ALIGN_END);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
 
       entry = gtk_combo_box_new ();
       gtk_combo_box_set_model (GTK_COMBO_BOX (entry), child_class);
@@ -2156,8 +2158,10 @@ glade_base_editor_add_label (GladeBaseEditor *editor, gchar *str)
   row = editor->priv->row;
 
   gtk_label_set_markup (GTK_LABEL (label), markup);
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
-  gtk_misc_set_padding (GTK_MISC (label), 0, 6);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_widget_set_valign (label, GTK_ALIGN_START);
+  gtk_widget_set_margin_top (label, 6);
+  gtk_widget_set_margin_bottom (label, 6);
 
   gtk_grid_attach (GTK_GRID (editor->priv->table), label, 0, row, 2, 1);
   gtk_widget_show (label);
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index 9523705..5facb39 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -1338,7 +1338,7 @@ glade_eprop_flags_show_dialog (GladeEditorProperty *eprop)
   view = glade_eprop_flags_create_treeview (eprop);
 
   label = gtk_label_new_with_mnemonic (_("_Select individual fields:"));
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label),
                                  gtk_bin_get_child (GTK_BIN (view)));
 
@@ -2026,7 +2026,7 @@ glade_editor_property_show_i18n_dialog (GtkWidget *parent,
   /* Text */
   label = gtk_label_new_with_mnemonic (_("_Text:"));
   gtk_widget_show (label);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -2076,7 +2076,7 @@ glade_editor_property_show_i18n_dialog (GtkWidget *parent,
 
   label = gtk_label_new_with_mnemonic (_("Conte_xt for translation:"));
   gtk_widget_show (label);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_container_add (GTK_CONTAINER (alignment), label);
   gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
   gtk_widget_set_tooltip_text (alignment,
@@ -2114,7 +2114,7 @@ glade_editor_property_show_i18n_dialog (GtkWidget *parent,
 
   label = gtk_label_new_with_mnemonic (_("Co_mments for translators:"));
   gtk_widget_show (label);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_container_add (GTK_CONTAINER (alignment), label);
   gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
 
@@ -3181,7 +3181,7 @@ glade_editor_property_show_object_dialog (GladeProject *project,
   /* Checklist */
   label = gtk_label_new_with_mnemonic (_("O_bjects:"));
   gtk_widget_show (label);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -3322,7 +3322,7 @@ glade_eprop_object_show_dialog (GladeEditorProperty *eprop)
   /* Checklist */
   label = gtk_label_new_with_mnemonic (_("O_bjects:"));
   gtk_widget_show (label);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -3625,7 +3625,7 @@ glade_eprop_objects_show_dialog (GladeEditorProperty *eprop)
   /* Checklist */
   label = gtk_label_new (_("Objects:"));
   gtk_widget_show (label);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
diff --git a/gladeui/glade-editor-table.c b/gladeui/glade-editor-table.c
index 1992530..80a8d65 100644
--- a/gladeui/glade-editor-table.c
+++ b/gladeui/glade-editor-table.c
@@ -552,7 +552,7 @@ append_name_field (GladeEditorTable *table)
 
   /* translators: The unique identifier of an object in the project */
   table->priv->name_label = gtk_label_new (_("ID:"));
-  gtk_misc_set_alignment (GTK_MISC (table->priv->name_label), 0.0, 0.5);
+  gtk_widget_set_halign (table->priv->name_label, GTK_ALIGN_START);
   gtk_widget_show (table->priv->name_label);
   gtk_widget_set_no_show_all (table->priv->name_label, TRUE);
 
diff --git a/gladeui/glade-editor.c b/gladeui/glade-editor.c
index b85e5c3..4574802 100644
--- a/gladeui/glade-editor.c
+++ b/gladeui/glade-editor.c
@@ -1118,7 +1118,7 @@ glade_editor_reset_dialog_run (GtkWidget *parent, GladeWidget *gwidget)
   /* Checklist */
   label = gtk_label_new_with_mnemonic (_("_Properties:"));
   gtk_widget_show (label);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -1165,7 +1165,7 @@ glade_editor_reset_dialog_run (GtkWidget *parent, GladeWidget *gwidget)
   /* Description */
   label = gtk_label_new_with_mnemonic (_("Property _Description:"));
   gtk_widget_show (label);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
diff --git a/gladeui/glade-named-icon-chooser-dialog.c b/gladeui/glade-named-icon-chooser-dialog.c
index abf723a..22830fd 100644
--- a/gladeui/glade-named-icon-chooser-dialog.c
+++ b/gladeui/glade-named-icon-chooser-dialog.c
@@ -1401,7 +1401,7 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
   gtk_widget_show (contents);
 
   label = gtk_label_new_with_mnemonic (_("Icon _Name:"));
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_show (label);
 
   dialog->priv->entry = gtk_entry_new ();
@@ -1447,7 +1447,7 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
   label = gtk_label_new_with_mnemonic (_("C_ontexts:"));
   gtk_label_set_mnemonic_widget (GTK_LABEL (label),
                                  dialog->priv->contexts_view);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_size_group_add_widget (group, label);
   gtk_widget_show (label);
 
@@ -1469,7 +1469,7 @@ glade_named_icon_chooser_dialog_init (GladeNamedIconChooserDialog *dialog)
 
   label = gtk_label_new_with_mnemonic (_("Icon Na_mes:"));
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->priv->icons_view);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_size_group_add_widget (group, label);
   gtk_widget_show (label);
 
diff --git a/gladeui/glade-palette.c b/gladeui/glade-palette.c
index 063822b..3bcde29 100644
--- a/gladeui/glade-palette.c
+++ b/gladeui/glade-palette.c
@@ -321,7 +321,7 @@ glade_palette_new_item (GladePalette *palette, GladeWidgetAdaptor *adaptor)
   /* Add a box to avoid the ellipsize on the items */
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   label = gtk_label_new (glade_widget_adaptor_get_title (adaptor));
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_show (label);
   gtk_widget_show (box);
   gtk_container_add (GTK_CONTAINER (box), label);
@@ -363,7 +363,7 @@ glade_palette_new_item_group (GladePalette *palette, GladeWidgetGroup *group)
 
   /* Give the item group a left aligned label */
   label = gtk_label_new (glade_widget_group_get_title (group));
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_show (label);
 
   item_group = gtk_tool_item_group_new ("");
diff --git a/gladeui/glade-project-properties.c b/gladeui/glade-project-properties.c
index 85213e2..f517591 100644
--- a/gladeui/glade-project-properties.c
+++ b/gladeui/glade-project-properties.c
@@ -259,7 +259,7 @@ target_version_box_fill (GladeProjectProperties *properties)
         label = gtk_label_new ("GTK+");
       else
         label = gtk_label_new (glade_catalog_get_name (catalog));
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0F, 0.5F);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
 
       gtk_widget_show (label);
       gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
diff --git a/plugins/gtk+/glade-column-types.c b/plugins/gtk+/glade-column-types.c
index 8027970..7bc9485 100644
--- a/plugins/gtk+/glade-column-types.c
+++ b/plugins/gtk+/glade-column-types.c
@@ -827,8 +827,7 @@ glade_eprop_column_types_create_input (GladeEditorProperty * eprop)
   label = gtk_label_new (string);
   g_free (string);
   gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-  gtk_misc_set_padding (GTK_MISC (label), 2, 4);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
 
   swin = gtk_scrolled_window_new (NULL, NULL);
diff --git a/plugins/gtk+/glade-gtk-menu-item.c b/plugins/gtk+/glade-gtk-menu-item.c
index 326eaf7..34868e6 100644
--- a/plugins/gtk+/glade-gtk-menu-item.c
+++ b/plugins/gtk+/glade-gtk-menu-item.c
@@ -91,7 +91,7 @@ glade_gtk_menu_item_post_create (GladeWidgetAdaptor * adaptor,
   if (gtk_bin_get_child (GTK_BIN (object)) == NULL)
     {
       GtkWidget *label = gtk_label_new ("");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_container_add (GTK_CONTAINER (object), label);
     }
 }
diff --git a/plugins/gtk+/glade-model-data.c b/plugins/gtk+/glade-model-data.c
index 968b670..41cfcc2 100644
--- a/plugins/gtk+/glade-model-data.c
+++ b/plugins/gtk+/glade-model-data.c
@@ -1121,8 +1121,7 @@ glade_eprop_model_data_create_input (GladeEditorProperty * eprop)
   label = gtk_label_new (string);
   g_free (string);
   gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-  gtk_misc_set_padding (GTK_MISC (label), 2, 0);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
   button = gtk_button_new ();
diff --git a/src/glade-window.c b/src/glade-window.c
index a74c532..f73468a 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -2473,8 +2473,7 @@ create_notebook_tab (GladeWindow *window,
                     G_CALLBACK (tab_close_button_clicked_cb), project);
 
   label = gtk_label_new ("");
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-  gtk_misc_set_padding (GTK_MISC (label), 0, 0);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
   progress = gtk_progress_bar_new ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]