2005-11-24 [paul] 1.9.100cvs31
authorPaul Mangan <paul@claws-mail.org>
Thu, 24 Nov 2005 12:37:29 +0000 (12:37 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 24 Nov 2005 12:37:29 +0000 (12:37 +0000)
* manual/addrbook.xml
* manual/starting.xml
written by Colin, proofread, edited, adapted by me
* manual/advanced.xml
add some Actions examples
* src/importldif.c
use a Save button instead of a Close button
* src/wizard.c
indicate mandatory fields
fix page display
Thanks to Colin

ChangeLog
PATCHSETS
configure.ac
manual/addrbook.xml
manual/advanced.xml
manual/starting.xml
src/importldif.c
src/wizard.c

index e55cae1..4b4ab37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-11-24 [paul]      1.9.100cvs31
+
+       * manual/addrbook.xml
+       * manual/starting.xml
+               written by Colin, proofread, edited, adapted by me
+       * manual/advanced.xml
+               add some Actions examples
+       * src/importldif.c
+               use a Save button instead of a Close button
+       * src/wizard.c
+               indicate mandatory fields
+               fix page display
+               Thanks to Colin
+
 2005-11-23 [colin]     1.9.100cvs30
 
        * src/addressbook.c
index 619f695..8cba663 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.83.2.51 -r 1.83.2.52 src/mimeview.c;  ) > 1.9.100cvs28.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/advanced.xml;  ) > 1.9.100cvs29.patchset
 ( cvs diff -u -r 1.60.2.39 -r 1.60.2.40 src/addressbook.c;  cvs diff -u -r 1.28.2.12 -r 1.28.2.13 src/addrindex.c;  cvs diff -u -r 1.2.4.9 -r 1.2.4.10 src/browseldap.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/wizard.c;  ) > 1.9.100cvs30.patchset
+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/addrbook.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/advanced.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/starting.xml;  cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/importldif.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/wizard.c;  ) > 1.9.100cvs31.patchset
index f32db35..936c1ef 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index b6e98f9..840691a 100644 (file)
@@ -5,12 +5,21 @@
   <section id="addrbk_basic">
     <title>Basic management</title>
     <para>
+       The address book is accessible via the <quote>Tools/Address book</quote> menu. It is arranged in different sections: the <quote>Address Book</quote> and its subsections, which contain the contacts that you added locally; the vCard sections, which contain imported vCards; and, if support for them was built into Sylpheed-Claws, the LDAP and jPilot sections, containing contacts from your LDAP servers or handheld devices.
+    </para><para>
+       In the <quote>Address Book</quote> section, you can create multiple address books, each one being able to contain addresses and/or folders. This can help you organizing your contacts per category. In addition to this, you can create groups of addresses, which can then be used from the composition window to send mails to multiple people at once.
+       The menus in the address book's window allow you to do all of this. For example, you can create a <emphasis>Family</emphasis> folder inside your <quote>Personal Addresses</quote> address book, using the <quote>Book/New folder</quote> menu when <quote>Personal Addresses</quote> is selected, or by right-clicking on it. In the same way, you can add contacts to an address book or folder by using the <quote>Address</quote> menu, or by right-clicking an item in the list in the right-hand part of the window.
+       When adding a contact, a new window will popup, where you'll be able to specify the details of the contact in the first tab (<emphasis>Display Name, First Name, ...</emphasis>), and a list of email addresses in the second tab.
+    </para><para>
+       A simpler way to save your contacts to your address book is to save them when reading one of their emails, using the <quote>Tools/Add sender to address book</quote> menu, or by right-clicking on an email address in the message view.
     </para>
   </section>
 
   <section id="addrbk_expimp">
     <title>Exporting and importing addresses</title>
     <para>
+       Sylpheed-Claws can import address books easily from the majority of email programs. From the <quote>Tools</quote> menu in the address book, you will be able to import Pine or Mutt address books. As these formats are not so widespread, you can also import LDIF files. LDIF is a widely-used format, so most other email programs can export their address book to this format.
+       Importing an LDIF file is done via <quote>Tools/Import LDIF file</quote> and is a three-step operation: select the file to import and an address book name, check the fields you want to import if the defaults do not please you, then use the <quote>Save</quote> button.
     </para>
   </section>
 
     <section id="addrbk_adv_ldap">
       <title>Using LDAP servers</title>
       <para>
