diff options
Diffstat (limited to 'src/nautilus-properties-window.c')
| -rw-r--r-- | src/nautilus-properties-window.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c index 4ad4d8b4d..9142c4831 100644 --- a/src/nautilus-properties-window.c +++ b/src/nautilus-properties-window.c @@ -1263,7 +1263,7 @@ attach_label (GtkGrid *grid, gtk_label_set_selectable (GTK_LABEL (label_field), TRUE); } - gtk_misc_set_alignment (GTK_MISC (label_field), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label_field), 0.0); gtk_widget_show (label_field); if (ellipsize_text) { @@ -1696,7 +1696,6 @@ attach_combo_box (GtkGrid *grid, gboolean three_columns) { GtkWidget *combo_box; - GtkWidget *aligner; if (!three_columns) { combo_box = gtk_combo_box_text_new (); @@ -1714,6 +1713,7 @@ attach_combo_box (GtkGrid *grid, "text", 0); } + gtk_widget_set_halign (combo_box, GTK_ALIGN_START); gtk_widget_show (combo_box); gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo_box), @@ -1721,18 +1721,11 @@ attach_combo_box (GtkGrid *grid, NULL, NULL); - /* Put combo box in alignment to make it left-justified - * but minimally sized. - */ - aligner = gtk_alignment_new (0, 0.5, 0, 0); - gtk_widget_show (aligner); - - gtk_container_add (GTK_CONTAINER (aligner), combo_box); - gtk_grid_attach_next_to (grid, aligner, sibling, + gtk_grid_attach_next_to (grid, combo_box, sibling, GTK_POS_RIGHT, 1, 1); return GTK_COMBO_BOX (combo_box); -} +} static GtkComboBox* attach_group_combo_box (GtkGrid *grid, @@ -2906,7 +2899,6 @@ static void create_basic_page (NautilusPropertiesWindow *window) { GtkGrid *grid; - GtkWidget *icon_aligner; GtkWidget *icon_pixmap_widget; GtkWidget *volume_usage; GtkWidget *hbox, *vbox; @@ -2918,13 +2910,11 @@ create_basic_page (NautilusPropertiesWindow *window) icon_pixmap_widget = create_image_widget ( window, should_show_custom_icon_buttons (window)); + gtk_widget_set_halign (icon_pixmap_widget, GTK_ALIGN_END); + gtk_widget_set_valign (icon_pixmap_widget, GTK_ALIGN_START); gtk_widget_show (icon_pixmap_widget); - icon_aligner = gtk_alignment_new (1, 0, 0, 0); - gtk_widget_show (icon_aligner); - - gtk_container_add (GTK_CONTAINER (icon_aligner), icon_pixmap_widget); - gtk_box_pack_start (GTK_BOX (hbox), icon_aligner, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), icon_pixmap_widget, FALSE, FALSE, 0); window->details->icon_chooser = NULL; @@ -3105,7 +3095,7 @@ start_long_operation (NautilusPropertiesWindow *window) /* start long operation */ GdkCursor * cursor; - cursor = gdk_cursor_new (GDK_WATCH); + cursor = gdk_cursor_new_for_display (gdk_display_get_default (), GDK_WATCH); gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor); g_object_unref (cursor); } @@ -4186,14 +4176,12 @@ on_change_permissions_clicked (GtkWidget *button, TRUE, TRUE, 0); label = gtk_label_new (_("Files")); - gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); gtk_grid_attach (grid, label, 1, 0, 1, 1); label = gtk_label_new (_("Folders")); - gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); gtk_grid_attach (grid, label, 2, 0, 1, 1); label = gtk_label_new (_("Owner:")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_grid_attach (grid, label, 0, 1, 1, 1); combo = create_permissions_combo_box (PERMISSION_USER, FALSE); window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos, @@ -4207,7 +4195,7 @@ on_change_permissions_clicked (GtkWidget *button, gtk_grid_attach (grid, combo, 2, 1, 1, 1); label = gtk_label_new (_("Group:")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_grid_attach (grid, label, 0, 2, 1, 1); combo = create_permissions_combo_box (PERMISSION_GROUP, FALSE); window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos, @@ -4221,7 +4209,7 @@ on_change_permissions_clicked (GtkWidget *button, gtk_grid_attach (grid, combo, 2, 2, 1, 1); label = gtk_label_new (_("Others:")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_grid_attach (grid, label, 0, 3, 1, 1); combo = create_permissions_combo_box (PERMISSION_OTHER, FALSE); window->details->change_permission_combos = g_list_prepend (window->details->change_permission_combos, |