commit b517288f829eb24d14b733a408c77285343b9127
parent 77cb21eda32b978c2e1333f6c0af2ba98126b502
Author: paul <paul@claws-mail.org>
Date: Mon, 2 Dec 2019 12:06:23 +0000
replace deprecated GtkTable
Diffstat:
11 files changed, 164 insertions(+), 186 deletions(-)
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
@@ -140,31 +140,33 @@ gchar* ask_user_for_auth_code(const gchar *auth_uri)
gtk_widget_set_sensitive(btn_ok, FALSE);
- table = gtk_table_new(2, 3, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(table), 8);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+ table = gtk_grid_new();
+ gtk_grid_set_row_spacing(GTK_GRID(table), 8);
+ gtk_grid_set_column_spacing(GTK_GRID(table), 8);
str = g_strconcat("<b>", _("Step 1:"), "</b>", NULL);
label = gtk_label_new(str);
g_free(str);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1);
link_button = gtk_button_new_with_label(_("Click here to open the Google authorization page in a browser"));
auth_code_query_data = g_new0(AuthCodeQueryButtonData,1);
- gtk_table_attach(GTK_TABLE(table), link_button, 1, 3, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), link_button, 1, 0, 1, 1);
str = g_strconcat("<b>", _("Step 2:"), "</b>", NULL);
label = gtk_label_new(str);
g_free(str);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1);
- gtk_table_attach(GTK_TABLE(table), gtk_label_new(_("Enter code:")), 1, 2, 1, 2, 0, 0, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), gtk_label_new(_("Enter code:")), 1, 1, 1, 1);
entry = gtk_entry_new();
g_signal_connect(G_OBJECT(entry), "changed", (GCallback)auth_code_entry_changed_cb, (gpointer)btn_ok);
- gtk_table_attach(GTK_TABLE(table), entry, 2, 3, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), entry, 2, 1, 1, 1);
+ gtk_widget_set_hexpand(entry, TRUE);
+ gtk_widget_set_halign(entry, GTK_ALIGN_FILL);
auth_code_query_data->auth_uri = auth_uri;
auth_code_query_data->entry = entry;
diff --git a/src/plugins/gdata/cm_gdata_prefs.c b/src/plugins/gdata/cm_gdata_prefs.c
@@ -82,30 +82,32 @@ static void gdata_create_prefs_page(PrefsPage *page, GtkWindow *window, gpointer
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
/* username */
- table = gtk_table_new(2, 2, FALSE);
+ table = gtk_grid_new();
label = gtk_label_new(_("Username:"));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 4, 4);
+ gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1);
entry = gtk_entry_new();
gtk_widget_set_size_request(entry, 250, -1);
- gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 4, 4);
+ gtk_grid_attach(GTK_GRID(table), entry, 1, 0, 1, 1);
+ gtk_widget_set_hexpand(entry, TRUE);
+ gtk_widget_set_halign(entry, GTK_ALIGN_FILL);
gdata_page.entry_username = entry;
gtk_container_add(GTK_CONTAINER(frame), table);
- table = gtk_table_new(2, 2, FALSE);
+ table = gtk_grid_new();
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
label = gtk_label_new(_("Polling interval (seconds):"));
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 4, 4);
+ gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
spinner = gtk_spin_button_new_with_range(10, 10000, 10);
- gtk_table_attach(GTK_TABLE(table), spinner, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 4, 4);
+ gtk_grid_attach(GTK_GRID(table), spinner, 1, 0, 1, 1);
gdata_page.spin_max_cache_age = spinner;
label = gtk_label_new(_("Maximum number of results:"));
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 4, 4);
+ gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1);
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
spinner = gtk_spin_button_new_with_range(0, G_MAXINT, 50);
- gtk_table_attach(GTK_TABLE(table), spinner, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 4, 4);
+ gtk_grid_attach(GTK_GRID(table), spinner, 1, 1, 1, 1);
gdata_page.spin_max_num_results = spinner;
gtk_widget_show_all(vbox);
diff --git a/src/plugins/notification/notification_banner.c b/src/plugins/notification/notification_banner.c
@@ -335,45 +335,45 @@ static GtkWidget* create_entrybox(GSList *msg_list)
if(notify_config.banner_enable_colors)
gtk_widget_modify_bg(ebox,GTK_STATE_NORMAL,&bg);
- banner.entries[ii].table = gtk_table_new(3, 2, FALSE);
- gtk_container_add(GTK_CONTAINER(ebox),banner.entries[ii].table);
- g_signal_connect(ebox, "enter-notify-event",
- G_CALLBACK(notification_banner_swap_colors),
- banner.entries[ii].table);
- g_signal_connect(ebox, "leave-notify-event",
- G_CALLBACK(notification_banner_swap_colors),
- banner.entries[ii].table);
- g_signal_connect(ebox, "button-press-event",
- G_CALLBACK(notification_banner_button_press),
- cmsg);
+ banner.entries[ii].table = gtk_grid_new();
+ gtk_container_add(GTK_CONTAINER(ebox),banner.entries[ii].table);
+ g_signal_connect(ebox, "enter-notify-event",
+ G_CALLBACK(notification_banner_swap_colors),
+ banner.entries[ii].table);
+ g_signal_connect(ebox, "leave-notify-event",
+ G_CALLBACK(notification_banner_swap_colors),
+ banner.entries[ii].table);
+ g_signal_connect(ebox, "button-press-event",
+ G_CALLBACK(notification_banner_button_press),
+ cmsg);
label1 = gtk_label_new(prefs_common_translated_header_name("From:"));
gtk_label_set_xalign(GTK_LABEL(label1), 0.0);
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
- label1, 0, 1, 0, 1);
+ gtk_grid_attach(GTK_GRID(banner.entries[ii].table), label1, 0, 0, 1, 1);
+
label2 = gtk_label_new(prefs_common_translated_header_name("Subject:"));
gtk_label_set_xalign(GTK_LABEL(label2), 0.0);
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
- label2, 0, 1, 1, 2);
+ gtk_grid_attach(GTK_GRID(banner.entries[ii].table), label2, 0, 1, 1, 1);
+
label3 = gtk_label_new(_("Folder:"));
gtk_label_set_xalign(GTK_LABEL(label3), 0.0);
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
- label3, 0, 1, 2, 3);
+ gtk_grid_attach(GTK_GRID(banner.entries[ii].table), label3, 0, 2, 1, 1);
label4 = gtk_label_new(cmsg->from);
gtk_label_set_xalign(GTK_LABEL(label4), 0.0);
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
- label4, 1, 2, 0, 1);
+ gtk_grid_attach(GTK_GRID(banner.entries[ii].table), label4, 1, 0, 1, 1);
+
label5 = gtk_label_new(cmsg->subject);
gtk_label_set_xalign(GTK_LABEL(label5), 0.0);
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
- label5, 1, 2, 1, 2);
+ gtk_grid_attach(GTK_GRID(banner.entries[ii].table), label5, 1, 1, 1, 1);
+
label6 = gtk_label_new(cmsg->folderitem_name);
gtk_label_set_xalign(GTK_LABEL(label6), 0.0);
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
- label6, 1, 2, 2, 3);
- gtk_table_set_col_spacings(GTK_TABLE(banner.entries[ii].table), 5);
- ii++;
+ gtk_grid_attach(GTK_GRID(banner.entries[ii].table), label6, 1, 2, 1, 1);
+
+ gtk_grid_set_column_spacing(GTK_GRID(banner.entries[ii].table), 5);
+
+ ii++;
/* Color */
if(notify_config.banner_enable_colors) {
gtk_widget_modify_fg(label1,GTK_STATE_NORMAL,&fg);
@@ -390,16 +390,19 @@ static GtkWidget* create_entrybox(GSList *msg_list)
GtkWidget *label;
banner.entries = g_new(NotificationBannerEntry, 1);
- banner.entries[0].table = gtk_table_new(3, 1, FALSE);
+ banner.entries[0].table = gtk_grid_new();
label = gtk_label_new("");
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[0].table),
- label, 0, 1, 0, 1);
+ gtk_grid_attach(GTK_GRID(banner.entries[0].table), label, 0, 0, 1, 1);
+ gtk_widget_set_hexpand(label, TRUE);
+ gtk_widget_set_halign(label, GTK_ALIGN_FILL);
label = gtk_label_new("");
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[0].table),
- label, 0, 1, 1, 2);
+ gtk_grid_attach(GTK_GRID(banner.entries[0].table), label, 0, 1, 1, 1);
+ gtk_widget_set_hexpand(label, TRUE);
+ gtk_widget_set_halign(label, GTK_ALIGN_FILL);
label = gtk_label_new("");
- gtk_table_attach_defaults(GTK_TABLE(banner.entries[0].table),
- label, 0, 1, 2, 3);
+ gtk_grid_attach(GTK_GRID(banner.entries[0].table), label, 0, 2, 1, 1);
+ gtk_widget_set_hexpand(label, TRUE);
+ gtk_widget_set_halign(label, GTK_ALIGN_FILL);
gtk_box_pack_start(GTK_BOX(entrybox), banner.entries[0].table,
FALSE, FALSE, 0);
}
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
@@ -1123,28 +1123,30 @@ static void notify_create_popup_page(PrefsPage *page, GtkWindow *window,
popup_page.popup_enable_colors = checkbox;
/* Color selection dialogs for foreground and background color */
- table = gtk_table_new(2,2,FALSE);
+ table = gtk_grid_new();
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+
/* foreground */
label = gtk_label_new(_("Foreground"));
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,0,1);
+ gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1);
gtk_widget_show(label);
color_sel = gtk_color_button_new();
gtk_color_button_set_rgba(GTK_COLOR_BUTTON(color_sel),
¬ify_config.popup_color_fg);
gtk_color_button_set_title(GTK_COLOR_BUTTON(color_sel),_("Foreground color"));
- gtk_table_attach_defaults(GTK_TABLE(table),color_sel,1,2,0,1);
+ gtk_grid_attach(GTK_GRID(table), color_sel, 1, 0, 1, 1);
gtk_widget_show(color_sel);
popup_page.popup_color_fg = color_sel;
+
/* background */
label = gtk_label_new(_("Background"));
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,1,2);
+ gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1);
gtk_widget_show(label);
color_sel = gtk_color_button_new();
gtk_color_button_set_rgba(GTK_COLOR_BUTTON(color_sel),
¬ify_config.popup_color_bg);
gtk_color_button_set_title(GTK_COLOR_BUTTON(color_sel),_("Background color"));
- gtk_table_attach_defaults(GTK_TABLE(table),color_sel,1,2,1,2);
+ gtk_grid_attach(GTK_GRID(table), color_sel, 1, 1, 1, 1);
gtk_widget_show(color_sel);
gtk_widget_show(table);
popup_page.popup_color_bg = color_sel;
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -654,13 +654,15 @@ static char * pdf_viewer_get_document_format_data(GTime utime)
gtk_label_set_xalign(GTK_LABEL(label), 1.0); \
gtk_widget_set_margin_start(GTK_WIDGET(label), 4); \
gtk_widget_set_margin_end(GTK_WIDGET(label), 0); \
- gtk_table_attach(viewer->table_doc_info, label, 0, 1, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); \
+ gtk_grid_attach(GTK_GRID(viewer->table_doc_info), label, 0, row, 1, 1); \
\
label = gtk_label_new(VALUE); \
gtk_label_set_xalign(GTK_LABEL(label), 0.0); \
gtk_widget_set_margin_start(GTK_WIDGET(label), 4); \
gtk_widget_set_margin_end(GTK_WIDGET(label), 0); \
- gtk_table_attach(viewer->table_doc_info, label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); \
+ gtk_grid_attach(GTK_GRID(viewer->table_doc_info), label, 1, row, 1, 1); \
+ gtk_widget_set_hexpand(label, TRUE); \
+ gtk_widget_set_halign(label, GTK_ALIGN_FILL); \
row++;
@@ -698,7 +700,7 @@ static GtkTable * pdf_viewer_fill_info_table(PdfViewer *viewer)
"viewer-preferences", &view_prefs,
NULL);
- viewer->table_doc_info = GTK_TABLE(gtk_table_new(13, 2, FALSE));
+ viewer->table_doc_info = gtk_grid_new();
ADD_TO_TABLE(_("Filename:"), viewer->target_filename)
ADD_TO_TABLE(_("Size:"), to_human_readable(viewer->to_load->length))
@@ -1634,22 +1636,22 @@ static void pdf_viewer_scroll_one_line(MimeViewer *_viewer, gboolean up)
widget = gtk_button_new(); \
img = stock_pixmap_widget(stock_image); \
gtk_button_set_image(GTK_BUTTON(widget), img); \
- gtk_table_attach(GTK_TABLE(viewer->widgets_table), GTK_WIDGET(widget), \
- col, col+1, 0, 1, 0, 0, BUTTON_H_PADDING, 0); \
+ gtk_grid_attach(GTK_GRID(viewer->widgets_table), GTK_WIDGET(widget), \
+ col, 0, 1, 1); \
col++;
#define ADD_TOGGLE_BUTTON_TO_TABLE(widget, stock_image) \
widget = gtk_toggle_button_new(); \
img = stock_pixmap_widget(stock_image); \
gtk_button_set_image(GTK_BUTTON(widget), img); \
- gtk_table_attach(GTK_TABLE(viewer->widgets_table), GTK_WIDGET(widget), \
- col, col+1, 0, 1, 0, 0, BUTTON_H_PADDING, 0); \
+ gtk_grid_attach(GTK_GRID(viewer->widgets_table), GTK_WIDGET(widget), \
+ col, 0, 1, 1); \
col++;
#define ADD_SEP_TO_TABLE \
sep = gtk_label_new(""); \
- gtk_table_attach(GTK_TABLE(viewer->widgets_table), GTK_WIDGET(sep), \
- col, col+1, 0, 1, 0, 0, 0, 0); \
- gtk_table_set_col_spacing(GTK_TABLE(viewer->widgets_table), col, 3*BUTTON_H_PADDING); \
+ gtk_grid_attach(GTK_GRID(viewer->widgets_table), GTK_WIDGET(sep), \
+ col, 0, 1, 1); \
+ gtk_grid_set_column_spacing(GTK_GRID(viewer->widgets_table), 3); \
col++;
#if POPPLER_HAS_CAIRO
@@ -1770,7 +1772,7 @@ static MimeViewer *pdf_viewer_create(void)
viewer->doc_label = gtk_label_new("");
- viewer->widgets_table = gtk_table_new(1, 1, FALSE);
+ viewer->widgets_table = gtk_grid_new();
viewer->doc_index_pane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
@@ -1788,17 +1790,12 @@ static MimeViewer *pdf_viewer_create(void)
viewer->zoom = 1.0;
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(viewer->cur_page), TRUE);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(viewer->zoom_scroll), TRUE);
- gtk_table_attach(GTK_TABLE(viewer->widgets_table), GTK_WIDGET(viewer->cur_page),
- col, col+1,
- 0, 1, 0, 0,
- BUTTON_H_PADDING,
- 0);
+ gtk_grid_attach(GTK_GRID(viewer->widgets_table), GTK_WIDGET(viewer->cur_page),
+ col, 0, 1, 1);
+
col++;
- gtk_table_attach(GTK_TABLE(viewer->widgets_table), GTK_WIDGET(viewer->doc_label),
- col, col+1,
- 0, 1, 0, 0,
- BUTTON_H_PADDING,
- 0);
+ gtk_grid_attach(GTK_GRID(viewer->widgets_table), GTK_WIDGET(viewer->doc_label),
+ col, 0, 1, 1);
col++;
ADD_BUTTON_TO_TABLE(viewer->next_page, STOCK_PIXMAP_RIGHT_ARROW)
@@ -1806,11 +1803,8 @@ static MimeViewer *pdf_viewer_create(void)
ADD_SEP_TO_TABLE
ADD_BUTTON_TO_TABLE(viewer->zoom_fit, STOCK_PIXMAP_ZOOM_FIT)
ADD_BUTTON_TO_TABLE(viewer->zoom_in, STOCK_PIXMAP_ZOOM_IN)
- gtk_table_attach(GTK_TABLE(viewer->widgets_table), GTK_WIDGET(viewer->zoom_scroll),
- col, col+1,
- 0, 1, 0, 0,
- BUTTON_H_PADDING,
- 0);
+ gtk_grid_attach(GTK_GRID(viewer->widgets_table), GTK_WIDGET(viewer->zoom_scroll),
+ col, 0, 1, 1);
col++;
ADD_BUTTON_TO_TABLE(viewer->zoom_out, STOCK_PIXMAP_ZOOM_OUT)
ADD_BUTTON_TO_TABLE(viewer->zoom_width, STOCK_PIXMAP_ZOOM_WIDTH)
diff --git a/src/plugins/spam_report/spam_report_prefs.c b/src/plugins/spam_report/spam_report_prefs.c
@@ -150,18 +150,16 @@ static void create_spamreport_prefs_page(PrefsPage *page,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_page->enabled_chkbtn[i]),
spamreport_prefs.enabled[i]);
- table = gtk_table_new(3, 2, FALSE);
+ table = gtk_grid_new();
gtk_container_set_border_width(GTK_CONTAINER(table), 8);
- gtk_table_set_row_spacings(GTK_TABLE(table), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+ gtk_grid_set_row_spacing(GTK_GRID(table), 4);
+ gtk_grid_set_column_spacing(GTK_GRID(table), 8);
gtk_container_add(GTK_CONTAINER(prefs_page->frame[i]), table);
gtk_widget_show(prefs_page->frame[i]);
gtk_widget_show(table);
- gtk_table_attach(GTK_TABLE(table), prefs_page->enabled_chkbtn[i], 0, 2, 0, 1,
- GTK_EXPAND|GTK_FILL, GTK_EXPAND|GTK_FILL,
- 0, 0);
+ gtk_grid_attach(GTK_GRID(table), prefs_page->enabled_chkbtn[i], 0, 0, 1, 1);
gtk_widget_show(prefs_page->enabled_chkbtn[i]);
switch(spam_interfaces[i].type) {
@@ -171,24 +169,21 @@ static void create_spamreport_prefs_page(PrefsPage *page,
default:
tmp = gtk_label_new(_("Username:"));
}
- gtk_table_attach(GTK_TABLE(table), tmp, 0, 1, 1, 2,
- 0, 0,
- 0, 0);
- gtk_table_attach(GTK_TABLE(table), prefs_page->user_entry[i], 1, 2, 1, 2,
- GTK_EXPAND|GTK_FILL, GTK_EXPAND|GTK_FILL,
- 0, 0);
+ gtk_grid_attach(GTK_GRID(table), tmp, 0, 1, 1, 1);
+ gtk_grid_attach(GTK_GRID(table), prefs_page->user_entry[i], 1, 1, 1, 1);
+ gtk_widget_set_hexpand(prefs_page->user_entry[i], TRUE);
+ gtk_widget_set_halign(prefs_page->user_entry[i], GTK_ALIGN_FILL);
if (spam_interfaces[i].type != INTF_HTTP_GET) {
gtk_widget_show(tmp);
gtk_widget_show(prefs_page->user_entry[i]);
}
tmp = gtk_label_new(_("Password:"));
- gtk_table_attach(GTK_TABLE(table), tmp, 0, 1, 2, 3,
- 0, 0,
- 0, 0);
- gtk_table_attach(GTK_TABLE(table), prefs_page->pass_entry[i], 1, 2, 2, 3,
- GTK_EXPAND|GTK_FILL, GTK_EXPAND|GTK_FILL,
- 0, 0);
+ gtk_grid_attach(GTK_GRID(table), tmp, 0, 2, 1, 1);
+ gtk_grid_attach(GTK_GRID(table), prefs_page->pass_entry[i], 1, 2, 1, 1);
+ gtk_widget_set_hexpand(prefs_page->pass_entry[i], TRUE);
+ gtk_widget_set_halign(prefs_page->pass_entry[i], GTK_ALIGN_FILL);
+
if (spam_interfaces[i].type != INTF_MAIL && spam_interfaces[i].type != INTF_HTTP_GET) {
gtk_widget_show(tmp);
gtk_widget_show(prefs_page->pass_entry[i]);
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -277,19 +277,17 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
vbox_transport = gtkut_get_options_frame(vbox2, &frame_transport, _("Transport"));
- table_transport = gtk_table_new (3, 3, FALSE);
+ table_transport = gtk_grid_new();
gtk_widget_show (table_transport);
gtk_box_pack_start(GTK_BOX(vbox_transport), table_transport, TRUE, TRUE, 0);
- gtk_table_set_row_spacings (GTK_TABLE (table_transport), 4);
- gtk_table_set_col_spacings (GTK_TABLE (table_transport), 8);
+ gtk_grid_set_row_spacing(GTK_GRID(table_transport), 4);
+ gtk_grid_set_column_spacing(GTK_GRID(table_transport), 8);
transport_label = gtk_label_new(_("Type of transport"));
gtk_widget_show(transport_label);
- gtk_table_attach (GTK_TABLE (table_transport), transport_label, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify(GTK_LABEL(transport_label), GTK_JUSTIFY_RIGHT);
gtk_label_set_xalign(GTK_LABEL(transport_label), 1.0);
+ gtk_grid_attach(GTK_GRID(table_transport), transport_label, 0, 0, 1, 1);
store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
transport_optmenu = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
@@ -300,38 +298,32 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
renderer, "text", 0, NULL);
gtk_widget_show(transport_optmenu);
- gtk_table_attach (GTK_TABLE (table_transport), transport_optmenu, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(table_transport), transport_optmenu, 1, 0, 1, 1);
user_label = gtk_label_new(_("User"));
gtk_widget_show(user_label);
- gtk_table_attach (GTK_TABLE (table_transport), user_label, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify(GTK_LABEL(user_label), GTK_JUSTIFY_RIGHT);
gtk_label_set_xalign(GTK_LABEL(user_label), 1.0);
+ gtk_grid_attach(GTK_GRID(table_transport), user_label, 0, 1, 1, 1);
user_entry = gtk_entry_new();
gtk_widget_show(user_entry);
- gtk_table_attach (GTK_TABLE (table_transport), user_entry, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(table_transport), user_entry, 1, 1, 1, 1);
+ gtk_widget_set_hexpand(user_entry, TRUE);
+ gtk_widget_set_halign(user_entry, GTK_ALIGN_FILL);
CLAWS_SET_TIP(user_entry, _("User to use with spamd server"));
spamd_label = gtk_label_new(_("spamd"));
gtk_widget_show(spamd_label);
- gtk_table_attach (GTK_TABLE (table_transport), spamd_label, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify(GTK_LABEL(spamd_label), GTK_JUSTIFY_RIGHT);
gtk_label_set_xalign(GTK_LABEL(spamd_label), 1.0);
+ gtk_grid_attach(GTK_GRID(table_transport), spamd_label, 0, 2, 1, 1);
hbox_spamd = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show(hbox_spamd);
- gtk_table_attach (GTK_TABLE (table_transport), hbox_spamd, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(table_transport), hbox_spamd, 1, 2, 1, 1);
+ gtk_widget_set_hexpand(hbox_spamd, TRUE);
+ gtk_widget_set_halign(hbox_spamd, GTK_ALIGN_FILL);
spamd_hostname_entry = gtk_entry_new();
gtk_widget_show(spamd_hostname_entry);
diff --git a/src/plugins/vcalendar/day-view.c b/src/plugins/vcalendar/day-view.c
@@ -538,8 +538,7 @@ static void fill_days(day_win *dw, gint days, FolderItem *item, gint first_col_d
gtk_widget_modify_bg(ev, GTK_STATE_NORMAL, &dw->bg2);
gtk_box_pack_start(GTK_BOX(hb), ev, TRUE, TRUE, 0);
}
- gtk_table_attach(GTK_TABLE(dw->dtable_h), hb, col, col+1, 1, 2
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(dw->dtable_h), hb, col, 1, 1, 1);
/* check rows */
for (row = 0; row < 24; row++) {
@@ -570,9 +569,8 @@ static void fill_days(day_win *dw, gint days, FolderItem *item, gint first_col_d
, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hb), ev, TRUE, TRUE, 0);
}
- gtk_table_attach(GTK_TABLE(dw->dtable), hb, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
- }
+ gtk_grid_attach(GTK_GRID(dw->dtable), hb, col, row, 1, 1);
+ }
first_col_day++;
}
}
@@ -712,11 +710,9 @@ static void fill_hour(day_win *dw, gint col, gint row, char *text)
gtk_widget_set_size_request(ev, dw->hour_req.width
, dw->StartDate_button_req.height);
if (text)
- gtk_table_attach(GTK_TABLE(dw->dtable), ev, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(dw->dtable), ev, col, row, 1, 1);
else /* special, needed for header table full day events */
- gtk_table_attach(GTK_TABLE(dw->dtable_h), ev, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(dw->dtable_h), ev, col, row, 1, 1);
}
static void build_day_view_table(day_win *dw)
@@ -750,7 +746,7 @@ static void build_day_view_table(day_win *dw)
gtk_container_add(GTK_CONTAINER(dw->scroll_win_h), dw->day_view_vbox);
/* row 1= day header buttons
* row 2= full day events after the buttons */
- dw->dtable_h = gtk_table_new(2 , days+2, FALSE);
+ dw->dtable_h = gtk_grid_new();
gtk_box_pack_start(GTK_BOX(dw->day_view_vbox), dw->dtable_h
, FALSE, FALSE, 0);
@@ -767,8 +763,7 @@ static void build_day_view_table(day_win *dw)
gtk_container_set_border_width(GTK_CONTAINER(dw->Previous_toolbutton), 0);
arrow = gtk_image_new_from_icon_name("pan-start-symbolic", GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(dw->Previous_toolbutton), arrow);
- gtk_table_attach(GTK_TABLE(dw->dtable_h), dw->Previous_toolbutton, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(dw->dtable_h), dw->Previous_toolbutton, i, 0, 1, 1);
gtk_widget_show_all(dw->Previous_toolbutton);
g_signal_connect((gpointer)dw->Previous_toolbutton, "button_release_event"
, G_CALLBACK(on_Previous_clicked), dw);
@@ -797,8 +792,7 @@ static void build_day_view_table(day_win *dw)
g_signal_connect((gpointer)button, "clicked"
, G_CALLBACK(header_button_clicked_cb), dw);
g_object_set_data(G_OBJECT(button), "offset", GINT_TO_POINTER(tm_date.tm_mday*1000));
- gtk_table_attach(GTK_TABLE(dw->dtable_h), button, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(dw->dtable_h), button, i, 0, 1, 1);
if (++tm_date.tm_mday == (int)(monthdays[tm_date.tm_mon]+1)) {
if (++tm_date.tm_mon == 12) {
@@ -816,8 +810,7 @@ static void build_day_view_table(day_win *dw)
gtk_container_set_border_width(GTK_CONTAINER(dw->Next_toolbutton), 0);
arrow = gtk_image_new_from_icon_name("pan-end-symbolic", GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(dw->Next_toolbutton), arrow);
- gtk_table_attach(GTK_TABLE(dw->dtable_h), dw->Next_toolbutton, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(dw->dtable_h), dw->Next_toolbutton, i, 0, 1, 1);
gtk_widget_show_all(dw->Next_toolbutton);
g_signal_connect((gpointer)dw->Next_toolbutton, "button_release_event"
, G_CALLBACK(on_Next_clicked), dw);
@@ -839,7 +832,7 @@ static void build_day_view_table(day_win *dw)
vp = gtk_viewport_new(NULL, NULL);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(vp), GTK_SHADOW_NONE);
gtk_container_add(GTK_CONTAINER(dw->scroll_win), vp);
- dw->dtable = gtk_table_new(24, days+2, FALSE);
+ dw->dtable = gtk_grid_new();
gtk_container_add(GTK_CONTAINER(vp), dw->dtable);
gtk_widget_show_all(dw->dtable_h);
diff --git a/src/plugins/vcalendar/month-view.c b/src/plugins/vcalendar/month-view.c
@@ -673,8 +673,7 @@ static void fill_days(month_win *mw, gint days, FolderItem *item)
gtk_box_pack_start(GTK_BOX(vb), mw->line[row][col]
, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(mw->dtable), vb, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable), vb, col, row, 1, 1);
g_date_free(date);
}
}
@@ -791,11 +790,9 @@ static void fill_hour(month_win *mw, gint col, gint row, char *text)
gtk_widget_set_size_request(ev, mw->hour_req.width
, mw->StartDate_button_req.height);
if (text)
- gtk_table_attach(GTK_TABLE(mw->dtable), ev, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable), ev, col, row, 1, 1);
else /* special, needed for header table full day events */
- gtk_table_attach(GTK_TABLE(mw->dtable_h), ev, col, col+1, row, row+1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable_h), ev, col, row, 1, 1);
}
static void build_month_view_table(month_win *mw)
@@ -851,7 +848,7 @@ static void build_month_view_table(month_win *mw)
gtk_container_add(GTK_CONTAINER(mw->scroll_win_h), mw->month_view_vbox);
/* row 1= day header buttons
* row 2= full day events after the buttons */
- mw->dtable_h = gtk_table_new(2 , days+2, FALSE);
+ mw->dtable_h = gtk_grid_new();
gtk_box_pack_start(GTK_BOX(mw->month_view_vbox), mw->dtable_h
, FALSE, FALSE, 0);
@@ -868,8 +865,7 @@ static void build_month_view_table(month_win *mw)
gtk_container_set_border_width(GTK_CONTAINER(mw->Previous_toolbutton), 0);
arrow = gtk_image_new_from_icon_name("pan-start-symbolic", GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(mw->Previous_toolbutton), arrow);
- gtk_table_attach(GTK_TABLE(mw->dtable_h), mw->Previous_toolbutton, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable_h), mw->Previous_toolbutton, i, 0, 1, 1);
gtk_widget_show_all(mw->Previous_toolbutton);
g_signal_connect((gpointer)mw->Previous_toolbutton, "button_release_event"
, G_CALLBACK(on_Previous_clicked), mw);
@@ -879,8 +875,7 @@ static void build_month_view_table(month_win *mw)
gtk_widget_set_size_request(button, mw->StartDate_button_req.width, -1);
g_object_set_data(G_OBJECT(button), "offset", GINT_TO_POINTER(i-1));
- gtk_table_attach(GTK_TABLE(mw->dtable_h), button, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable_h), button, i, 0, 1, 1);
}
mw->Next_toolbutton = gtk_event_box_new();
@@ -888,8 +883,7 @@ static void build_month_view_table(month_win *mw)
gtk_container_set_border_width(GTK_CONTAINER(mw->Next_toolbutton), 0);
arrow = gtk_image_new_from_icon_name("pan-end-symbolic", GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(mw->Next_toolbutton), arrow);
- gtk_table_attach(GTK_TABLE(mw->dtable_h), mw->Next_toolbutton, i, i+1, 0, 1
- , (GTK_FILL), (0), 0, 0);
+ gtk_grid_attach(GTK_GRID(mw->dtable_h), mw->Next_toolbutton, i, 0, 1, 1);
gtk_widget_show_all(mw->Next_toolbutton);
g_signal_connect((gpointer)mw->Next_toolbutton, "button_release_event"
, G_CALLBACK(on_Next_clicked), mw);
@@ -908,7 +902,7 @@ static void build_month_view_table(month_win *mw)
vp = gtk_viewport_new(NULL, NULL);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(vp), GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(mw->scroll_win), vp);
- mw->dtable = gtk_table_new(6, days+2, FALSE);
+ mw->dtable = gtk_grid_new();
gtk_container_add(GTK_CONTAINER(vp), mw->dtable);
gtk_widget_show_all(mw->dtable_h);
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -128,12 +128,11 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
g_free(tmpstr); \
gtk_label_set_use_markup (GTK_LABEL (label), TRUE); \
gtk_label_set_xalign (GTK_LABEL(label), 1.0); \
- gtk_table_attach (GTK_TABLE (meet->table), \
- label, 0, 1, i, i+1, \
- GTK_FILL, GTK_FILL, 6, 6); \
- gtk_table_attach (GTK_TABLE (meet->table), \
- do_space?s_hbox:widget, 1, 2, i, i+1, \
- GTK_FILL|GTK_EXPAND, GTK_FILL, 6, 6); \
+ gtk_grid_attach(GTK_GRID(meet->table), label, 0, i, 1, 1); \
+ gtk_grid_attach(GTK_GRID(meet->table), do_space?s_hbox:widget, \
+ 1, i, 1, 1); \
+ gtk_widget_set_hexpand(do_space?s_hbox:widget, TRUE); \
+ gtk_widget_set_halign(do_space?s_hbox:widget, GTK_ALIGN_FILL); \
if (GTK_IS_LABEL(widget)) { \
gtk_label_set_use_markup(GTK_LABEL (widget), TRUE); \
gtk_label_set_xalign(GTK_LABEL(widget), 0.0); \
@@ -142,9 +141,10 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
} \
} else { \
g_free(tmpstr); \
- gtk_table_attach (GTK_TABLE (meet->table), \
- do_space?s_hbox:widget, 0, 2, i, i+1, \
- GTK_FILL|GTK_EXPAND, GTK_FILL, 6, 6); \
+ gtk_grid_attach(GTK_GRID(meet->table), do_space?s_hbox:widget, \
+ 0, i, 1, 1); \
+ gtk_widget_set_hexpand(do_space?s_hbox:widget, TRUE); \
+ gtk_widget_set_halign(do_space?s_hbox:widget, GTK_ALIGN_FILL); \
} \
i++; \
}
@@ -168,24 +168,20 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
gtk_label_set_use_markup (GTK_LABEL (label), TRUE); \
gtk_label_set_xalign (GTK_LABEL(label), 1.0); \
if(intable1) { \
- gtk_table_attach (GTK_TABLE (meet->table1), \
- label, 0, 1, i, i+1, \
- GTK_FILL, GTK_FILL, 1, 1); \
+ gtk_grid_attach(GTK_GRID(meet->table1), label, \
+ 0, i, 1, 1); \
} \
else { \
- gtk_table_attach (GTK_TABLE (meet->table2), \
- label, 0, 1, i, i+1, \
- GTK_FILL, GTK_FILL, 1, 1); \
+ gtk_grid_attach(GTK_GRID(meet->table2), label, \
+ 0, i, 1, 1); \
} \
if(intable1) { \
- gtk_table_attach (GTK_TABLE (meet->table1), \
- do_space?s_hbox:widget, 1, 2, i, i+1, \
- GTK_FILL|GTK_EXPAND, GTK_FILL, 1, 1); \
+ gtk_grid_attach(GTK_GRID(meet->table1), \
+ do_space?s_hbox:widget, 1, i, 1, 1); \
} \
else { \
- gtk_table_attach (GTK_TABLE (meet->table2), \
- do_space?s_hbox:widget, 1, 2, i, i+1, \
- GTK_FILL|GTK_EXPAND, GTK_FILL, 1, 1); \
+ gtk_grid_attach(GTK_GRID(meet->table2), \
+ do_space?s_hbox:widget, 1, i, 1, 1); \
} \
if (GTK_IS_LABEL(widget)) { \
gtk_label_set_use_markup(GTK_LABEL (widget), TRUE); \
@@ -196,14 +192,18 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
} else { \
g_free(tmpstr); \
if(intable1) { \
- gtk_table_attach (GTK_TABLE (meet->table1), \
- do_space?s_hbox:widget, 0, 2, i, i+1, \
- GTK_FILL|GTK_EXPAND, GTK_FILL, 1, 1); \
+ gtk_grid_attach(GTK_GRID(meet->table1), \
+ do_space?s_hbox:widget, 0, i, 1, 1); \
+ gtk_widget_set_hexpand(do_space?s_hbox:widget, TRUE); \
+ gtk_widget_set_halign(do_space?s_hbox:widget, \
+ GTK_ALIGN_FILL); \
} \
else { \
- gtk_table_attach (GTK_TABLE (meet->table2), \
- do_space?s_hbox:widget, 0, 2, i, i+1, \
- GTK_FILL|GTK_EXPAND, GTK_FILL, 1, 1); \
+ gtk_grid_attach(GTK_GRID(meet->table2), \
+ do_space?s_hbox:widget, 0, i, 1, 1); \
+ gtk_widget_set_hexpand(do_space?s_hbox:widget, TRUE); \
+ gtk_widget_set_halign(do_space?s_hbox:widget, \
+ GTK_ALIGN_FILL); \
} \
} \
i++; \
@@ -1341,10 +1341,10 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
meet->window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "vcal_meeting_gtk");
#ifndef GENERIC_UMPC
- meet->table = gtk_table_new(7, 2, FALSE);
+ meet->table = gtk_grid_new();
#else
- meet->table1 = gtk_table_new(4, 2, FALSE);
- meet->table2 = gtk_table_new(2, 2, FALSE);
+ meet->table1 = gtk_grid_new();
+ meet->table2 = gtk_grid_new();
#endif
meet->who = gtk_combo_box_text_new();
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
@@ -1092,12 +1092,13 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data)
g_free(tmpstr); \
gtk_label_set_use_markup (GTK_LABEL (label), TRUE); \
gtk_label_set_xalign (GTK_LABEL(label), 1.0); \
- gtk_table_attach (GTK_TABLE (vcalviewer->table), \
- label, 0, 1, i, i+1, \
- GTK_FILL, GTK_FILL, 6, 6); \
- gtk_table_attach (GTK_TABLE (vcalviewer->table), \
- widget, 1, 2, i, i+1, \
- GTK_FILL, GTK_FILL, 6, 6); \
+ gtk_grid_attach(GTK_GRID(vcalviewer->table), label, 0, i, 1, 1);\
+ gtk_widget_set_hexpand(label, TRUE); \
+ gtk_widget_set_halign(label, GTK_ALIGN_FILL); \
+ gtk_grid_attach(GTK_GRID(vcalviewer->table), widget, \
+ 1, i, 1, 1); \
+ gtk_widget_set_hexpand(widget, TRUE); \
+ gtk_widget_set_halign(widget, GTK_ALIGN_FILL); \
if (GTK_IS_LABEL(widget)) { \
gtk_label_set_use_markup(GTK_LABEL (widget), TRUE); \
gtk_label_set_xalign(GTK_LABEL(widget), 0.0); \
@@ -1171,7 +1172,7 @@ MimeViewer *vcal_viewer_create(void)
vcalviewer->mimeviewer.scroll_page = vcal_viewer_scroll_page;
vcalviewer->mimeviewer.scroll_one_line = vcal_viewer_scroll_one_line;
- vcalviewer->table = gtk_table_new(8, 2, FALSE);
+ vcalviewer->table = gtk_grid_new();
vcalviewer->type = gtk_label_new("meeting");
vcalviewer->who = gtk_label_new("who");
vcalviewer->start = gtk_label_new("start");
