[Xfce4-commits] [xfce/thunar] 01/01: Replace GtkV/HBox by GtkBox
noreply at xfce.org
noreply at xfce.org
Sat Aug 26 02:23:43 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 e859409cbe4a67394455519d5c371bf0538faf73
Author: Andre Miranda <andreldm at xfce.org>
Date: Fri Aug 25 21:22:27 2017 -0300
Replace GtkV/HBox by GtkBox
---
plugins/thunar-sbr/thunar-sbr-case-renamer.c | 2 +-
plugins/thunar-sbr/thunar-sbr-date-renamer.c | 6 +++---
plugins/thunar-sbr/thunar-sbr-insert-renamer.c | 2 +-
plugins/thunar-sbr/thunar-sbr-number-renamer.c | 4 ++--
plugins/thunar-sendto-email/main.c | 4 ++--
thunar/thunar-chooser-dialog.c | 8 ++++----
thunar/thunar-column-editor.c | 2 +-
thunar/thunar-location-entry.c | 3 ++-
thunar/thunar-permissions-chooser.c | 18 ++++++++++--------
thunar/thunar-preferences-dialog.c | 16 ++++++++--------
thunar/thunar-progress-dialog.c | 4 ++--
thunar/thunar-progress-view.c | 14 ++++++++------
thunar/thunar-properties-dialog.c | 8 ++++----
thunar/thunar-renamer-dialog.c | 8 ++++----
thunar/thunar-size-label.c | 4 +++-
thunar/thunar-standard-view.c | 2 +-
thunar/thunar-window.c | 6 +++---
thunarx/thunarx-renamer.c | 5 +++--
18 files changed, 62 insertions(+), 54 deletions(-)
diff --git a/plugins/thunar-sbr/thunar-sbr-case-renamer.c b/plugins/thunar-sbr/thunar-sbr-case-renamer.c
index 2e13f97..1fd5ade 100644
--- a/plugins/thunar-sbr/thunar-sbr-case-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-case-renamer.c
@@ -110,7 +110,7 @@ thunar_sbr_case_renamer_init (ThunarSbrCaseRenamer *case_renamer)
GtkWidget *hbox;
guint n;
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (case_renamer), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
diff --git a/plugins/thunar-sbr/thunar-sbr-date-renamer.c b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
index 4d0c7f5..64b92d5 100644
--- a/plugins/thunar-sbr/thunar-sbr-date-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
@@ -184,11 +184,11 @@ thunar_sbr_date_renamer_init (ThunarSbrDateRenamer *date_renamer)
GtkAdjustment *adjustment;
guint n;
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (date_renamer), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
@@ -236,7 +236,7 @@ thunar_sbr_date_renamer_init (ThunarSbrDateRenamer *date_renamer)
atk_relation_set_add (relations, relation);
g_object_unref (G_OBJECT (relation));
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
diff --git a/plugins/thunar-sbr/thunar-sbr-insert-renamer.c b/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
index 51ec408..f86bfe6 100644
--- a/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-insert-renamer.c
@@ -199,7 +199,7 @@ thunar_sbr_insert_renamer_init (ThunarSbrInsertRenamer *insert_renamer)
gtk_table_attach (GTK_TABLE (table), label, 0, 2, 1, 2, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
gtk_widget_show (hbox);
diff --git a/plugins/thunar-sbr/thunar-sbr-number-renamer.c b/plugins/thunar-sbr/thunar-sbr-number-renamer.c
index 7c0afdc..91b4e3d 100644
--- a/plugins/thunar-sbr/thunar-sbr-number-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-number-renamer.c
@@ -177,7 +177,7 @@ thunar_sbr_number_renamer_init (ThunarSbrNumberRenamer *number_renamer)
GtkWidget *hbox;
guint n;
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (number_renamer), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
@@ -223,7 +223,7 @@ thunar_sbr_number_renamer_init (ThunarSbrNumberRenamer *number_renamer)
atk_relation_set_add (relations, relation);
g_object_unref (G_OBJECT (relation));
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_end (GTK_BOX (number_renamer), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
diff --git a/plugins/thunar-sendto-email/main.c b/plugins/thunar-sendto-email/main.c
index 3aed4c2..0ae48b8 100644
--- a/plugins/thunar-sendto-email/main.c
+++ b/plugins/thunar-sendto-email/main.c
@@ -275,7 +275,7 @@ tse_progress (const gchar *working_directory,
gtk_window_set_default_size (GTK_WINDOW (dialog), 300, -1);
/* setup the hbox */
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
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);
@@ -287,7 +287,7 @@ tse_progress (const gchar *working_directory,
gtk_widget_show (image);
/* setup the vbox */
- 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);
gtk_widget_show (vbox);
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index 45eedf5..60e209a 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -188,12 +188,12 @@ thunar_chooser_dialog_init (ThunarChooserDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Open With"));
/* create the main widget box */
- vbox = g_object_new (GTK_TYPE_VBOX, "border-width", 6, "spacing", 12, NULL);
+ vbox = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, "border-width", 6, "spacing", 12, NULL);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* create the header box */
- header = gtk_hbox_new (FALSE, 6);
+ header = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (vbox), header, FALSE, FALSE, 0);
gtk_widget_show (header);
@@ -211,7 +211,7 @@ thunar_chooser_dialog_init (ThunarChooserDialog *dialog)
gtk_widget_show (dialog->header_label);
/* create the view box */
- box = gtk_vbox_new (FALSE, 6);
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (vbox), box, TRUE, TRUE, 0);
gtk_widget_show (box);
@@ -263,7 +263,7 @@ thunar_chooser_dialog_init (ThunarChooserDialog *dialog)
gtk_widget_show (dialog->custom_expander);
/* create the "Custom command" box */
- hbox = gtk_hbox_new (FALSE, 2);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
gtk_container_add (GTK_CONTAINER (dialog->custom_expander), hbox);
gtk_widget_show (hbox);
diff --git a/thunar/thunar-column-editor.c b/thunar/thunar-column-editor.c
index 58fe6f4..f2ed5d1 100644
--- a/thunar/thunar-column-editor.c
+++ b/thunar/thunar-column-editor.c
@@ -127,7 +127,7 @@ thunar_column_editor_init (ThunarColumnEditor *column_editor)
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (column_editor))), button, TRUE);
gtk_widget_show (button);
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (column_editor))), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
diff --git a/thunar/thunar-location-entry.c b/thunar/thunar-location-entry.c
index 48ce464..fd0a65b 100644
--- a/thunar/thunar-location-entry.c
+++ b/thunar/thunar-location-entry.c
@@ -93,7 +93,7 @@ struct _ThunarLocationEntry
-G_DEFINE_TYPE_WITH_CODE (ThunarLocationEntry, thunar_location_entry, GTK_TYPE_HBOX,
+G_DEFINE_TYPE_WITH_CODE (ThunarLocationEntry, thunar_location_entry, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (THUNAR_TYPE_BROWSER, NULL)
G_IMPLEMENT_INTERFACE (THUNAR_TYPE_NAVIGATOR, thunar_location_entry_navigator_init))
@@ -180,6 +180,7 @@ static void
thunar_location_entry_init (ThunarLocationEntry *location_entry)
{
gtk_box_set_spacing (GTK_BOX (location_entry), 0);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (location_entry), GTK_ORIENTATION_HORIZONTAL);
location_entry->path_entry = thunar_path_entry_new ();
exo_binding_new (G_OBJECT (location_entry), "current-directory", G_OBJECT (location_entry->path_entry), "current-file");
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index 801821f..8c17521 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -151,7 +151,7 @@ struct _ThunarPermissionsChooser
-G_DEFINE_TYPE (ThunarPermissionsChooser, thunar_permissions_chooser, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (ThunarPermissionsChooser, thunar_permissions_chooser, GTK_TYPE_BOX)
@@ -207,6 +207,8 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
/* setup the chooser */
gtk_container_set_border_width (GTK_CONTAINER (chooser), 12);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (chooser), GTK_ORIENTATION_VERTICAL);
+
/* allocate the shared renderer for the various combo boxes */
renderer_text = gtk_cell_renderer_text_new ();
@@ -222,7 +224,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_table_attach (GTK_TABLE (chooser->table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 6);
gtk_widget_show (hbox);
@@ -341,7 +343,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
row += 1;
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
exo_binding_new (G_OBJECT (chooser), "mutable", G_OBJECT (hbox), "sensitive");
exo_binding_new (G_OBJECT (chooser->program_button), "visible", G_OBJECT (hbox), "visible");
gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
@@ -357,7 +359,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show (label);
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
exo_binding_new (G_OBJECT (chooser), "mutable", G_OBJECT (hbox), "sensitive");
gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox);
@@ -375,7 +377,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
row += 1;
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_table_attach (GTK_TABLE (chooser->table), hbox, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox);
@@ -387,7 +389,7 @@ thunar_permissions_chooser_init (ThunarPermissionsChooser *chooser)
gtk_widget_show (chooser->fixperm_button);
/* the job control stuff */
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (chooser), hbox, FALSE, FALSE, 0);
chooser->job_progress = gtk_progress_bar_new ();
@@ -518,7 +520,7 @@ thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser)
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
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);
@@ -528,7 +530,7 @@ thunar_permissions_chooser_ask_recursive (ThunarPermissionsChooser *chooser)
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
- 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);
gtk_widget_show (vbox);
diff --git a/thunar/thunar-preferences-dialog.c b/thunar/thunar-preferences-dialog.c
index bcbf6d7..ea8d693 100644
--- a/thunar/thunar-preferences-dialog.c
+++ b/thunar/thunar-preferences-dialog.c
@@ -241,7 +241,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
Display
*/
label = gtk_label_new (_("Display"));
- vbox = g_object_new (GTK_TYPE_VBOX, "border-width", 12, "spacing", 12, NULL);
+ vbox = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, "border-width", 12, "spacing", 12, NULL);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
gtk_widget_show (label);
gtk_widget_show (vbox);
@@ -368,7 +368,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
Side Pane
*/
label = gtk_label_new (_("Side Pane"));
- vbox = g_object_new (GTK_TYPE_VBOX, "border-width", 12, "spacing", 12, NULL);
+ vbox = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, "border-width", 12, "spacing", 12, NULL);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
gtk_widget_show (label);
gtk_widget_show (vbox);
@@ -462,7 +462,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
Behavior
*/
label = gtk_label_new (_("Behavior"));
- vbox = g_object_new (GTK_TYPE_VBOX, "border-width", 12, "spacing", 12, NULL);
+ vbox = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, "border-width", 12, "spacing", 12, NULL);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
gtk_widget_show (label);
gtk_widget_show (vbox);
@@ -495,11 +495,11 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_table_attach (GTK_TABLE (table), align, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_widget_show (align);
- hbox = gtk_hbox_new (FALSE, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add (GTK_CONTAINER (align), hbox);
gtk_widget_show (hbox);
- ibox = gtk_vbox_new (FALSE, 0);
+ ibox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start (GTK_BOX (hbox), ibox, FALSE, FALSE, 0);
gtk_widget_show (ibox);
@@ -529,7 +529,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
adjustment = gtk_range_get_adjustment (GTK_RANGE (range));
exo_mutual_binding_new (G_OBJECT (dialog->preferences), "misc-single-click-timeout", G_OBJECT (adjustment), "value");
- hbox = gtk_hbox_new (TRUE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (ibox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
@@ -566,7 +566,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_widget_show (label);
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_widget_show (vbox);
@@ -586,7 +586,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
Advanced
*/
label = gtk_label_new (_("Advanced"));
- vbox = g_object_new (GTK_TYPE_VBOX, "border-width", 12, "spacing", 12, NULL);
+ vbox = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, "border-width", 12, "spacing", 12, NULL);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
gtk_widget_show (label);
gtk_widget_show (vbox);
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index 2e040fe..af80b0d 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -104,11 +104,11 @@ thunar_progress_dialog_init (ThunarProgressDialog *dialog)
g_signal_connect (dialog, "delete-event",
G_CALLBACK (thunar_progress_dialog_closed), dialog);
- dialog->vbox = gtk_vbox_new (FALSE, 0);
+ dialog->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (dialog), dialog->vbox);
gtk_widget_show (dialog->vbox);
- dialog->content_box = gtk_vbox_new (FALSE, 12);
+ dialog->content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (dialog->content_box), 8);
gtk_container_add (GTK_CONTAINER (dialog->vbox), dialog->content_box);
gtk_widget_show (dialog->content_box);
diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c
index ce77b9b..4a5814c 100644
--- a/thunar/thunar-progress-view.c
+++ b/thunar/thunar-progress-view.c
@@ -102,7 +102,7 @@ struct _ThunarProgressView
-G_DEFINE_TYPE (ThunarProgressView, thunar_progress_view, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (ThunarProgressView, thunar_progress_view, GTK_TYPE_BOX)
@@ -179,11 +179,13 @@ thunar_progress_view_init (ThunarProgressView *view)
GtkWidget *vbox3;
GtkWidget *hbox;
- vbox = gtk_vbox_new (FALSE, 6);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (view), GTK_ORIENTATION_VERTICAL);
+
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (view), vbox);
gtk_widget_show (vbox);
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
@@ -192,7 +194,7 @@ thunar_progress_view_init (ThunarProgressView *view)
exo_binding_new (G_OBJECT (view), "icon-name", G_OBJECT (image), "icon-name");
gtk_widget_show (image);
- vbox2 = gtk_vbox_new (FALSE, 6);
+ vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
gtk_widget_show (vbox2);
@@ -207,11 +209,11 @@ thunar_progress_view_init (ThunarProgressView *view)
gtk_box_pack_start (GTK_BOX (vbox2), view->message_label, TRUE, TRUE, 0);
gtk_widget_show (view->message_label);
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
- vbox3 = gtk_vbox_new (FALSE, 3);
+ vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
gtk_box_pack_start (GTK_BOX (hbox), vbox3, TRUE, TRUE, 0);
gtk_widget_show (vbox3);
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index 441d1ec..45c56c0 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -272,7 +272,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
/*
First box (icon, name) for 1 file
*/
- dialog->single_box = gtk_hbox_new (FALSE, 6);
+ dialog->single_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_table_attach (GTK_TABLE (table), dialog->single_box, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
dialog->icon_button = gtk_button_new ();
@@ -303,7 +303,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
/*
First box (icon, name) for multiple files
*/
- box = gtk_hbox_new (FALSE, 6);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_table_attach (GTK_TABLE (table), box, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
exo_binding_new_with_negation (G_OBJECT (dialog->single_box), "visible", G_OBJECT (box), "visible");
@@ -495,7 +495,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
- box = gtk_hbox_new (FALSE, 6);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
exo_binding_new (G_OBJECT (box), "visible", G_OBJECT (label), "visible");
gtk_table_attach (GTK_TABLE (table), box, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (box);
@@ -519,7 +519,7 @@ thunar_properties_dialog_init (ThunarPropertiesDialog *dialog)
gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 3);
gtk_widget_show (label);
- dialog->freespace_vbox = gtk_vbox_new (FALSE, 4);
+ dialog->freespace_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
gtk_table_attach (GTK_TABLE (table), dialog->freespace_vbox, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 3);
exo_binding_new (G_OBJECT (dialog->freespace_vbox), "visible", G_OBJECT (label), "visible");
gtk_widget_show (dialog->freespace_vbox);
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 76596b8..4470c59 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -388,7 +388,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (renamer_dialog))), toolbar, FALSE, FALSE, 0);
/* create the main vbox */
- mbox = gtk_vbox_new (FALSE, 12);
+ mbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (mbox), 6);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (renamer_dialog))), mbox, TRUE, TRUE, 0);
gtk_widget_show (mbox);
@@ -450,12 +450,12 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
gtk_tree_view_append_column (GTK_TREE_VIEW (renamer_dialog->tree_view), column);
/* create the vbox for the renamer parameters */
- vbox = gtk_vbox_new (FALSE, 6);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (mbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
/* create the hbox for the renamer selection */
- rbox = gtk_hbox_new (FALSE, 3);
+ rbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_pack_start (GTK_BOX (vbox), rbox, FALSE, FALSE, 0);
gtk_widget_show (rbox);
@@ -596,7 +596,7 @@ thunar_renamer_dialog_init (ThunarRenamerDialog *renamer_dialog)
gtk_widget_set_sensitive (swin, FALSE);
/* display an error to the user */
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index bb0839c..e78f003 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -99,7 +99,7 @@ struct _ThunarSizeLabel
-G_DEFINE_TYPE (ThunarSizeLabel, thunar_size_label, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (ThunarSizeLabel, thunar_size_label, GTK_TYPE_BOX)
@@ -146,6 +146,8 @@ thunar_size_label_init (ThunarSizeLabel *size_label)
{
GtkWidget *ebox;
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (size_label), GTK_ORIENTATION_HORIZONTAL);
+
/* binary file size */
size_label->preferences = thunar_preferences_get ();
exo_binding_new (G_OBJECT (size_label->preferences), "misc-file-size-binary",
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 60630ba..ffcae58 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -2636,7 +2636,7 @@ thunar_standard_view_action_select_by_pattern (GtkAction *action,
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_window_set_default_size (GTK_WINDOW (dialog), 290, -1);
- hbox = g_object_new (GTK_TYPE_HBOX, "border-width", 6, "spacing", 10, NULL);
+ hbox = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_HORIZONTAL, "border-width", 6, "spacing", 10, NULL);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 2995a77..21f446c 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1760,7 +1760,7 @@ thunar_window_notebook_insert (ThunarWindow *window,
if (history != NULL)
thunar_standard_view_set_history (THUNAR_STANDARD_VIEW (view), history);
- label_box = gtk_hbox_new (FALSE, 0);
+ label_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new (NULL);
exo_binding_new (G_OBJECT (view), "display-name", G_OBJECT (label), "label");
@@ -2956,7 +2956,7 @@ thunar_window_action_open_templates (GtkAction *action,
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
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);
@@ -2966,7 +2966,7 @@ thunar_window_action_open_templates (GtkAction *action,
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
gtk_widget_show (image);
- vbox = gtk_vbox_new (FALSE, 18);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
diff --git a/thunarx/thunarx-renamer.c b/thunarx/thunarx-renamer.c
index 571bbd8..1d8c442 100644
--- a/thunarx/thunarx-renamer.c
+++ b/thunarx/thunarx-renamer.c
@@ -88,7 +88,7 @@ static guint renamer_signals[LAST_SIGNAL];
-G_DEFINE_ABSTRACT_TYPE (ThunarxRenamer, thunarx_renamer, GTK_TYPE_VBOX)
+G_DEFINE_ABSTRACT_TYPE (ThunarxRenamer, thunarx_renamer, GTK_TYPE_BOX)
@@ -176,7 +176,8 @@ thunarx_renamer_init (ThunarxRenamer *renamer)
/* grab a pointer on the private data */
renamer->priv = THUNARX_RENAMER_GET_PRIVATE (renamer);
- /* initialize the GtkVBox to sane defaults */
+ /* initialize the GtkBox to sane defaults */
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (renamer), GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width (GTK_CONTAINER (renamer), 12);
gtk_box_set_homogeneous (GTK_BOX (renamer), FALSE);
gtk_box_set_spacing (GTK_BOX (renamer), 6);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list