Aggiustamento all'espansione del pannello allegati in SolipaMailUI.

diff --git a/.cproject b/.cproject
index 62d84c13b253d5788222555247c967b35604945e..6f6b7fc15beb2dae9b835215cc2398dcf003b7ba 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -3,8 +3,8 @@
 
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
        <storageModule moduleId="org.eclipse.cdt.core.settings">
-               <cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.435264715">
-                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.435264715" moduleId="org.eclipse.cdt.core.settings" name="Default">
+               <cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.397025770">
+                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.397025770" moduleId="org.eclipse.cdt.core.settings" name="Default">
                                <externalSettings/>
                                <extensions>
                                        <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -14,35 +14,31 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="libsolipa" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.435264715" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
-                                       <folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.435264715.1217267171" name="/" resourcePath="">
-                                               <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.497139149" name="cdt.managedbuild.toolchain.gnu.mingw.base" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
-                                                       <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.PE" id="cdt.managedbuild.target.gnu.platform.mingw.base.168847057" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-                                                       <builder buildPath="${workspace_loc:/libsolipa/Default}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.15885143" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.1294569448" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1613338013" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+                               <configuration artifactName="libsolipa" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.397025770" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+                                       <folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.397025770.685019227" name="/" resourcePath="">
+                                               <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.1977220310" name="cdt.managedbuild.toolchain.gnu.mingw.base" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
+                                                       <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.PE" id="cdt.managedbuild.target.gnu.platform.mingw.base.853896214" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
+                                                       <builder buildPath="${workspace_loc:/libsolipa/Default}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1174014127" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.1638837374" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
+                                                               <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1226629793" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.230674068" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.415710353" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1117856784" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-                                                               <option id="gnu.c.compiler.option.include.paths.2062206943" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include&quot;"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.898606963" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.1060880142" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2108842943" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
+                                                               <option id="gnu.c.compiler.option.include.paths.783512568" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\glib-2.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include\gdk-pixbuf-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\gtk-2.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include\libgda-4.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include\libgda-4.0\libgda&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\evolution-data-server-2.32&quot;"/>
                                                                </option>
-                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1748195690" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1341682187" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.578934050" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1275200429" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+                                                       <tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1721454496" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
+                                                               <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.593433811" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
                                                                        <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.1235005096" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"/>
+                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.1051122829" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"/>
                                                </toolChain>
                                        </folderInfo>
                                </configuration>
@@ -50,13 +46,10 @@
                        <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
                </cconfiguration>
        </storageModule>
-       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-               <project id="libsolipa.null.1346253745" name="libsolipa"/>
-       </storageModule>
        <storageModule moduleId="scannerConfiguration">
                <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </storageModule>
-       <storageModule moduleId="refreshScope" versionNumber="1">
-               <resource resourceType="PROJECT" workspacePath="/libsolipa"/>
+       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+               <project id="libsolipa.null.707681827" name="libsolipa"/>
        </storageModule>
 </cproject>

diff --git a/data/libsolipa/gui/libsolipa.ui b/data/libsolipa/gui/libsolipa.ui
index d068fe6481fec269a376efeff5337bf3d6a895dc..13f55613327dd72a29eedd566d916acce56e8e98 100644 (file)
--- a/data/libsolipa/gui/libsolipa.ui
+++ b/data/libsolipa/gui/libsolipa.ui
@@ -701,6 +701,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">5</property>
+                        <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="button9">
                             <property name="label">gtk-add</property>
@@ -753,6 +754,7 @@
                 <property name="right_attach">2</property>
                 <property name="top_attach">7</property>
                 <property name="bottom_attach">8</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
           </object>
@@ -804,6 +806,9 @@
         <property name="n_columns">2</property>
         <property name="column_spacing">5</property>
         <property name="row_spacing">5</property>
+        <child>
+          <placeholder/>
+        </child>
         <child>
           <object class="GtkLabel" id="label139">
             <property name="visible">True</property>
@@ -997,9 +1002,6 @@
             <property name="y_options">GTK_FILL</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
     </child>
   </object>

diff --git a/src/mailui.c b/src/mailui.c
index c56a7806d0a86b42dc5ef91196f1bbc9f0ce8507..94e14174a6724922a62a115df9921d2c6728ae79 100644 (file)
--- a/src/mailui.c
+++ b/src/mailui.c
@@ -63,8 +63,12 @@ static void solipa_mail_ui_get_property (GObject *object,
                                GValue *value,
                                GParamSpec *pspec);
 
-static void solipa_mail_ui_on_iv_attachment_selection_changed  (GtkIconView *iconview,
-                                                                gpointer user_data);
+static void solipa_mail_ui_on_exp_attachments_expanded (GObject *object,
+                                                        GParamSpec *param_spec,
+                                                        gpointer user_data);
+
+static void solipa_mail_ui_on_iv_attachment_selection_changed (GtkIconView *iconview,
+                                                               gpointer user_data);
 
 static void solipa_mail_ui_on_btn_attachment_add_clicked (GtkButton *button,
                                                           gpointer user_data);
@@ -326,6 +330,9 @@ SolipaMailUI
        priv->iv_attachments = GTK_WIDGET (gtk_builder_get_object (builder, "iconview1"));
        priv->btn_attachment_remove = GTK_WIDGET (gtk_builder_get_object (builder, "button10"));
 
+       g_signal_connect (gtk_builder_get_object (builder, "expander1"), "notify::expanded",
+                         G_CALLBACK (solipa_mail_ui_on_exp_attachments_expanded), (gpointer)solipa_mail_ui);
+
        gtk_icon_view_set_text_column (GTK_ICON_VIEW (priv->iv_attachments), COL_ATTACHMENTS_FILE_NAME_BASE);
        gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (priv->iv_attachments), COL_ATTACHMENTS_ICON);
 
@@ -746,6 +753,37 @@ solipa_mail_ui_get_property (GObject *object,
 }
 
 /* CALLBACK */
+static void
+solipa_mail_ui_on_exp_attachments_expanded (GObject *object,
+                                            GParamSpec *param_spec,
+                                            gpointer user_data)
+{
+       GtkExpander *expander;
+       GtkBuilder *builder;
+       GValue *gval;
+
+       SolipaMailUIPrivate *priv = SOLIPA_MAIL_UI_GET_PRIVATE ((SolipaMailUI *)user_data);
+
+       builder = solipa_get_gtkbuilder (priv->solipa);
+
+       expander = GTK_EXPANDER (object);
+
+       gval = (GValue *)g_new0 (GValue, 1);
+       g_value_init (gval, G_TYPE_INT);
+       if (gtk_expander_get_expanded (expander))
+               {
+                       g_value_set_int (gval, GTK_EXPAND | GTK_FILL);
+               }
+       else
+               {
+                       g_value_set_int (gval, GTK_FILL);
+               }
+       gtk_container_child_set_property (GTK_CONTAINER (gtk_builder_get_object (builder, "table2")),
+                                         GTK_WIDGET (object),
+                                         "y-options", gval);
+       g_value_unset (gval);
+}
+
 static void
 solipa_mail_ui_on_iv_attachment_selection_changed (GtkIconView *iconview,
                                   gpointer user_data)