Commit 05a56350 authored by Sergey V. Udaltsov's avatar Sergey V. Udaltsov Committed by Matthias Clasen

Replacing hbox/vbox with box

GTK deprecated hbox/vbox. Simple change makes g-d-u compilable at least
https://bugzilla.gnome.org/show_bug.cgi?id=652504
parent bcb96fb7
......@@ -209,14 +209,14 @@ gdu_add_component_linux_md_dialog_constructed (GObject *object)
icon = gdu_presentable_get_icon (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
p = gdu_dialog_get_presentable (GDU_DIALOG (dialog));
......
......@@ -233,14 +233,14 @@ gdu_add_pv_linux_lvm2_dialog_constructed (GObject *object)
icon = gdu_presentable_get_icon (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
p = gdu_dialog_get_presentable (GDU_DIALOG (dialog));
......
......@@ -1123,7 +1123,7 @@ on_self_test_button_clicked (GduButtonElement *button_element,
gtk_box_set_spacing (GTK_BOX (action_area), 6);
gtk_window_set_resizable (GTK_WINDOW (test_dialog), FALSE);
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
......@@ -1131,7 +1131,7 @@ on_self_test_button_clicked (GduButtonElement *button_element,
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
main_vbox = gtk_vbox_new (FALSE, 10);
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE, 0);
label = gtk_label_new (NULL);
......@@ -1278,7 +1278,7 @@ gdu_ata_smart_dialog_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 12, 12, 12, 12);
gtk_box_pack_start (GTK_BOX (content_area), align, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_add (GTK_CONTAINER (align), vbox);
/* ---------------------------------------------------------------------------------------------------- */
......
......@@ -48,7 +48,7 @@ enum
static void do_relayout (GduButtonTable *table);
G_DEFINE_TYPE (GduButtonTable, gdu_button_table, GTK_TYPE_HBOX)
G_DEFINE_TYPE (GduButtonTable, gdu_button_table, GTK_TYPE_BOX)
static void
gdu_button_table_finalize (GObject *object)
......@@ -295,7 +295,7 @@ create_button (GtkWidget *widget,
gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
g_free (s);
hbox = gtk_hbox_new (FALSE, 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
......
......@@ -39,7 +39,7 @@ typedef struct GduButtonTablePrivate GduButtonTablePrivate;
struct GduButtonTable
{
GtkHBox parent;
GtkBox parent;
/*< private >*/
GduButtonTablePrivate *priv;
......@@ -47,7 +47,7 @@ struct GduButtonTable
struct GduButtonTableClass
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
};
GType gdu_button_table_get_type (void) G_GNUC_CONST;
......
......@@ -146,7 +146,7 @@ gdu_confirmation_dialog_constructed (GObject *object)
emblemed_icon = g_emblemed_icon_new (confirmation_icon,
emblem);
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
image = gtk_image_new_from_gicon (emblemed_icon,
......@@ -154,7 +154,7 @@ gdu_confirmation_dialog_constructed (GObject *object)
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
s = g_strdup_printf ("<big><big><b>%s</b></big></big>",
......
......@@ -537,7 +537,7 @@ gdu_create_linux_md_dialog_constructed (GObject *object)
g_free (s);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new (FALSE, 12);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
......@@ -693,7 +693,7 @@ gdu_create_linux_md_dialog_constructed (GObject *object)
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), disk_selection_widget);
vbox2 = gtk_vbox_new (FALSE, 12);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
......@@ -717,7 +717,7 @@ gdu_create_linux_md_dialog_constructed (GObject *object)
/* -------------------------------------------------------------------------------- */
hbox = gtk_hbox_new (FALSE, 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_MENU);
......
......@@ -48,7 +48,7 @@ enum
static void do_relayout (GduDetailsTable *table);
G_DEFINE_TYPE (GduDetailsTable, gdu_details_table, GTK_TYPE_HBOX)
G_DEFINE_TYPE (GduDetailsTable, gdu_details_table, GTK_TYPE_BOX)
static void
gdu_details_table_finalize (GObject *object)
......@@ -448,7 +448,7 @@ do_relayout (GduDetailsTable *table)
0, 1, row, row + 1,
GTK_FILL, GTK_FILL, 0, 0);
hbox = gtk_hbox_new (FALSE, 2);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
data->image = gtk_image_new_from_stock ("gtk-missing-image",
GTK_ICON_SIZE_MENU);
......
......@@ -39,7 +39,7 @@ typedef struct GduDetailsTablePrivate GduDetailsTablePrivate;
struct GduDetailsTable
{
GtkHBox parent;
GtkBox parent;
/*< private >*/
GduDetailsTablePrivate *priv;
......@@ -47,7 +47,7 @@ struct GduDetailsTable
struct GduDetailsTableClass
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
};
GType gdu_details_table_get_type (void) G_GNUC_CONST;
......
......@@ -100,7 +100,7 @@ static void on_row_inserted (GtkTreeModel *tree_model,
GtkTreeIter *iter,
gpointer user_data);
G_DEFINE_TYPE (GduDiskSelectionWidget, gdu_disk_selection_widget, GTK_TYPE_VBOX)
G_DEFINE_TYPE (GduDiskSelectionWidget, gdu_disk_selection_widget, GTK_TYPE_BOX)
static void
gdu_disk_selection_widget_finalize (GObject *object)
......
......@@ -39,7 +39,7 @@ typedef struct GduDiskSelectionWidgetPrivate GduDiskSelectionWidgetPrivate;
struct GduDiskSelectionWidget
{
GtkVBox parent;
GtkBox parent;
/*< private >*/
GduDiskSelectionWidgetPrivate *priv;
......@@ -47,7 +47,7 @@ struct GduDiskSelectionWidget
struct GduDiskSelectionWidgetClass
{
GtkVBoxClass parent_class;
GtkBoxClass parent_class;
void (*changed) (GduDiskSelectionWidget *widget);
......
......@@ -695,7 +695,7 @@ gdu_drive_benchmark_dialog_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 12, 12, 12, 12);
gtk_box_pack_start (GTK_BOX (content_area), align, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_add (GTK_CONTAINER (align), vbox);
/* ---------------------------------------------------------------------------------------------------- */
......@@ -720,7 +720,7 @@ gdu_drive_benchmark_dialog_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 36, 0);
gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new (FALSE, 12);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_add (GTK_CONTAINER (align), vbox2);
/* ---------------------------------------------------------------------------------------------------- */
......
......@@ -311,14 +311,14 @@ gdu_edit_linux_lvm2_dialog_constructed (GObject *object)
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_container_set_border_width (GTK_CONTAINER (content_area), 10);
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 6);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
......@@ -345,7 +345,7 @@ gdu_edit_linux_lvm2_dialog_constructed (GObject *object)
g_free (s);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new (FALSE, 12);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
......
......@@ -349,14 +349,14 @@ gdu_edit_linux_md_dialog_constructed (GObject *object)
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_container_set_border_width (GTK_CONTAINER (content_area), 10);
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 6);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
......@@ -383,7 +383,7 @@ gdu_edit_linux_md_dialog_constructed (GObject *object)
g_free (s);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new (FALSE, 12);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
......
......@@ -203,14 +203,14 @@ gdu_edit_name_dialog_constructed (GObject *object)
icon = gdu_presentable_get_icon (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
s2 = gdu_presentable_get_vpd_name (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
......
......@@ -276,14 +276,14 @@ gdu_edit_partition_dialog_constructed (GObject *object)
icon = gdu_presentable_get_icon (gdu_dialog_get_presentable (GDU_DIALOG (dialog)));
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
p = gdu_dialog_get_presentable (GDU_DIALOG (dialog));
......
......@@ -192,13 +192,13 @@ gdu_error_dialog_constructed (GObject *object)
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
}
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
s = g_strdup_printf ("<big><big><b>%s</b></big></big>",
......
......@@ -524,7 +524,7 @@ gdu_format_dialog_constructed (GObject *object)
gtk_container_set_border_width (GTK_CONTAINER (content_area), 10);
/* icon and text labels */
hbox = gtk_hbox_new (FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
image = gtk_image_new_from_pixbuf (pixbuf);
......@@ -535,7 +535,7 @@ gdu_format_dialog_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 12, 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0);
vbox2 = gtk_vbox_new (FALSE, 6);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (align), vbox2);
table = dialog->priv->table;
......
......@@ -358,7 +358,7 @@ gdu_util_dialog_show_filesystem_busy (GtkWidget *parent_window,
// TODO: no support for GIcon in GtkWindow
//gtk_window_set_icon_name (GTK_WINDOW (dialog), window_icon);
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
......@@ -366,7 +366,7 @@ gdu_util_dialog_show_filesystem_busy (GtkWidget *parent_window,
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
main_vbox = gtk_vbox_new (FALSE, 10);
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE, 0);
/* main message */
......@@ -609,7 +609,7 @@ gdu_util_dialog_secret_internal (GtkWidget *parent_window,
//else
gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_DIALOG_AUTHENTICATION);
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
......@@ -617,7 +617,7 @@ gdu_util_dialog_secret_internal (GtkWidget *parent_window,
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
main_vbox = gtk_vbox_new (FALSE, 10);
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE, 0);
/* main message */
......@@ -666,7 +666,7 @@ gdu_util_dialog_secret_internal (GtkWidget *parent_window,
}
/* password entry */
vbox = gtk_vbox_new (FALSE, 6);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
table_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
......@@ -719,13 +719,13 @@ gdu_util_dialog_secret_internal (GtkWidget *parent_window,
gtk_table_attach_defaults (GTK_TABLE (table), data->password_entry_verify, 1, 2, row, row + 1);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), data->password_entry_verify);
data->warning_hbox = gtk_hbox_new (FALSE, 12);
data->warning_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_MENU);
data->warning_label = gtk_label_new (NULL);
gtk_box_pack_start (GTK_BOX (data->warning_hbox), image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (data->warning_hbox), data->warning_label, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (hbox), data->warning_hbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (" "), FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
......@@ -1172,7 +1172,7 @@ gdu_util_delete_confirmation_dialog (GtkWidget *parent_window,
gtk_box_set_spacing (GTK_BOX (action_area), 6);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
hbox = gtk_hbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
......@@ -1180,7 +1180,7 @@ gdu_util_delete_confirmation_dialog (GtkWidget *parent_window,
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
main_vbox = gtk_vbox_new (FALSE, 10);
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE, 0);
label = gtk_label_new (NULL);
......
......@@ -222,7 +222,7 @@ gdu_partition_dialog_constructed (GObject *object)
gtk_container_set_border_width (GTK_CONTAINER (content_area), 10);
/* icon and text labels */
hbox = gtk_hbox_new (FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
image = gtk_image_new_from_pixbuf (pixbuf);
......@@ -233,7 +233,7 @@ gdu_partition_dialog_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 12, 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0);
vbox2 = gtk_vbox_new (FALSE, 6);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (align), vbox2);
row = 0;
......
......@@ -172,7 +172,7 @@ enum
guint signals[LAST_SIGNAL] = {0,};
G_DEFINE_TYPE (GduSizeWidget, gdu_size_widget, GTK_TYPE_HBOX)
G_DEFINE_TYPE (GduSizeWidget, gdu_size_widget, GTK_TYPE_BOX)
static void update_stepping (GduSizeWidget *widget);
......
......@@ -39,7 +39,7 @@ typedef struct GduSizeWidgetPrivate GduSizeWidgetPrivate;
struct GduSizeWidget
{
GtkHBox parent;
GtkBox parent;
/*< private >*/
GduSizeWidgetPrivate *priv;
......@@ -47,7 +47,7 @@ struct GduSizeWidget
struct GduSizeWidgetClass
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
void (*changed) (GduSizeWidget *widget);
};
......
......@@ -221,7 +221,7 @@ gdu_slow_unmount_dialog_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 12, 12, 12, 12);
gtk_box_pack_start (GTK_BOX (content_area), align, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 12);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_add (GTK_CONTAINER (align), vbox);
label = gtk_label_new (NULL);
......
......@@ -829,7 +829,7 @@ gdu_section_drive_constructed (GObject *object)
info_bar = gtk_info_bar_new ();
gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_WARNING);
hbox = gtk_hbox_new (FALSE, 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
label = gtk_label_new (NULL);
......@@ -855,7 +855,7 @@ gdu_section_drive_constructed (GObject *object)
"response",
G_CALLBACK (on_multipath_component_info_bar_go_to_multipath_device),
section);
hbox = gtk_hbox_new (FALSE, 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
label = gtk_label_new (NULL);
......@@ -881,7 +881,7 @@ gdu_section_drive_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (section), align, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 6);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (align), vbox);
section->priv->main_vbox = vbox;
......
......@@ -213,7 +213,7 @@ gdu_section_hub_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (section), align, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 6);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (align), vbox);
elements = g_ptr_array_new_with_free_func (g_object_unref);
......
......@@ -659,7 +659,7 @@ gdu_section_linux_lvm2_volume_group_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (section), align, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 6);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (align), vbox);
elements = g_ptr_array_new_with_free_func (g_object_unref);
......
......@@ -950,7 +950,7 @@ gdu_section_linux_md_drive_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (section), align, FALSE, FALSE, 0);
vbox = gtk_vbox_new (FALSE, 6);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (align), vbox);
elements = g_ptr_array_new_with_free_func (g_object_unref);
......
......@@ -2332,7 +2332,7 @@ gdu_section_volumes_constructed (GObject *object)
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0);
gtk_box_pack_start (GTK_BOX (section), align, FALSE, FALSE, 0);
vbox2 = gtk_vbox_new (FALSE, 6);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (align), vbox2);
section->priv->main_vbox = vbox2;
......@@ -2355,7 +2355,7 @@ gdu_section_volumes_constructed (GObject *object)
info_bar = gtk_info_bar_new ();
gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_WARNING);
hbox = gtk_hbox_new (FALSE, 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
label = gtk_label_new (NULL);
......
......@@ -38,7 +38,7 @@ struct _GduSectionPrivate
static GObjectClass *parent_class = NULL;
G_DEFINE_TYPE (GduSection, gdu_section, GTK_TYPE_VBOX)
G_DEFINE_TYPE (GduSection, gdu_section, GTK_TYPE_BOX)
enum {
PROP_0,
......
......@@ -41,7 +41,7 @@ typedef struct _GduSectionPrivate GduSectionPrivate;
struct _GduSection
{
GtkVBox parent;
GtkBox parent;
/* private */
GduSectionPrivate *priv;
......@@ -49,7 +49,7 @@ struct _GduSection
struct _GduSectionClass
{
GtkVBoxClass parent_class;
GtkBoxClass parent_class;
/* virtual table */
void (*update) (GduSection *section);
......
......@@ -1114,7 +1114,7 @@ create_window (GduShell *shell)
gtk_window_set_default_size (GTK_WINDOW (shell->priv->app_window), 800, 600);
gtk_window_set_title (GTK_WINDOW (shell->priv->app_window), _("Disk Utility"));
vbox = gtk_vbox_new (FALSE, 0);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (shell->priv->app_window), vbox);
shell->priv->ui_manager = create_ui_manager (shell);
......@@ -1142,17 +1142,17 @@ create_window (GduShell *shell)
/* --- */
vbox1 = gtk_vbox_new (FALSE, 0);
vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
/* --- */
vbox2 = gtk_vbox_new (FALSE, 0);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
//gtk_container_set_border_width (GTK_CONTAINER (vbox2), 12);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, TRUE, TRUE, 0);
/* --- */
shell->priv->sections_vbox = gtk_vbox_new (FALSE, 12);
shell->priv->sections_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (shell->priv->sections_vbox), 6);
gtk_box_pack_start (GTK_BOX (vbox2), shell->priv->sections_vbox, TRUE, TRUE, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment