[balsa/gtk4: 76/294] Various: Stop using GtkBox child properties
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk4: 76/294] Various: Stop using GtkBox child properties
- Date: Sun, 10 Oct 2021 00:02:58 +0000 (UTC)
commit 3ac77f8677dbb26066f93d167ccac67eb8ece966
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue Jun 9 14:23:14 2020 -0400
Various: Stop using GtkBox child properties
Stop using GtkBox padding, fill and expand child properties
* src/information-dialog.c (balsa_information_list):
* src/main-window.c (bw_create_index_widget), (bw_set_panes),
(balsa_window_new), (bw_notebook_label_new), (bw_find_real):
ChangeLog | 8 ++++++
src/information-dialog.c | 8 ++++--
src/main-window.c | 68 ++++++++++++++++++++++++++++++++++++------------
3 files changed, 66 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 48aad0f21..4ee889cf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -565,6 +565,14 @@
(open_with_change_state), (copy_part_change_state),
(part_create_menu):
+2020-06-09 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Various: Stop using GtkBox padding, fill and expand child properties
+
+ * src/information-dialog.c (balsa_information_list):
+ * src/main-window.c (bw_create_index_widget), (bw_set_panes),
+ (balsa_window_new), (bw_notebook_label_new), (bw_find_real):
+
2020-06-09 Peter Bloomfield <pbloomfield bellsouth net>
Various: restore filtering in a mailbox that is not currently
diff --git a/src/information-dialog.c b/src/information-dialog.c
index 7d59fb7c1..ed91ffc54 100644
--- a/src/information-dialog.c
+++ b/src/information-dialog.c
@@ -256,10 +256,14 @@ balsa_information_list(GtkWindow *parent, LibBalsaInformationType type,
(scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start(GTK_BOX
+ gtk_widget_set_vexpand(scrolled_window, TRUE);
+ gtk_widget_set_valign(scrolled_window, GTK_ALIGN_FILL);
+ gtk_widget_set_margin_top(scrolled_window, 1);
+ gtk_widget_set_margin_bottom(scrolled_window, 1);
+ gtk_container_add(GTK_CONTAINER
(gtk_dialog_get_content_area
(GTK_DIALOG(information_dialog))),
- scrolled_window, TRUE, TRUE, 1);
+ scrolled_window);
gtk_container_set_border_width(GTK_CONTAINER(scrolled_window), 6);
gtk_widget_show(scrolled_window);
diff --git a/src/main-window.c b/src/main-window.c
index 5d9a56c44..7af9b11ab 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -550,7 +550,9 @@ bw_create_index_widget(BalsaWindow *bw)
g_signal_connect(priv->sos_entry, "icon-release",
G_CALLBACK(bw_sos_icon_release), button);
- gtk_box_pack_start(GTK_BOX(priv->sos_bar), priv->sos_entry, TRUE, TRUE, 0);
+ gtk_widget_set_hexpand(priv->sos_entry, TRUE);
+ gtk_widget_set_halign(priv->sos_entry, GTK_ALIGN_FILL);
+ gtk_container_add(GTK_CONTAINER(priv->sos_bar), priv->sos_entry);
gtk_widget_show(priv->sos_entry);
gtk_box_pack_start(GTK_BOX(priv->sos_bar), button, FALSE, FALSE, 0);
@@ -566,10 +568,14 @@ bw_create_index_widget(BalsaWindow *bw)
g_signal_connect(priv->filter_choice, "changed",
G_CALLBACK(bw_filter_entry_changed), button);
gtk_widget_show_all(button);
+
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(priv->sos_bar);
gtk_box_pack_start(GTK_BOX(vbox), priv->sos_bar, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), priv->notebook, TRUE, TRUE, 0);
+
+ gtk_widget_set_vexpand(priv->notebook, TRUE);
+ gtk_widget_set_valign(priv->notebook, GTK_ALIGN_FILL);
+ gtk_container_add(GTK_CONTAINER(vbox), priv->notebook);
gtk_widget_set_sensitive(button, FALSE);
gtk_widget_show(vbox);
@@ -2294,8 +2300,7 @@ balsa_window_new(GtkApplication *application)
model = balsa_window_get_toolbar_model();
priv->toolbar = balsa_toolbar_new(model, G_ACTION_MAP(window));
- gtk_box_pack_start(GTK_BOX(priv->vbox), priv->toolbar,
- FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(priv->vbox), priv->toolbar, FALSE, FALSE, 0);
priv->bottom_bar = hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_end(GTK_BOX(priv->vbox), hbox, FALSE, FALSE, 0);
@@ -2306,11 +2311,12 @@ balsa_window_new(GtkApplication *application)
gtk_widget_set_valign(priv->progress_bar, GTK_ALIGN_CENTER);
gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(priv->progress_bar),
0.01);
- gtk_box_pack_start(GTK_BOX(hbox), priv->progress_bar, FALSE, FALSE,
- 0);
+ gtk_box_pack_start(GTK_BOX(hbox), priv->progress_bar, FALSE, FALSE, 0);
priv->statusbar = gtk_statusbar_new();
- gtk_box_pack_start(GTK_BOX(hbox), priv->statusbar, TRUE, TRUE, 0);
+ gtk_widget_set_hexpand(priv->statusbar, TRUE);
+ gtk_widget_set_halign(priv->statusbar, GTK_ALIGN_FILL);
+ gtk_box_pack_start(GTK_BOX(hbox), priv->statusbar, FALSE, FALSE, 0);
gtk_widget_show_all(hbox);
#if 0
@@ -2841,7 +2847,9 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
libbalsa_mailbox_get_unread(balsa_mailbox_node_get_mailbox(mbnode)) > 0);
g_signal_connect_object(balsa_mailbox_node_get_mailbox(mbnode), "changed",
G_CALLBACK(bw_mailbox_changed), lab, 0);
- gtk_box_pack_start(GTK_BOX(box), lab, TRUE, TRUE, 0);
+ gtk_widget_set_hexpand(lab, TRUE);
+ gtk_widget_set_halign(lab, GTK_ALIGN_FILL);
+ gtk_box_pack_start(GTK_BOX(box), lab, FALSE, FALSE, 0);
but = gtk_button_new();
gtk_widget_set_focus_on_click(but, FALSE);
@@ -3857,7 +3865,10 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
gtk_widget_set_hexpand(search_entry, TRUE);
gtk_grid_attach(GTK_GRID(page),search_entry,1, 0, 1, 1);
gtk_label_set_mnemonic_widget(GTK_LABEL(w), search_entry);
- gtk_box_pack_start(GTK_BOX(vbox), page, FALSE, FALSE, 2);
+
+ gtk_widget_set_margin_top(page, 2);
+ gtk_widget_set_margin_bottom(page, 2);
+ gtk_box_pack_start(GTK_BOX(vbox), page, FALSE, FALSE, 0);
/* builds the toggle buttons to specify fields concerned by
* the search. */
@@ -3867,7 +3878,10 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
GTK_POS_LEFT, GTK_POS_TOP);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2);
+
+ gtk_widget_set_margin_top(frame, 2);
+ gtk_widget_set_margin_bottom(frame, 2);
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
grid = gtk_grid_new();
gtk_grid_set_column_homogeneous(GTK_GRID(grid), TRUE);
@@ -3882,7 +3896,10 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
frame = gtk_frame_new(_("Show only matching messages"));
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2);
+
+ gtk_widget_set_margin_top(frame, 2);
+ gtk_widget_set_margin_bottom(frame, 2);
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
/* Button box */
box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
@@ -3903,32 +3920,51 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
frame = gtk_frame_new(_("Open next matching message"));
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
- gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2);
+
+ gtk_widget_set_margin_top(frame, 2);
+ gtk_widget_set_margin_bottom(frame, 2);
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
/* Reverse and Wrap checkboxes */
box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+ gtk_container_set_border_width(GTK_CONTAINER(box), 6);
gtk_container_add(GTK_CONTAINER(frame), box);
+
w = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
gtk_box_set_homogeneous(GTK_BOX(w), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(w), 6);
+
reverse_button =
gtk_check_button_new_with_mnemonic(_("_Reverse search"));
- gtk_box_pack_start(GTK_BOX(w), reverse_button, TRUE, TRUE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(reverse_button),
reverse);
+
+ gtk_widget_set_vexpand(reverse_button, TRUE);
+ gtk_widget_set_valign(reverse_button, GTK_ALIGN_FILL);
+ gtk_box_pack_start(GTK_BOX(w), reverse_button, FALSE, FALSE, 0);
+
wrap_button =
gtk_check_button_new_with_mnemonic(_("_Wrap around"));
- gtk_box_pack_start(GTK_BOX(w), wrap_button, TRUE, TRUE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wrap_button),
wrap);
- gtk_box_pack_start(GTK_BOX(box), w, TRUE, TRUE, 0);
+
+ gtk_widget_set_vexpand(wrap_button, TRUE);
+ gtk_widget_set_valign(wrap_button, GTK_ALIGN_FILL);
+ gtk_box_pack_start(GTK_BOX(w), wrap_button, FALSE, FALSE, 0);
+
+ gtk_widget_set_hexpand(w, TRUE);
+ gtk_widget_set_halign(w, GTK_ALIGN_FILL);
+ gtk_box_pack_start(GTK_BOX(box), w, FALSE, FALSE, 0);
button = gtk_button_new_with_mnemonic(_("_OK"));
g_signal_connect(button, "clicked",
G_CALLBACK(bw_find_button_clicked),
GINT_TO_POINTER(GTK_RESPONSE_OK));
+
+ gtk_widget_set_hexpand(button, TRUE);
+ gtk_widget_set_halign(button, GTK_ALIGN_FILL);
gtk_widget_set_valign(button, GTK_ALIGN_CENTER);
- gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
+ gtk_container_add(GTK_CONTAINER(box), button);
gtk_widget_show_all(vbox);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]