+             LDAP servers are used to share address books across networks. They are often available in companies. Enabling an LDAP server in Sylpheed-Claws is quite straight forward. Choose <quote>Book/New LDAP server</quote> in the <quote>Book</quote> menu, then choose a name for this LDAP server. Enter the hostname of the server (<emphasis>e.g. <quote>ldap.sylpheed.org</quote></emphasis>), its port, if necessary (<emphasis>the standard port is 389</emphasis>). You can then either fill in the <quote>Search Base</quote> yourself if you know what to use, or click on <quote>Check Server</quote> to have Sylpheed-Claws attempt to guess it automatically. If your server requires authentication, you can set it in the <quote>Extended</quote> tab.
+       When you close this window by clicking <quote>Ok</quote>, the server appears in the address book's sources list on the left-hand side. When selecting the server, you will see an empty list of contacts at the right, which can be surprising at first. This is to avoid doing full searches on the server without you explicitly asking for it. You can now search for names using the <quote>Lookup</quote> form at the bottom of this list. If you want a full listing, just search for <quote>*</quote>.
       </para>
     </section>
 
     <section id="addrbk_adv_jpilot">
-      <title>Integration with JPilot</title>
+      <title>Integration with jPilot</title>
       <para>
+       Sylpheed-Claws can use addresses stored on your handheld device.
       </para>
     </section>
 
     <section id="addrbk_adv_vcard">
-      <title>VCard support</title>
+      <title>vCard support</title>
       <para>
+       Sylpheed-Claws can import vCards of your contacts by using <quote>Book/New vCard</quote>.
       </para>
     </section>
     
index 0706d12..43c977f 100644 (file)
@@ -6,6 +6,36 @@
     <para>
     Actions allow you to use all the power of the Unix command-line with your emails. You can define various commands, taking parameters such as the current email file, a list of emails, the currently selected text, and so on. In this way, you'll be able to perform various tasks such as editing a raw mail in your text editor, "hide" what you mean using ROT-13, apply patches contained in emails directly, and so on. The only limit is your imagination. You can configure Actions via the Tools menu.
     </para>
+    <blockquote>
+       <example><title>Simple <quote>Open With...</quote></title>
+               <variablelist>
+                       <varlistentry><term>Menu name: <emphasis>Open with/kate</emphasis> Command Line: <emphasis>kate%p</emphasis></term>
+                               <listitem><para>Opens the file of the selected decoded MIME part (<emphasis>%p</emphasis>) with the <emphasis>kate</emphasis> text editor.
+                                   </para></listitem>
+                   </varlistentry>
+               </variablelist>
+       </example>
+       <example><title>Spam management using <ulink url="http://bogofilter.sourceforge.net/">Bogofilter</ulink></title>
+               <variablelist>
+                       <varlistentry><term>Menu name: <emphasis>Bogofilter/Mark as Ham</emphasis> Command Line: <emphasis>bogofilter -n -v -B "%f"</emphasis></term>
+                               <listitem><para>Marks the currently selected mails (<emphasis>%f</emphasis>) as 'not spam' using <emphasis>Bogofilter</emphasis>.
+                                   </para></listitem>
+                   </varlistentry>
+                   <varlistentry><term>Menu name: <emphasis>Bogofilter/Mark as Spam</emphasis> Command Line: <emphasis>bogofilter -s -v -B "%f"</emphasis></term>
+                           <listitem><para>Marks the currently selected mails (<emphasis>%f</emphasis>) as 'spam' using <emphasis>Bogofilter</emphasis>.
+                                   </para></listitem>
+                   </varlistentry>
+               </variablelist>
+    </example>
+    <example><title>Search google using an external script</title>
+           <variablelist>
+                   <varlistentry><term>Menu name: <emphasis>Search/Google</emphasis> Command Line: <emphasis>|/path/to/google_search.pl</emphasis></term>
+                           <listitem><para>Searches google for the currently selected text (<emphasis>|</emphasis>) using the external script <emphasis><ulink url="http://claws.sylpheed.org/tools.php">google_search.pl</ulink></emphasis>.
+                                   </para></listitem>
+                   </varlistentry>
+           </variablelist>
+    </example>
+    </blockquote>
   </section>
   <section id="adv_templates">
     <title>Templates</title>
