0.9.4claws46

* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/spamassassin/spamassassin_gtk.glade
        reduce GUI clutter by placing hints into tooltips

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d3cde307bc7844456c07b2c9ca2a314d3bd65f10..872de654453e0f8b8f663dc04a69b73ff0dc93a6 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-08-30 [christoph] 0.9.4claws46
+
+       * src/plugins/spamassassin/spamassassin_gtk.c
+       * src/plugins/spamassassin/spamassassin_gtk.glade
+               reduce GUI clutter by placing hints into tooltips
+

 2003-08-30 [paul]      0.9.4claws45
 
        * src/compose.c
 2003-08-30 [paul]      0.9.4claws45
 
        * src/compose.c

diff --git a/configure.ac b/configure.ac
index 35c5b62480007d7dc9ef1d33d31e5556b77d4535..d1e3c8178769bd36ce78cf344510efb836de0671 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=45
+EXTRA_VERSION=46

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 654e240ff21c3189de35cc69b964f6b70c6944ad..7b41f3c7dc8d2e7ab5e8642cd363b9ed3259f1a9 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -88,42 +88,44 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        GtkWidget *port;
        GtkWidget *enable;
        GtkWidget *receive_spam;
        GtkWidget *port;
        GtkWidget *enable;
        GtkWidget *receive_spam;

-       GtkWidget *label10;

        GtkWidget *save_folder;
        GtkWidget *button4;
        GtkWidget *label11;
        GtkWidget *hbox3;
        GtkObject *max_size_adj;
        GtkWidget *max_size;
        GtkWidget *save_folder;
        GtkWidget *button4;
        GtkWidget *label11;
        GtkWidget *hbox3;
        GtkObject *max_size_adj;
        GtkWidget *max_size;

+       GtkTooltips *tooltips;

 
 

-       table1 = gtk_table_new(6, 3, FALSE);
+       tooltips = gtk_tooltips_new();
+
+       table1 = gtk_table_new(5, 3, FALSE);

        gtk_widget_show(table1);
        gtk_container_set_border_width(GTK_CONTAINER(table1), 8);
        gtk_table_set_row_spacings(GTK_TABLE(table1), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table1), 8);
 
        gtk_widget_show(table1);
        gtk_container_set_border_width(GTK_CONTAINER(table1), 8);
        gtk_table_set_row_spacings(GTK_TABLE(table1), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table1), 8);
 

-       label3 = gtk_label_new(_("Enable SpamAssassin Filtering"));
+       label3 = gtk_label_new(_("Enable"));

        gtk_widget_show(label3);
        gtk_table_attach(GTK_TABLE(table1), label3, 0, 1, 0, 1,
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5);
 
        gtk_widget_show(label3);
        gtk_table_attach(GTK_TABLE(table1), label3, 0, 1, 0, 1,
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5);
 

-       label4 = gtk_label_new(_("SpamAssassin Server (spamd)"));
+       label4 = gtk_label_new(_("spamd "));

        gtk_widget_show(label4);
        gtk_table_attach(GTK_TABLE(table1), label4, 0, 1, 1, 2,
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label4), 0, 0.5);
 
        gtk_widget_show(label4);
        gtk_table_attach(GTK_TABLE(table1), label4, 0, 1, 1, 2,
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label4), 0, 0.5);
 

