From f9db50e1ed2c18e202be7caac601b83b9e32b598 Mon Sep 17 00:00:00 2001 From: Andrea Zagli <a.zagli@comune.scandicci.fi.it> Date: Wed, 5 Dec 2012 08:57:33 +0100 Subject: [PATCH] Aggiunta la funzione SolipaAllegato::set_salva_in_db. --- .cproject | 54 ++++++++++++++++----------------- data/libsolipa/gui/libsolipa.ui | 23 +++----------- src/allegato.c | 23 ++++++++------ src/allegato.h | 4 ++- 4 files changed, 48 insertions(+), 56 deletions(-) diff --git a/.cproject b/.cproject index fe70b0e..69cecb5 100644 --- a/.cproject +++ b/.cproject @@ -3,46 +3,40 @@ <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> <storageModule moduleId="org.eclipse.cdt.core.settings"> - <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"> + <cconfiguration id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477"> + <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477" moduleId="org.eclipse.cdt.core.settings" name="Build (GNU)"> <externalSettings/> <extensions> + <extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/> <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <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"/> + <configuration buildProperties="" description="" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477" name="Build (GNU)" parent="org.eclipse.cdt.build.core.emptycfg"> + <folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477.912877605" name="/" resourcePath=""> + <toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1792737919" name="org.eclipse.linuxtools.cdt.autotools.core.toolChain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain"> + <targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.1314607368" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/> + <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.508220876" keepEnvironmentInBuildfile="false" managedBuildOn="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.213892850" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"> + <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.210087798" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477" valueType="string"/> </tool> - <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"> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.1802348268" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.2074081626" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc"> + <option id="gnu.c.compiler.option.include.paths.2135141" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""C:\mingw\include""/> - <listOptionValue builtIn="false" value=""C:\mingw\include\gdk-pixbuf-2.0""/> <listOptionValue builtIn="false" value=""C:\mingw\include\glib-2.0""/> <listOptionValue builtIn="false" value=""C:\mingw\include\gtk-2.0""/> - <listOptionValue builtIn="false" value=""C:\mingw\include\evolution-data-server-2.32""/> <listOptionValue builtIn="false" value=""C:\mingw\include\libgda-4.0""/> <listOptionValue builtIn="false" value=""C:\mingw\include\libgda-4.0\libgda""/> + <listOptionValue builtIn="false" value=""C:\mingw\include\gdk-pixbuf-2.0""/> </option> - <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1341682187" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> + <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1589342168" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> </tool> - <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.1051122829" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"/> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.484606055" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp"/> </toolChain> </folderInfo> </configuration> @@ -50,10 +44,14 @@ <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> </cconfiguration> </storageModule> + <storageModule moduleId="cdtBuildSystem" version="4.0.0"> + <project id="libsolipa.null.182313735" name="libsolipa"/> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> <storageModule moduleId="scannerConfiguration"> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> - </storageModule> - <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <project id="libsolipa.null.707681827" name="libsolipa"/> + <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477;org.eclipse.linuxtools.cdt.autotools.core.toolChain.2078941477.912877605;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.2074081626;cdt.managedbuild.tool.gnu.c.compiler.input.1589342168"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> + </scannerConfigBuildInfo> </storageModule> </cproject> diff --git a/data/libsolipa/gui/libsolipa.ui b/data/libsolipa/gui/libsolipa.ui index 8ef1dae..d185fa8 100644 --- a/data/libsolipa/gui/libsolipa.ui +++ b/data/libsolipa/gui/libsolipa.ui @@ -20,7 +20,6 @@ <child> <object class="GtkButton" id="button1"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -35,7 +34,6 @@ <child> <object class="GtkButton" id="button2"> <property name="label">gtk-save</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -135,7 +133,6 @@ <child> <object class="GtkButton" id="button3"> <property name="label" translatable="yes">Deseleziona tutti</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -149,7 +146,6 @@ <child> <object class="GtkButton" id="button4"> <property name="label" translatable="yes">Seleziona tutti</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -249,7 +245,6 @@ </child> <child> <object class="GtkCheckButton" id="checkbutton1"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -312,7 +307,6 @@ </child> <child> <object class="GtkCheckButton" id="checkbutton3"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -429,7 +423,6 @@ <child> <object class="GtkButton" id="button6"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -444,7 +437,6 @@ <child> <object class="GtkButton" id="button7"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -705,7 +697,6 @@ <child> <object class="GtkButton" id="button9"> <property name="label">gtk-add</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -720,7 +711,6 @@ <child> <object class="GtkButton" id="button10"> <property name="label">gtk-remove</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -789,7 +779,6 @@ </child> <child> <object class="GtkCheckButton" id="checkbutton4"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -858,6 +847,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> @@ -895,10 +887,10 @@ </child> <child> <object class="GtkButton" id="button5"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Apri file</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> @@ -916,10 +908,10 @@ </child> <child> <object class="GtkButton" id="button144"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Seleziona file</property> <child> <object class="GtkImage" id="image2"> <property name="visible">True</property> @@ -1010,7 +1002,6 @@ </child> <child> <object class="GtkCheckButton" id="checkbutton2"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1058,9 +1049,6 @@ <property name="y_options">GTK_FILL</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> </object> @@ -1109,7 +1097,6 @@ <child> <object class="GtkButton" id="button8"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/src/allegato.c b/src/allegato.c index a25062d..76380f6 100644 --- a/src/allegato.c +++ b/src/allegato.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Andrea Zagli <azagli@libero.it> + * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -231,14 +231,19 @@ solipa_allegato_get_salva_in_db (SolipaAllegato *solipa_allegato) priv = SOLIPA_ALLEGATO_GET_PRIVATE (solipa_allegato); - if (!gtk_widget_get_visible (priv->chk_salva_nel_db)) - { - return FALSE; - } - else - { - return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->chk_salva_nel_db)); - } + return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->chk_salva_nel_db)); +} + +void +solipa_allegato_set_salva_in_db (SolipaAllegato *solipa_allegato, gboolean salva) +{ + SolipaAllegatoPrivate *priv; + + g_return_if_fail (IS_SOLIPA_ALLEGATO (solipa_allegato)); + + priv = SOLIPA_ALLEGATO_GET_PRIVATE (solipa_allegato); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->chk_salva_nel_db), salva); } void diff --git a/src/allegato.h b/src/allegato.h index 5a37afa..22ec0d5 100644 --- a/src/allegato.h +++ b/src/allegato.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli <azagli@libero.it> + * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,7 +63,9 @@ void solipa_allegato_con_salva_in_db (SolipaAllegato *solipa_allegato, gboolean const gchar *solipa_allegato_get_percorso (SolipaAllegato *solipa_allegato); const gchar *solipa_allegato_get_data (SolipaAllegato *solipa_allegato); guint solipa_allegato_get_dimensione (SolipaAllegato *solipa_allegato); + gboolean solipa_allegato_get_salva_in_db (SolipaAllegato *solipa_allegato); +void solipa_allegato_set_salva_in_db (SolipaAllegato *solipa_allegato, gboolean salva); void solipa_allegato_add_to_gtkform (SolipaAllegato *solipa_allegato, GtkForm *form, const gchar *percorso_field, -- 2.49.0