From: Andrea Zagli <azagli@libero.it> Date: Sat, 22 Oct 2016 14:24:57 +0000 (+0200) Subject: Aggiunta la proprietà proxy a SolipaMailUI. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=b2ee361df339393c863fd080e807446de1bbab2b;p=solipa%2Flibsolipa Aggiunta la proprietà proxy a SolipaMailUI. --- diff --git a/data/libsolipa/gui/libsolipa.ui b/data/libsolipa/gui/libsolipa.ui index 6d878c5..59c1025 100644 --- a/data/libsolipa/gui/libsolipa.ui +++ b/data/libsolipa/gui/libsolipa.ui @@ -1,25 +1,60 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="diag_gtktreemodel_to_csv"> + <object class="GtkListStore" id="lstore_mail_attachments"> + <columns> + <!-- column-name file_name --> + <column type="gchararray"/> + <!-- column-name file_name_base --> + <column type="gchararray"/> + <!-- column-name icon --> + <column type="GdkPixbuf"/> + </columns> + </object> + <object class="GtkListStore" id="lstore_metodo_sicurezza"> + <columns> + <!-- column-name id --> + <column type="gchararray"/> + <!-- column-name descrizione --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0">0</col> + <col id="1" translatable="yes">Nessuno</col> + </row> + <row> + <col id="0">1</col> + <col id="1" translatable="yes">SSL/TLS</col> + </row> + <row> + <col id="0">2</col> + <col id="1" translatable="yes">STARTTLS</col> + </row> + </data> + </object> + <object class="GtkDialog" id="diag_mail"> <property name="can_focus">False</property> <property name="border_width">5</property> - <property name="title" translatable="yes">Esporta CSV</property> + <property name="modal">True</property> + <property name="default_width">550</property> + <property name="default_height">400</property> + <property name="destroy_with_parent">True</property> <property name="type_hint">normal</property> <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox1"> + <object class="GtkBox" id="dialog-vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area1"> + <object class="GtkButtonBox" id="dialog-action_area2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="button1"> + <object class="GtkButton" id="button6"> <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -33,8 +68,8 @@ </packing> </child> <child> - <object class="GtkButton" id="button2"> - <property name="label">gtk-save</property> + <object class="GtkButton" id="button7"> + <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -55,446 +90,353 @@ </packing> </child> <child> - <object class="GtkPaned" id="paned1"> + <object class="GtkNotebook" id="notebook1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box4"> + <object class="GtkGrid" id="table2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="spacing">5</property> + <property name="border_width">5</property> + <property name="row_spacing">5</property> + <property name="column_spacing">5</property> <child> - <object class="GtkFrame" id="frame1"> + <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> + <property name="label" translatable="yes">Da:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">A:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">â</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">â</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Oggetto:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">â</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Cc:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Ccn:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry6"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">â</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry7"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">â</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">etched-in</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkTextView" id="textview1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkExpander" id="expander1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">5</property> - <property name="bottom_padding">5</property> - <property name="left_padding">5</property> - <property name="right_padding">5</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="spacing">5</property> <child> - <object class="GtkBox" id="vbox2"> + <object class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">etched-in</property> + <child> + <object class="GtkIconView" id="iconview1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin">5</property> + <property name="selection_mode">multiple</property> + <property name="model">lstore_mail_attachments</property> + <property name="row_spacing">5</property> + <property name="column_spacing">5</property> + <property name="reorderable">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="vbuttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> + <property name="layout_style">start</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkButton" id="button9"> + <property name="label">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">etched-in</property> - <child> - <object class="GtkTreeView" id="treeview1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">lstore_treemodel_campi</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection"/> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <child> - <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/> - <attributes> - <attribute name="active">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="title">Campo</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">2</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> + <property name="receives_default">True</property> + <property name="use_stock">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkButton" id="button10"> + <property name="label">gtk-remove</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">5</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="button3"> - <property name="label" translatable="yes">Deseleziona tutti</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button4"> - <property name="label" translatable="yes">Seleziona tutti</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Seleziona i campi</b></property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">Allegati</property> </object> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkBox" id="hbox3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> + <property name="hexpand">True</property> + <property name="spacing">5</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkGrid" id="table1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">5</property> - <property name="column_spacing">5</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Quotatura</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">â</property> - <property name="text" translatable="yes">"</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Quotare tutto</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Separatore</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">â</property> - <property name="text" translatable="yes">,</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Nomi dei campi come prima riga</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - </object> - </child> + <property name="label" translatable="yes">Richiedere ricevuta di ritorno</property> + <property name="xalign">0</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label3"> + <child> + <object class="GtkCheckButton" id="checkbutton4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Opzioni di esportazione</b></property> - <property name="use_markup">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">2</property> </packing> </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="label_xalign">0</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">5</property> - <property name="bottom_padding">5</property> - <property name="left_padding">5</property> - <property name="right_padding">5</property> - <child> - <object class="GtkFileChooserWidget" id="filechooserwidget1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action">save</property> - <property name="local_only">False</property> - <property name="preview_widget_active">False</property> - <property name="use_preview_label">False</property> - </object> - </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">2</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label2"> + <child> + <object class="GtkSeparator" id="separator2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>Seleziona il file</b></property> - <property name="use_markup">True</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + <property name="width">2</property> + </packing> </child> </object> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">button1</action-widget> - <action-widget response="-5">button2</action-widget> - </action-widgets> - </object> - <object class="GtkListStore" id="lstore_mail_attachments"> - <columns> - <!-- column-name file_name --> - <column type="gchararray"/> - <!-- column-name file_name_base --> - <column type="gchararray"/> - <!-- column-name icon --> - <column type="GdkPixbuf"/> - </columns> - </object> - <object class="GtkListStore" id="lstore_metodo_sicurezza"> - <columns> - <!-- column-name id --> - <column type="gchararray"/> - <!-- column-name descrizione --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0">0</col> - <col id="1" translatable="yes">Nessuno</col> - </row> - <row> - <col id="0">1</col> - <col id="1" translatable="yes">SSL/TLS</col> - </row> - <row> - <col id="0">2</col> - <col id="1" translatable="yes">STARTTLS</col> - </row> - </data> - </object> - <object class="GtkDialog" id="diag_mail"> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="modal">True</property> - <property name="default_width">550</property> - <property name="default_height">400</property> - <property name="destroy_with_parent">True</property> - <property name="type_hint">normal</property> - <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">2</property> - <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="button6"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkButton" id="button7"> - <property name="label">gtk-ok</property> + <child type="tab"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Mail</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="tab_fill">False</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkNotebook" id="notebook1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> <child> - <object class="GtkGrid" id="table2"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> <property name="border_width">5</property> <property name="row_spacing">5</property> <property name="column_spacing">5</property> <child> - <object class="GtkLabel" id="label11"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Da:</property> + <property name="label" translatable="yes">Server</property> <property name="xalign">0</property> </object> <packing> @@ -503,39 +445,42 @@ </packing> </child> <child> - <object class="GtkLabel" id="label12"> + <object class="GtkEntry" id="entry9"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">A:</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkEntry" id="entry3"> + <object class="GtkLabel" id="label19"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="invisible_char">â</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Metodo di sicurezza</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkEntry" id="entry4"> + <object class="GtkComboBox" id="combobox1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="invisible_char">â</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> + <property name="model">lstore_metodo_sicurezza</property> + <property name="active">0</property> + <property name="id_column">0</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> </object> <packing> <property name="left_attach">1</property> @@ -543,48 +488,33 @@ </packing> </child> <child> - <object class="GtkLabel" id="label14"> + <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Oggetto:</property> + <property name="label" translatable="yes">Utente</property> <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkEntry" id="entry5"> + <object class="GtkEntry" id="entry10"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="invisible_char">â</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Cc:</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="label16"> + <object class="GtkLabel" id="label21"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Ccn:</property> + <property name="label" translatable="yes">Password</property> <property name="xalign">0</property> </object> <packing> @@ -593,377 +523,470 @@ </packing> </child> <child> - <object class="GtkEntry" id="entry6"> + <object class="GtkEntry" id="entry11"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="visibility">False</property> <property name="invisible_char">â</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkEntry" id="entry7"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="invisible_char">â</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Proxy URI</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkEntry" id="entry14"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">etched-in</property> - <child> - <object class="GtkTextView" id="textview1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word</property> - </object> - </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">4</property> </packing> </child> - <child> - <object class="GtkExpander" id="expander1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Server</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-6">button6</action-widget> + <action-widget response="-5">button7</action-widget> + </action-widgets> + </object> + <object class="GtkListStore" id="lstore_treemodel_campi"> + <columns> + <!-- column-name selezionato --> + <column type="gboolean"/> + <!-- column-name id --> + <column type="guint"/> + <!-- column-name nome --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkDialog" id="diag_gtktreemodel_to_csv"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="title" translatable="yes">Esporta CSV</property> + <property name="type_hint">normal</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="button1"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button2"> + <property name="label">gtk-save</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkPaned" id="paned1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="spacing">5</property> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="spacing">5</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">5</property> + <property name="right_padding">5</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow3"> + <object class="GtkBox" id="vbox2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">etched-in</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> <child> - <object class="GtkIconView" id="iconview1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="margin">5</property> - <property name="selection_mode">multiple</property> - <property name="model">lstore_mail_attachments</property> - <property name="row_spacing">5</property> - <property name="column_spacing">5</property> - <property name="reorderable">True</property> + <property name="shadow_type">etched-in</property> + <child> + <object class="GtkTreeView" id="treeview1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">lstore_treemodel_campi</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <child> + <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/> + <attributes> + <attribute name="active">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <property name="title">Campo</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">5</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="button3"> + <property name="label" translatable="yes">Deseleziona tutti</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button4"> + <property name="label" translatable="yes">Seleziona tutti</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Seleziona i campi</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> <child> - <object class="GtkButtonBox" id="vbuttonbox1"> + <object class="GtkGrid" id="table1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> - <property name="layout_style">start</property> + <property name="row_spacing">5</property> + <property name="column_spacing">5</property> <child> - <object class="GtkButton" id="button9"> - <property name="label">gtk-add</property> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Quotatura</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="invisible_char">â</property> + <property name="text" translatable="yes">"</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Quotare tutto</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Separatore</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â</property> + <property name="text" translatable="yes">,</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Nomi dei campi come prima riga</property> + <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkButton" id="button10"> - <property name="label">gtk-remove</property> + <object class="GtkCheckButton" id="checkbutton3"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Allegati</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">5</property> - <child> - <object class="GtkLabel" id="label18"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Richiedere ricevuta di ritorno</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"><b>Opzioni di esportazione</b></property> + <property name="use_markup">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - <property name="width">2</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Mail</property> - </object> <packing> - <property name="tab_fill">False</property> + <property name="resize">False</property> + <property name="shrink">True</property> </packing> </child> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="row_spacing">5</property> - <property name="column_spacing">5</property> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Server</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry9"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Metodo di sicurezza</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label_xalign">0</property> <child> - <object class="GtkComboBox" id="combobox1"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="model">lstore_metodo_sicurezza</property> - <property name="active">0</property> - <property name="id_column">0</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">5</property> + <property name="right_padding">5</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> + <object class="GtkFileChooserWidget" id="filechooserwidget1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="action">save</property> + <property name="local_only">False</property> + <property name="preview_widget_active">False</property> + <property name="use_preview_label">False</property> + </object> </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Utente</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry10"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label21"> + <child type="label"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Password</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry11"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="visibility">False</property> - <property name="invisible_char">â</property> + <property name="label" translatable="yes"><b>Seleziona il file</b></property> + <property name="use_markup">True</property> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> </object> <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Server</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> </child> <action-widgets> - <action-widget response="-6">button6</action-widget> - <action-widget response="-5">button7</action-widget> + <action-widget response="-6">button1</action-widget> + <action-widget response="-5">button2</action-widget> </action-widgets> </object> - <object class="GtkListStore" id="lstore_treemodel_campi"> - <columns> - <!-- column-name selezionato --> - <column type="gboolean"/> - <!-- column-name id --> - <column type="guint"/> - <!-- column-name nome --> - <column type="gchararray"/> - </columns> - </object> <object class="GtkWindow" id="w_allegato"> <property name="can_focus">False</property> - <property name="title" translatable="yes">Allegato - Gestione mezzi</property> + <property name="title" translatable="yes">Allegato</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="default_width">480</property> diff --git a/src/mailui.c b/src/mailui.c index 9e94028..81f707f 100644 --- a/src/mailui.c +++ b/src/mailui.c @@ -52,7 +52,8 @@ enum PROP_USERNAME, PROP_USERNAME_EDITABLE, PROP_PASSWORD, - PROP_PASSWORD_EDITABLE + PROP_PASSWORD_EDITABLE, + PROP_PROXY_URI }; enum @@ -125,6 +126,7 @@ struct _SolipaMailUIPrivate GtkWidget *security_method; GtkWidget *username; GtkWidget *password; + GtkWidget *proxy; }; G_DEFINE_TYPE (SolipaMailUI, solipa_mail_ui, G_TYPE_OBJECT) @@ -283,7 +285,7 @@ solipa_mail_ui_class_init (SolipaMailUIClass *klass) "Security method", CAMEL_NETWORK_SECURITY_METHOD_NONE, CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT, - CAMEL_NETWORK_SECURITY_METHOD_NONE, + CAMEL_NETWORK_SECURITY_METHOD_NONE, G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_SECURITY_METHOD_EDITABLE, @@ -321,6 +323,13 @@ solipa_mail_ui_class_init (SolipaMailUIClass *klass) TRUE, G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_PROXY_URI, + g_param_spec_string ("proxy", + "Proxy URI", + "Proxy URI", + "", + G_PARAM_READWRITE)); + /** * SolipaMailUI::btn_cancel_clicked: * @solipa_mail_ui: @@ -433,6 +442,7 @@ SolipaMailUI priv->security_method = GTK_WIDGET (gtk_builder_get_object (builder, "combobox1")); priv->username = GTK_WIDGET (gtk_builder_get_object (builder, "entry10")); priv->password = GTK_WIDGET (gtk_builder_get_object (builder, "entry11")); + priv->proxy = GTK_WIDGET (gtk_builder_get_object (builder, "entry14")); g_signal_connect (gtk_builder_get_object (builder, "expander1"), "notify::expanded", G_CALLBACK (solipa_mail_ui_on_exp_attachments_expanded), (gpointer)solipa_mail_ui); @@ -501,7 +511,7 @@ GtkWidget void solipa_mail_ui_show_server_options (SolipaMailUI *mailui, gboolean show) { - g_return_val_if_fail (IS_SOLIPA_MAIL_UI (mailui), NULL); + g_return_if_fail (IS_SOLIPA_MAIL_UI (mailui)); SolipaMailUIPrivate *priv = SOLIPA_MAIL_UI_GET_PRIVATE (mailui); @@ -512,6 +522,8 @@ solipa_mail_ui_send (SolipaMailUI *mailui) { gboolean ret; + SolipaMail *smail; + gchar *smtpuri; gchar *from; gchar *to; @@ -523,6 +535,7 @@ solipa_mail_ui_send (SolipaMailUI *mailui) CamelNetworkSecurityMethod security_method; gchar *username; gchar *password; + gchar *proxy; gchar *email; @@ -539,16 +552,6 @@ solipa_mail_ui_send (SolipaMailUI *mailui) SolipaMailUIPrivate *priv = SOLIPA_MAIL_UI_GET_PRIVATE (mailui); - SolipaMail *smail = solipa_mail_new (priv->solipa); - if (smail == NULL) - { - solipa_message_dialog (transient, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, - "Impossibile creare l'oggetto SolipaMail."); - return FALSE; - } - if (gtk_widget_get_parent (priv->widget) == NULL) { transient = priv->dialog; @@ -558,6 +561,16 @@ solipa_mail_ui_send (SolipaMailUI *mailui) transient = gtk_widget_get_toplevel (priv->widget); } + smail = solipa_mail_new (priv->solipa); + if (smail == NULL) + { + solipa_message_dialog (transient, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Impossibile creare l'oggetto SolipaMail."); + return FALSE; + } + g_object_get (G_OBJECT (mailui), "smtp-uri", &smtpuri, "from", &from, @@ -570,6 +583,7 @@ solipa_mail_ui_send (SolipaMailUI *mailui) "security-method", &security_method, "username", &username, "password", &password, + "proxy", &proxy, NULL); solipa_mail_set_subject (smail, subject); @@ -774,6 +788,10 @@ solipa_mail_ui_send (SolipaMailUI *mailui) if (g_strcmp0 (g_strstrip (smtpuri), "") != 0) { + if (g_strcmp0 (proxy, "") != 0) + { + solipa_mail_set_proxy (smail, NULL, proxy); + } solipa_mail_send (smail, smtpuri); } else @@ -918,6 +936,10 @@ solipa_mail_ui_set_property (GObject *object, gtk_editable_set_editable (GTK_EDITABLE (priv->password), g_value_get_boolean (value)); break; + case PROP_PROXY_URI: + gtk_entry_set_text (GTK_ENTRY (priv->proxy), g_strstrip (g_value_dup_string (value))); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -1059,6 +1081,10 @@ solipa_mail_ui_get_property (GObject *object, g_value_set_boolean (value, gtk_editable_get_editable (GTK_EDITABLE (priv->password))); break; + case PROP_PROXY_URI: + g_value_set_string (value, gtk_entry_get_text (GTK_ENTRY (priv->proxy))); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break;