-       label6 = gtk_label_new(_("Maximum Message Size"));
+       label6 = gtk_label_new(_("Maximum Size"));

        gtk_widget_show(label6);
        gtk_table_attach(GTK_TABLE(table1), label6, 0, 1, 2, 3,
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label6), 0, 0.5);
 
        gtk_widget_show(label6);
        gtk_table_attach(GTK_TABLE(table1), label6, 0, 1, 2, 3,
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
        gtk_misc_set_alignment(GTK_MISC(label6), 0, 0.5);
 

-       label8 = gtk_label_new(_("Folder for saved Spam"));
+       label8 = gtk_label_new(_("Save Folder"));

        gtk_widget_show(label8);
        gtk_table_attach(GTK_TABLE(table1), label8, 0, 1, 4, 5,
                         (GtkAttachOptions) (GTK_FILL),
        gtk_widget_show(label8);
        gtk_table_attach(GTK_TABLE(table1), label8, 0, 1, 4, 5,
                         (GtkAttachOptions) (GTK_FILL),


@@ -131,7 +133,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_label_set_justify(GTK_LABEL(label8), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment(GTK_MISC(label8), 0, 0.5);
 
        gtk_label_set_justify(GTK_LABEL(label8), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment(GTK_MISC(label8), 0, 0.5);
 

-       label9 = gtk_label_new(_("Receive Spam"));
+       label9 = gtk_label_new(_("Save Spam"));

        gtk_widget_show(label9);
        gtk_table_attach(GTK_TABLE(table1), label9, 0, 1, 3, 4,
                         (GtkAttachOptions) (GTK_FILL),
        gtk_widget_show(label9);
        gtk_table_attach(GTK_TABLE(table1), label9, 0, 1, 3, 4,
                         (GtkAttachOptions) (GTK_FILL),


@@ -147,6 +149,9 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        hostname = gtk_entry_new();
        gtk_widget_show(hostname);
        gtk_box_pack_start(GTK_BOX(hbox1), hostname, TRUE, TRUE, 0);
        hostname = gtk_entry_new();
        gtk_widget_show(hostname);
        gtk_box_pack_start(GTK_BOX(hbox1), hostname, TRUE, TRUE, 0);

+       gtk_tooltips_set_tip(tooltips, hostname,
+                            _("Hostname or IP address of spamd server"),
+                            NULL);

 
        label5 = gtk_label_new(_(":"));
        gtk_widget_show(label5);
 
        label5 = gtk_label_new(_(":"));
        gtk_widget_show(label5);


@@ -158,6 +163,8 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(port);
        gtk_box_pack_end(GTK_BOX(hbox1), port, FALSE, TRUE, 0);
        gtk_widget_set_usize(port, 64, -2);
        gtk_widget_show(port);
        gtk_box_pack_end(GTK_BOX(hbox1), port, FALSE, TRUE, 0);
        gtk_widget_set_usize(port, 64, -2);

+       gtk_tooltips_set_tip(tooltips, port, _("Port of spamd server"),
+                            NULL);

        gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(port), TRUE);
 
        enable = gtk_check_button_new_with_label("");
        gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(port), TRUE);
 
        enable = gtk_check_button_new_with_label("");


@@ -165,28 +172,28 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_table_attach(GTK_TABLE(table1), enable, 1, 2, 0, 1,
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
        gtk_table_attach(GTK_TABLE(table1), enable, 1, 2, 0, 1,
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

+       gtk_tooltips_set_tip(tooltips, enable,
+                            _("Enable SpamAssassin filtering"), NULL);

 
        receive_spam = gtk_check_button_new_with_label("");
        gtk_widget_show(receive_spam);
        gtk_table_attach(GTK_TABLE(table1), receive_spam, 1, 2, 3, 4,
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
 
        receive_spam = gtk_check_button_new_with_label("");
        gtk_widget_show(receive_spam);
        gtk_table_attach(GTK_TABLE(table1), receive_spam, 1, 2, 3, 4,
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

-
-       label10 =
-           gtk_label_new(_
-                         ("Leave empty to use the default trash folder"));
-       gtk_widget_show(label10);
-       gtk_table_attach(GTK_TABLE(table1), label10, 1, 2, 5, 6,
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-       gtk_label_set_justify(GTK_LABEL(label10), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label10), 1, 0.5);
+       gtk_tooltips_set_tip(tooltips, receive_spam,
+                            _
+                            ("Save mails that where identified as spam to a folder"),
+                            NULL);

 
        save_folder = gtk_entry_new();
        gtk_widget_show(save_folder);
        gtk_table_attach(GTK_TABLE(table1), save_folder, 1, 2, 4, 5,
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
 
        save_folder = gtk_entry_new();
        gtk_widget_show(save_folder);
        gtk_table_attach(GTK_TABLE(table1), save_folder, 1, 2, 4, 5,
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

+       gtk_tooltips_set_tip(tooltips, save_folder,
+                            _
+                            ("Folder that will be used to save spam. Leave empty to use the default trash folder"),
+                            NULL);

 
        button4 = gtk_button_new_with_label(_("..."));
        gtk_widget_show(button4);
 
        button4 = gtk_button_new_with_label(_("..."));
        gtk_widget_show(button4);


@@ -212,6 +219,10 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_show(max_size);
        gtk_box_pack_end(GTK_BOX(hbox3), max_size, FALSE, TRUE, 0);
        gtk_widget_set_usize(max_size, 64, -2);
        gtk_widget_show(max_size);
        gtk_box_pack_end(GTK_BOX(hbox3), max_size, FALSE, TRUE, 0);
        gtk_widget_set_usize(max_size, 64, -2);

+       gtk_tooltips_set_tip(tooltips, max_size,
+                            _
+                            ("Maximum size a message is allowed to have to be checked"),
+                            NULL);

        gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size), TRUE);
        /*
         * END GLADE CODE
        gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size), TRUE);
        /*
         * END GLADE CODE

diff --git a/src/plugins/spamassassin/spamassassin_gtk.glade b/src/plugins/spamassassin/spamassassin_gtk.glade
index 9f70df6d3db0a47aa970c48c78eda0b401223ba1..c53f4c9cecf9b1f42b858131b455faff8a2fe0db 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.glade
+++ b/src/plugins/spamassassin/spamassassin_gtk.glade
@@ -27,7 +27,7 @@
     <class>GtkTable</class>
     <name>table1</name>
     <border_width>8</border_width>
     <class>GtkTable</class>
     <name>table1</name>
     <border_width>8</border_width>

-    <rows>6</rows>
+    <rows>5</rows>

     <columns>3</columns>
     <homogeneous>False</homogeneous>
     <row_spacing>4</row_spacing>
     <columns>3</columns>
     <homogeneous>False</homogeneous>
     <row_spacing>4</row_spacing>


@@ -36,7 +36,7 @@
     <widget>
       <class>GtkLabel</class>
       <name>label3</name>
     <widget>
       <class>GtkLabel</class>
       <name>label3</name>

-      <label>Enable SpamAssassin Filtering</label>
+      <label>Enable</label>

       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>
       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>


@@ -62,7 +62,7 @@
     <widget>
       <class>GtkLabel</class>
       <name>label4</name>
     <widget>
       <class>GtkLabel</class>
       <name>label4</name>

-      <label>SpamAssassin Server (spamd)</label>
+      <label>spamd </label>

       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>
       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>


@@ -88,7 +88,7 @@
     <widget>
       <class>GtkLabel</class>
       <name>label6</name>
     <widget>
       <class>GtkLabel</class>
       <name>label6</name>

-      <label>Maximum Message Size</label>
+      <label>Maximum Size</label>

       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>
       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>


@@ -114,7 +114,7 @@
     <widget>
       <class>GtkLabel</class>
       <name>label8</name>
     <widget>
       <class>GtkLabel</class>
       <name>label8</name>

-      <label>Folder for saved Spam</label>
+      <label>Save Folder</label>

       <justify>GTK_JUSTIFY_LEFT</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>
       <justify>GTK_JUSTIFY_LEFT</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>


@@ -140,7 +140,7 @@
     <widget>
       <class>GtkLabel</class>
       <name>label9</name>
     <widget>
       <class>GtkLabel</class>
       <name>label9</name>

-      <label>Receive Spam</label>
+      <label>Save Spam</label>

       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>
       <justify>GTK_JUSTIFY_CENTER</justify>
       <wrap>False</wrap>
       <xalign>0</xalign>


@@ -186,6 +186,7 @@
       <widget>
        <class>GtkEntry</class>
        <name>hostname</name>
       <widget>
        <class>GtkEntry</class>
        <name>hostname</name>

+       <tooltip>Hostname or IP address of spamd server</tooltip>

        <can_focus>True</can_focus>
        <editable>True</editable>
        <text_visible>True</text_visible>
        <can_focus>True</can_focus>
        <editable>True</editable>
        <text_visible>True</text_visible>


@@ -219,6 +220,7 @@
        <class>GtkSpinButton</class>
        <name>port</name>
        <width>64</width>
        <class>GtkSpinButton</class>
        <name>port</name>
        <width>64</width>

+       <tooltip>Port of spamd server</tooltip>

        <can_focus>True</can_focus>
        <climb_rate>1</climb_rate>
        <digits>0</digits>
        <can_focus>True</can_focus>
        <climb_rate>1</climb_rate>
        <digits>0</digits>


@@ -244,6 +246,7 @@
     <widget>
       <class>GtkCheckButton</class>
       <name>enable</name>
     <widget>
       <class>GtkCheckButton</class>
       <name>enable</name>

+      <tooltip>Enable SpamAssassin filtering</tooltip>

       <can_focus>True</can_focus>
       <label></label>
       <active>False</active>
       <can_focus>True</can_focus>
       <label></label>
       <active>False</active>


@@ -267,6 +270,7 @@
     <widget>
       <class>GtkCheckButton</class>
       <name>receive_spam</name>
     <widget>
       <class>GtkCheckButton</class>
       <name>receive_spam</name>

+      <tooltip>Save mails that where identified as spam to a folder</tooltip>

       <can_focus>True</can_focus>
       <label></label>
       <active>False</active>
       <can_focus>True</can_focus>
       <label></label>
       <active>False</active>


@@ -287,35 +291,10 @@
       </child>
     </widget>
 
       </child>
     </widget>
 

-    <widget>
-      <class>GtkLabel</class>
-      <name>label10</name>
-      <label>Leave empty to use the default trash folder</label>
-      <justify>GTK_JUSTIFY_RIGHT</justify>
-      <wrap>False</wrap>
-      <xalign>1</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-       <left_attach>1</left_attach>
-       <right_attach>2</right_attach>
-       <top_attach>5</top_attach>
-       <bottom_attach>6</bottom_attach>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <xexpand>False</xexpand>
-       <yexpand>False</yexpand>
-       <xshrink>False</xshrink>
-       <yshrink>False</yshrink>
-       <xfill>True</xfill>
-       <yfill>False</yfill>
-      </child>
-    </widget>
-

     <widget>
       <class>GtkEntry</class>
       <name>save_folder</name>
     <widget>
       <class>GtkEntry</class>
       <name>save_folder</name>

+      <tooltip>Folder that will be used to save spam. Leave empty to use the default trash folder</tooltip>

       <can_focus>True</can_focus>
       <editable>True</editable>
       <text_visible>True</text_visible>
       <can_focus>True</can_focus>
       <editable>True</editable>
       <text_visible>True</text_visible>


@@ -409,6 +388,7 @@
        <class>GtkSpinButton</class>
        <name>max_size</name>
        <width>64</width>
        <class>GtkSpinButton</class>
        <name>max_size</name>
        <width>64</width>

+       <tooltip>Maximum size a message is allowed to have to be checked</tooltip>

        <can_focus>True</can_focus>
        <climb_rate>1</climb_rate>
        <digits>0</digits>
        <can_focus>True</can_focus>
        <climb_rate>1</climb_rate>
        <digits>0</digits>