index 22f54e1..33619e7 100644 (file)
@@ -5,32 +5,66 @@
   <section id="start_wizard">
     <title>The initial wizard</title>
     <para>
+       The first time that you start Sylpheed-Claws, you will be asked a few questions in order to set up an account. These questions are easy to answer and grouped in several short pages.
+    </para><para>
+           First you will be asked to fill in your name, (<emphasis>usually guessed from the operating system</emphasis>), your email address, and the name of your organisation, (<emphasis>optional</emphasis>).
+    </para><para>
+           On the next page you will enter the address of your SMTP server, (<emphasis>sometimes referred to as <quote>Outgoing server</quote></emphasis>).
+    </para><para>The following page will allow you to enter details of how to retrieve your mail. The format of the page will be determined by the <quote>Server type</quote>:
+    </para>
+    <blockquote><variablelist>
+           <varlistentry><term>POP3</term>
+                   <listitem><para>If you choose POP3, you will need to enter the server address, username, and password. The password is optional, if you don't provide it here then you will be prompted for it each time it is needed.
+                   </para></listitem>
+           </varlistentry>
+           <varlistentry><term>IMAP</term>
+                   <listitem><para>If you choose IMAP, you will need to enter the server address, username, password, and IMAP server directory. The password is optional, if you don't provide it here then you will be prompted for it each time it is needed. The IMAP server directory is also optional, often it is not needed and can be left empty.
+                           </para></listitem>
+           </varlistentry>
+           <varlistentry><term>Local mbox file</term>
+                   <listitem><para>If you choose Local mbox file, you will need to enter the location of your local mailbox file.
+                           </para></listitem>
+           </varlistentry>
+    </variablelist></blockquote>
+<para>If you chose either POP3 or Local mbox file, the next page  will ask you where to save your mail on disk. The default, <quote>Mail</quote>, is usually ok and will save your mails in a directory called <quote>Mail</quote> in your home directory.
+    </para><para>If Sylpheed-Claws is built with support for OpenSSL, you will next see the <quote>Security</quote> page, here you will be able to choose to use SSL encryption to send and receive your emails. Most ISPs do not enable this, but many companies do; if you're unsure about it, you can leave them unselected.
+    </para><para>
+       You can now click on the Save button, and start enjoying Sylpheed-Claws.
     </para>
   </section>
 
   <section id="start_getting">
     <title>Getting mail</title>
     <para>
+       Retrieving your email can be done from the toolbar button named <quote>Get mail</quote> or from the <quote>Receive</quote> submenu of the <quote>Message</quote> menu.
+    </para><para>
+       If you want Sylpheed-Claws to check your mail automatically at regular intervals, you can ask it to do so from the <quote>Mail handling: Receive</quote> preference page which you'll find in the <quote>Configuration/Preferences...</quote> menu. Just click the <quote>Auto-check new mail every [...] minutes</quote> checkbox, and set the interval to your liking.
     </para>
   </section>
 
   <section id="start_reading">
-    <title>Reading mail</title>
+    <title>Reading your mail</title>
     <para>
+       Once you have retrieved your emails, the Inbox folder will contain them. The total number of emails in a folder is shown at the right of the folder's name, along with the number of unread and new emails in it. To see them, click on the folder row in the folder list, and the list of emails in that folder will be displayed in the message list pane. You can then select an email using the mouse, or by using the Up and Down keys to navigate through the list, and the Space bar to display and scroll emails. You can use other keys to navigate through emails, like P and N (previous and next).
     </para>
   </section>
 
-  <section id="start_writting">
-    <title>Writting first mail</title>
+  <section id="start_writing">
+    <title>Writing your first mail</title>
     <para>
+       When clicking on the <quote>Compose</quote> button of the toolbar, a composition window will open. This window contains different fields which you should be able to recognise easily: the From field can be used to select which account you want to use with this email, in the case that you have multiple accounts; the To field is for recipient of the email. When you fill it up, a second To field will appear, so that you can send the email to multiple recipients. You can also change the To field to a Cc field or other types of fields, by using its dropdown menu. After that, you will be able to set the subject of your email, then type its body.
+    </para><para>
+       A little note about an email's subject: Sylpheed-Claws will ask you for confirmation if you attempt to send an email with an empty subject. This is because it can be annoying for the recipient to receive emails with no subjects, as it doesn't help him to quickly handle his emails.
     </para>
   </section>
 
   <section id="start_sending">
