From: Colin Leroy Date: Sat, 31 Mar 2007 15:08:05 +0000 (+0000) Subject: 2007-03-31 [colin] 2.8.1cvs78 X-Git-Tag: rel_2_9_0~26 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ffe7727fe42c11c8e617e8e95b31d08777af1519;hp=c447cec3e7aa3efcfcaa547b82459956672e55f7 2007-03-31 [colin] 2.8.1cvs78 * src/prefs_account.c Maemo: rework account prefs so that less horizontal scrolling is required --- diff --git a/ChangeLog b/ChangeLog index 001049bb9..4352dc178 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-03-31 [colin] 2.8.1cvs78 + + * src/prefs_account.c + Maemo: rework account prefs so + that less horizontal scrolling + is required + 2007-03-31 [colin] 2.8.1cvs77 * src/folderview.c diff --git a/PATCHSETS b/PATCHSETS index b55159204..4ad350f65 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2494,3 +2494,4 @@ ( cvs diff -u -r 1.179.2.162 -r 1.179.2.163 src/imap.c; ) > 2.8.1cvs75.patchset ( cvs diff -u -r 1.100.2.48 -r 1.100.2.49 AUTHORS; ) > 2.8.1cvs76.patchset ( cvs diff -u -r 1.207.2.158 -r 1.207.2.159 src/folderview.c; cvs diff -u -r 1.204.2.128 -r 1.204.2.129 src/prefs_common.c; cvs diff -u -r 1.103.2.78 -r 1.103.2.79 src/prefs_common.h; ) > 2.8.1cvs77.patchset +( cvs diff -u -r 1.105.2.89 -r 1.105.2.90 src/prefs_account.c; ) > 2.8.1cvs78.patchset diff --git a/configure.ac b/configure.ac index 2adc90d8d..8f41112ae 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=77 +EXTRA_VERSION=78 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_account.c b/src/prefs_account.c index 2e17e337f..724815315 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -1193,8 +1193,12 @@ static void prefs_account_basic_create(void) default_checkbtn = gtk_check_button_new_with_label (_("Set as default")); gtk_widget_show (default_checkbtn); +#ifndef MAEMO gtk_box_pack_end (GTK_BOX (hbox), default_checkbtn, TRUE, FALSE, 0); - +#else + gtk_box_pack_start (GTK_BOX (vbox1), default_checkbtn, FALSE, FALSE, 0); + +#endif PACK_FRAME (vbox1, frame1, _("Personal information")); table1 = gtk_table_new (3, 2, FALSE); @@ -1344,16 +1348,25 @@ static void prefs_account_basic_create(void) uid_entry = gtk_entry_new (); gtk_widget_show (uid_entry); gtk_widget_set_size_request (uid_entry, DEFAULT_ENTRY_WIDTH, -1); + pass_entry = gtk_entry_new (); + gtk_widget_show (pass_entry); + gtk_widget_set_size_request (pass_entry, DEFAULT_ENTRY_WIDTH, -1); +#ifndef MAEMO gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 7, 8, GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); - pass_entry = gtk_entry_new (); - gtk_widget_show (pass_entry); - gtk_widget_set_size_request (pass_entry, DEFAULT_ENTRY_WIDTH, -1); gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 3, 4, 7, 8, GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); +#else + gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 4, 7, 8, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); + gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 1, 4, 8, 9, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, + GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); +#endif gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE); nntpserv_label = gtk_label_new (_("News server")); @@ -1407,9 +1420,14 @@ static void prefs_account_basic_create(void) pass_label = gtk_label_new (_("Password")); gtk_widget_show (pass_label); +#ifndef MAEMO gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 7, 8, 0, 0, 0, 0); - +#else + gtk_misc_set_alignment (GTK_MISC (pass_label), 1, 0.5); + gtk_table_attach (GTK_TABLE (serv_table), pass_label, 0, 1, 8, 9, + GTK_FILL, 0, 0, 0); +#endif SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, uid_label); SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, pass_label); SET_TOGGLE_SENSITIVITY (nntpauth_checkbtn, uid_entry); @@ -1835,6 +1853,17 @@ static void prefs_account_send_create(void) gtk_widget_set_size_request (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1); gtk_box_pack_start (GTK_BOX (hbox), smtp_uid_entry, TRUE, TRUE, 0); +#ifdef MAEMO + PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2); + hbox = gtk_hbox_new (FALSE, 8); + gtk_widget_show (hbox); + gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0); + + hbox_spc = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox_spc); + gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); + gtk_widget_set_size_request (hbox_spc, 12, -1); +#endif label = gtk_label_new (_("Password")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); @@ -1843,8 +1872,8 @@ static void prefs_account_send_create(void) gtk_widget_show (smtp_pass_entry); gtk_widget_set_size_request (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1); gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0); - gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE); + gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE); PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2); hbox = gtk_hbox_new (FALSE, 8);