*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <gtk/gtkutils.h>
#include "common/sylpheed.h"
#include "common/version.h"
-#include "intl.h"
#include "plugin.h"
#include "utils.h"
#include "prefs.h"
#include "prefs_gtk.h"
#include "foldersel.h"
#include "clamav_plugin.h"
+#include "statusbar.h"
struct ClamAvPage
{
GtkObject *max_size_adj;
GtkWidget *max_size;
GtkWidget *hbox1;
- GtkWidget *label4;
- GtkWidget *label5;
+ GtkWidget *hbox2;
GtkWidget *recv_infected;
- GtkWidget *label6;
+ GtkTooltips *recv_infected_tip;
GtkWidget *save_folder;
GtkWidget *save_folder_select;
GtkTooltips *save_folder_tip;
- table = gtk_table_new (6, 3, FALSE);
+ table = gtk_table_new (8, 3, FALSE);
gtk_widget_show(table);
+ gtk_container_set_border_width(GTK_CONTAINER(table), VBOX_BORDER);
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- label1 = gtk_label_new(_("Enable virus scanning"));
- gtk_widget_show (label1);
- gtk_table_attach (GTK_TABLE (table), label1, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
-
- enable_clamav = gtk_check_button_new();
+ enable_clamav = gtk_check_button_new_with_label(_("Enable virus scanning"));
gtk_widget_show (enable_clamav);
- gtk_table_attach (GTK_TABLE (table), enable_clamav, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- label2 = gtk_label_new(_("Scan archive contents"));
- gtk_widget_show (label2);
- gtk_table_attach (GTK_TABLE (table), label2, 0, 1, 1, 2,
+ gtk_table_attach (GTK_TABLE (table), enable_clamav, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
+ (GtkAttachOptions) (0), 0, 0);
- enable_arc = gtk_check_button_new();
+ enable_arc = gtk_check_button_new_with_label(_("Scan archive contents"));
gtk_widget_show (enable_arc);
- gtk_table_attach (GTK_TABLE (table), enable_arc, 1, 2, 1, 2,
+ gtk_table_attach (GTK_TABLE (table), enable_arc, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- label3 = gtk_label_new(_("Maximum attachment size"));
- gtk_widget_show (label3);
- gtk_table_attach (GTK_TABLE (table), label3, 0, 1, 4, 5,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
-
- hbox1 = gtk_hbox_new (FALSE, 0);
+ hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
- gtk_table_attach (GTK_TABLE (table), hbox1, 1, 2, 4, 5,
+ gtk_table_attach (GTK_TABLE (table), hbox1, 0, 1, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
+ SET_TOGGLE_SENSITIVITY (enable_arc, hbox1);
+
+ label1 = gtk_label_new(_("Maximum attachment size"));
+ gtk_widget_show (label1);
+ gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 0);
max_size_adj = gtk_adjustment_new (1, 1, 1024, 1, 10, 10);
max_size = gtk_spin_button_new (GTK_ADJUSTMENT (max_size_adj), 1, 0);
gtk_widget_show (max_size);
gtk_box_pack_start (GTK_BOX (hbox1), max_size, FALSE, FALSE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (max_size), TRUE);
- label4 = gtk_label_new(_("MB"));
- gtk_widget_show (label4);
- gtk_box_pack_start (GTK_BOX (hbox1), label4, FALSE, FALSE, 0);
-
- label5 = gtk_label_new(_("Save infected messages"));
- gtk_widget_show (label5);
- gtk_table_attach (GTK_TABLE (table), label5, 0, 1, 5, 6,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
+ label2 = gtk_label_new(_("MB"));
+ gtk_widget_show (label2);
+ gtk_box_pack_start (GTK_BOX (hbox1), label2, FALSE, FALSE, 0);
- recv_infected = gtk_check_button_new();
+ recv_infected_tip = gtk_tooltips_new();
+ recv_infected = gtk_check_button_new_with_label(_("Save infected messages"));
gtk_widget_show (recv_infected);
- gtk_table_attach (GTK_TABLE (table), recv_infected, 1, 2, 5, 6,
+ gtk_table_attach (GTK_TABLE (table), recv_infected, 0, 1, 4, 5,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
+ gtk_tooltips_set_tip(recv_infected_tip, recv_infected,
+ _("Save mails that contain viruses"),
+ NULL);
- label6 = gtk_label_new (_("Save folder"));
- gtk_widget_show (label6);
- gtk_table_attach (GTK_TABLE (table), label6, 0, 1, 6, 7,
+ hbox2 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox2);
+ gtk_table_attach (GTK_TABLE (table), hbox2, 0, 1, 5, 6,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 2, 4);
- gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5);
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+ SET_TOGGLE_SENSITIVITY (recv_infected, hbox2);
+
+ label3 = gtk_label_new (_("Save folder"));
+ gtk_widget_show (label3);
+ gtk_box_pack_start (GTK_BOX (hbox2), label3, FALSE, FALSE, 0);
save_folder_tip = gtk_tooltips_new();
save_folder = gtk_entry_new ();
gtk_widget_show (save_folder);
- gtk_table_attach (GTK_TABLE (table), save_folder, 1, 2, 6, 7,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), save_folder, FALSE, FALSE, 0);
gtk_tooltips_set_tip(save_folder_tip, save_folder,
_("Leave empty to use the default trash folder"),
NULL);
- save_folder_select = gtk_button_new_with_label (" ... ");
+ save_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show (save_folder_select);
- gtk_table_attach (GTK_TABLE (table), save_folder_select, 2, 3, 6, 7,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), save_folder_select, FALSE, FALSE, 0);
gtk_tooltips_set_tip(save_folder_tip, save_folder_select,
_("Leave empty to use the default trash folder"),
NULL);
config = clamav_get_config();
- gtk_signal_connect(GTK_OBJECT(save_folder_select), "released", GTK_SIGNAL_FUNC(foldersel_cb), page);
+ g_signal_connect(G_OBJECT(save_folder_select), "released",
+ G_CALLBACK(foldersel_cb), page);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_clamav), config->clamav_enable);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_arc), config->clamav_enable_arc);
static struct ClamAvPage clamav_page;
-gint plugin_init(gchar **error)
+static void gtk_message_callback(gchar *message)
{
- if ((sylpheed_get_version() > VERSION_NUMERIC)) {
- *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
- return -1;
- }
+ statusbar_print_all(message);
+}
- if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
- *error = g_strdup("Your sylpheed version is too old");
- return -1;
- }
+gint clamav_gtk_init(void)
+{
+ static gchar *path[3];
+
+ path[0] = _("Plugins");
+ path[1] = _("Clam AntiVirus");
+ path[2] = NULL;
- clamav_page.page.path = _("Filtering/Clam AntiVirus");
+ clamav_page.page.path = path;
clamav_page.page.create_widget = clamav_create_widget_func;
clamav_page.page.destroy_widget = clamav_destroy_widget_func;
clamav_page.page.save_page = clamav_save_func;
clamav_page.page.weight = 35.0;
prefs_gtk_register_page((PrefsPage *) &clamav_page);
+ clamav_set_message_callback(gtk_message_callback);
debug_print("ClamAV GTK plugin loaded\n");
return 0;
}
-void plugin_done(void)
-{
- prefs_gtk_unregister_page((PrefsPage *) &clamav_page);
-
- debug_print("ClamAV GTK plugin unloaded\n");
-}
-
-const gchar *plugin_name(void)
-{
- return _("Clam AntiVirus GTK");
-}
-
-const gchar *plugin_desc(void)
-{
- return _("This plugin provides a Preferences page for the Clam AntiVirus "
- "plugin.\n"
- "\n"
- "You will find the options in the Other Preferences window "
- "under Filtering/Clam AntiVirus.\n"
- "\n"
- "With this plugin you can enable the scanning, enable archive "
- "content scanning, set the maximum size of an attachment to be "
- "checked, (if the attachment is larger it will not be checked), "
- "configure whether infected mail should be received (default: Yes) "
- "and select the folder where infected mail will be saved.\n");
-}
-
-const gchar *plugin_type(void)
+void clamav_gtk_done(void)
{
- return "GTK";
+ prefs_gtk_unregister_page((PrefsPage *) &clamav_page);
}
projects / claws.git / blobdiff