-    <title>Send first mail</title>
+    <title>Sending the first mail</title>
     <para>
+       When you have finished writing your first email, you can either click the <quote>Send</quote> button to send your email immediately, or use the <quote>Send later</quote> button. When using <quote>Send</quote>, the composition window will close itself when the mail has been sent; it will stay open if there is an error. When using <quote>Send later</quote>, the composition window will immediately close, and your email will be stored in your Queue folder. It will then be sent when you click the <quote>Send</quote> button in the main window's toolbar.
+    </para><para>
+       The emails you send are saved in the Sent folder of your mailbox, so that you can remember what you wrote to whom, or use an already sent email as a template to write another one.
     </para>
   </section>
-
 </section>
 
index e58b42b..9570218 100644 (file)
@@ -544,7 +544,7 @@ static void imp_ldif_next( GtkWidget *widget ) {
                        gtk_notebook_set_current_page(
                                GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FINISH );
                        gtk_button_set_label(GTK_BUTTON(impldif_dlg.btnCancel),
-                                            GTK_STOCK_CLOSE);
+                                            GTK_STOCK_SAVE);
                        imp_ldif_finish_show();
                }
        }
index 89d1198..ee76d76 100644 (file)
@@ -55,6 +55,7 @@
 #include "stock_pixmap.h"
 #include "setup.h"
 #include "folder.h"
+#include "alertpanel.h"
 #ifdef USE_OPENSSL                     
 #include "ssl.h"
 #endif
@@ -68,6 +69,14 @@ typedef enum
        FINISHED
 } PageNavigation;
 
+int WELCOME_PAGE = -1;
+int USER_PAGE = -1;
+int SMTP_PAGE = -1;
+int RECV_PAGE = -1;
+int MAILBOX_PAGE = -1;
+int SSL_PAGE = -1;
+int DONE_PAGE = -1;
+
 typedef struct
 {
        GtkWidget *window;
@@ -239,6 +248,16 @@ static gboolean wizard_write_config(WizardWindow *wizard)
                        (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
        
        
+       if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4 && 
+           !strlen(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)))) {
+               alertpanel_error(_("Please enter the mailbox name."));
+               g_free(prefs_account);
+               gtk_notebook_set_current_page (
+                       GTK_NOTEBOOK(wizard->notebook), 
+                       MAILBOX_PAGE);
+               return FALSE;
+       }
+
        if (!mailbox_ok) {
                if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4) {
                        mailbox_ok = setup_write_mailbox_path(wizard->mainwin, 
@@ -253,48 +272,48 @@ static gboolean wizard_write_config(WizardWindow *wizard)
                g_free(prefs_account);
                gtk_notebook_set_current_page (
                        GTK_NOTEBOOK(wizard->notebook), 
-                       4);
+                       MAILBOX_PAGE);
                return FALSE;
        }
        
        if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->full_name)))
        ||  !strlen(gtk_entry_get_text(GTK_ENTRY(wizard->email)))) {
-               alertpanel_error(_("Please fill in your name and email address."));
+               alertpanel_error(_("Please enter your name and email address."));
                g_free(prefs_account);
                gtk_notebook_set_current_page (
                        GTK_NOTEBOOK(wizard->notebook), 
-                       1);
+                       USER_PAGE);
                return FALSE;
        }
        
        if (prefs_account->protocol != A_LOCAL) {
                if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->recv_username)))
                ||  !strlen(gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)))) {
-                       alertpanel_error(_("Please fill in your reception server "
+                       alertpanel_error(_("Please enter your receiving server "
                                           "and username."));
                        g_free(prefs_account);
                        gtk_notebook_set_current_page (
                                GTK_NOTEBOOK(wizard->notebook), 
-                               3);
+                               RECV_PAGE);
                        return FALSE;
                }
        } else {
                if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)))) {
-                       alertpanel_error(_("Please fill in your username."));
+                       alertpanel_error(_("Please enter your username."));
                        g_free(prefs_account);
                        gtk_notebook_set_current_page (
                                GTK_NOTEBOOK(wizard->notebook), 
-                               3);
+                               RECV_PAGE);
                        return FALSE;
                }
        }
 
        if (!strlen(gtk_entry_get_text(GTK_ENTRY(wizard->smtp_server)))) {
-               alertpanel_error(_("Please fill in your SMTP server."));
+               alertpanel_error(_("Please enter your SMTP server."));
                g_free(prefs_account);
                gtk_notebook_set_current_page (
                        GTK_NOTEBOOK(wizard->notebook), 
-                       2);
+                       SMTP_PAGE);
                return FALSE;
 
        }
