From: Andrea Zagli Date: Thu, 5 Jan 2012 15:23:50 +0000 (+0100) Subject: Aggiunta la possibilità di richiedere la ricevuta X-Git-Tag: 0.5.0~7 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=f61a6ede6fba3e0af1526f6348964f1e757c94ac;p=solipa%2Flibsolipa Aggiunta la possibilità di richiedere la ricevuta di ritorno in SolipaMailUI (closes #234). --- diff --git a/data/libsolipa/gui/libsolipa.ui b/data/libsolipa/gui/libsolipa.ui index d626534..8ef1dae 100644 --- a/data/libsolipa/gui/libsolipa.ui +++ b/data/libsolipa/gui/libsolipa.ui @@ -468,7 +468,7 @@ True False - 8 + 10 2 5 5 @@ -657,8 +657,8 @@ 2 - 6 - 7 + 8 + 9 @@ -750,6 +750,18 @@ + + 2 + 9 + 10 + GTK_FILL + + + + + True + False + 2 7 @@ -757,6 +769,46 @@ GTK_FILL + + + True + False + 5 + + + True + False + 0 + Richiedere ricevuta di ritorno + + + False + True + 0 + + + + + False + True + True + False + True + + + True + True + 1 + + + + + 2 + 6 + 7 + GTK_FILL + + True diff --git a/src/mail.c b/src/mail.c index 913714c..d544d91 100644 --- a/src/mail.c +++ b/src/mail.c @@ -551,8 +551,8 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) if (priv->with_notification) { - gchar *namep; - gchar *addressp; + const gchar *namep; + const gchar *addressp; if (camel_internet_address_get (from, 0, &namep, &addressp)) { diff --git a/src/mailui.c b/src/mailui.c index 4138b3e..1a35986 100644 --- a/src/mailui.c +++ b/src/mailui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Andrea Zagli + * Copyright (C) 2011-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,6 +40,8 @@ enum PROP_BCC_VISIBLE, PROP_SUBJECT, PROP_SUBJECT_EDITABLE, + PROP_WITH_NOTIFICATION, + PROP_WITH_NOTIFICATION_VISIBLE, PROP_BODY, PROP_BODY_EDITABLE, PROP_WITH_ATTACHMENTS @@ -101,6 +103,9 @@ struct _SolipaMailUIPrivate GtkWidget *bcc; GtkWidget *bcc_lbl; GtkWidget *subject; + GtkWidget *with_notification; + GtkWidget *with_notification_lbl; + GtkWidget *hseparator2; GtkWidget *body; GtkWidget *iv_attachments; GtkWidget *btn_attachment_remove; @@ -209,6 +214,20 @@ solipa_mail_ui_class_init (SolipaMailUIClass *klass) TRUE, G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_WITH_NOTIFICATION, + g_param_spec_boolean ("with-notification", + "With notification", + "With notification", + FALSE, + G_PARAM_READWRITE)); + + g_object_class_install_property (object_class, PROP_WITH_NOTIFICATION_VISIBLE, + g_param_spec_boolean ("with-notification-visible", + "With notification visible", + "With notification visible", + FALSE, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_BODY, g_param_spec_string ("body", "Body", @@ -325,6 +344,9 @@ SolipaMailUI priv->bcc = GTK_WIDGET (gtk_builder_get_object (builder, "entry7")); priv->bcc_lbl = GTK_WIDGET (gtk_builder_get_object (builder, "label12")); priv->subject = GTK_WIDGET (gtk_builder_get_object (builder, "entry5")); + priv->with_notification = GTK_WIDGET (gtk_builder_get_object (builder, "checkbutton4")); + priv->with_notification_lbl = GTK_WIDGET (gtk_builder_get_object (builder, "label15")); + priv->hseparator2 = GTK_WIDGET (gtk_builder_get_object (builder, "hseparator2")); priv->body = GTK_WIDGET (gtk_builder_get_object (builder, "textview1")); priv->lstore_attachments = GTK_LIST_STORE (gtk_builder_get_object (builder, "lstore_mail_attachments")); @@ -406,6 +428,7 @@ solipa_mail_ui_send (SolipaMailUI *mailui) gchar *cc; gchar *bcc; gchar *subject; + gboolean with_notification; gchar *body; gchar *email; @@ -449,11 +472,14 @@ solipa_mail_ui_send (SolipaMailUI *mailui) "cc", &cc, "bcc", &bcc, "subject", &subject, + "with-notification", &with_notification, "body", &body, NULL); solipa_mail_set_subject (smail, subject); + solipa_mail_set_notification (smail, with_notification); + if (g_strcmp0 (g_strstrip (from), "") != 0) { lst_addrs = solipa_mail_get_addresses_from_string (from); @@ -740,6 +766,16 @@ solipa_mail_ui_set_property (GObject *object, gtk_entry_set_editable (GTK_ENTRY (priv->subject), g_value_get_boolean (value)); break; + case PROP_WITH_NOTIFICATION: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->with_notification), g_value_get_boolean (value)); + break; + + case PROP_WITH_NOTIFICATION_VISIBLE: + gtk_widget_set_visible (priv->with_notification, g_value_get_boolean (value)); + gtk_widget_set_visible (priv->with_notification_lbl, g_value_get_boolean (value)); + gtk_widget_set_visible (priv->hseparator2, g_value_get_boolean (value)); + break; + case PROP_BODY: { GtkTextBuffer *buffer; @@ -827,6 +863,14 @@ solipa_mail_ui_get_property (GObject *object, g_value_set_boolean (value, gtk_editable_get_editable (GTK_EDITABLE (priv->subject))); break; + case PROP_WITH_NOTIFICATION: + g_value_set_boolean (value, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->with_notification))); + break; + + case PROP_WITH_NOTIFICATION_VISIBLE: + g_value_set_boolean (value, gtk_widget_get_visible (priv->with_notification)); + break; + case PROP_BODY: { GtkTextBuffer *buffer; diff --git a/tests/mailui.c b/tests/mailui.c index 1f03545..10936ca 100644 --- a/tests/mailui.c +++ b/tests/mailui.c @@ -125,6 +125,7 @@ main (int argc, char *argv[]) "from-editable", FALSE, "to", "azagli@libero.it", "bcc-visible", FALSE, + "with-notification", TRUE, "subject", "Da SolipaMailUI", "body", "Il body della mail\n" " con a capo\t\te tab\n\nprova prova",