[Commits] [SCM] claws branch, master, updated. 3.16.0-22-g46a9ad5

mones at claws-mail.org mones at claws-mail.org
Mon Jan 22 23:21:50 CET 2018


The branch, master has been updated
       via  46a9ad57bcf6ceee33bb8221dd39a3afb7e9b10e (commit)
      from  3ace185053c05655a36179bc383029cdb03d3114 (commit)

Summary of changes:
 src/prefs_themes.c |   42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)


- Log -----------------------------------------------------------------
commit 46a9ad57bcf6ceee33bb8221dd39a3afb7e9b10e
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Jan 22 23:16:03 2018 +0100

    Use spacing more uniformly on themes prefs
    
    Also remove colons from labels (not used in other places), and align
    them to the right, to be visually consistent with other preference
    pages.

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 1106279..ef345cf 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -950,7 +950,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
 #endif
 
 	vbox1 = gtk_vbox_new (FALSE, VSPACING);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox1), 5);
 	gtk_widget_show (vbox1);
 
 	vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("Selector"));
@@ -958,7 +958,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
 	hbox3 = gtk_hbox_new (FALSE, 5);
 	gtk_widget_show (hbox3);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox3, FALSE, FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (hbox3), 5);
+	// gtk_container_set_border_width (GTK_CONTAINER (hbox3), 5);
 
 	menu_themes = gtk_combo_box_new();
 	gtk_widget_show (menu_themes);
@@ -978,70 +978,71 @@ 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_misc_set_alignment (GTK_MISC (label_global_status), 0, 0.5);
-	gtk_misc_set_padding (GTK_MISC (label_global_status), 6, 0);
+	gtk_misc_set_padding (GTK_MISC (label_global_status), 1, 0);
 
 	PACK_FRAME(vbox1, frame_info, _("Information"));
 
 	table1 = gtk_table_new (4, 2, FALSE);
 	gtk_widget_show (table1);
 	gtk_container_add (GTK_CONTAINER (frame_info), table1);
+	gtk_container_set_border_width (GTK_CONTAINER (table1), 5);
 
-	label1 = gtk_label_new (_("Name: "));
+	label1 = gtk_label_new (_("Name"));
 	gtk_widget_show (label1);
 	gtk_table_attach (GTK_TABLE (table1), label1, 0, 1, 0, 1,
 			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 8, 2);
+			(GtkAttachOptions) (0), 5, 4);
 	gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
+	gtk_misc_set_alignment (GTK_MISC (label1), 1, 0.5);
 
-	label2 = gtk_label_new (_("Author: "));
+	label2 = gtk_label_new (_("Author"));
 	gtk_widget_show (label2);
 	gtk_table_attach (GTK_TABLE (table1), label2, 0, 1, 1, 2,
 			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 8, 2);
+			(GtkAttachOptions) (0), 5, 4);
 	gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
+	gtk_misc_set_alignment (GTK_MISC (label2), 1, 0.5);
 
-	label3 = gtk_label_new (_("URL:"));
+	label3 = gtk_label_new (_("URL"));
 	gtk_widget_show (label3);
 	gtk_table_attach (GTK_TABLE (table1), label3, 0, 1, 2, 3,
 			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 8, 2);
-	gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
+			(GtkAttachOptions) (0), 5, 4);
+	gtk_misc_set_alignment (GTK_MISC (label3), 1, 0.5);
 
 	label_name = gtk_label_new ("");
 	gtk_widget_show (label_name);
 	gtk_table_attach (GTK_TABLE (table1), label_name, 1, 2, 0, 1,
 			(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-			(GtkAttachOptions) (0), 0, 0);
+			(GtkAttachOptions) (0), 5, 0);
 	gtk_misc_set_alignment (GTK_MISC (label_name), 0, 0.5);
 
 	label_author = gtk_label_new ("");
 	gtk_widget_show (label_author);
 	gtk_table_attach (GTK_TABLE (table1), label_author, 1, 2, 1, 2,
 			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 0, 0);
+			(GtkAttachOptions) (0), 5, 0);
 	gtk_misc_set_alignment (GTK_MISC (label_author), 0, 0.5);
 
 	label_url = gtk_label_new ("");
 	gtk_widget_show (label_url);
 	gtk_table_attach (GTK_TABLE (table1), label_url, 1, 2, 2, 3,
 			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 0, 0);
+			(GtkAttachOptions) (0), 5, 0);
 	gtk_misc_set_alignment (GTK_MISC (label_url), 0, 0.5);
 
-	label4 = gtk_label_new (_("Status:"));
+	label4 = gtk_label_new (_("Status"));
 	gtk_widget_show (label4);
 	gtk_table_attach (GTK_TABLE (table1), label4, 0, 1, 3, 4,
 			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 8, 2);
-	gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
+			(GtkAttachOptions) (0), 5, 4);
+	gtk_misc_set_alignment (GTK_MISC (label4), 1, 0.5);
 
 	label_status = gtk_label_new ("");
 	gtk_widget_show (label_status);
 	gtk_table_attach (GTK_TABLE (table1), label_status, 1, 2, 3, 4,
 			(GtkAttachOptions) (GTK_FILL),
-			(GtkAttachOptions) (0), 0, 0);
+			(GtkAttachOptions) (0), 5, 0);
 	gtk_misc_set_alignment (GTK_MISC (label_status), 0, 0.5);
 
 	PACK_FRAME(vbox1, frame_preview, _("Preview"));
@@ -1049,6 +1050,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
 	hbox1 = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox1);
 	gtk_container_add (GTK_CONTAINER (frame_preview), hbox1);
+	gtk_container_set_border_width (GTK_CONTAINER (hbox1), 5);
 
 	icon_1 = gtk_image_new();
 	gtk_widget_show (icon_1);
@@ -1090,7 +1092,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
 	hbuttonbox1 = gtk_hbutton_box_new ();
 	gtk_widget_show (hbuttonbox1);
 	gtk_container_add (GTK_CONTAINER (frame_buttons), hbuttonbox1);
-	gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 5);
+	gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 8);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_START);
 	gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 5);
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list