@@ -395,10 +414,11 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
        return vbox;
 }
 
-#define GTK_TABLE_ADD_ROW_AT(table,text,entry,i) {                           \
+#define GTK_TABLE_ADD_ROW_AT(table,text,entry,i) {                           \
        GtkWidget *label = gtk_label_new(text);                               \
        gtk_table_attach(GTK_TABLE(table), label,                             \
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            \
+       gtk_label_set_use_markup(GTK_LABEL(label), TRUE);                     \
        if (GTK_IS_MISC(label))                                               \
                gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);              \
        gtk_table_attach(GTK_TABLE(table), entry,                             \
@@ -498,18 +518,18 @@ static GtkWidget* user_page (WizardWindow * wizard)
 
        wizard->full_name = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(wizard->full_name), g_get_real_name());
-       GTK_TABLE_ADD_ROW_AT(table, _("Your name:"), 
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Your name:</span>"), 
                             wizard->full_name, i); i++;
        
        wizard->email = gtk_entry_new();
        text = get_default_email_addr();
        gtk_entry_set_text(GTK_ENTRY(wizard->email), text);
        g_free(text);
-       GTK_TABLE_ADD_ROW_AT(table, _("Your email address:"), 
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Your email address:</span>"), 
                             wizard->email, i); i++;
        
        wizard->organization = gtk_entry_new();
-       GTK_TABLE_ADD_ROW_AT(table, _("Your organization:"), 
+       GTK_TABLE_ADD_ROW_AT(table, _("Your organization:"),
                             wizard->organization, i); i++;
        
        g_signal_connect(G_OBJECT(wizard->email), "changed",
@@ -528,7 +548,7 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
 
        wizard->mailbox_name = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), "Mail");
-       GTK_TABLE_ADD_ROW_AT(table, _("Mailbox name:"), 
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Mailbox name:</span>"), 
                             wizard->mailbox_name, i); i++;
        
        return table;
@@ -547,7 +567,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        text = get_default_server(wizard, "smtp");
        gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
        g_free(text);
-       GTK_TABLE_ADD_ROW_AT(table, _("SMTP server address:"), 
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">SMTP server address:</span>"), 
                             wizard->smtp_server, i); i++;
        return table;
 }
@@ -569,7 +589,8 @@ static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
                gtk_widget_show(wizard->recv_password);
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
-               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("Server address:"));
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
+               gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
                g_free(text);
        } else if (protocol == A_IMAP4) {
                text = get_default_server(wizard, "imap");
@@ -580,13 +601,15 @@ static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
                gtk_widget_show(wizard->recv_password);
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
-               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("Server address:"));
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Server address:</span>"));
+               gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
                g_free(text);
        } else if (protocol == A_LOCAL) {
                gchar *mbox = g_strdup_printf("/var/mail/%s", g_get_user_name());
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), mbox);
                g_free(mbox);
-               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("Local mailbox:"));
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("<span weight=\"bold\">Local mailbox:</span>"));
+               gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
                gtk_widget_hide(wizard->recv_imap_label);
                gtk_widget_hide(wizard->recv_imap_subdir);
                gtk_widget_hide(wizard->recv_username);
@@ -623,7 +646,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
                         wizard);
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (wizard->recv_type), menu);
-       GTK_TABLE_ADD_ROW_AT(table, _("Server type:"), 
+       GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">Server type:</span>"), 
                             wizard->recv_type, i); i++;
 
        wizard->recv_server = gtk_entry_new();
@@ -631,7 +654,8 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
        g_free(text);
        
