commit f9c2062d1e84a7767bf83ac40575cd3c84d2d69a
parent cbd1fb9ea393a51e8340620c2800ee7130e4cd03
Author: paul <paul@claws-mail.org>
Date: Fri, 22 Nov 2019 11:25:06 +0000
replace deprecated gtk_misc_set_padding() and gtk_misc_set_alignment()
Diffstat:
8 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/src/addrmerge.c b/src/addrmerge.c
@@ -253,7 +253,8 @@ static void addrmerge_prompt( struct AddrMergePage *page )
g_list_length(page->addressSelect->listSelect));
label = gtk_label_new( label_msg );
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label),0);
+ gtk_label_set_yalign(GTK_LABEL(label),0.5);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
g_free(label_msg);
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
@@ -353,7 +353,8 @@ void pluginwindow_create()
gtk_widget_show(label13);
gtk_container_add(GTK_CONTAINER(frame2), label13);
gtk_label_set_xalign(GTK_LABEL(label13), 0.0);
- gtk_misc_set_padding(GTK_MISC(label13), 2, 2);
+ gtk_widget_set_margin_start(GTK_WIDGET(label13), 2);
+ gtk_widget_set_margin_end(GTK_WIDGET(label13), 2);
scrolledwindow3 = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwindow3);
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2018 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2019 Ricardo Mones and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -82,7 +82,8 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
label = gtk_label_new(_("One of the following regular expressions is matched (one per line)"));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
- gtk_misc_set_padding(GTK_MISC(label), 2, 0);
+ gtk_widget_set_margin_start(GTK_WIDGET(label), 2);
+ gtk_widget_set_margin_end(GTK_WIDGET(label), 0);
case_sensitive_checkbox = gtk_check_button_new_with_label(_("Expressions are case sensitive"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(case_sensitive_checkbox),
diff --git a/src/plugins/litehtml_viewer/lh_prefs.c b/src/plugins/litehtml_viewer/lh_prefs.c
@@ -116,7 +116,8 @@ static void create_lh_prefs_page(PrefsPage *page, GtkWindow *window,
label = gtk_label_new(_("Loading remote resources can lead to some privacy issues.\n"
"When remote content loading is disabled, nothing will be requested\n"
"from the network."));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+ gtk_label_set_xalign(GTK_LABEL(label),0);
+ gtk_label_set_yalign(GTK_LABEL(label),0);
enable_remote_content = gtk_check_button_new_with_label(_("Enable loading of remote content"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_remote_content),
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -652,12 +652,14 @@ static char * pdf_viewer_get_document_format_data(GTime utime)
#define ADD_TO_TABLE(LABEL, VALUE) \
label = gtk_label_new(LABEL); \
gtk_label_set_xalign(GTK_LABEL(label), 1.0); \
- gtk_misc_set_padding(GTK_MISC(label), 4, 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); \
\
label = gtk_label_new(VALUE); \
gtk_label_set_xalign(GTK_LABEL(label), 0.0); \
- gtk_misc_set_padding(GTK_MISC(label), 4, 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); \
row++;
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.c b/src/plugins/rssyl/rssyl_subscribe_gtk.c
@@ -63,7 +63,8 @@ void rssyl_subscribe_dialog(RSubCtx *ctx) {
titlelabel = gtk_label_new(g_strconcat("<b>",_("Feed folder:"),"</b>", NULL));
gtk_label_set_use_markup(GTK_LABEL(titlelabel), TRUE);
- gtk_misc_set_padding(GTK_MISC(titlelabel), 5, 0);
+ gtk_widget_set_margin_start(GTK_WIDGET(titlelabel), 5);
+ gtk_widget_set_margin_end(GTK_WIDGET(titlelabel), 0);
gtk_frame_set_label_widget(GTK_FRAME(titleframe), titlelabel);
title = gtk_entry_new();
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
@@ -765,7 +765,8 @@ static void prefs_matcher_create(void)
time_entry = gtkut_time_select_combo_new();
gtk_box_pack_start(GTK_BOX(date_hbox), time_entry, FALSE, FALSE, 0);
time_label = gtk_label_new(_("on:"));
- gtk_misc_set_alignment(GTK_MISC(time_label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(time_label),0);
+ gtk_label_set_yalign(GTK_LABEL(time_label),0.5);
gtk_box_pack_start(GTK_BOX(date_hbox), time_label, FALSE, FALSE, 0);
/* test info button */
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
@@ -978,7 +978,8 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
gtk_box_pack_start (GTK_BOX (vbox2), label_global_status, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label_global_status), GTK_JUSTIFY_LEFT);
gtk_label_set_xalign (GTK_LABEL (label_global_status), 0.0);
- gtk_misc_set_padding (GTK_MISC (label_global_status), 1, 0);
+ gtk_widget_set_margin_start(GTK_WIDGET(label_global_status), 1);
+ gtk_widget_set_margin_end(GTK_WIDGET(label_global_status), 0);
PACK_FRAME(vbox1, frame_info, _("Information"));
@@ -1055,37 +1056,44 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
icon_1 = gtk_image_new();
gtk_widget_show (icon_1);
gtk_box_pack_start (GTK_BOX (hbox1), icon_1, TRUE, TRUE, 2);
- gtk_misc_set_padding (GTK_MISC (icon_1), 0, 5);
+ gtk_widget_set_margin_start(GTK_WIDGET(icon_1), 0);
+ gtk_widget_set_margin_end(GTK_WIDGET(icon_1), 5);
icon_2 = gtk_image_new();
gtk_widget_show (icon_2);
gtk_box_pack_start (GTK_BOX (hbox1), icon_2, TRUE, TRUE, 2);
- gtk_misc_set_padding (GTK_MISC (icon_2), 0, 5);
+ gtk_widget_set_margin_start(GTK_WIDGET(icon_2), 0);
+ gtk_widget_set_margin_end(GTK_WIDGET(icon_2), 5);
icon_3 = gtk_image_new();
gtk_widget_show (icon_3);
gtk_box_pack_start (GTK_BOX (hbox1), icon_3, TRUE, TRUE, 2);
- gtk_misc_set_padding (GTK_MISC (icon_3), 0, 5);
+ gtk_widget_set_margin_start(GTK_WIDGET(icon_3), 0);
+ gtk_widget_set_margin_end(GTK_WIDGET(icon_3), 5);
icon_4 = gtk_image_new();
gtk_widget_show (icon_4);
gtk_box_pack_start (GTK_BOX (hbox1), icon_4, TRUE, TRUE, 2);
- gtk_misc_set_padding (GTK_MISC (icon_4), 0, 5);
+ gtk_widget_set_margin_start(GTK_WIDGET(icon_4), 0);
+ gtk_widget_set_margin_end(GTK_WIDGET(icon_4), 5);
icon_5 = gtk_image_new();
gtk_widget_show (icon_5);
gtk_box_pack_start (GTK_BOX (hbox1), icon_5, TRUE, TRUE, 2);
- gtk_misc_set_padding (GTK_MISC (icon_5), 0, 5);
+ gtk_widget_set_margin_start(GTK_WIDGET(icon_5), 0);
+ gtk_widget_set_margin_end(GTK_WIDGET(icon_5), 5);
icon_6 = gtk_image_new();
gtk_widget_show (icon_6);
gtk_box_pack_start (GTK_BOX (hbox1), icon_6, TRUE, TRUE, 2);
- gtk_misc_set_padding (GTK_MISC (icon_6), 0, 5);
+ gtk_widget_set_margin_start(GTK_WIDGET(icon_6), 0);
+ gtk_widget_set_margin_end(GTK_WIDGET(icon_6), 5);
icon_7 = gtk_image_new();
gtk_widget_show (icon_7);
gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 2);
- gtk_misc_set_padding (GTK_MISC (icon_7), 0, 5);
+ gtk_widget_set_margin_start(GTK_WIDGET(icon_7), 0);
+ gtk_widget_set_margin_end(GTK_WIDGET(icon_7), 5);
PACK_FRAME(vbox1, frame_buttons, _("Actions"));