-       wizard->recv_label = gtk_label_new(_("Server address:"));
+       wizard->recv_label = gtk_label_new(_("<span weight=\"bold\">Server address:</span>"));
+       gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
        gtk_table_attach(GTK_TABLE(table), wizard->recv_label,                        
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
        if (GTK_IS_MISC(wizard->recv_label))                                                  
@@ -641,7 +665,8 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        i++;
        
        wizard->recv_username = gtk_entry_new();
-       wizard->recv_username_label = gtk_label_new(_("Username:"));
+       wizard->recv_username_label = gtk_label_new(_("<span weight=\"bold\">Username:</span>"));
+       gtk_label_set_use_markup(GTK_LABEL(wizard->recv_username_label), TRUE);
        gtk_table_attach(GTK_TABLE(table), wizard->recv_username_label,                               
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
        if (GTK_IS_MISC(wizard->recv_username_label))                                                 
@@ -745,7 +770,7 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
                {
                        if (current_page > 0) {
                                current_page--;
-                               if (current_page == 4 && skip_mailbox_page) {
+                               if (current_page == MAILBOX_PAGE && skip_mailbox_page) {
                                        /* mailbox */
                                        current_page--;
                                }
@@ -758,7 +783,7 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
                {
                        if (current_page < (num_pages-1)) {
                                current_page++;
-                               if (current_page == 4 && skip_mailbox_page) {
+                               if (current_page == MAILBOX_PAGE && skip_mailbox_page) {
                                        /* mailbox */
                                        current_page++;
                                }
@@ -787,14 +812,21 @@ static gint wizard_close_cb(GtkWidget *widget, GdkEventAny *event,
        return FALSE;
 }
 
+#define PACK_WARNING(text) {                                           \
+       label = gtk_label_new(text);                                    \
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0);                  \
+       gtk_box_pack_end(GTK_BOX(widget), label, FALSE, FALSE, 0);      \
+}
+
 gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        WizardWindow *wizard = g_new0(WizardWindow, 1);
        GtkWidget *page;
        GtkWidget *widget;
+       GtkWidget *label;
        gchar     *text;
        GSList    *cur;
        gboolean   result;
-       
+       gint i = 0;
        wizard->mainwin = mainwin;
        wizard->create_mailbox = create_mailbox;
        
@@ -831,6 +863,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        wizard->pages = NULL;
        
 /*welcome page: 0 */
+       WELCOME_PAGE = i;
        page = create_page(wizard, _("Welcome to Sylpheed-Claws"));
        
        wizard->pages = g_slist_append(wizard->pages, page);
@@ -850,34 +883,56 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        g_free(text);
 
 /* user page: 1 */
+       i++;
+       USER_PAGE = i;
        widget = create_page (wizard, _("About You"));
        gtk_box_pack_start (GTK_BOX(widget), user_page(wizard), FALSE, FALSE, 0);
+       PACK_WARNING(_("Bold fields must be completed"));
+       
        wizard->pages = g_slist_append(wizard->pages, widget);
 
 /*smtp page: 2 */
+       i++;
+       SMTP_PAGE = i;
        widget = create_page (wizard, _("Sending mail"));
        gtk_box_pack_start (GTK_BOX(widget), smtp_page(wizard), FALSE, FALSE, 0);
+       PACK_WARNING(_("Bold fields must be completed"));
+       
        wizard->pages = g_slist_append(wizard->pages, widget);
 
 /* recv+auth page: 3 */
+       i++;
+       RECV_PAGE = i;
        widget = create_page (wizard, _("Receiving mail"));
        gtk_box_pack_start (GTK_BOX(widget), recv_page(wizard), FALSE, FALSE, 0);
+       PACK_WARNING(_("Bold fields must be completed"));
+       
        wizard->pages = g_slist_append(wizard->pages, widget);
 
 /* mailbox page: 4 */
        if (create_mailbox) {
+               i++;
+               MAILBOX_PAGE = i;
                widget = create_page (wizard, _("Saving mail on disk"));
                gtk_box_pack_start (GTK_BOX(widget), mailbox_page(wizard), FALSE, FALSE, 0);
+               PACK_WARNING(_("Bold fields must be completed"));
+       
                wizard->pages = g_slist_append(wizard->pages, widget);
        }
 /* ssl page: 5 */
 #ifdef USE_OPENSSL
+       i++;
+       SSL_PAGE = i;
        widget = create_page (wizard, _("Security"));
        gtk_box_pack_start (GTK_BOX(widget), ssl_page(wizard), FALSE, FALSE, 0);
+       PACK_WARNING(_("Bold fields must be completed"));
+       
        wizard->pages = g_slist_append(wizard->pages, widget);
 #endif
 
 /* done page: 6 */
+       i++;
+       DONE_PAGE = i;
        page = create_page(wizard, _("Configuration finished"));
        
        wizard->pages = g_slist_append(wizard->pages, page);