Aggiunto il namespace organigramma (refs #103).

diff --git a/.cproject b/.cproject
index 87b0512a84cc5f447cc47d141202c1da7c110d26..71d0b5db439e06060c30fb10db0e9524a03cfc7e 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -3,219 +3,176 @@
 
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
        <storageModule moduleId="org.eclipse.cdt.core.settings">
-               <cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1212945857">
-                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1212945857" moduleId="org.eclipse.cdt.core.settings" name="Default">
+               <cconfiguration id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.590174213">
+                       <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.590174213" 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 buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1212945857" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
-                                       <folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1212945857.37586123" name="/" resourcePath="">
-                                               <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.404490334" 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.1319117986" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-                                                       <builder buildPath="${workspace_loc:/organigramma/Default}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.815825232" 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.436020784" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.assembler.input.36101004" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+                               <configuration buildProperties="" description="" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.590174213" name="Build (GNU)" parent="org.eclipse.cdt.build.core.emptycfg">
+                                       <folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.590174213.184868573" name="/" resourcePath="">
+                                               <toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1178137107" 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.1521462816" 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.2121159532" 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.1676069924" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
+                                                               <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.1070104063" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.toolChain.590174213" valueType="string"/>
                                                        </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.2083640945" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.630803900" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base"/>
-                                                       <tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1795142806" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-                                                               <option id="gnu.c.compiler.option.include.paths.665935208" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.153546674" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/>
+                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1556295077" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
+                                                               <option id="gnu.c.compiler.option.include.paths.325591640" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\glib-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\libgtkform&quot;"/>
                                                                </option>
-                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.669767949" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+                                                               <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.120162119" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
-                                                       <tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1998334407" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
-                                                               <inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1457831931" 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.302188117" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"/>
+                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.610890521" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp"/>
                                                </toolChain>
                                        </folderInfo>
                                </configuration>
                        </storageModule>
                        <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-                       <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-                       <storageModule moduleId="scannerConfiguration">
-                               <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-                               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-                                       <buildOutputProvider>
-                                               <openAction enabled="true" filePath=""/>
-                                               <parser enabled="true"/>
-                                       </buildOutputProvider>
-                                       <scannerInfoProvider id="specsFile">
-                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-                                               <parser enabled="true"/>
-                                       </scannerInfoProvider>
-                               </profile>
-                               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-                                       <buildOutputProvider>
-                                               <openAction enabled="true" filePath=""/>
-                                               <parser enabled="true"/>
-                                       </buildOutputProvider>
-                                       <scannerInfoProvider id="makefileGenerator">
-                                               <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
-                                               <parser enabled="true"/>
-                                       </scannerInfoProvider>
-                               </profile>
-                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-                                       <buildOutputProvider>
-                                               <openAction enabled="true" filePath=""/>
-                                               <parser enabled="true"/>
-                                       </buildOutputProvider>
-                                       <scannerInfoProvider id="specsFile">
-                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-                                               <parser enabled="true"/>
-                                       </scannerInfoProvider>
-                               </profile>
-                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-                                       <buildOutputProvider>
-                                               <openAction enabled="true" filePath=""/>
-                                               <parser enabled="true"/>
-                                       </buildOutputProvider>
-                                       <scannerInfoProvider id="specsFile">
-                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-                                               <parser enabled="true"/>
-                                       </scannerInfoProvider>
-                               </profile>
-                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-                                       <buildOutputProvider>
-                                               <openAction enabled="true" filePath=""/>
-                                               <parser enabled="true"/>
-                                       </buildOutputProvider>
-                                       <scannerInfoProvider id="specsFile">
-                                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-                                               <parser enabled="true"/>
-                                       </scannerInfoProvider>
-                               </profile>
-                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-                                       <buildOutputProvider>
-                                               <openAction enabled="true" filePath=""/>
-                                               <parser enabled="true"/>
-                                       </buildOutputProvider>
-                                       <scannerInfoProvider id="specsFile">
-                                               <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-                                               <parser enabled="true"/>
-                                       </scannerInfoProvider>
-                               </profile>
-                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-                                       <buildOutputProvider>
-                                               <openAction enabled="true" filePath=""/>
-                                               <parser enabled="true"/>
-                                       </buildOutputProvider>
-                                       <scannerInfoProvider id="specsFile">
-                                               <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-                                               <parser enabled="true"/>
-                                       </scannerInfoProvider>
-                               </profile>
-                               <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-                                       <buildOutputProvider>
-                                               <openAction enabled="true" filePath=""/>
-                                               <parser enabled="true"/>
-                                       </buildOutputProvider>
-                                       <scannerInfoProvider id="specsFile">
-                                               <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-                                               <parser enabled="true"/>
-                                       </scannerInfoProvider>
-                               </profile>
-                               <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1212945857;cdt.managedbuild.toolchain.gnu.mingw.base.1212945857.37586123;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1795142806;cdt.managedbuild.tool.gnu.c.compiler.input.669767949">
-                                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="makefileGenerator">
-                                                       <runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-                                               <buildOutputProvider>
-                                                       <openAction enabled="true" filePath=""/>
-                                                       <parser enabled="true"/>
-                                               </buildOutputProvider>
-                                               <scannerInfoProvider id="specsFile">
-                                                       <runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-                                                       <parser enabled="true"/>
-                                               </scannerInfoProvider>
-                                       </profile>
-                               </scannerConfigBuildInfo>
-                       </storageModule>
-                       <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
                </cconfiguration>
        </storageModule>
        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-               <project id="organigramma.null.905468110" name="organigramma"/>
+               <project id="organigramma.null.670366725" name="organigramma"/>
+       </storageModule>
+       <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+       <storageModule moduleId="scannerConfiguration">
+               <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+                       <buildOutputProvider>
+                               <openAction enabled="true" filePath=""/>
+                               <parser enabled="true"/>
+                       </buildOutputProvider>
+                       <scannerInfoProvider id="specsFile">
+                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+                               <parser enabled="true"/>
+                       </scannerInfoProvider>
+               </profile>
+               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+                       <buildOutputProvider>
+                               <openAction enabled="true" filePath=""/>
+                               <parser enabled="true"/>
+                       </buildOutputProvider>
+                       <scannerInfoProvider id="specsFile">
+                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+                               <parser enabled="true"/>
+                       </scannerInfoProvider>
+               </profile>
+               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+                       <buildOutputProvider>
+                               <openAction enabled="true" filePath=""/>
+                               <parser enabled="true"/>
+                       </buildOutputProvider>
+                       <scannerInfoProvider id="specsFile">
+                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+                               <parser enabled="true"/>
+                       </scannerInfoProvider>
+               </profile>
+               <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+                       <buildOutputProvider>
+                               <openAction enabled="true" filePath=""/>
+                               <parser enabled="true"/>
+                       </buildOutputProvider>
+                       <scannerInfoProvider id="specsFile">
+                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+                               <parser enabled="true"/>
+                       </scannerInfoProvider>
+               </profile>
+               <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1212945857;cdt.managedbuild.toolchain.gnu.mingw.base.1212945857.37586123;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1795142806;cdt.managedbuild.tool.gnu.c.compiler.input.669767949">
+                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+               </scannerConfigBuildInfo>
+               <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.590174213;org.eclipse.linuxtools.cdt.autotools.core.toolChain.590174213.184868573;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1556295077;cdt.managedbuild.tool.gnu.c.compiler.input.120162119">
+                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+                       <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+               </scannerConfigBuildInfo>
        </storageModule>
 </cproject>

diff --git a/data/organigramma/gui/organigramma.gui b/data/organigramma/gui/organigramma.gui
index 330a1fc56617b48f317ca4e9833252d4ade327af..541b02a5c7a8f8295d0c097d10de2e458b514b8a 100644 (file)
--- a/data/organigramma/gui/organigramma.gui
+++ b/data/organigramma/gui/organigramma.gui
@@ -1,678 +1,224 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="w_main">
-    <property name="title" translatable="yes">Gestione organigramma</property>
-    <property name="window_position">center</property>
-    <property name="default_width">600</property>
-    <property name="default_height">400</property>
-    <signal name="destroy" handler="gtk_main_quit"/>
-    <child>
-      <object class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkMenuBar" id="menubar1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkMenuItem" id="menuitem1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_File</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu1">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem5">
-                        <property name="label">gtk-quit</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="gtk_main_quit"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem2">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Visualizza</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu2">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Organigramma</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_view_nodi_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem9">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Strutture</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_view_strutture_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem8">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Uffici</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_view_uffici_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem11">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Persone</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_view_persone_activate"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem5">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Tabelle</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu4">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem6">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Tipi _nodo</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_tabelle_tipi_nodo_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem7">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Tipi _recapito</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_tabelle_tipi_recapito_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem10">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Titoli</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_tabelle_titoli_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem12">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Tipi rapporto di _lavoro</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_tabelle_tipi_rapporto_lavoro_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem13">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Posizioni economiche</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_tabelle_posizioni_economiche_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem14">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Tipi pr_estazione</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_tabelle_tipi_prestazione_activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="menuitem15">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Pro_fili professionali</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mnu_tabelle_profili_professionali_activate"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem4">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">A_iuto</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu3">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem10">
-                        <property name="label">gtk-about</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_mnu_help_about_activate"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVBox" id="vbx_body">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStatusbar" id="statusbar1">
-            <property name="visible">True</property>
-            <property name="spacing">2</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
+  <object class="GtkAdjustment" id="adj_dmon">
+    <property name="upper">31</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
-  <object class="GtkTreeStore" id="tstore_nodi">
-    <columns>
-      <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkAdjustment" id="adj_week">
+    <property name="upper">4</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAboutDialog" id="dlg_about">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Informazioni su...</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <property name="program_name">Organigramma</property>
     <property name="version">0.0.1</property>
-    <property name="copyright" translatable="yes">Andrea Zagli 2010</property>
+    <property name="copyright" translatable="yes">Copyright © Andrea Zagli 2010-2012</property>
     <property name="authors">Andrea Zagli &lt;azagli@libero.it&gt;</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
           </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>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_nodo">
-    <property name="title" translatable="yes">Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox2">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkTable" id="table1">
-            <property name="visible">True</property>
-            <property name="n_rows">6</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
-            <child>
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tipo</property>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="combobox1">
-                <property name="visible">True</property>
-                <property name="model">lstore_tipi_nodo</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext3"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
-              </object>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">200</property>
-                <property name="invisible_char">&#x25CF;</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Descrizione</property>
-              </object>
-              <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</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>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nodo superiore</property>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox1">
-                <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkEntry" id="entry2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                    <property name="secondary_icon_stock">gtk-clear</property>
-                    <property name="secondary_icon_activatable">True</property>
-                    <property name="secondary_icon_sensitive">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button6">
-                    <property name="label" translatable="yes">...</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="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label5">
-                    <property name="label" translatable="yes">lbl_id_nodi</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label6">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox2">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button4">
-                <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="button5">
-                <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="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkListStore" id="lstore_tipi_nodo">
+  <object class="GtkListStore" id="lstore_mesi">
     <columns>
-      <!-- column-name id -->
-      <column type="gchararray"/>
+      <!-- column-name numero -->
+      <column type="guint"/>
       <!-- column-name nome -->
       <column type="gchararray"/>
     </columns>
+    <data>
+      <row>
+        <col id="0">0</col>
+        <col id="1" translatable="yes"> </col>
+      </row>
+      <row>
+        <col id="0">1</col>
+        <col id="1" translatable="yes">Gennaio</col>
+      </row>
+      <row>
+        <col id="0">2</col>
+        <col id="1" translatable="yes">Febbraio</col>
+      </row>
+      <row>
+        <col id="0">3</col>
+        <col id="1" translatable="yes">Marzo</col>
+      </row>
+      <row>
+        <col id="0">4</col>
+        <col id="1" translatable="yes">Aprile</col>
+      </row>
+      <row>
+        <col id="0">5</col>
+        <col id="1" translatable="yes">Maggio</col>
+      </row>
+      <row>
+        <col id="0">6</col>
+        <col id="1" translatable="yes">Giugno</col>
+      </row>
+      <row>
+        <col id="0">7</col>
+        <col id="1" translatable="yes">Luglio</col>
+      </row>
+      <row>
+        <col id="0">8</col>
+        <col id="1" translatable="yes">Agosto</col>
+      </row>
+      <row>
+        <col id="0">9</col>
+        <col id="1" translatable="yes">Settembre</col>
+      </row>
+      <row>
+        <col id="0">10</col>
+        <col id="1" translatable="yes">Ottobre</col>
+      </row>
+      <row>
+        <col id="0">11</col>
+        <col id="1" translatable="yes">Novembre</col>
+      </row>
+      <row>
+        <col id="0">12</col>
+        <col id="1" translatable="yes">Dicembre</col>
+      </row>
+    </data>
   </object>
-  <object class="GtkListStore" id="lstore_tipi_recapito">
-    <columns>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="lstore_uffici">
+  <object class="GtkListStore" id="lstore_persona_incarichi">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name nome -->
+      <!-- column-name da_data -->
+      <column type="gchararray"/>
+      <!-- column-name a_data -->
+      <column type="gchararray"/>
+      <!-- column-name descrizione -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_strutture">
+  <object class="GtkListStore" id="lstore_persona_nodi">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name nome -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="lstore_ufficio_nodi">
-    <columns>
       <!-- column-name tipo -->
       <column type="gchararray"/>
-      <!-- column-name id -->
-      <column type="guint"/>
       <!-- column-name nodo -->
       <column type="gchararray"/>
+      <!-- column-name da_data -->
+      <column type="gchararray"/>
+      <!-- column-name a_data -->
+      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_vie">
+  <object class="GtkListStore" id="lstore_persona_nodo_recapiti">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name nome -->
+      <!-- column-name tipo -->
+      <column type="gchararray"/>
+      <!-- column-name recapito -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_struttura_indirizzi">
+  <object class="GtkListStore" id="lstore_persona_recapiti">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name indirizzo -->
+      <!-- column-name tipo -->
+      <column type="gchararray"/>
+      <!-- column-name recapito -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_ufficio_recapiti">
+  <object class="GtkListStore" id="lstore_persona_uffici">
     <columns>
-      <!-- column-name tipo -->
-      <column type="gchararray"/>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name recapito -->
+      <!-- column-name ufficio -->
+      <column type="gchararray"/>
+      <!-- column-name da_data -->
+      <column type="gchararray"/>
+      <!-- column-name a_data -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_mesi">
+  <object class="GtkListStore" id="lstore_persona_ufficio_recapiti">
     <columns>
-      <!-- column-name numero -->
+      <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name nome -->
+      <!-- column-name tipo -->
+      <column type="gchararray"/>
+      <!-- column-name recapito -->
       <column type="gchararray"/>
     </columns>
-    <data>
-      <row>
-        <col id="0">0</col>
-        <col id="1" translatable="yes"> </col>
-      </row>
-      <row>
-        <col id="0">1</col>
-        <col id="1" translatable="yes">Gennaio</col>
-      </row>
-      <row>
-        <col id="0">2</col>
-        <col id="1" translatable="yes">Febbraio</col>
-      </row>
-      <row>
-        <col id="0">3</col>
-        <col id="1" translatable="yes">Marzo</col>
-      </row>
-      <row>
-        <col id="0">4</col>
-        <col id="1" translatable="yes">Aprile</col>
-      </row>
-      <row>
-        <col id="0">5</col>
-        <col id="1" translatable="yes">Maggio</col>
-      </row>
-      <row>
-        <col id="0">6</col>
-        <col id="1" translatable="yes">Giugno</col>
-      </row>
-      <row>
-        <col id="0">7</col>
-        <col id="1" translatable="yes">Luglio</col>
-      </row>
-      <row>
-        <col id="0">8</col>
-        <col id="1" translatable="yes">Agosto</col>
-      </row>
-      <row>
-        <col id="0">9</col>
-        <col id="1" translatable="yes">Settembre</col>
-      </row>
-      <row>
-        <col id="0">10</col>
-        <col id="1" translatable="yes">Ottobre</col>
-      </row>
-      <row>
-        <col id="0">11</col>
-        <col id="1" translatable="yes">Novembre</col>
-      </row>
-      <row>
-        <col id="0">12</col>
-        <col id="1" translatable="yes">Dicembre</col>
-      </row>
-    </data>
   </object>
-  <object class="GtkListStore" id="lstore_ufficio_orari">
+  <object class="GtkListStore" id="lstore_persone">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name orario -->
+      <!-- column-name cognome_nome -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_persona_uffici">
+  <object class="GtkListStore" id="lstore_posizioni_economiche">
     <columns>
       <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name ufficio -->
-      <column type="gchararray"/>
-      <!-- column-name da_data -->
       <column type="gchararray"/>
-      <!-- column-name a_data -->
+      <!-- column-name nome -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_persona_ufficio_recapiti">
+  <object class="GtkListStore" id="lstore_profili_professionali">
     <columns>
       <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name tipo -->
       <column type="gchararray"/>
-      <!-- column-name recapito -->
+      <!-- column-name nome -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_persona_recapiti">
+  <object class="GtkListStore" id="lstore_struttura_indirizzi">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name tipo -->
-      <column type="gchararray"/>
-      <!-- column-name recapito -->
+      <!-- column-name indirizzo -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_persona_nodo_recapiti">
+  <object class="GtkListStore" id="lstore_strutture">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name tipo -->
-      <column type="gchararray"/>
-      <!-- column-name recapito -->
+      <!-- column-name nome -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_tipi_rapporto_lavoro">
+  <object class="GtkListStore" id="lstore_tipi_nodo">
     <columns>
       <!-- column-name id -->
       <column type="gchararray"/>
@@ -680,7 +226,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_posizioni_economiche">
+  <object class="GtkListStore" id="lstore_tipi_prestazione">
     <columns>
       <!-- column-name id -->
       <column type="gchararray"/>
@@ -688,7 +234,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_tipi_prestazione">
+  <object class="GtkListStore" id="lstore_tipi_rapporto_lavoro">
     <columns>
       <!-- column-name id -->
       <column type="gchararray"/>
@@ -696,7 +242,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_profili_professionali">
+  <object class="GtkListStore" id="lstore_tipi_recapito">
     <columns>
       <!-- column-name id -->
       <column type="gchararray"/>
@@ -714,37 +260,39 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_persone">
+  <object class="GtkListStore" id="lstore_uffici">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name cognome_nome -->
+      <!-- column-name nome -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_persona_nodi">
+  <object class="GtkListStore" id="lstore_ufficio_nodi">
     <columns>
-      <!-- column-name id -->
-      <column type="guint"/>
       <!-- column-name tipo -->
       <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="guint"/>
       <!-- column-name nodo -->
       <column type="gchararray"/>
-      <!-- column-name da_data -->
-      <column type="gchararray"/>
-      <!-- column-name a_data -->
-      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="lstore_persona_incarichi">
+  <object class="GtkListStore" id="lstore_ufficio_orari">
     <columns>
       <!-- column-name id -->
       <column type="guint"/>
-      <!-- column-name da_data -->
+      <!-- column-name orario -->
       <column type="gchararray"/>
-      <!-- column-name a_data -->
+    </columns>
+  </object>
+  <object class="GtkListStore" id="lstore_ufficio_recapiti">
+    <columns>
+      <!-- column-name tipo -->
       <column type="gchararray"/>
-      <!-- column-name descrizione -->
+      <!-- column-name id -->
+      <column type="guint"/>
+      <!-- column-name recapito -->
       <column type="gchararray"/>
     </columns>
   </object>
@@ -760,69 +308,335 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkWindow" id="w_nodi">
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
+  <object class="GtkListStore" id="lstore_vie">
+    <columns>
+      <!-- column-name id -->
+      <column type="guint"/>
+      <!-- column-name nome -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="tstore_nodi">
+    <columns>
+      <!-- column-name id -->
+      <column type="guint"/>
+      <!-- column-name nome -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkWindow" id="w_main">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Gestione organigramma</property>
+    <property name="window_position">center</property>
     <property name="default_width">600</property>
     <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
+    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child>
-      <object class="GtkVBox" id="vbx_nodi">
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label11">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Nodi&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
+        <property name="can_focus">False</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
+          <object class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
+            <property name="can_focus">False</property>
             <child>
-              <object class="GtkTreeView" id="treeview1">
+              <object class="GtkMenuItem" id="menuitem1">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">tstore_nodi</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                    <property name="title">Nome</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
+                      <object class="GtkImageMenuItem" id="imagemenuitem5">
+                        <property name="label">gtk-quit</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="gtk_main_quit" swapped="no"/>
+                      </object>
                     </child>
                   </object>
                 </child>
               </object>
             </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button1">
+              <object class="GtkMenuItem" id="menuitem2">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Visualizza</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem3">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Organigramma</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_view_nodi_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem9">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Strutture</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_view_strutture_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem8">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Uffici</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_view_uffici_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem11">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Persone</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_view_persone_activate" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem5">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Tabelle</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem6">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Tipi _nodo</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_tabelle_tipi_nodo_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem7">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Tipi _recapito</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_tabelle_tipi_recapito_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem10">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Titoli</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_tabelle_titoli_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem12">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Tipi rapporto di _lavoro</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_tabelle_tipi_rapporto_lavoro_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem13">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Posizioni economiche</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_tabelle_posizioni_economiche_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem14">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Tipi pr_estazione</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_tabelle_tipi_prestazione_activate" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem15">
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Pro_fili professionali</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_mnu_tabelle_profili_professionali_activate" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem4">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">A_iuto</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="imagemenuitem10">
+                        <property name="label">gtk-about</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_mnu_help_about_activate" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbx_body">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkStatusbar" id="statusbar1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_nodi">
+    <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">600</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbx_nodi">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label11">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Nodi&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</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">tstore_nodi</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" 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="button1">
                 <property name="label">gtk-new</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>
@@ -837,6 +651,7 @@
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label">gtk-edit</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>
@@ -851,6 +666,7 @@
             <child>
               <object class="GtkButton" id="button3">
                 <property name="label">gtk-delete</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>
@@ -865,6 +681,7 @@
             <child>
               <object class="GtkButton" id="button14">
                 <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>
@@ -879,6 +696,7 @@
             <child>
               <object class="GtkButton" id="button15">
                 <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>
@@ -893,101 +711,255 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_tipo_nodo">
-    <property name="title" translatable="yes">Tipo nodo - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_nodo">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox3">
+      <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table2">
+          <object class="GtkTable" id="table1">
             <property name="visible">True</property>
-            <property name="n_rows">3</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">6</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label8">
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
+                <property name="label" translatable="yes">Tipo</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry3">
+              <object class="GtkComboBox" id="combobox1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">100</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_tipi_nodo</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext3"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label12">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+                <property name="label" translatable="yes">Nome</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label9">
+              <object class="GtkEntry" id="entry1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">200</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Descrizione</property>
               </object>
               <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</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>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Nodo superiore</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkEntry" id="entry2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="secondary_icon_stock">gtk-clear</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">True</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button6">
+                    <property name="label" translatable="yes">...</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>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">lbl_id_nodi</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">ID</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox3">
+          <object class="GtkHButtonBox" id="hbuttonbox2">
             <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="button8">
+              <object class="GtkButton" id="button4">
                 <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>
@@ -1000,8 +972,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button9">
+              <object class="GtkButton" id="button5">
                 <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>
@@ -1016,1371 +989,1377 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_tipi_nodo">
-    <property name="title" translatable="yes">Tipi nodo - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_persona">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Persona - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">500</property>
-    <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbx_tipi_nodo">
+      <object class="GtkVBox" id="vbox11">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkLabel" id="label7">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Tipi nodo&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow3">
+          <object class="GtkTable" id="table10">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">9</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
             <child>
-              <object class="GtkTreeView" id="treeview2">
+              <object class="GtkLabel" id="label65">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_tipi_nodo</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                    <property name="title">Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Nome</property>
               </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox4">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button7">
-                <property name="label">gtk-new</property>
+              <object class="GtkEntry" id="entry14">
                 <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="max_length">50</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button10">
-                <property name="label">gtk-edit</property>
+              <object class="GtkLabel" id="label66">
                 <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="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Descrizione</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button11">
-                <property name="label">gtk-delete</property>
+              <object class="GtkScrolledWindow" id="scrolledwindow18">
                 <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="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview8">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button12">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkLabel" id="label67">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button13">
-                <property name="label">gtk-ok</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">4</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_tipi_recapito">
-    <property name="title" translatable="yes">Tipi recapito - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbx_tipi_recapito">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label13">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Tipi recapito&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow4">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
-            <child>
-              <object class="GtkTreeView" id="treeview3">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_tipi_recapito</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn3">
-                    <property name="title">Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext4"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox5">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button16">
-                <property name="label">gtk-new</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="button17">
-                <property name="label">gtk-edit</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>
-            <child>
-              <object class="GtkButton" id="button18">
-                <property name="label">gtk-delete</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">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button19">
-                <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">3</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button20">
-                <property name="label">gtk-ok</property>
+              <object class="GtkLabel" id="label68">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">ID</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_tipo_recapito">
-    <property name="title" translatable="yes">Tipo recapito - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox4">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkTable" id="table3">
-            <property name="visible">True</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label14">
+              <object class="GtkLabel" id="label72">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
+                <property name="label" translatable="yes">Cognome</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry4">
+              <object class="GtkEntry" id="entry17">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">100</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">50</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label15">
+              <object class="GtkLabel" id="label73">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+                <property name="label" translatable="yes">Titolo</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label16">
+              <object class="GtkComboBox" id="combobox4">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_titoli</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext38"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
               </object>
               <packing>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox6">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button21">
-                <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="button22">
-                <property name="label">gtk-save</property>
+              <object class="GtkNotebook" id="notebook1">
                 <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="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_uffici">
-    <property name="title" translatable="yes">Uffici - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbx_uffici">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label17">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Uffici&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow5">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
-            <child>
-              <object class="GtkTreeView" id="treeview4">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_uffici</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn4">
-                    <property name="title">Nome</property>
+                  <object class="GtkFrame" id="frame10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
                     <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext5"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
+                      <object class="GtkAlignment" id="alignment10">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox15">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow24">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
+                                <property name="shadow_type">etched-in</property>
+                                <child>
+                                  <object class="GtkTreeView" id="treeview16">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="model">lstore_persona_incarichi</property>
+                                    <property name="headers_clickable">False</property>
+                                    <property name="search_column">0</property>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn18">
+                                        <property name="title">Da data</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext21"/>
+                                          <attributes>
+                                            <attribute name="text">1</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn25">
+                                        <property name="title">A data</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext30"/>
+                                          <attributes>
+                                            <attribute name="text">2</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn32">
+                                        <property name="title">Descrizione</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext43"/>
+                                          <attributes>
+                                            <attribute name="text">3</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="GtkVButtonBox" id="vbuttonbox10">
+                                <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="button79">
+                                    <property name="label">gtk-new</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>
+                                    <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="button80">
+                                    <property name="label">gtk-edit</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>
+                                    <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>
+                                <child>
+                                  <object class="GtkButton" id="button81">
+                                    <property name="label">gtk-delete</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>
+                                    <property name="use_stock">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label86">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Incarichi&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
                     </child>
                   </object>
                 </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox7">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button23">
-                <property name="label">gtk-new</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="button24">
-                <property name="label">gtk-edit</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>
-            <child>
-              <object class="GtkButton" id="button25">
-                <property name="label">gtk-delete</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">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button26">
-                <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">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button27">
-                <property name="label">gtk-ok</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">4</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_ufficio">
-    <property name="title" translatable="yes">Ufficio - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox5">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkTable" id="table4">
-            <property name="visible">True</property>
-            <property name="n_rows">8</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
-            <child>
-              <object class="GtkLabel" id="label19">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
-              </object>
-              <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry5">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">100</property>
-                <property name="invisible_char">&#x25CF;</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label20">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Descrizione</property>
-              </object>
-              <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow6">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
-                <child>
-                  <object class="GtkTextView" id="textview2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label23">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label24">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label18">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Struttura</property>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox3">
-                <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkEntry" id="entry7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button31">
-                    <property name="label" translatable="yes">...</property>
+                <child type="tab">
+                  <object class="GtkLabel" id="label85">
                     <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="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label25">
-                    <property name="label" translatable="yes">lbl_id_strutture</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Incarichi</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
+                    <property name="tab_fill">False</property>
                   </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame1">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment1">
+                  <object class="GtkVBox" id="vbox12">
                     <property name="visible">True</property>
-                    <property name="left_padding">12</property>
+                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkHBox" id="hbox4">
+                      <object class="GtkFrame" id="frame7">
                         <property name="visible">True</property>
-                        <property name="spacing">5</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
                         <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow9">
+                          <object class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
-                            <property name="shadow_type">etched-in</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkTreeView" id="treeview6">
+                              <object class="GtkHBox" id="hbox12">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="model">lstore_ufficio_recapiti</property>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn6">
-                                    <property name="title">Tipo</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext8"/>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn7">
-                                    <property name="title">Recapito</property>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow21">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
+                                    <property name="shadow_type">etched-in</property>
                                     <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext9"/>
-                                      <attributes>
-                                        <attribute name="text">2</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVButtonBox" id="vbuttonbox1">
-                            <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <property name="layout_style">start</property>
-                            <child>
-                              <object class="GtkButton" id="button37">
-                                <property name="label">gtk-new</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="button38">
-                                <property name="label">gtk-edit</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>
-                            <child>
-                              <object class="GtkButton" id="button41">
-                                <property name="label">gtk-delete</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 class="GtkTreeView" id="treeview13">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="model">lstore_persona_nodi</property>
+                                        <property name="headers_clickable">False</property>
+                                        <property name="search_column">0</property>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn15">
+                                            <property name="title">Tipo</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext18"/>
+                                              <attributes>
+                                                <attribute name="text">1</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn23">
+                                            <property name="title">Nodo</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext28"/>
+                                              <attributes>
+                                                <attribute name="text">2</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn30">
+                                            <property name="title">Da data</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext41"/>
+                                              <attributes>
+                                                <attribute name="text">3</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn31">
+                                            <property name="title">A data</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext42"/>
+                                              <attributes>
+                                                <attribute name="text">4</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="GtkVButtonBox" id="vbuttonbox7">
+                                    <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="button70">
+                                        <property name="label">gtk-new</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>
+                                        <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="button71">
+                                        <property name="label">gtk-edit</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>
+                                        <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>
+                                    <child>
+                                      <object class="GtkButton" id="button72">
+                                        <property name="label">gtk-delete</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>
+                                        <property name="use_stock">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</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">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label70">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Nodi&lt;/b&gt;</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>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label29">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Recapiti&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame2">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkHBox" id="hbox2">
+                      <object class="GtkFrame" id="frame8">
                         <property name="visible">True</property>
-                        <property name="spacing">5</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
                         <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow10">
+                          <object class="GtkAlignment" id="alignment8">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
-                            <property name="shadow_type">etched-in</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkTreeView" id="treeview7">
+                              <object class="GtkHBox" id="hbox13">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="model">lstore_ufficio_nodi</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn8">
-                                    <property name="title">Tipo</property>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow22">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
+                                    <property name="shadow_type">etched-in</property>
                                     <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext10"/>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                      </attributes>
+                                      <object class="GtkTreeView" id="treeview14">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="model">lstore_persona_nodo_recapiti</property>
+                                        <property name="headers_clickable">False</property>
+                                        <property name="search_column">0</property>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn16">
+                                            <property name="title">Tipo</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext19"/>
+                                              <attributes>
+                                                <attribute name="text">1</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn24">
+                                            <property name="title">Recapito</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext29"/>
+                                              <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="GtkTreeViewColumn" id="treeviewcolumn9">
-                                    <property name="title">Nodo</property>
+                                  <object class="GtkVButtonBox" id="vbuttonbox8">
+                                    <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="GtkCellRendererText" id="cellrenderertext11"/>
-                                      <attributes>
-                                        <attribute name="text">2</attribute>
-                                      </attributes>
+                                      <object class="GtkButton" id="button73">
+                                        <property name="label">gtk-new</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>
+                                        <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="button74">
+                                        <property name="label">gtk-edit</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>
+                                        <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>
+                                    <child>
+                                      <object class="GtkButton" id="button75">
+                                        <property name="label">gtk-delete</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>
+                                        <property name="use_stock">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkVButtonBox" id="vbuttonbox2">
+                        <child type="label">
+                          <object class="GtkLabel" id="label77">
                             <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <property name="layout_style">start</property>
-                            <child>
-                              <object class="GtkButton" id="button28">
-                                <property name="label">gtk-new</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="button42">
-                                <property name="label">gtk-edit</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>
-                            <child>
-                              <object class="GtkButton" id="button43">
-                                <property name="label">gtk-delete</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">2</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Recapiti&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</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>
+                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label21">
+                <child type="tab">
+                  <object class="GtkLabel" id="label74">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Nodi superiori&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Nodi</property>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame4">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment4">
+                  <object class="GtkVBox" id="vbox13">
                     <property name="visible">True</property>
-                    <property name="left_padding">12</property>
+                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkHBox" id="hbox9">
+                      <object class="GtkFrame" id="frame5">
                         <property name="visible">True</property>
-                        <property name="spacing">5</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
                         <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow17">
+                          <object class="GtkAlignment" id="alignment5">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
-                            <property name="shadow_type">etched-in</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkTreeView" id="treeview10">
+                              <object class="GtkHBox" id="hbox10">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="model">lstore_ufficio_orari</property>
-                                <property name="headers_clickable">False</property>
-                                <property name="search_column">0</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn12">
-                                    <property name="title">Orario</property>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow19">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
+                                    <property name="shadow_type">etched-in</property>
                                     <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext15"/>
-                                      <attributes>
-                                        <attribute name="text">1</attribute>
-                                      </attributes>
+                                      <object class="GtkTreeView" id="treeview11">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="model">lstore_persona_uffici</property>
+                                        <property name="headers_clickable">False</property>
+                                        <property name="search_column">0</property>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn13">
+                                            <property name="title">Ufficio</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext16"/>
+                                              <attributes>
+                                                <attribute name="text">1</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn19">
+                                            <property name="title">Da data</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext24"/>
+                                              <attributes>
+                                                <attribute name="text">2</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn20">
+                                            <property name="title">A data</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext25"/>
+                                              <attributes>
+                                                <attribute name="text">3</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="GtkVButtonBox" id="vbuttonbox5">
+                                    <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="button62">
+                                        <property name="label">gtk-new</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>
+                                        <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="button63">
+                                        <property name="label">gtk-edit</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>
+                                        <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>
+                                    <child>
+                                      <object class="GtkButton" id="button64">
+                                        <property name="label">gtk-delete</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>
+                                        <property name="use_stock">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkVButtonBox" id="vbuttonbox4">
+                        <child type="label">
+                          <object class="GtkLabel" id="label71">
                             <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <property name="layout_style">start</property>
-                            <child>
-                              <object class="GtkButton" id="button59">
-                                <property name="label">gtk-new</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="button60">
-                                <property name="label">gtk-edit</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>
-                            <child>
-                              <object class="GtkButton" id="button61">
-                                <property name="label">gtk-delete</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">2</property>
-                              </packing>
-                            </child>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Uffici&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</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="label64">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Orari&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame12">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment12">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkHBox" id="hbox19">
+                      <object class="GtkFrame" id="frame6">
                         <property name="visible">True</property>
-                        <property name="spacing">5</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
                         <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow39">
+                          <object class="GtkAlignment" id="alignment6">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
-                            <property name="shadow_type">etched-in</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkTreeView" id="treeview23">
+                              <object class="GtkHBox" id="hbox11">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="model">lstore_ufficio_stanze</property>
-                                <property name="headers_clickable">False</property>
-                                <property name="search_column">0</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn36">
-                                    <property name="title">Piano</property>
+                                  <object class="GtkScrolledWindow" id="scrolledwindow20">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
+                                    <property name="shadow_type">etched-in</property>
                                     <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext47"/>
-                                      <attributes>
-                                        <attribute name="text">1</attribute>
-                                      </attributes>
+                                      <object class="GtkTreeView" id="treeview12">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="model">lstore_persona_ufficio_recapiti</property>
+                                        <property name="headers_clickable">False</property>
+                                        <property name="search_column">0</property>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn14">
+                                            <property name="title">Tipo</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext17"/>
+                                              <attributes>
+                                                <attribute name="text">1</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTreeViewColumn" id="treeviewcolumn21">
+                                            <property name="title">Recapito</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="cellrenderertext26"/>
+                                              <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="GtkTreeViewColumn" id="treeviewcolumn37">
-                                    <property name="title">Da stanza</property>
+                                  <object class="GtkVButtonBox" id="vbuttonbox6">
+                                    <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="GtkCellRendererText" id="cellrenderertext48"/>
-                                      <attributes>
-                                        <attribute name="text">2</attribute>
-                                      </attributes>
+                                      <object class="GtkButton" id="button67">
+                                        <property name="label">gtk-new</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>
+                                        <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>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn38">
-                                    <property name="title">A stanza</property>
                                     <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext49"/>
-                                      <attributes>
-                                        <attribute name="text">3</attribute>
-                                      </attributes>
+                                      <object class="GtkButton" id="button68">
+                                        <property name="label">gtk-edit</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>
+                                        <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>
+                                    <child>
+                                      <object class="GtkButton" id="button69">
+                                        <property name="label">gtk-delete</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>
+                                        <property name="use_stock">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label69">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Recapiti&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child type="tab">
+                  <object class="GtkLabel" id="label75">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Uffici</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame9">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment9">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkVButtonBox" id="vbuttonbox11">
+                          <object class="GtkHBox" id="hbox14">
                             <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="button137">
-                                <property name="label">gtk-new</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="button140">
-                                <property name="label">gtk-edit</property>
+                              <object class="GtkScrolledWindow" id="scrolledwindow23">
                                 <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="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
+                                <property name="shadow_type">etched-in</property>
+                                <child>
+                                  <object class="GtkTreeView" id="treeview15">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="model">lstore_persona_recapiti</property>
+                                    <property name="headers_clickable">False</property>
+                                    <property name="search_column">0</property>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn17">
+                                        <property name="title">Tipo</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext20"/>
+                                          <attributes>
+                                            <attribute name="text">1</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkTreeViewColumn" id="treeviewcolumn22">
+                                        <property name="title">Recapito</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="cellrenderertext27"/>
+                                          <attributes>
+                                            <attribute name="text">2</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="button141">
-                                <property name="label">gtk-delete</property>
+                              <object class="GtkVButtonBox" id="vbuttonbox9">
                                 <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="spacing">5</property>
+                                <property name="layout_style">start</property>
+                                <child>
+                                  <object class="GtkButton" id="button76">
+                                    <property name="label">gtk-new</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>
+                                    <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="button77">
+                                    <property name="label">gtk-edit</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>
+                                    <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>
+                                <child>
+                                  <object class="GtkButton" id="button78">
+                                    <property name="label">gtk-delete</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>
+                                    <property name="use_stock">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label78">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Recapiti&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label166">
+                <child type="tab">
+                  <object class="GtkLabel" id="label76">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Stanze&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Recapiti generici</property>
                   </object>
+                  <packing>
+                    <property name="position">3</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">8</property>
+                <property name="bottom_attach">9</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox8">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button29">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkLabel" id="label84">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">Data di nascita</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button30">
-                <property name="label">gtk-save</property>
+              <object class="GtkEntry" id="entry20">
                 <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="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">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="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_strutture">
-    <property name="title" translatable="yes">Strutture - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbx_strutture">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label26">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Strutture&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow7">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkTreeView" id="treeview5">
+              <object class="GtkFrame" id="frame11">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_strutture</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn5">
-                    <property name="title">Nome</property>
+                  <object class="GtkAlignment" id="alignment11">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext6"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox9">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button32">
-                <property name="label">gtk-new</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="button33">
-                <property name="label">gtk-edit</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>
+                      <object class="GtkTable" id="table14">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">5</property>
+                        <property name="row_spacing">5</property>
+                        <child>
+                          <object class="GtkLabel" id="label108">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Indirizzo</property>
+                          </object>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="entry26">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">●</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label109">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Città</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox17">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkEntry" id="entry27">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                                <property name="invisible_char">●</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="button89">
+                                <property name="label" translatable="yes">...</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>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label110">
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">lbl_id_citta</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label112">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">CAP</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="entry29">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="max_length">5</property>
+                            <property name="invisible_char">●</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label104">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Residenza&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button34">
-                <property name="label">gtk-delete</property>
+              <object class="GtkLabel" id="label111">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Codice fiscale</property>
+              </object>
+              <packing>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry28">
                 <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="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox16">
+            <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="button35">
+              <object class="GtkButton" id="button65">
                 <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>
@@ -2389,12 +2368,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">3</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button36">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="button66">
+                <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>
@@ -2403,87 +2383,92 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">4</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">2</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_struttura">
-    <property name="title" translatable="yes">Struttura - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_persona_incarico">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Incarico - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox6">
+      <object class="GtkVBox" id="vbox19">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table5">
+          <object class="GtkTable" id="table17">
             <property name="visible">True</property>
-            <property name="n_rows">6</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">10</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label27">
+              <object class="GtkLabel" id="label127">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
+                <property name="label" translatable="yes">Matricola</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry8">
+              <object class="GtkEntry" id="entry34">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">100</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">20</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label28">
+              <object class="GtkLabel" id="label128">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">Descrizione</property>
+                <property name="label" translatable="yes">Note</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">8</property>
+                <property name="bottom_attach">9</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow8">
+              <object class="GtkScrolledWindow" id="scrolledwindow30">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkTextView" id="textview3">
+                  <object class="GtkTextView" id="textview14">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </object>
@@ -2492,275 +2477,109 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">8</property>
+                <property name="bottom_attach">9</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label31">
-                <property name="visible">True</property>
+              <object class="GtkLabel" id="label129">
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label32">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
-              </object>
-              <packing>
+                <property name="top_attach">9</property>
+                <property name="bottom_attach">10</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label30">
+              <object class="GtkLabel" id="label131">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Prefisso centralino</property>
+                <property name="label" translatable="yes">Da data</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry9">
+              <object class="GtkEntry" id="entry35">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">20</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label33">
+              <object class="GtkLabel" id="label132">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Interno centralino</property>
+                <property name="label" translatable="yes">A data</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry10">
+              <object class="GtkEntry" id="entry36">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame3">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment3">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox6">
-                        <property name="visible">True</property>
-                        <property name="spacing">5</property>
-                        <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
-                            <property name="shadow_type">etched-in</property>
-                            <child>
-                              <object class="GtkTreeView" id="treeview9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="model">lstore_struttura_indirizzi</property>
-                                <property name="headers_clickable">False</property>
-                                <property name="search_column">0</property>
-                                <child>
-                                  <object class="GtkTreeViewColumn" id="treeviewcolumn11">
-                                    <property name="title">Indirizzo</property>
-                                    <child>
-                                      <object class="GtkCellRendererText" id="cellrenderertext13"/>
-                                      <attributes>
-                                        <attribute name="text">1</attribute>
-                                      </attributes>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVButtonBox" id="vbuttonbox3">
-                            <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <property name="layout_style">start</property>
-                            <child>
-                              <object class="GtkButton" id="button47">
-                                <property name="label">gtk-new</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="button50">
-                                <property name="label">gtk-edit</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>
-                            <child>
-                              <object class="GtkButton" id="button51">
-                                <property name="label">gtk-delete</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">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label43">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Indirizzi&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
+              <object class="GtkLabel" id="label130">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_persone</property>
               </object>
               <packing>
+                <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox10">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button39">
-                <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="button40">
-                <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>
+                <property name="top_attach">9</property>
+                <property name="bottom_attach">10</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_ufficio_nodo">
-    <property name="title" translatable="yes">Nodo superiore dell'ufficio - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox7">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkTable" id="table6">
-            <property name="visible">True</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label35">
+              <object class="GtkLabel" id="label133">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Note</property>
+                <property name="label" translatable="yes">Tipo rapporto di lavoro</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -2770,17 +2589,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow11">
+              <object class="GtkComboBox" id="combobox8">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_tipi_rapporto_lavoro</property>
                 <child>
-                  <object class="GtkTextView" id="textview4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
+                  <object class="GtkCellRendererText" id="cellrenderertext32"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
                 </child>
               </object>
               <packing>
@@ -2788,98 +2605,164 @@
                 <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label36">
+              <object class="GtkLabel" id="label134">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nodo superiore</property>
+                <property name="label" translatable="yes">Posizione economica</property>
               </object>
               <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox5">
+              <object class="GtkComboBox" id="combobox9">
                 <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkEntry" id="entry11">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button44">
-                    <property name="label" translatable="yes">...</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="position">1</property>
-                  </packing>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_posizioni_economiche</property>
                 <child>
-                  <object class="GtkLabel" id="label37">
-                    <property name="label" translatable="yes">lbl_id_nodi</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
+                  <object class="GtkCellRendererText" id="cellrenderertext33"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label38">
+              <object class="GtkLabel" id="label135">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+                <property name="label" translatable="yes">Tipo prestazione</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label22">
-                <property name="label" translatable="yes">lbl_id_uffici</property>
+              <object class="GtkComboBox" id="combobox10">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_tipi_prestazione</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext34"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label136">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Profilo professionale</property>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="combobox11">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_profili_professionali</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext35"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label144">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Descrizione</property>
+              </object>
+              <packing>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow34">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview15">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox11">
+          <object class="GtkHButtonBox" id="hbuttonbox22">
             <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="button45">
+              <object class="GtkButton" id="button98">
                 <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>
@@ -2892,8 +2775,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button46">
+              <object class="GtkButton" id="button99">
                 <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>
@@ -2908,53 +2792,57 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_ufficio_recapito">
-    <property name="title" translatable="yes">Recapito dell'ufficio - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_persona_nodo">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Nodo superiore della persona - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox8">
+      <object class="GtkVBox" id="vbox17">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table7">
+          <object class="GtkTable" id="table15">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="n_rows">5</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label34">
+              <object class="GtkLabel" id="label113">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">Note</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow12">
+              <object class="GtkScrolledWindow" id="scrolledwindow28">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkTextView" id="textview5">
+                  <object class="GtkTextView" id="textview12">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </object>
@@ -2963,15 +2851,16 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label39">
+              <object class="GtkLabel" id="label114">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tipo recapito</property>
+                <property name="label" translatable="yes">Nodo</property>
               </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
@@ -2979,7 +2868,62 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label41">
+              <object class="GtkHBox" id="hbox18">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkEntry" id="entry30">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button90">
+                    <property name="label" translatable="yes">...</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>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label115">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">lbl_id_nodi</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label116">
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">lbl_id</property>
               </object>
@@ -2991,8 +2935,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label42">
-                <property name="label" translatable="yes">lbl_id_uffici</property>
+              <object class="GtkLabel" id="label117">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_persone</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -3002,10 +2947,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label40">
+              <object class="GtkLabel" id="label118">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Recapito</property>
+                <property name="label" translatable="yes">Da data</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -3015,78 +2961,74 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry6">
+              <object class="GtkLabel" id="label119">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">100</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">A data</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="combobox2">
+              <object class="GtkEntry" id="entry31">
                 <property name="visible">True</property>
-                <property name="model">lstore_tipi_recapito</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext7"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label83">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Privato</property>
-              </object>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="checkbutton8">
+              <object class="GtkEntry" id="entry32">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox12">
+          <object class="GtkHButtonBox" id="hbuttonbox20">
             <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="button48">
+              <object class="GtkButton" id="button91">
                 <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>
@@ -3099,8 +3041,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button49">
+              <object class="GtkButton" id="button92">
                 <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>
@@ -3115,120 +3058,40 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_vie">
-    <property name="title" translatable="yes">Vie - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_persona_nodo_recapito">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Recapito del nodo - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbx_vie">
+      <object class="GtkVBox" id="vbox18">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow13">
+          <object class="GtkTable" id="table16">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">6</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
             <child>
-              <object class="GtkTreeView" id="treeview8">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_vie</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">1</property>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn10">
-                    <property name="title">Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext12"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox13">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button52">
-                <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="button53">
-                <property name="label">gtk-ok</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="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_struttura_indirizzo">
-    <property name="title" translatable="yes">Indirizzo della struttura - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox9">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkTable" id="table8">
-            <property name="visible">True</property>
-            <property name="n_rows">4</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
-            <child>
-              <object class="GtkLabel" id="label44">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label120">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">Note</property>
@@ -3241,14 +3104,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow15">
+              <object class="GtkScrolledWindow" id="scrolledwindow29">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkTextView" id="textview6">
+                  <object class="GtkTextView" id="textview13">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </object>
@@ -3262,10 +3125,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label45">
+              <object class="GtkLabel" id="label121">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Via</property>
+                <property name="label" translatable="yes">Tipo recapito</property>
               </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
@@ -3273,112 +3137,142 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox7">
-                <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkEntry" id="entry12">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button54">
-                    <property name="label" translatable="yes">...</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="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label46">
-                    <property name="label" translatable="yes">lbl_id_vie</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
+              <object class="GtkLabel" id="label122">
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label123">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_nodi</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label47">
+              <object class="GtkLabel" id="label124">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+                <property name="label" translatable="yes">Recapito</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label48">
-                <property name="label" translatable="yes">lbl_id_strutture</property>
+              <object class="GtkEntry" id="entry33">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label49">
+              <object class="GtkComboBox" id="combobox7">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_tipi_recapito</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext31"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label125">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Civico</property>
+                <property name="label" translatable="yes">Privato</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry13">
+              <object class="GtkCheckButton" id="checkbutton11">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label126">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_persone</property>
+              </object>
+              <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox14">
+          <object class="GtkHButtonBox" id="hbuttonbox21">
             <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="button55">
+              <object class="GtkButton" id="button93">
                 <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>
@@ -3391,8 +3285,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button56">
+              <object class="GtkButton" id="button94">
                 <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>
@@ -3407,51 +3302,57 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_ufficio_orario">
-    <property name="title" translatable="yes">Orario dell'ufficio - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_persona_recapito">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Recapito - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox10">
+      <object class="GtkVBox" id="vbox16">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table9">
+          <object class="GtkTable" id="table13">
             <property name="visible">True</property>
-            <property name="n_rows">10</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">5</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label50">
+              <object class="GtkLabel" id="label101">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">Descrizione</property>
+                <property name="label" translatable="yes">Note</property>
               </object>
               <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow16">
+              <object class="GtkScrolledWindow" id="scrolledwindow27">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkTextView" id="textview7">
+                  <object class="GtkTextView" id="textview11">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </object>
@@ -3460,308 +3361,354 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label52">
+              <object class="GtkLabel" id="label102">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+                <property name="label" translatable="yes">Tipo recapito</property>
               </object>
               <packing>
-                <property name="top_attach">9</property>
-                <property name="bottom_attach">10</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label53">
-                <property name="label" translatable="yes">lbl_id_uffici</property>
+              <object class="GtkLabel" id="label103">
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">9</property>
-                <property name="bottom_attach">10</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label51">
+              <object class="GtkLabel" id="label105">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Giorno della settimana</property>
+                <property name="label" translatable="yes">Recapito</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox8">
+              <object class="GtkEntry" id="entry25">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="label57">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Lun</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</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="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label58">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Mar</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label59">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Mer</property>
-                  </object>
-                  <packing>
-                    <property name="position">4</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="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">5</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label60">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Gio</property>
-                  </object>
-                  <packing>
-                    <property name="position">6</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="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">7</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label61">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Ven</property>
-                  </object>
-                  <packing>
-                    <property name="position">8</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">9</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label62">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Sab</property>
-                  </object>
-                  <packing>
-                    <property name="position">10</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">11</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label63">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Dom</property>
-                  </object>
-                  <packing>
-                    <property name="position">12</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="position">13</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label54">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Settimana</property>
-              </object>
-              <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label55">
+              <object class="GtkComboBox" id="combobox6">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Giorno del mese</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_tipi_recapito</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext23"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label56">
+              <object class="GtkLabel" id="label106">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Mese</property>
+                <property name="label" translatable="yes">Privato</property>
               </object>
               <packing>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="combobox3">
+              <object class="GtkCheckButton" id="checkbutton10">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="model">lstore_mesi</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext14"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkSpinButton" id="spinbutton1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">&#x25CF;</property>
-                <property name="adjustment">adj_week</property>
+              <object class="GtkLabel" id="label107">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_persone</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
                 <property name="top_attach">4</property>
                 <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox19">
+            <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="GtkSpinButton" id="spinbutton2">
+              <object class="GtkButton" id="button87">
+                <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="invisible_char">&#x25CF;</property>
-                <property name="adjustment">adj_dmon</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label79">
+              <object class="GtkButton" id="button88">
+                <property name="label">gtk-save</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Da data</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkEntry" id="entry15">
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_persona_ufficio">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Ufficio - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox14">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table11">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">7</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label87">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Note</property>
+              </object>
+              <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow25">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview9">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label88">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Ufficio</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox16">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkEntry" id="entry21">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button82">
+                    <property name="label" translatable="yes">...</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>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label89">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">lbl_id_uffici</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label90">
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
+              </object>
+              <packing>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label91">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_persone</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label92">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Da data</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry22">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -3772,8 +3719,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label80">
+              <object class="GtkLabel" id="label93">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">A data</property>
               </object>
@@ -3785,11 +3733,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry16">
+              <object class="GtkEntry" id="entry23">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -3800,74 +3752,88 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label81">
+              <object class="GtkLabel" id="label167">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Da ora</property>
+                <property name="label" translatable="yes">Piano</property>
               </object>
               <packing>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label82">
+              <object class="GtkEntry" id="entry46">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">A ora</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry18">
+              <object class="GtkLabel" id="label168">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">5</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Stanza</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry19">
+              <object class="GtkEntry" id="entry47">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">5</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox15">
+          <object class="GtkHButtonBox" id="hbuttonbox17">
             <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="button57">
+              <object class="GtkButton" id="button83">
                 <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>
@@ -3880,8 +3846,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button58">
+              <object class="GtkButton" id="button84">
                 <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>
@@ -3896,160 +3863,168 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adj_week">
-    <property name="upper">4</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adj_dmon">
-    <property name="upper">31</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkWindow" id="w_persona">
-    <property name="title" translatable="yes">Persona - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_persona_ufficio_recapito">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Recapito dell'ufficio - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox11">
+      <object class="GtkVBox" id="vbox15">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table10">
+          <object class="GtkTable" id="table12">
             <property name="visible">True</property>
-            <property name="n_rows">9</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">6</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label65">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label94">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Note</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry14">
+              <object class="GtkScrolledWindow" id="scrolledwindow26">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">50</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label66">
+              <object class="GtkLabel" id="label95">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Descrizione</property>
+                <property name="label" translatable="yes">Tipo recapito</property>
               </object>
               <packing>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow18">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
-                <child>
-                  <object class="GtkTextView" id="textview8">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
+              <object class="GtkLabel" id="label96">
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label67">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+              <object class="GtkLabel" id="label97">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_uffici</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label68">
+              <object class="GtkLabel" id="label98">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
+                <property name="label" translatable="yes">Recapito</property>
               </object>
               <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label72">
+              <object class="GtkEntry" id="entry24">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Cognome</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry17">
+              <object class="GtkComboBox" id="combobox5">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">50</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_tipi_recapito</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext22"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label73">
+              <object class="GtkLabel" id="label99">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Titolo</property>
+                <property name="label" translatable="yes">Privato</property>
               </object>
               <packing>
                 <property name="top_attach">3</property>
@@ -4059,15 +4034,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="combobox4">
+              <object class="GtkCheckButton" id="checkbutton9">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="model">lstore_titoli</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext38"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -4078,1069 +4050,752 @@
               </packing>
             </child>
             <child>
-              <object class="GtkNotebook" id="notebook1">
+              <object class="GtkLabel" id="label100">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_persone</property>
+              </object>
+              <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox18">
+            <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="button85">
+                <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>
+                <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="button86">
+                <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>
+                <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="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_persone">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Persone - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbx_persone">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label139">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Persone&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow32">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
+            <child>
+              <object class="GtkTreeView" id="treeview18">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="model">lstore_persone</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
                 <child>
-                  <object class="GtkFrame" id="frame10">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn28">
+                    <property name="title">Cognome/Nome</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment10">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox15">
-                            <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow24">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">automatic</property>
-                                <property name="vscrollbar_policy">automatic</property>
-                                <property name="shadow_type">etched-in</property>
-                                <child>
-                                  <object class="GtkTreeView" id="treeview16">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="model">lstore_persona_incarichi</property>
-                                    <property name="headers_clickable">False</property>
-                                    <property name="search_column">0</property>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" id="treeviewcolumn18">
-                                        <property name="title">Da data</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext21"/>
-                                          <attributes>
-                                            <attribute name="text">1</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" id="treeviewcolumn25">
-                                        <property name="title">A data</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext30"/>
-                                          <attributes>
-                                            <attribute name="text">2</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" id="treeviewcolumn32">
-                                        <property name="title">Descrizione</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext43"/>
-                                          <attributes>
-                                            <attribute name="text">3</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkVButtonBox" id="vbuttonbox10">
-                                <property name="visible">True</property>
-                                <property name="spacing">5</property>
-                                <property name="layout_style">start</property>
-                                <child>
-                                  <object class="GtkButton" id="button79">
-                                    <property name="label">gtk-new</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="button80">
-                                    <property name="label">gtk-edit</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>
-                                <child>
-                                  <object class="GtkButton" id="button81">
-                                    <property name="label">gtk-delete</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">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label86">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Incarichi&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
+                      <object class="GtkCellRendererText" id="cellrenderertext39"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
                     </child>
                   </object>
                 </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="label85">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Incarichi</property>
-                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox12">
-                    <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkFrame" id="frame7">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment7">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox12">
-                                <property name="visible">True</property>
-                                <property name="spacing">5</property>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow21">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">etched-in</property>
-                                    <child>
-                                      <object class="GtkTreeView" id="treeview13">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="model">lstore_persona_nodi</property>
-                                        <property name="headers_clickable">False</property>
-                                        <property name="search_column">0</property>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn15">
-                                            <property name="title">Tipo</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext18"/>
-                                              <attributes>
-                                                <attribute name="text">1</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn23">
-                                            <property name="title">Nodo</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext28"/>
-                                              <attributes>
-                                                <attribute name="text">2</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn30">
-                                            <property name="title">Da data</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext41"/>
-                                              <attributes>
-                                                <attribute name="text">3</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn31">
-                                            <property name="title">A data</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext42"/>
-                                              <attributes>
-                                                <attribute name="text">4</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVButtonBox" id="vbuttonbox7">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">5</property>
-                                    <property name="layout_style">start</property>
-                                    <child>
-                                      <object class="GtkButton" id="button70">
-                                        <property name="label">gtk-new</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="button71">
-                                        <property name="label">gtk-edit</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>
-                                    <child>
-                                      <object class="GtkButton" id="button72">
-                                        <property name="label">gtk-delete</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">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label70">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Nodi&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame8">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment8">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox13">
-                                <property name="visible">True</property>
-                                <property name="spacing">5</property>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow22">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">etched-in</property>
-                                    <child>
-                                      <object class="GtkTreeView" id="treeview14">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="model">lstore_persona_nodo_recapiti</property>
-                                        <property name="headers_clickable">False</property>
-                                        <property name="search_column">0</property>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn16">
-                                            <property name="title">Tipo</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext19"/>
-                                              <attributes>
-                                                <attribute name="text">1</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn24">
-                                            <property name="title">Recapito</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext29"/>
-                                              <attributes>
-                                                <attribute name="text">2</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVButtonBox" id="vbuttonbox8">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">5</property>
-                                    <property name="layout_style">start</property>
-                                    <child>
-                                      <object class="GtkButton" id="button73">
-                                        <property name="label">gtk-new</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="button74">
-                                        <property name="label">gtk-edit</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>
-                                    <child>
-                                      <object class="GtkButton" id="button75">
-                                        <property name="label">gtk-delete</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">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label77">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Recapiti&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="label74">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Nodi</property>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox13">
-                    <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkFrame" id="frame5">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment5">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox10">
-                                <property name="visible">True</property>
-                                <property name="spacing">5</property>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow19">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">etched-in</property>
-                                    <child>
-                                      <object class="GtkTreeView" id="treeview11">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="model">lstore_persona_uffici</property>
-                                        <property name="headers_clickable">False</property>
-                                        <property name="search_column">0</property>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn13">
-                                            <property name="title">Ufficio</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext16"/>
-                                              <attributes>
-                                                <attribute name="text">1</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn19">
-                                            <property name="title">Da data</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext24"/>
-                                              <attributes>
-                                                <attribute name="text">2</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn20">
-                                            <property name="title">A data</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext25"/>
-                                              <attributes>
-                                                <attribute name="text">3</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVButtonBox" id="vbuttonbox5">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">5</property>
-                                    <property name="layout_style">start</property>
-                                    <child>
-                                      <object class="GtkButton" id="button62">
-                                        <property name="label">gtk-new</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="button63">
-                                        <property name="label">gtk-edit</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>
-                                    <child>
-                                      <object class="GtkButton" id="button64">
-                                        <property name="label">gtk-delete</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">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label71">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Uffici&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame6">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <child>
-                          <object class="GtkAlignment" id="alignment6">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox11">
-                                <property name="visible">True</property>
-                                <property name="spacing">5</property>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow20">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">etched-in</property>
-                                    <child>
-                                      <object class="GtkTreeView" id="treeview12">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="model">lstore_persona_ufficio_recapiti</property>
-                                        <property name="headers_clickable">False</property>
-                                        <property name="search_column">0</property>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn14">
-                                            <property name="title">Tipo</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext17"/>
-                                              <attributes>
-                                                <attribute name="text">1</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkTreeViewColumn" id="treeviewcolumn21">
-                                            <property name="title">Recapito</property>
-                                            <child>
-                                              <object class="GtkCellRendererText" id="cellrenderertext26"/>
-                                              <attributes>
-                                                <attribute name="text">2</attribute>
-                                              </attributes>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVButtonBox" id="vbuttonbox6">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">5</property>
-                                    <property name="layout_style">start</property>
-                                    <child>
-                                      <object class="GtkButton" id="button67">
-                                        <property name="label">gtk-new</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="button68">
-                                        <property name="label">gtk-edit</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>
-                                    <child>
-                                      <object class="GtkButton" id="button69">
-                                        <property name="label">gtk-delete</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">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label69">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Recapiti&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="label75">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Uffici</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="frame9">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment9">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox14">
-                            <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow23">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">automatic</property>
-                                <property name="vscrollbar_policy">automatic</property>
-                                <property name="shadow_type">etched-in</property>
-                                <child>
-                                  <object class="GtkTreeView" id="treeview15">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="model">lstore_persona_recapiti</property>
-                                    <property name="headers_clickable">False</property>
-                                    <property name="search_column">0</property>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" id="treeviewcolumn17">
-                                        <property name="title">Tipo</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext20"/>
-                                          <attributes>
-                                            <attribute name="text">1</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" id="treeviewcolumn22">
-                                        <property name="title">Recapito</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext27"/>
-                                          <attributes>
-                                            <attribute name="text">2</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkVButtonBox" id="vbuttonbox9">
-                                <property name="visible">True</property>
-                                <property name="spacing">5</property>
-                                <property name="layout_style">start</property>
-                                <child>
-                                  <object class="GtkButton" id="button76">
-                                    <property name="label">gtk-new</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="button77">
-                                    <property name="label">gtk-edit</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>
-                                <child>
-                                  <object class="GtkButton" id="button78">
-                                    <property name="label">gtk-delete</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">2</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label78">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Recapiti&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox25">
+            <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="button102">
+                <property name="label">gtk-new</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>
+                <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="button103">
+                <property name="label">gtk-edit</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>
+                <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>
+            <child>
+              <object class="GtkButton" id="button104">
+                <property name="label">gtk-delete</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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button107">
+                <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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button108">
+                <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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_posizione_economica">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Posizione economica - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox22">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table20">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label149">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label150">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">ID</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label151">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Nome</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry39">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">50</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox29">
+            <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="button121">
+                <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>
+                <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="button122">
+                <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>
+                <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="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_posizioni_economiche">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Posizioni economiche - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbx_posizioni_economiche">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label148">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Posizioni economiche&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow35">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
+            <child>
+              <object class="GtkTreeView" id="treeview20">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">lstore_posizioni_economiche</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn33">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext44"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
                 </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="label76">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Recapiti generici</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox28">
+            <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="button116">
+                <property name="label">gtk-new</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>
+                <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="button117">
+                <property name="label">gtk-edit</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>
+                <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>
+            <child>
+              <object class="GtkButton" id="button118">
+                <property name="label">gtk-delete</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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button119">
+                <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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button120">
+                <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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_profili_professionali">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Profili professionali - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbx_profili_professionali">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label156">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Profili professionali&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow37">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
+            <child>
+              <object class="GtkTreeView" id="treeview22">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">lstore_profili_professionali</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn35">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext46"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="position">3</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
                 </child>
               </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox32">
+            <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="button130">
+                <property name="label">gtk-new</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>
+                <property name="use_stock">True</property>
+              </object>
               <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label84">
+              <object class="GtkButton" id="button131">
+                <property name="label">gtk-edit</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Data di nascita</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry20">
+              <object class="GtkButton" id="button132">
+                <property name="label">gtk-delete</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</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">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button133">
+                <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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button134">
+                <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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_profilo_professionale">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Profilo professionale - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox24">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table22">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label157">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame11">
+              <object class="GtkLabel" id="label158">
                 <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment11">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkTable" id="table14">
-                        <property name="visible">True</property>
-                        <property name="n_rows">3</property>
-                        <property name="n_columns">2</property>
-                        <property name="column_spacing">5</property>
-                        <property name="row_spacing">5</property>
-                        <child>
-                          <object class="GtkLabel" id="label108">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Indirizzo</property>
-                          </object>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry26">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label109">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Citt&#xE0;</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox17">
-                            <property name="visible">True</property>
-                            <property name="spacing">5</property>
-                            <child>
-                              <object class="GtkEntry" id="entry27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="editable">False</property>
-                                <property name="invisible_char">&#x25CF;</property>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="button89">
-                                <property name="label" translatable="yes">...</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="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label110">
-                                <property name="label" translatable="yes">lbl_id_citta</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label112">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">CAP</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry29">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="max_length">5</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label104">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Residenza&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">ID</property>
               </object>
               <packing>
-                <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label111">
+              <object class="GtkLabel" id="label159">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Codice fiscale</property>
+                <property name="label" translatable="yes">Nome</property>
               </object>
               <packing>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry28">
+              <object class="GtkEntry" id="entry42">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">50</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox16">
+          <object class="GtkHButtonBox" id="hbuttonbox33">
             <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="button65">
+              <object class="GtkButton" id="button135">
                 <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>
@@ -5153,8 +4808,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button66">
+              <object class="GtkButton" id="button136">
                 <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>
@@ -5169,267 +4825,337 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_persona_ufficio">
-    <property name="title" translatable="yes">Ufficio - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_struttura">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Struttura - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">450</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox14">
+      <object class="GtkVBox" id="vbox6">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table11">
+          <object class="GtkTable" id="table5">
             <property name="visible">True</property>
-            <property name="n_rows">7</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">6</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label87">
+              <object class="GtkLabel" id="label27">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Note</property>
+                <property name="label" translatable="yes">Nome</property>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow25">
+              <object class="GtkEntry" id="entry8">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
-                <child>
-                  <object class="GtkTextView" id="textview9">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
+                <property name="max_length">100</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label88">
+              <object class="GtkLabel" id="label28">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Ufficio</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Descrizione</property>
               </object>
               <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox16">
+              <object class="GtkScrolledWindow" id="scrolledwindow8">
                 <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkEntry" id="entry21">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkButton" id="button82">
-                    <property name="label" translatable="yes">...</property>
+                  <object class="GtkTextView" id="textview3">
                     <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="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label89">
-                    <property name="label" translatable="yes">lbl_id_uffici</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label90">
+              <object class="GtkLabel" id="label31">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">lbl_id</property>
               </object>
-              <packing>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label91">
-                <property name="label" translatable="yes">lbl_id_persone</property>
-              </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label92">
+              <object class="GtkLabel" id="label32">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Da data</property>
+                <property name="label" translatable="yes">ID</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry22">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label93">
+              <object class="GtkLabel" id="label30">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">A data</property>
+                <property name="label" translatable="yes">Prefisso centralino</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry23">
+              <object class="GtkEntry" id="entry9">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">20</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label167">
+              <object class="GtkLabel" id="label33">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Piano</property>
+                <property name="label" translatable="yes">Interno centralino</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry46">
+              <object class="GtkEntry" id="entry10">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label168">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Stanza</property>
-              </object>
-              <packing>
                 <property name="top_attach">4</property>
                 <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry47">
+              <object class="GtkFrame" id="frame3">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</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="GtkHBox" id="hbox6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow14">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">etched-in</property>
+                            <child>
+                              <object class="GtkTreeView" id="treeview9">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">lstore_struttura_indirizzi</property>
+                                <property name="headers_clickable">False</property>
+                                <property name="search_column">0</property>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn11">
+                                    <property name="title">Indirizzo</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext13"/>
+                                      <attributes>
+                                        <attribute name="text">1</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="GtkVButtonBox" id="vbuttonbox3">
+                            <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="button47">
+                                <property name="label">gtk-new</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>
+                                <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="button50">
+                                <property name="label">gtk-edit</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>
+                                <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>
+                            <child>
+                              <object class="GtkButton" id="button51">
+                                <property name="label">gtk-delete</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>
+                                <property name="use_stock">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label43">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Indirizzi&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox17">
+          <object class="GtkHButtonBox" id="hbuttonbox10">
             <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="button83">
+              <object class="GtkButton" id="button39">
                 <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>
@@ -5442,8 +5168,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button84">
+              <object class="GtkButton" id="button40">
                 <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>
@@ -5458,33 +5185,37 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_persona_ufficio_recapito">
-    <property name="title" translatable="yes">Recapito dell'ufficio - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_struttura_indirizzo">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Indirizzo della struttura - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox15">
+      <object class="GtkVBox" id="vbox9">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table12">
+          <object class="GtkTable" id="table8">
             <property name="visible">True</property>
-            <property name="n_rows">6</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">4</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label94">
+              <object class="GtkLabel" id="label44">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">Note</property>
@@ -5497,14 +5228,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow26">
+              <object class="GtkScrolledWindow" id="scrolledwindow15">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">automatic</property>
                 <property name="vscrollbar_policy">automatic</property>
                 <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkTextView" id="textview10">
+                  <object class="GtkTextView" id="textview6">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                   </object>
@@ -5518,10 +5249,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label95">
+              <object class="GtkLabel" id="label45">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tipo recapito</property>
+                <property name="label" translatable="yes">Via</property>
               </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
@@ -5529,35 +5261,90 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label96">
+              <object class="GtkHBox" id="hbox7">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkEntry" id="entry12">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button54">
+                    <property name="label" translatable="yes">...</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>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label46">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">lbl_id_vie</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label47">
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label97">
-                <property name="label" translatable="yes">lbl_id_uffici</property>
+              <object class="GtkLabel" id="label48">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_strutture</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label98">
+              <object class="GtkLabel" id="label49">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Recapito</property>
+                <property name="label" translatable="yes">Civico</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -5567,11 +5354,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry24">
+              <object class="GtkEntry" id="entry13">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">100</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -5581,78 +5372,175 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox14">
+            <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="GtkComboBox" id="combobox5">
+              <object class="GtkButton" id="button55">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="model">lstore_tipi_recapito</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext22"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label99">
+              <object class="GtkButton" id="button56">
+                <property name="label">gtk-save</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Privato</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <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>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_strutture">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Strutture - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbx_strutture">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label26">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Strutture&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow7">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
+            <child>
+              <object class="GtkTreeView" id="treeview5">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">lstore_strutture</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn5">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext6"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox9">
+            <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="GtkCheckButton" id="checkbutton9">
+              <object class="GtkButton" id="button32">
+                <property name="label">gtk-new</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label100">
-                <property name="label" translatable="yes">lbl_id_persone</property>
+              <object class="GtkButton" id="button33">
+                <property name="label">gtk-edit</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>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkButton" id="button34">
+                <property name="label">gtk-delete</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>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox18">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button85">
+              <object class="GtkButton" id="button35">
                 <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>
@@ -5661,12 +5549,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button86">
-                <property name="label">gtk-save</property>
+              <object class="GtkButton" id="button36">
+                <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>
@@ -5675,193 +5564,287 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">1</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_persona_recapito">
-    <property name="title" translatable="yes">Recapito - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_tipi_nodo">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tipi nodo - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox16">
+      <object class="GtkVBox" id="vbx_tipi_nodo">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table13">
+          <object class="GtkLabel" id="label7">
             <property name="visible">True</property>
-            <property name="n_rows">5</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Tipi nodo&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow3">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkLabel" id="label101">
+              <object class="GtkTreeView" id="treeview2">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Note</property>
+                <property name="can_focus">True</property>
+                <property name="model">lstore_tipi_nodo</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox4">
+            <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="GtkScrolledWindow" id="scrolledwindow27">
+              <object class="GtkButton" id="button7">
+                <property name="label">gtk-new</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
-                <child>
-                  <object class="GtkTextView" id="textview11">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label102">
+              <object class="GtkButton" id="button10">
+                <property name="label">gtk-edit</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tipo recapito</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label103">
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+              <object class="GtkButton" id="button11">
+                <property name="label">gtk-delete</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>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label105">
+              <object class="GtkButton" id="button12">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Recapito</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry25">
+              <object class="GtkButton" id="button13">
+                <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="max_length">100</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_tipi_prestazione">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tipi prestazione - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbx_tipi_prestazione">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="label152">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Tipi prestazione&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow36">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkComboBox" id="combobox6">
+              <object class="GtkTreeView" id="treeview21">
                 <property name="visible">True</property>
-                <property name="model">lstore_tipi_recapito</property>
+                <property name="can_focus">True</property>
+                <property name="model">lstore_tipi_prestazione</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
                 <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext23"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn34">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext45"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
                 </child>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox30">
+            <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="GtkLabel" id="label106">
+              <object class="GtkButton" id="button123">
+                <property name="label">gtk-new</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Privato</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="checkbutton10">
+              <object class="GtkButton" id="button124">
+                <property name="label">gtk-edit</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label107">
-                <property name="label" translatable="yes">lbl_id_persone</property>
+              <object class="GtkButton" id="button125">
+                <property name="label">gtk-delete</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>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox19">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button87">
+              <object class="GtkButton" id="button126">
                 <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>
@@ -5870,12 +5853,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button88">
-                <property name="label">gtk-save</property>
+              <object class="GtkButton" id="button127">
+                <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>
@@ -5884,217 +5868,135 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">1</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_persona_nodo">
-    <property name="title" translatable="yes">Nodo superiore della persona - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_tipi_rapporto_lavoro">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tipi rapporto di lavoro - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox17">
+      <object class="GtkVBox" id="vbx_tipi_rapporto_lavoro">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table15">
+          <object class="GtkLabel" id="label143">
             <property name="visible">True</property>
-            <property name="n_rows">5</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
-            <child>
-              <object class="GtkLabel" id="label113">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Note</property>
-              </object>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Tipi rapporto di lavoro&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow33">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow28">
+              <object class="GtkTreeView" id="treeview19">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
-                <child>
-                  <object class="GtkTextView" id="textview12">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label114">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nodo</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox18">
-                <property name="visible">True</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkEntry" id="entry30">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button90">
-                    <property name="label" translatable="yes">...</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="position">1</property>
-                  </packing>
-                </child>
+                <property name="model">lstore_tipi_rapporto_lavoro</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
                 <child>
-                  <object class="GtkLabel" id="label115">
-                    <property name="label" translatable="yes">lbl_id_nodi</property>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn29">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext40"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label116">
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
-              </object>
-              <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label117">
-                <property name="label" translatable="yes">lbl_id_persone</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label118">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Da data</property>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox26">
+            <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="GtkLabel" id="label119">
+              <object class="GtkButton" id="button109">
+                <property name="label">gtk-new</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">A data</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry31">
+              <object class="GtkButton" id="button110">
+                <property name="label">gtk-edit</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry32">
+              <object class="GtkButton" id="button111">
+                <property name="label">gtk-delete</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox20">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button91">
+              <object class="GtkButton" id="button112">
                 <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>
@@ -6103,12 +6005,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button92">
-                <property name="label">gtk-save</property>
+              <object class="GtkButton" id="button113">
+                <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>
@@ -6117,207 +6020,273 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">1</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_persona_nodo_recapito">
-    <property name="title" translatable="yes">Recapito del nodo - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_tipi_recapito">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tipi recapito - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox18">
+      <object class="GtkVBox" id="vbx_tipi_recapito">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table16">
+          <object class="GtkLabel" id="label13">
             <property name="visible">True</property>
-            <property name="n_rows">6</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
-            <child>
-              <object class="GtkLabel" id="label120">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Note</property>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Tipi recapito&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow4">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow29">
+              <object class="GtkTreeView" id="treeview3">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
+                <property name="model">lstore_tipi_recapito</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">0</property>
                 <child>
-                  <object class="GtkTextView" id="textview13">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext4"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-              </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox5">
+            <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="GtkLabel" id="label121">
+              <object class="GtkButton" id="button16">
+                <property name="label">gtk-new</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tipo recapito</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label122">
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+              <object class="GtkButton" id="button17">
+                <property name="label">gtk-edit</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>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label123">
-                <property name="label" translatable="yes">lbl_id_nodi</property>
+              <object class="GtkButton" id="button18">
+                <property name="label">gtk-delete</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>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label124">
+              <object class="GtkButton" id="button19">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Recapito</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry33">
+              <object class="GtkButton" id="button20">
+                <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="max_length">100</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_tipo_nodo">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tipo nodo - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <placeholder/>
+            </child>
             <child>
-              <object class="GtkComboBox" id="combobox7">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
-                <property name="model">lstore_tipi_recapito</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext31"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Nome</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label125">
+              <object class="GtkEntry" id="entry3">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Privato</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="checkbutton11">
+              <object class="GtkLabel" id="label12">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label126">
-                <property name="label" translatable="yes">lbl_id_persone</property>
+              <object class="GtkLabel" id="label9">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">ID</property>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox21">
+          <object class="GtkHButtonBox" id="hbuttonbox3">
             <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="button93">
+              <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>
@@ -6330,8 +6299,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button94">
+              <object class="GtkButton" id="button9">
                 <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>
@@ -6346,47 +6316,39 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_persona_incarico">
-    <property name="title" translatable="yes">Incarico - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_tipo_prestazione">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tipo prestazione - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox19">
+      <object class="GtkVBox" id="vbox23">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table17">
+          <object class="GtkTable" id="table21">
             <property name="visible">True</property>
-            <property name="n_rows">10</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label127">
+              <object class="GtkLabel" id="label153">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Matricola</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry34">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">20</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -6395,297 +6357,336 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label128">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Note</property>
-              </object>
-              <packing>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow30">
+              <object class="GtkLabel" id="label154">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
-                <child>
-                  <object class="GtkTextView" id="textview14">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">8</property>
-                <property name="bottom_attach">9</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label129">
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+                <property name="label" translatable="yes">ID</property>
               </object>
               <packing>
-                <property name="top_attach">9</property>
-                <property name="bottom_attach">10</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label131">
+              <object class="GtkLabel" id="label155">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Da data</property>
+                <property name="label" translatable="yes">Nome</property>
               </object>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry35">
+              <object class="GtkEntry" id="entry41">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">50</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox31">
+            <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="GtkLabel" id="label132">
+              <object class="GtkButton" id="button128">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">A data</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry36">
+              <object class="GtkButton" id="button129">
+                <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="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
-                <property name="y_options">GTK_FILL</property>
+                <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>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_tipo_rapporto_lavoro">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tipo rapporto lavoro - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox21">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table19">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label130">
-                <property name="label" translatable="yes">lbl_id_persone</property>
+              <object class="GtkLabel" id="label145">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">9</property>
-                <property name="bottom_attach">10</property>
-                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label133">
+              <object class="GtkLabel" id="label146">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tipo rapporto di lavoro</property>
+                <property name="label" translatable="yes">ID</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="combobox8">
+              <object class="GtkLabel" id="label147">
                 <property name="visible">True</property>
-                <property name="model">lstore_tipi_rapporto_lavoro</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext32"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Nome</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label134">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Posizione economica</property>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="combobox9">
+              <object class="GtkEntry" id="entry40">
                 <property name="visible">True</property>
-                <property name="model">lstore_posizioni_economiche</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext33"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="max_length">50</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox27">
+            <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="GtkLabel" id="label135">
+              <object class="GtkButton" id="button114">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tipo prestazione</property>
-              </object>
-              <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</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="GtkComboBox" id="combobox10">
+              <object class="GtkButton" id="button115">
+                <property name="label">gtk-save</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="model">lstore_tipi_prestazione</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext34"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
+                <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>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_tipo_recapito">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Tipo recapito - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">3</property>
+            <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="label136">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label14">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Profilo professionale</property>
+                <property name="label" translatable="yes">Nome</property>
               </object>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="combobox11">
+              <object class="GtkEntry" id="entry4">
                 <property name="visible">True</property>
-                <property name="model">lstore_profili_professionali</property>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext35"/>
-                  <attributes>
-                    <attribute name="text">1</attribute>
-                  </attributes>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label144">
+              <object class="GtkLabel" id="label15">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label" translatable="yes">Descrizione</property>
+                <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow34">
+              <object class="GtkLabel" id="label16">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">etched-in</property>
-                <child>
-                  <object class="GtkTextView" id="textview15">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">ID</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox22">
+          <object class="GtkHButtonBox" id="hbuttonbox6">
             <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="button98">
+              <object class="GtkButton" id="button21">
                 <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>
@@ -6698,8 +6699,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button99">
+              <object class="GtkButton" id="button22">
                 <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>
@@ -6714,6 +6716,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -6721,6 +6724,7 @@
     </child>
   </object>
   <object class="GtkWindow" id="w_titoli">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Titoli - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
@@ -6730,17 +6734,19 @@
     <child>
       <object class="GtkVBox" id="vbx_titoli">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkLabel" id="label137">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">&lt;b&gt;Titoli&lt;/b&gt;</property>
             <property name="use_markup">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -6784,17 +6790,21 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox23">
             <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="button95">
                 <property name="label">gtk-new</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>
@@ -6809,6 +6819,7 @@
             <child>
               <object class="GtkButton" id="button96">
                 <property name="label">gtk-edit</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>
@@ -6823,6 +6834,7 @@
             <child>
               <object class="GtkButton" id="button97">
                 <property name="label">gtk-delete</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>
@@ -6837,6 +6849,7 @@
             <child>
               <object class="GtkButton" id="button100">
                 <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>
@@ -6851,6 +6864,7 @@
             <child>
               <object class="GtkButton" id="button101">
                 <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>
@@ -6865,6 +6879,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -6872,6 +6887,7 @@
     </child>
   </object>
   <object class="GtkWindow" id="w_titolo">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Titolo - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
@@ -6879,12 +6895,13 @@
     <child>
       <object class="GtkVBox" id="vbox20">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkTable" id="table18">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="n_rows">3</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
@@ -6892,6 +6909,7 @@
             <child>
               <object class="GtkLabel" id="label138">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Sigla</property>
               </object>
@@ -6907,7 +6925,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -6920,6 +6942,7 @@
             <child>
               <object class="GtkLabel" id="label140">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">lbl_id</property>
               </object>
@@ -6932,6 +6955,7 @@
             <child>
               <object class="GtkLabel" id="label141">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">ID</property>
               </object>
@@ -6943,6 +6967,7 @@
             <child>
               <object class="GtkLabel" id="label142">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Descrizione</property>
               </object>
@@ -6958,7 +6983,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">50</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -6970,157 +6999,21 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox24">
             <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="button105">
-                <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="button106">
-                <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="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_persone">
-    <property name="title" translatable="yes">Persone - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbx_persone">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label139">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Persone&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow32">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
-            <child>
-              <object class="GtkTreeView" id="treeview18">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_persone</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn28">
-                    <property name="title">Cognome/Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext39"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox25">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button102">
-                <property name="label">gtk-new</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="button103">
-                <property name="label">gtk-edit</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>
-            <child>
-              <object class="GtkButton" id="button104">
-                <property name="label">gtk-delete</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">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button107">
+              <object class="GtkButton" id="button105">
                 <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>
@@ -7129,12 +7022,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">3</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button108">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="button106">
+                <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>
@@ -7143,61 +7037,65 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">4</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">2</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_tipi_rapporto_lavoro">
-    <property name="title" translatable="yes">Tipi rapporto di lavoro - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_uffici">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Uffici - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">500</property>
     <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbx_tipi_rapporto_lavoro">
+      <object class="GtkVBox" id="vbx_uffici">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkLabel" id="label143">
+          <object class="GtkLabel" id="label17">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Tipi rapporto di lavoro&lt;/b&gt;</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">&lt;b&gt;Uffici&lt;/b&gt;</property>
             <property name="use_markup">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow33">
+          <object class="GtkScrolledWindow" id="scrolledwindow5">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">automatic</property>
             <property name="vscrollbar_policy">automatic</property>
             <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkTreeView" id="treeview19">
+              <object class="GtkTreeView" id="treeview4">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="model">lstore_tipi_rapporto_lavoro</property>
+                <property name="model">lstore_uffici</property>
                 <property name="headers_clickable">False</property>
                 <property name="search_column">0</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn29">
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn4">
                     <property name="title">Nome</property>
                     <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext40"/>
+                      <object class="GtkCellRendererText" id="cellrenderertext5"/>
                       <attributes>
                         <attribute name="text">1</attribute>
                       </attributes>
@@ -7208,17 +7106,21 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox26">
+          <object class="GtkHButtonBox" id="hbuttonbox7">
             <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="button109">
+              <object class="GtkButton" id="button23">
                 <property name="label">gtk-new</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>
@@ -7231,8 +7133,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button110">
+              <object class="GtkButton" id="button24">
                 <property name="label">gtk-edit</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>
@@ -7245,8 +7148,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button111">
+              <object class="GtkButton" id="button25">
                 <property name="label">gtk-delete</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>
@@ -7259,8 +7163,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button112">
+              <object class="GtkButton" id="button26">
                 <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>
@@ -7273,8 +7178,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button113">
+              <object class="GtkButton" id="button27">
                 <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>
@@ -7289,192 +7195,759 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_tipo_rapporto_lavoro">
-    <property name="title" translatable="yes">Tipo rapporto lavoro - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_ufficio">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Ufficio - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox21">
+      <object class="GtkVBox" id="vbox5">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table19">
+          <object class="GtkTable" id="table4">
             <property name="visible">True</property>
-            <property name="n_rows">2</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">8</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label145">
+              <object class="GtkLabel" id="label19">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Nome</property>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry5">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label20">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Descrizione</property>
+              </object>
+              <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow6">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label23">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">lbl_id</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label24">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">ID</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label18">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Struttura</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkEntry" id="entry7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button31">
+                    <property name="label" translatable="yes">...</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>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label25">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">lbl_id_strutture</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <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="left_padding">12</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow9">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">etched-in</property>
+                            <child>
+                              <object class="GtkTreeView" id="treeview6">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">lstore_ufficio_recapiti</property>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn6">
+                                    <property name="title">Tipo</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext8"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn7">
+                                    <property name="title">Recapito</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext9"/>
+                                      <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="GtkVButtonBox" id="vbuttonbox1">
+                            <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="button37">
+                                <property name="label">gtk-new</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>
+                                <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="button38">
+                                <property name="label">gtk-edit</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>
+                                <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>
+                            <child>
+                              <object class="GtkButton" id="button41">
+                                <property name="label">gtk-delete</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>
+                                <property name="use_stock">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label29">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Recapiti&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
                 <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label146">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label147">
+              <object class="GtkFrame" id="frame2">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow10">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">etched-in</property>
+                            <child>
+                              <object class="GtkTreeView" id="treeview7">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">lstore_ufficio_nodi</property>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn8">
+                                    <property name="title">Tipo</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext10"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn9">
+                                    <property name="title">Nodo</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext11"/>
+                                      <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="GtkVButtonBox" id="vbuttonbox2">
+                            <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="button28">
+                                <property name="label">gtk-new</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>
+                                <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="button42">
+                                <property name="label">gtk-edit</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>
+                                <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>
+                            <child>
+                              <object class="GtkButton" id="button43">
+                                <property name="label">gtk-delete</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>
+                                <property name="use_stock">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label21">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Nodi superiori&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
+                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
                 <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry40">
+              <object class="GtkFrame" id="frame4">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="max_length">50</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox9">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow17">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">etched-in</property>
+                            <child>
+                              <object class="GtkTreeView" id="treeview10">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">lstore_ufficio_orari</property>
+                                <property name="headers_clickable">False</property>
+                                <property name="search_column">0</property>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn12">
+                                    <property name="title">Orario</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext15"/>
+                                      <attributes>
+                                        <attribute name="text">1</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="GtkVButtonBox" id="vbuttonbox4">
+                            <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="button59">
+                                <property name="label">gtk-new</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>
+                                <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="button60">
+                                <property name="label">gtk-edit</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>
+                                <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>
+                            <child>
+                              <object class="GtkButton" id="button61">
+                                <property name="label">gtk-delete</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>
+                                <property name="use_stock">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label64">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Orari&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox27">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button114">
-                <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="button115">
-                <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>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_posizioni_economiche">
-    <property name="title" translatable="yes">Posizioni economiche - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbx_posizioni_economiche">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label148">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Posizioni economiche&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow35">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkTreeView" id="treeview20">
+              <object class="GtkFrame" id="frame12">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_posizioni_economiche</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
+                <property name="can_focus">False</property>
+                <property name="label_xalign">0</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn33">
-                    <property name="title">Nome</property>
+                  <object class="GtkAlignment" id="alignment12">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext44"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
+                      <object class="GtkHBox" id="hbox19">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow39">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="shadow_type">etched-in</property>
+                            <child>
+                              <object class="GtkTreeView" id="treeview23">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="model">lstore_ufficio_stanze</property>
+                                <property name="headers_clickable">False</property>
+                                <property name="search_column">0</property>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn36">
+                                    <property name="title">Piano</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext47"/>
+                                      <attributes>
+                                        <attribute name="text">1</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn37">
+                                    <property name="title">Da stanza</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext48"/>
+                                      <attributes>
+                                        <attribute name="text">2</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="treeviewcolumn38">
+                                    <property name="title">A stanza</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="cellrenderertext49"/>
+                                      <attributes>
+                                        <attribute name="text">3</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="GtkVButtonBox" id="vbuttonbox11">
+                            <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="button137">
+                                <property name="label">gtk-new</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>
+                                <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="button140">
+                                <property name="label">gtk-edit</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>
+                                <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>
+                            <child>
+                              <object class="GtkButton" id="button141">
+                                <property name="label">gtk-delete</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>
+                                <property name="use_stock">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
                     </child>
                   </object>
                 </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label166">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Stanze&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox28">
+          <object class="GtkHButtonBox" id="hbuttonbox8">
             <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="button116">
-                <property name="label">gtk-new</property>
+              <object class="GtkButton" id="button29">
+                <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>
@@ -7487,8 +7960,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button117">
-                <property name="label">gtk-edit</property>
+              <object class="GtkButton" id="button30">
+                <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>
@@ -7500,23 +7974,180 @@
                 <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>
+  </object>
+  <object class="GtkWindow" id="w_ufficio_nodo">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Nodo superiore dell'ufficio - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbox7">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table6">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
             <child>
-              <object class="GtkButton" id="button118">
-                <property name="label">gtk-delete</property>
+              <object class="GtkLabel" id="label35">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Note</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow11">
                 <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="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button119">
+              <object class="GtkLabel" id="label36">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Nodo superiore</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkEntry" id="entry11">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="invisible_char">●</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="button44">
+                    <property name="label" translatable="yes">...</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>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label37">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">lbl_id_nodi</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label38">
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label22">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_uffici</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox11">
+            <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="button45">
                 <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>
@@ -7525,12 +8156,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">3</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button120">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="button46">
+                <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>
@@ -7539,320 +8171,416 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">4</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">2</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_posizione_economica">
-    <property name="title" translatable="yes">Posizione economica - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_ufficio_orario">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Orario dell'ufficio - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox22">
+      <object class="GtkVBox" id="vbox10">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table20">
+          <object class="GtkTable" id="table9">
             <property name="visible">True</property>
-            <property name="n_rows">2</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">10</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label149">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label150">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label151">
+              <object class="GtkLabel" id="label50">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Descrizione</property>
               </object>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry39">
+              <object class="GtkScrolledWindow" id="scrolledwindow16">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">50</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox29">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button121">
-                <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 class="GtkLabel" id="label52">
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
+              </object>
+              <packing>
+                <property name="top_attach">9</property>
+                <property name="bottom_attach">10</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label53">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_uffici</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">9</property>
+                <property name="bottom_attach">10</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button122">
-                <property name="label">gtk-save</property>
+              <object class="GtkLabel" id="label51">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">Giorno della settimana</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_tipi_prestazione">
-    <property name="title" translatable="yes">Tipi prestazione - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbx_tipi_prestazione">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label152">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Tipi prestazione&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow36">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkTreeView" id="treeview21">
+              <object class="GtkHBox" id="hbox8">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_tipi_prestazione</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn34">
-                    <property name="title">Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext45"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
+                  <object class="GtkLabel" id="label57">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Lun</property>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </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>
+                    <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>
+                <child>
+                  <object class="GtkLabel" id="label58">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Mar</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </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>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label59">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Mer</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">4</property>
+                  </packing>
+                </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>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label60">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Gio</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">6</property>
+                  </packing>
+                </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>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label61">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Ven</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="checkbutton5">
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">9</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label62">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Sab</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">10</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="checkbutton6">
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">11</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label63">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Dom</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">12</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="checkbutton7">
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">13</property>
+                  </packing>
                 </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox30">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button123">
-                <property name="label">gtk-new</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>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button124">
-                <property name="label">gtk-edit</property>
+              <object class="GtkLabel" id="label54">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">Settimana</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button125">
-                <property name="label">gtk-delete</property>
+              <object class="GtkLabel" id="label55">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">Giorno del mese</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button126">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkLabel" id="label56">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">Mese</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button127">
-                <property name="label">gtk-ok</property>
+              <object class="GtkComboBox" id="combobox3">
                 <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="model">lstore_mesi</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext14"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">4</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_tipo_prestazione">
-    <property name="title" translatable="yes">Tipo prestazione - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox23">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkTable" id="table21">
-            <property name="visible">True</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">5</property>
-            <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label153">
+              <object class="GtkSpinButton" id="spinbutton1">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <property name="adjustment">adj_week</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label154">
+              <object class="GtkSpinButton" id="spinbutton2">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+                <property name="adjustment">adj_dmon</property>
               </object>
               <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label155">
+              <object class="GtkLabel" id="label79">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
+                <property name="label" translatable="yes">Da data</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -7862,11 +8590,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry41">
+              <object class="GtkEntry" id="entry15">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">50</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -7876,159 +8608,122 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox31">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button128">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkLabel" id="label80">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">A data</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button129">
-                <property name="label">gtk-save</property>
+              <object class="GtkEntry" id="entry16">
                 <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="max_length">10</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">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="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="w_profili_professionali">
-    <property name="title" translatable="yes">Profili professionali - Gestione organigramma</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="destroy_with_parent">True</property>
-    <child>
-      <object class="GtkVBox" id="vbx_profili_professionali">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkLabel" id="label156">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">&lt;b&gt;Profili professionali&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow37">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">etched-in</property>
             <child>
-              <object class="GtkTreeView" id="treeview22">
+              <object class="GtkLabel" id="label81">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">lstore_profili_professionali</property>
-                <property name="headers_clickable">False</property>
-                <property name="search_column">0</property>
-                <child>
-                  <object class="GtkTreeViewColumn" id="treeviewcolumn35">
-                    <property name="title">Nome</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext46"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Da ora</property>
               </object>
+              <packing>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox32">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button130">
-                <property name="label">gtk-new</property>
+              <object class="GtkLabel" id="label82">
                 <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="xalign">0</property>
+                <property name="label" translatable="yes">A ora</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="top_attach">8</property>
+                <property name="bottom_attach">9</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button131">
-                <property name="label">gtk-edit</property>
+              <object class="GtkEntry" id="entry18">
                 <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="max_length">5</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">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="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>
             <child>
-              <object class="GtkButton" id="button132">
-                <property name="label">gtk-delete</property>
+              <object class="GtkEntry" id="entry19">
                 <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="max_length">5</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">8</property>
+                <property name="bottom_attach">9</property>
+                <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox15">
+            <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="button133">
+              <object class="GtkButton" id="button57">
                 <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>
@@ -8037,12 +8732,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">3</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button134">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="button58">
+                <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>
@@ -8051,53 +8747,81 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">4</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">2</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="w_profilo_professionale">
-    <property name="title" translatable="yes">Profilo professionale - Gestione organigramma</property>
+  <object class="GtkWindow" id="w_ufficio_recapito">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Recapito dell'ufficio - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <child>
-      <object class="GtkVBox" id="vbox24">
+      <object class="GtkVBox" id="vbox8">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
-          <object class="GtkTable" id="table22">
+          <object class="GtkTable" id="table7">
             <property name="visible">True</property>
-            <property name="n_rows">2</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">5</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
             <child>
-              <object class="GtkLabel" id="label157">
+              <object class="GtkLabel" id="label34">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">lbl_id</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Note</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow12">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTextView" id="textview5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label158">
+              <object class="GtkLabel" id="label39">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">ID</property>
+                <property name="label" translatable="yes">Tipo recapito</property>
               </object>
               <packing>
                 <property name="x_options">GTK_FILL</property>
@@ -8105,10 +8829,36 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label159">
+              <object class="GtkLabel" id="label41">
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">lbl_id</property>
+              </object>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label42">
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">lbl_id_uffici</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label40">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Nome</property>
+                <property name="label" translatable="yes">Recapito</property>
               </object>
               <packing>
                 <property name="top_attach">1</property>
@@ -8118,11 +8868,15 @@
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="entry42">
+              <object class="GtkEntry" id="entry6">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="max_length">50</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="max_length">100</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -8132,19 +8886,71 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkComboBox" id="combobox2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="model">lstore_tipi_recapito</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext7"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label83">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Privato</property>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="checkbutton8">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox33">
+          <object class="GtkHButtonBox" id="hbuttonbox12">
             <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="button135">
+              <object class="GtkButton" id="button48">
                 <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>
@@ -8157,8 +8963,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button136">
+              <object class="GtkButton" id="button49">
                 <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>
@@ -8173,6 +8980,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -8180,6 +8988,7 @@
     </child>
   </object>
   <object class="GtkWindow" id="w_ufficio_stanza">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Stanze dell'ufficio - Gestione organigramma</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
@@ -8187,12 +8996,13 @@
     <child>
       <object class="GtkVBox" id="vbox25">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">5</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkTable" id="table23">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="n_rows">5</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
@@ -8200,6 +9010,7 @@
             <child>
               <object class="GtkLabel" id="label160">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="label" translatable="yes">Note</property>
@@ -8235,6 +9046,7 @@
             <child>
               <object class="GtkLabel" id="label161">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Da stanza</property>
               </object>
@@ -8247,6 +9059,7 @@
             </child>
             <child>
               <object class="GtkLabel" id="label163">
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">lbl_id</property>
               </object>
@@ -8259,6 +9072,7 @@
             </child>
             <child>
               <object class="GtkLabel" id="label164">
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">lbl_id_uffici</property>
               </object>
               <packing>
@@ -8271,6 +9085,7 @@
             <child>
               <object class="GtkLabel" id="label165">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Piano</property>
               </object>
@@ -8284,7 +9099,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -8297,7 +9116,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -8310,6 +9133,7 @@
             <child>
               <object class="GtkLabel" id="label162">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">A stanza</property>
               </object>
@@ -8325,7 +9149,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x25CF;</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -8337,17 +9165,21 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox34">
             <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="button138">
                 <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>
@@ -8362,6 +9194,101 @@
             <child>
               <object class="GtkButton" id="button139">
                 <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>
+                <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="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="w_vie">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Vie - Gestione organigramma</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">500</property>
+    <property name="default_height">400</property>
+    <property name="destroy_with_parent">True</property>
+    <child>
+      <object class="GtkVBox" id="vbx_vie">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow13">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <property name="shadow_type">etched-in</property>
+            <child>
+              <object class="GtkTreeView" id="treeview8">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">lstore_vie</property>
+                <property name="headers_clickable">False</property>
+                <property name="search_column">1</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="treeviewcolumn10">
+                    <property name="title">Nome</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext12"/>
+                      <attributes>
+                        <attribute name="text">1</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="GtkHButtonBox" id="hbuttonbox13">
+            <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="button52">
+                <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>
+                <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="button53">
+                <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>
@@ -8376,6 +9303,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>

diff --git a/src/commons.h b/src/commons.h
index 94772d3e84f2006b1b585bfaa10375fd26c4e030..e3db5f1f57f22a4a070c6673e282325c88ae7655 100644 (file)
--- a/src/commons.h
+++ b/src/commons.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Andrea Zagli <a.zagli@comune.scandicci.fi.it>
+ * Copyright (C) 2010-2012 Andrea Zagli <a.zagli@comune.scandicci.fi.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
        #include <config.h>
 #endif
 
-#ifndef __COMMONS_H__
-#define __COMMONS_H__
+#ifndef __ORGANIGRAMMA_COMMONS_H__
+#define __ORGANIGRAMMA_COMMONS_H__
 
 #include <gtk/gtk.h>
 
@@ -39,4 +39,4 @@ typedef struct
                const gchar *guifile;
        } OrganigrammaCommons;
 
-#endif /* __COMMONS_H__ */
+#endif /* __ORGANIGRAMMA_COMMONS_H__ */

diff --git a/src/main.c b/src/main.c
index e6a67cf6d629b8038427b9150e160b3b7bec82b9..3c6f875cd4b0d480eafe93c66590b6dc17944c4f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Andrea Zagli <a.zagli@comune.scandicci.fi.it>
+ * Copyright (C) 2010-2012 Andrea Zagli <a.zagli@comune.scandicci.fi.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -66,9 +66,9 @@ on_mnu_view_nodi_activate (GtkMenuItem *menuitem,
 {
        GtkWidget *vbx;
 
-       Nodi *m = nodi_new (commons, FALSE);
+       OrganigrammaNodi *m = organigramma_nodi_new (commons, FALSE);
 
-       vbx = nodi_get_widget (m);
+       vbx = organigramma_nodi_get_widget (m);
 
        main_set_vbx_body_child (vbx);
 }
@@ -79,9 +79,9 @@ on_mnu_view_strutture_activate (GtkMenuItem *menuitem,
 {
        GtkWidget *vbx;
 
-       Strutture *m = strutture_new (commons, FALSE);
+       OrganigrammaStrutture *m = organigramma_strutture_new (commons, FALSE);
 
-       vbx = strutture_get_widget (m);
+       vbx = organigramma_strutture_get_widget (m);
 
        main_set_vbx_body_child (vbx);
 }
@@ -92,9 +92,9 @@ on_mnu_view_uffici_activate (GtkMenuItem *menuitem,
 {
        GtkWidget *vbx;
 
-       Uffici *m = uffici_new (commons, FALSE);
+       OrganigrammaUffici *m = organigramma_uffici_new (commons, FALSE);
 
-       vbx = uffici_get_widget (m);
+       vbx = organigramma_uffici_get_widget (m);
 
        main_set_vbx_body_child (vbx);
 }
@@ -105,9 +105,9 @@ on_mnu_view_persone_activate (GtkMenuItem *menuitem,
 {
        GtkWidget *vbx;
 
-       Persone *m = persone_new (commons, FALSE);
+       OrganigrammaPersone *m = organigramma_persone_new (commons, FALSE);
 
-       vbx = persone_get_widget (m);
+       vbx = organigramma_persone_get_widget (m);
 
        main_set_vbx_body_child (vbx);
 }
@@ -118,9 +118,9 @@ on_mnu_tabelle_tipi_nodo_activate (GtkMenuItem *menuitem,
 {
        GtkWidget *vbx;
 
-       TipiNodo *m = tipi_nodo_new (commons, FALSE);
+       OrganigrammaTipiNodo *m = organigramma_tipi_nodo_new (commons, FALSE);
 
-       vbx = tipi_nodo_get_widget (m);
+       vbx = organigramma_tipi_nodo_get_widget (m);
 
        main_set_vbx_body_child (vbx);
 }
@@ -144,9 +144,9 @@ on_mnu_tabelle_titoli_activate (GtkMenuItem *menuitem,
 {
        GtkWidget *vbx;
 
-       Titoli *m = titoli_new (commons, FALSE);
+       OrganigrammaTitoli *m = organigramma_titoli_new (commons, FALSE);
 
-       vbx = titoli_get_widget (m);
+       vbx = organigramma_titoli_get_widget (m);
 
        main_set_vbx_body_child (vbx);
 }

diff --git a/src/nodi.c b/src/nodi.c
index 97f8cd60ab7f95f914ccc5b2ece65da6b42026f0..7af0b1c860bb41e7d82da628ce03bec012661280 100644 (file)
--- a/src/nodi.c
+++ b/src/nodi.c
@@ -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
@@ -20,44 +20,44 @@
 #include "nodi.h"
 #include "nodo.h"
 
-static void nodi_class_init (NodiClass *klass);
-static void nodi_init (Nodi *nodi);
+static void organigramma_nodi_class_init (OrganigrammaNodiClass *klass);
+static void organigramma_nodi_init (OrganigrammaNodi *nodi);
 
-static void nodi_carica (Nodi *nodi);
-static void nodi_modifica (Nodi *nodi);
+static void organigramma_nodi_carica (OrganigrammaNodi *nodi);
+static void organigramma_nodi_modifica (OrganigrammaNodi *nodi);
 
-static void nodi_selezionato (Nodi *nodi);
-static void nodi_on_nodo_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_nodi_selezionato (OrganigrammaNodi *nodi);
+static void organigramma_nodi_on_organigramma_nodo_aggiornato (gpointer instance, gpointer user_data);
 
-static void nodi_set_property (GObject *object,
+static void organigramma_nodi_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void nodi_get_property (GObject *object,
+static void organigramma_nodi_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void nodi_on_btn_nuovo_clicked (GtkButton *button,
+static void organigramma_nodi_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data);
-static void nodi_on_btn_modifica_clicked (GtkButton *button,
+static void organigramma_nodi_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data);
-static void nodi_on_btn_elimina_clicked (GtkButton *button,
+static void organigramma_nodi_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data);
-static void nodi_on_trv_nodi_row_activated (GtkTreeView *tree_view,
+static void organigramma_nodi_on_trv_organigramma_nodi_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void nodi_on_btn_ricerca_clicked (GtkButton *button,
+static void organigramma_nodi_on_btn_ricerca_clicked (GtkButton *button,
                                     gpointer user_data);
 
-static void nodi_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_nodi_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void nodi_on_btn_seleziona_clicked (GtkButton *button,
+static void organigramma_nodi_on_btn_seleziona_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define NODI_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_NODI, NodiPrivate))
+#define ORGANIGRAMMA_NODI_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_NODI, OrganigrammaNodiPrivate))
 
 enum
 {
@@ -65,8 +65,8 @@ enum
        COL_NOME
 };
 
-typedef struct _NodiPrivate NodiPrivate;
-struct _NodiPrivate
+typedef struct _OrganigrammaNodiPrivate OrganigrammaNodiPrivate;
+struct _OrganigrammaNodiPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -78,20 +78,20 @@ struct _NodiPrivate
                GtkWindow *wtransient;
        };
 
-G_DEFINE_TYPE (Nodi, nodi, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaNodi, organigramma_nodi, G_TYPE_OBJECT)
 
 static void
-nodi_class_init (NodiClass *klass)
+organigramma_nodi_class_init (OrganigrammaNodiClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (NodiPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaNodiPrivate));
 
-       object_class->set_property = nodi_set_property;
-       object_class->get_property = nodi_get_property;
+       object_class->set_property = organigramma_nodi_set_property;
+       object_class->get_property = organigramma_nodi_get_property;
 
        /**
-        * Nodi::selezionato:
+        * OrganigrammaNodi::selezionato:
         * @nodi:
         *
         */
@@ -107,26 +107,26 @@ nodi_class_init (NodiClass *klass)
 }
 
 static void
-nodi_init (Nodi *nodi)
+organigramma_nodi_init (OrganigrammaNodi *nodi)
 {
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 }
 
 /**
- * nodi_new:
+ * organigramma_nodi_new:
  * @commons:
  * @selezione:
  *
- * Returns: the newly created #Nodi object.
+ * Returns: the newly created #OrganigrammaNodi object.
  */
-Nodi
-*nodi_new (OrganigrammaCommons *commons, gboolean selezione)
+OrganigrammaNodi
+*organigramma_nodi_new (OrganigrammaCommons *commons, gboolean selezione)
 {
        GError *error;
 
-       Nodi *a = NODI (g_object_new (nodi_get_type (), NULL));
+       OrganigrammaNodi *a = ORGANIGRAMMA_NODI (g_object_new (organigramma_nodi_get_type (), NULL));
 
-       NodiPrivate *priv = NODI_GET_PRIVATE (a);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (a);
 
        priv->commons = commons;
        priv->selezione = selezione;
@@ -157,21 +157,21 @@ Nodi
                }
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button1"),
-                         "clicked", G_CALLBACK (nodi_on_btn_nuovo_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_nodi_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button2"),
-                         "clicked", G_CALLBACK (nodi_on_btn_modifica_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_nodi_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button3"),
-                         "clicked", G_CALLBACK (nodi_on_btn_elimina_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_nodi_on_btn_elimina_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview1"),
-                         "row-activated", G_CALLBACK (nodi_on_trv_nodi_row_activated), (gpointer)a);
+                         "row-activated", G_CALLBACK (organigramma_nodi_on_trv_organigramma_nodi_row_activated), (gpointer)a);
 
        if (priv->selezione)
                {
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "label11")));
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button14"),
-                                         "clicked", G_CALLBACK (nodi_on_btn_annulla_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_nodi_on_btn_annulla_clicked), (gpointer)a);
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button15"),
-                                         "clicked", G_CALLBACK (nodi_on_btn_seleziona_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_nodi_on_btn_seleziona_clicked), (gpointer)a);
                }
        else
                {
@@ -179,27 +179,27 @@ Nodi
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "button15")));
                }
 
-       nodi_carica (a);
+       organigramma_nodi_carica (a);
 
        return a;
 }
 
 /**
- * nodi_get_widget:
+ * organigramma_nodi_get_widget:
  * @nodi:
  *
  */
 GtkWidget
-*nodi_get_widget (Nodi *nodi)
+*organigramma_nodi_get_widget (OrganigrammaNodi *nodi)
 {
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
        return priv->widget;
 }
 
 /* PRIVATE */
 static void
-nodi_carica_figli (Nodi *nodi, const gchar *sql_where, GtkTreeIter *iter_parent, guint id_nodi)
+organigramma_nodi_carica_figli (OrganigrammaNodi *nodi, const gchar *sql_where, GtkTreeIter *iter_parent, guint id_nodi)
 {
        GtkTreeIter iter;
        GdaDataModel *dm;
@@ -210,7 +210,7 @@ nodi_carica_figli (Nodi *nodi, const gchar *sql_where, GtkTreeIter *iter_parent,
        guint row;
        guint id;
 
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
        sql = g_strdup_printf ("SELECT c.id, c.nome"
                          " FROM nodi c"
@@ -234,7 +234,7 @@ nodi_carica_figli (Nodi *nodi, const gchar *sql_where, GtkTreeIter *iter_parent,
                                                            COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
                                                            -1);
 
-                                       nodi_carica_figli (nodi, sql_where, &iter, id);
+                                       organigramma_nodi_carica_figli (nodi, sql_where, &iter, id);
                                }
 
                        g_object_unref (dm);
@@ -242,14 +242,14 @@ nodi_carica_figli (Nodi *nodi, const gchar *sql_where, GtkTreeIter *iter_parent,
 }
 
 static void
-nodi_carica (Nodi *nodi)
+organigramma_nodi_carica (OrganigrammaNodi *nodi)
 {
        gchar *sql_where;
 
        gchar *gcval;
        gint ival;
 
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
        gtk_tree_store_clear (priv->tstore_nodi);
 
@@ -290,16 +290,16 @@ nodi_carica (Nodi *nodi)
                                }
                }*/
 
-       nodi_carica_figli (nodi, sql_where, NULL, 0);
+       organigramma_nodi_carica_figli (nodi, sql_where, NULL, 0);
 }
 
 static void
-nodi_modifica (Nodi *nodi)
+organigramma_nodi_modifica (OrganigrammaNodi *nodi)
 {
        GtkTreeIter iter;
        guint id;
 
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -309,12 +309,12 @@ nodi_modifica (Nodi *nodi)
                                            COL_ID, &id,
                                            -1);
 
-                       Nodo *c = nodo_new (priv->commons, id);
+                       OrganigrammaNodo *c = organigramma_nodo_new (priv->commons, id);
 
                        g_signal_connect (G_OBJECT (c), "aggiornato",
-                                         G_CALLBACK (nodi_on_nodo_aggiornato), (gpointer)nodi);
+                                         G_CALLBACK (organigramma_nodi_on_organigramma_nodo_aggiornato), (gpointer)nodi);
 
-                       w = nodo_get_widget (c);
+                       w = organigramma_nodo_get_widget (c);
                        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
                        gtk_widget_show (w);
                }
@@ -331,13 +331,13 @@ nodi_modifica (Nodi *nodi)
 }
 
 static void
-nodi_selezionato (Nodi *nodi)
+organigramma_nodi_selezionato (OrganigrammaNodi *nodi)
 {
        GtkTreeIter iter;
        guint id;
 
-       NodiClass *klass = NODI_GET_CLASS (nodi);
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodiClass *klass = ORGANIGRAMMA_NODI_GET_CLASS (nodi);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -363,17 +363,16 @@ nodi_selezionato (Nodi *nodi)
 }
 
 static void
-nodi_on_nodo_aggiornato (gpointer instance, gpointer user_data)
+organigramma_nodi_on_organigramma_nodo_aggiornato (gpointer instance, gpointer user_data)
 {
-       nodi_carica ((Nodi *)user_data);
+       organigramma_nodi_carica ((OrganigrammaNodi *)user_data);
 }
 
 static void
-nodi_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_nodi_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Nodi *nodi = NODI (object);
-
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodi *nodi = ORGANIGRAMMA_NODI (object);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
        switch (property_id)
                {
@@ -384,11 +383,10 @@ nodi_set_property (GObject *object, guint property_id, const GValue *value, GPar
 }
 
 static void
-nodi_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_nodi_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Nodi *nodi = NODI (object);
-
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodi *nodi = ORGANIGRAMMA_NODI (object);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
        switch (property_id)
                {
@@ -400,33 +398,33 @@ nodi_get_property (GObject *object, guint property_id, GValue *value, GParamSpec
 
 /* CALLBACK */
 static void
-nodi_on_btn_nuovo_clicked (GtkButton *button,
+organigramma_nodi_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data)
 {
        GtkWidget *w;
 
-       Nodi *nodi = (Nodi *)user_data;
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodi *nodi = (OrganigrammaNodi *)user_data;
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
-       Nodo *c = nodo_new (priv->commons, 0);
+       OrganigrammaNodo *c = organigramma_nodo_new (priv->commons, 0);
 
        g_signal_connect (G_OBJECT (c), "aggiornato",
-                         G_CALLBACK (nodi_on_nodo_aggiornato), (gpointer)nodi);
+                         G_CALLBACK (organigramma_nodi_on_organigramma_nodo_aggiornato), user_data);
 
-       w = nodo_get_widget (c);
+       w = organigramma_nodo_get_widget (c);
        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
        gtk_widget_show (w);
 }
 
 static void
-nodi_on_btn_modifica_clicked (GtkButton *button,
+organigramma_nodi_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       nodi_modifica ((Nodi *)user_data);
+       organigramma_nodi_modifica ((OrganigrammaNodi *)user_data);
 }
 
 static void
-nodi_on_btn_elimina_clicked (GtkButton *button,
+organigramma_nodi_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data)
 {
        GtkWidget *dialog;
@@ -435,8 +433,8 @@ nodi_on_btn_elimina_clicked (GtkButton *button,
        GtkTreeIter iter;
        guint id;
 
-       Nodi *nodi = (Nodi *)user_data;
-       NodiPrivate *priv = NODI_GET_PRIVATE (nodi);
+       OrganigrammaNodi *nodi = (OrganigrammaNodi *)user_data;
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE (nodi);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -456,7 +454,7 @@ nodi_on_btn_elimina_clicked (GtkButton *button,
                                        gdaex_execute (priv->commons->gdaex,
                                                       g_strdup_printf ("UPDATE nodi SET status = 'E' WHERE id = %d", id));
 
-                                       nodi_carica (nodi);
+                                       organigramma_nodi_carica (nodi);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -473,36 +471,36 @@ nodi_on_btn_elimina_clicked (GtkButton *button,
 }
 
 static void
-nodi_on_trv_nodi_row_activated (GtkTreeView *tree_view,
+organigramma_nodi_on_trv_organigramma_nodi_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
-                                                                                        GtkTreeViewColumn *column,
-                                                                                        gpointer user_data)
+                                             GtkTreeViewColumn *column,
+                                             gpointer user_data)
 {
-       NodiPrivate *priv = NODI_GET_PRIVATE ((Nodi *)user_data);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE ((OrganigrammaNodi *)user_data);
 
        if (priv->selezione)
                {
-                       nodi_selezionato ((Nodi *)user_data);
+                       organigramma_nodi_selezionato ((OrganigrammaNodi *)user_data);
                }
        else
                {
-                       nodi_modifica ((Nodi *)user_data);
+                       organigramma_nodi_modifica ((OrganigrammaNodi *)user_data);
                }
 }
 
 static void
-nodi_on_btn_annulla_clicked (GtkButton *button,
+organigramma_nodi_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       NodiPrivate *priv = NODI_GET_PRIVATE ((Nodi *)user_data);
+       OrganigrammaNodiPrivate *priv = ORGANIGRAMMA_NODI_GET_PRIVATE ((OrganigrammaNodi *)user_data);
 
        gtk_widget_destroy (priv->widget);
        g_object_unref (G_OBJECT (user_data));
 }
 
 static void
-nodi_on_btn_seleziona_clicked (GtkButton *button,
+organigramma_nodi_on_btn_seleziona_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       nodi_selezionato ((Nodi *)user_data);
+       organigramma_nodi_selezionato ((OrganigrammaNodi *)user_data);
 }

diff --git a/src/nodi.h b/src/nodi.h
index c6501ced54ee360a941bba7fdb0b4ab75b1ac17a..f6a89223a6b76efe1e24bdd2f376143ffffe3166 100644 (file)
--- a/src/nodi.h
+++ b/src/nodi.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __NODI_H__
-#define __NODI_H__
+#ifndef __ORGANIGRAMMA_NODI_H__
+#define __ORGANIGRAMMA_NODI_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_NODI                 (nodi_get_type ())
-#define NODI(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NODI, Nodi))
-#define NODI_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NODI, NodiClass))
-#define IS_NODI(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NODI))
-#define IS_NODI_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NODI))
-#define NODI_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NODI, NodiClass))
+#define TYPE_ORGANIGRAMMA_NODI                 (organigramma_nodi_get_type ())
+#define ORGANIGRAMMA_NODI(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_NODI, OrganigrammaNodi))
+#define ORGANIGRAMMA_NODI_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_NODI, OrganigrammaNodiClass))
+#define IS_ORGANIGRAMMA_NODI(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_NODI))
+#define IS_ORGANIGRAMMA_NODI_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_NODI))
+#define ORGANIGRAMMA_NODI_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_NODI, OrganigrammaNodiClass))
 
 
-typedef struct _Nodi Nodi;
-typedef struct _NodiClass NodiClass;
+typedef struct _OrganigrammaNodi OrganigrammaNodi;
+typedef struct _OrganigrammaNodiClass OrganigrammaNodiClass;
 
-struct _Nodi
+struct _OrganigrammaNodi
        {
                GObject parent;
        };
 
-struct _NodiClass
+struct _OrganigrammaNodiClass
        {
                GObjectClass parent_class;
 
                guint selezionato_signal_id;
        };
 
-GType nodi_get_type (void) G_GNUC_CONST;
+GType organigramma_nodi_get_type (void) G_GNUC_CONST;
 
-Nodi *nodi_new (OrganigrammaCommons *commons, gboolean selezione);
+OrganigrammaNodi *organigramma_nodi_new (OrganigrammaCommons *commons, gboolean selezione);
 
-GtkWidget *nodi_get_widget (Nodi *nodi);
+GtkWidget *organigramma_nodi_get_widget (OrganigrammaNodi *nodi);
 
 
 G_END_DECLS
 
-#endif /* __NODI_H__ */
+#endif /* __ORGANIGRAMMA_NODI_H__ */

diff --git a/src/nodo.c b/src/nodo.c
index b8a3cdc2a11cfeaf956eb00255780ccb39c716e7..fe12ac61ddafc6947d299e9c36f5507fcd3ac5ba 100644 (file)
--- a/src/nodo.c
+++ b/src/nodo.c
@@ -22,50 +22,50 @@
 #include "nodo.h"
 #include "nodi.h"
 
-static void nodo_class_init (NodoClass *klass);
-static void nodo_init (Nodo *nodo);
+static void organigramma_nodo_class_init (OrganigrammaNodoClass *klass);
+static void organigramma_nodo_init (OrganigrammaNodo *nodo);
 
-static void nodo_carica (Nodo *nodo);
-static void nodo_salva (Nodo *nodo);
+static void organigramma_nodo_carica (OrganigrammaNodo *nodo);
+static void organigramma_nodo_salva (OrganigrammaNodo *nodo);
 
-static gboolean nodo_conferma_chiusura (Nodo *nodo);
+static gboolean organigramma_nodo_conferma_chiusura (OrganigrammaNodo *nodo);
 
-static void nodo_set_property (GObject *object,
+static void organigramma_nodo_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void nodo_get_property (GObject *object,
+static void organigramma_nodo_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void nodo_on_nodo_selezionato (gpointer instance, guint id, gpointer user_data);
+static void organigramma_nodo_on_organigramma_nodo_selezionato (gpointer instance, guint id, gpointer user_data);
 
-static void nodo_on_nodo_pulisci (GtkEntry *entry,
+static void organigramma_nodo_on_organigramma_nodo_pulisci (GtkEntry *entry,
                           GtkEntryIconPosition icon_pos,
                           GdkEvent *event,
                           gpointer user_data);
-static void nodo_on_btn_nodo_clicked (GtkButton *button,
+static void organigramma_nodo_on_btn_organigramma_nodo_clicked (GtkButton *button,
                       gpointer user_data);
 
-static gboolean nodo_on_w_nodo_delete_event (GtkWidget *widget,
+static gboolean organigramma_nodo_on_w_organigramma_nodo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void nodo_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_nodo_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void nodo_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_nodo_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_NODO, NodoPrivate))
+#define ORGANIGRAMMA_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_NODO, OrganigrammaNodoPrivate))
 
 enum
 {
        LBL_ID
 };
 
-typedef struct _NodoPrivate NodoPrivate;
-struct _NodoPrivate
+typedef struct _OrganigrammaNodoPrivate OrganigrammaNodoPrivate;
+struct _OrganigrammaNodoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -78,20 +78,20 @@ struct _NodoPrivate
                gint id;
        };
 
-G_DEFINE_TYPE (Nodo, nodo, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaNodo, organigramma_nodo, G_TYPE_OBJECT)
 
 static void
-nodo_class_init (NodoClass *klass)
+organigramma_nodo_class_init (OrganigrammaNodoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (NodoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaNodoPrivate));
 
-       object_class->set_property = nodo_set_property;
-       object_class->get_property = nodo_get_property;
+       object_class->set_property = organigramma_nodo_set_property;
+       object_class->get_property = organigramma_nodo_get_property;
 
        /**
-        * Nodo::aggiornato:
+        * OrganigrammaNodo::aggiornato:
         * @nodo:
         *
         */
@@ -107,26 +107,26 @@ nodo_class_init (NodoClass *klass)
 }
 
 static void
-nodo_init (Nodo *nodo)
+organigramma_nodo_init (OrganigrammaNodo *nodo)
 {
-       NodoPrivate *priv = NODO_GET_PRIVATE (nodo);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (nodo);
 }
 
 /**
- * nodo_new:
+ * organigramma_nodo_new:
  * @commons:
  * @id:
  *
- * Returns: the newly created #Nodo object.
+ * Returns: the newly created #OrganigrammaNodo object.
  */
-Nodo
-*nodo_new (OrganigrammaCommons *commons, gint id)
+OrganigrammaNodo
+*organigramma_nodo_new (OrganigrammaCommons *commons, gint id)
 {
        GError *error;
 
-       Nodo *a = NODO (g_object_new (nodo_get_type (), NULL));
+       OrganigrammaNodo *a = ORGANIGRAMMA_NODO (g_object_new (organigramma_nodo_get_type (), NULL));
 
-       NodoPrivate *priv = NODO_GET_PRIVATE (a);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
@@ -153,17 +153,17 @@ Nodo
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (nodo_on_w_nodo_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_nodo_on_w_organigramma_nodo_delete_event), (gpointer *)a);
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "entry2"),
-                         "icon-press", G_CALLBACK (nodo_on_nodo_pulisci), (gpointer *)a);
+                         "icon-press", G_CALLBACK (organigramma_nodo_on_organigramma_nodo_pulisci), (gpointer *)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button6"),
-                         "clicked", G_CALLBACK (nodo_on_btn_nodo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_nodo_on_btn_organigramma_nodo_clicked), (gpointer *)a);
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button4"),
-                         "clicked", G_CALLBACK (nodo_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_nodo_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button5"),
-                         "clicked", G_CALLBACK (nodo_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_nodo_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
 
@@ -176,30 +176,30 @@ Nodo
        else
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
-                       nodo_carica (a);
+                       organigramma_nodo_carica (a);
                }
 
        return a;
 }
 
 /**
- * nodo_get_widget:
+ * organigramma_nodo_get_widget:
  * @nodo:
  *
  */
 GtkWidget
-*nodo_get_widget (Nodo *nodo)
+*organigramma_nodo_get_widget (OrganigrammaNodo *nodo)
 {
-       NodoPrivate *priv = NODO_GET_PRIVATE (nodo);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (nodo);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-nodo_carica (Nodo *nodo)
+organigramma_nodo_carica (OrganigrammaNodo *nodo)
 {
-       NodoPrivate *priv = NODO_GET_PRIVATE (nodo);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (nodo);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -207,7 +207,7 @@ nodo_carica (Nodo *nodo)
 }
 
 static void
-nodo_salva (Nodo *nodo)
+organigramma_nodo_salva (OrganigrammaNodo *nodo)
 {
        GError *error = NULL;
        gchar *sql;
@@ -216,9 +216,9 @@ nodo_salva (Nodo *nodo)
        GDate *da;
        GDate *a;
 
-       NodoClass *klass = NODO_GET_CLASS (nodo);
+       OrganigrammaNodoClass *klass = ORGANIGRAMMA_NODO_GET_CLASS (nodo);
 
-       NodoPrivate *priv = NODO_GET_PRIVATE (nodo);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (nodo);
 
        if (!gtk_form_check (priv->form, (priv->id != 0), NULL, TRUE, priv->w, TRUE))
                {
@@ -271,11 +271,11 @@ nodo_salva (Nodo *nodo)
 }
 
 static void
-nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Nodo *nodo = NODO (object);
+       OrganigrammaNodo *nodo = ORGANIGRAMMA_NODO (object);
 
-       NodoPrivate *priv = NODO_GET_PRIVATE (nodo);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (nodo);
 
        switch (property_id)
                {
@@ -286,11 +286,11 @@ nodo_set_property (GObject *object, guint property_id, const GValue *value, GPar
 }
 
 static void
-nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Nodo *nodo = NODO (object);
+       OrganigrammaNodo *nodo = ORGANIGRAMMA_NODO (object);
 
-       NodoPrivate *priv = NODO_GET_PRIVATE (nodo);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (nodo);
 
        switch (property_id)
                {
@@ -301,13 +301,13 @@ nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec
 }
 
 static gboolean
-nodo_conferma_chiusura (Nodo *nodo)
+organigramma_nodo_conferma_chiusura (OrganigrammaNodo *nodo)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       NodoPrivate *priv = NODO_GET_PRIVATE (nodo);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (nodo);
 
        ret = TRUE;
        if (gtk_form_is_changed (priv->form))
@@ -329,69 +329,69 @@ nodo_conferma_chiusura (Nodo *nodo)
 
 /* CALLBACK */
 static void
-nodo_on_nodo_selezionato (gpointer instance, guint id, gpointer user_data)
+organigramma_nodo_on_organigramma_nodo_selezionato (gpointer instance, guint id, gpointer user_data)
 {
-       Nodo *f = (Nodo *)user_data;
-       NodoPrivate *priv = NODO_GET_PRIVATE (f);
+       OrganigrammaNodo *f = (OrganigrammaNodo *)user_data;
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (f);
 
        gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "label5"), g_strdup_printf ("%d", id));
 }
 
 static void
-nodo_on_nodo_pulisci (GtkEntry *entry,
+organigramma_nodo_on_organigramma_nodo_pulisci (GtkEntry *entry,
                           GtkEntryIconPosition icon_pos,
                           GdkEvent *event,
                           gpointer user_data)
 {
-       Nodo *f = (Nodo *)user_data;
-       NodoPrivate *priv = NODO_GET_PRIVATE (f);
+       OrganigrammaNodo *f = (OrganigrammaNodo *)user_data;
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (f);
 
        gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label5")), "");
        gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (priv->commons->gtkbuilder, "entry2")), "");
 }
 
 static void
-nodo_on_btn_nodo_clicked (GtkButton *button,
+organigramma_nodo_on_btn_organigramma_nodo_clicked (GtkButton *button,
                       gpointer user_data)
 {
        GtkWidget *w;
 
-       Nodo *rf = (Nodo *)user_data;
+       OrganigrammaNodo *rf = (OrganigrammaNodo *)user_data;
 
-       NodoPrivate *priv = NODO_GET_PRIVATE (rf);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (rf);
 
-       Nodi *c = nodi_new (priv->commons, TRUE);
+       OrganigrammaNodi *c = organigramma_nodi_new (priv->commons, TRUE);
 
        g_signal_connect (G_OBJECT (c), "selezionato",
-                         G_CALLBACK (nodo_on_nodo_selezionato), user_data);
+                         G_CALLBACK (organigramma_nodo_on_organigramma_nodo_selezionato), user_data);
 
-       w = nodi_get_widget (c);
+       w = organigramma_nodi_get_widget (c);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static gboolean
-nodo_on_w_nodo_delete_event (GtkWidget *widget,
+organigramma_nodo_on_w_organigramma_nodo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !nodo_conferma_chiusura ((Nodo *)user_data);
+       return !organigramma_nodo_conferma_chiusura ((OrganigrammaNodo *)user_data);
 }
 
 static void
-nodo_on_btn_annulla_clicked (GtkButton *button,
+organigramma_nodo_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       Nodo *nodo = (Nodo *)user_data;
+       OrganigrammaNodo *nodo = (OrganigrammaNodo *)user_data;
 
-       NodoPrivate *priv = NODO_GET_PRIVATE (nodo);
+       OrganigrammaNodoPrivate *priv = ORGANIGRAMMA_NODO_GET_PRIVATE (nodo);
 
-       if (nodo_conferma_chiusura (nodo)) gtk_widget_destroy (priv->w);
+       if (organigramma_nodo_conferma_chiusura (nodo)) gtk_widget_destroy (priv->w);
 }
 
 static void
-nodo_on_btn_salva_clicked (GtkButton *button,
+organigramma_nodo_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       nodo_salva ((Nodo *)user_data);
+       organigramma_nodo_salva ((OrganigrammaNodo *)user_data);
 }

diff --git a/src/nodo.h b/src/nodo.h
index d275d0c7bd1d7c8967df5627634c0b2bf8fbf8ec..1a0575ea6f8e68ccca4f8aea73c74eacb1db9a5d 100644 (file)
--- a/src/nodo.h
+++ b/src/nodo.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __NODO_H__
-#define __NODO_H__
+#ifndef __ORGANIGRAMMA_NODO_H__
+#define __ORGANIGRAMMA_NODO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_NODO                 (nodo_get_type ())
-#define NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NODO, Nodo))
-#define NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NODO, NodoClass))
-#define IS_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NODO))
-#define IS_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NODO))
-#define NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NODO, NodoClass))
+#define TYPE_ORGANIGRAMMA_NODO                 (organigramma_nodo_get_type ())
+#define ORGANIGRAMMA_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_NODO, OrganigrammaNodo))
+#define ORGANIGRAMMA_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_NODO, OrganigrammaNodoClass))
+#define IS_ORGANIGRAMMA_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_NODO))
+#define IS_ORGANIGRAMMA_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_NODO))
+#define ORGANIGRAMMA_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_NODO, OrganigrammaNodoClass))
 
 
-typedef struct _Nodo Nodo;
-typedef struct _NodoClass NodoClass;
+typedef struct _OrganigrammaNodo OrganigrammaNodo;
+typedef struct _OrganigrammaNodoClass OrganigrammaNodoClass;
 
-struct _Nodo
+struct _OrganigrammaNodo
        {
                GObject parent;
        };
 
-struct _NodoClass
+struct _OrganigrammaNodoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType nodo_get_type (void) G_GNUC_CONST;
+GType organigramma_nodo_get_type (void) G_GNUC_CONST;
 
-Nodo *nodo_new (OrganigrammaCommons *commons, gint id);
+OrganigrammaNodo *organigramma_nodo_new (OrganigrammaCommons *commons, gint id);
 
-GtkWidget *nodo_get_widget (Nodo *nodo);
+GtkWidget *organigramma_nodo_get_widget (OrganigrammaNodo *nodo);
 
 
 G_END_DECLS
 
-#endif /* __NODO_H__ */
+#endif /* __ORGANIGRAMMA_NODO_H__ */

diff --git a/src/persona.c b/src/persona.c
index 57d074c65f2f7b34f6c519aab89d35c29bd5a9fc..e8215b0f3079e8403dd56a2c31ce13a109380da3 100644 (file)
--- a/src/persona.c
+++ b/src/persona.c
@@ -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
@@ -28,124 +28,124 @@
 #include "personaufficiorecapito.h"
 #include "personarecapito.h"
 
-static void persona_class_init (PersonaClass *klass);
-static void persona_init (Persona *persona);
+static void organigramma_persona_class_init (OrganigrammaPersonaClass *klass);
+static void organigramma_persona_init (OrganigrammaPersona *persona);
 
-static void persona_carica (Persona *persona);
-static void persona_salva (Persona *persona);
+static void organigramma_persona_carica (OrganigrammaPersona *persona);
+static void organigramma_persona_salva (OrganigrammaPersona *persona);
 
-static void persona_carica_incarichi (Persona *persona);
-static void persona_carica_nodi (Persona *persona);
-static void persona_carica_nodo_recapiti (Persona *persona);
-static void persona_carica_uffici (Persona *persona);
-static void persona_carica_ufficio_recapiti (Persona *persona);
-static void persona_carica_recapiti (Persona *persona);
+static void organigramma_persona_carica_incarichi (OrganigrammaPersona *persona);
+static void organigramma_persona_carica_nodi (OrganigrammaPersona *persona);
+static void organigramma_persona_carica_nodo_recapiti (OrganigrammaPersona *persona);
+static void organigramma_persona_carica_uffici (OrganigrammaPersona *persona);
+static void organigramma_persona_carica_ufficio_recapiti (OrganigrammaPersona *persona);
+static void organigramma_persona_carica_recapiti (OrganigrammaPersona *persona);
 
-static void persona_incarico_modifica (Persona *persona);
-static void persona_nodo_modifica (Persona *persona);
-static void persona_nodo_recapito_modifica (Persona *persona);
-static void persona_ufficio_modifica (Persona *persona);
-static void persona_ufficio_recapito_modifica (Persona *persona);
-static void persona_recapito_modifica (Persona *persona);
+static void organigramma_persona_incarico_modifica (OrganigrammaPersona *persona);
+static void organigramma_persona_nodo_modifica (OrganigrammaPersona *persona);
+static void organigramma_persona_nodo_recapito_modifica (OrganigrammaPersona *persona);
+static void organigramma_persona_ufficio_modifica (OrganigrammaPersona *persona);
+static void organigramma_persona_ufficio_recapito_modifica (OrganigrammaPersona *persona);
+static void organigramma_persona_recapito_modifica (OrganigrammaPersona *persona);
 
-static gboolean persona_conferma_chiusura (Persona *persona);
+static gboolean organigramma_persona_conferma_chiusura (OrganigrammaPersona *persona);
 
-static void persona_set_property (GObject *object,
+static void organigramma_persona_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void persona_get_property (GObject *object,
+static void organigramma_persona_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void persona_on_incarico_aggiornato (gpointer instance, gpointer user_data);
-static void persona_on_nodo_aggiornato (gpointer instance, gpointer user_data);
-static void persona_on_nodo_recapito_aggiornato (gpointer instance, gpointer user_data);
-static void persona_on_ufficio_aggiornato (gpointer instance, gpointer user_data);
-static void persona_on_ufficio_recapito_aggiornato (gpointer instance, gpointer user_data);
-static void persona_on_recapito_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_persona_on_incarico_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_persona_on_nodo_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_persona_on_nodo_recapito_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_persona_on_ufficio_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_persona_on_ufficio_recapito_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_persona_on_recapito_aggiornato (gpointer instance, gpointer user_data);
 
-static gboolean persona_on_w_persona_delete_event (GtkWidget *widget,
+static gboolean organigramma_persona_on_w_organigramma_persona_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void persona_on_btn_incarico_nuovo_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_incarico_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_incarico_modifica_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_incarico_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_incarico_elimina_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_incarico_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_trv_incarichi_row_activated (GtkTreeView *tree_view,
+static void organigramma_persona_on_trv_incarichi_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void persona_on_btn_nodo_nuovo_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_nodo_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_nodo_modifica_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_nodo_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_nodo_elimina_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_nodo_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_trv_nodi_row_activated (GtkTreeView *tree_view,
+static void organigramma_persona_on_trv_nodi_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
-static void persona_on_nodi_sel_changed (GtkTreeSelection *selection,
+static void organigramma_persona_on_nodi_sel_changed (GtkTreeSelection *selection,
                                     gpointer user_data);
 
-static void persona_on_btn_nodo_recapito_nuovo_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_nodo_recapito_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_nodo_recapito_modifica_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_nodo_recapito_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_nodo_recapito_elimina_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_nodo_recapito_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_trv_nodo_recapiti_row_activated (GtkTreeView *tree_view,
+static void organigramma_persona_on_trv_nodo_recapiti_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void persona_on_btn_ufficio_nuovo_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_ufficio_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_ufficio_modifica_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_ufficio_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_ufficio_elimina_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_ufficio_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_trv_uffici_row_activated (GtkTreeView *tree_view,
+static void organigramma_persona_on_trv_uffici_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
-static void persona_on_uffici_sel_changed (GtkTreeSelection *selection,
+static void organigramma_persona_on_uffici_sel_changed (GtkTreeSelection *selection,
                                     gpointer user_data);
 
-static void persona_on_btn_ufficio_recapito_nuovo_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_ufficio_recapito_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_ufficio_recapito_modifica_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_ufficio_recapito_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_ufficio_recapito_elimina_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_ufficio_recapito_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_trv_ufficio_recapiti_row_activated (GtkTreeView *tree_view,
+static void organigramma_persona_on_trv_ufficio_recapiti_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void persona_on_btn_recapito_nuovo_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_recapito_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_recapito_modifica_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_recapito_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_recapito_elimina_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_recapito_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_trv_recapiti_row_activated (GtkTreeView *tree_view,
+static void organigramma_persona_on_trv_recapiti_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void persona_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_persona_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define PERSONA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PERSONA, PersonaPrivate))
+#define ORGANIGRAMMA_PERSONA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_PERSONA, OrganigrammaPersonaPrivate))
 
 enum
 {
@@ -204,8 +204,8 @@ enum
        RECAPITI_COL_RECAPITO
 };
 
-typedef struct _PersonaPrivate PersonaPrivate;
-struct _PersonaPrivate
+typedef struct _OrganigrammaPersonaPrivate OrganigrammaPersonaPrivate;
+struct _OrganigrammaPersonaPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -225,20 +225,20 @@ struct _PersonaPrivate
                gint id;
        };
 
-G_DEFINE_TYPE (Persona, persona, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaPersona, organigramma_persona, G_TYPE_OBJECT)
 
 static void
-persona_class_init (PersonaClass *klass)
+organigramma_persona_class_init (OrganigrammaPersonaClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (PersonaPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaPersonaPrivate));
 
-       object_class->set_property = persona_set_property;
-       object_class->get_property = persona_get_property;
+       object_class->set_property = organigramma_persona_set_property;
+       object_class->get_property = organigramma_persona_get_property;
 
        /**
-        * Persona::aggiornato:
+        * OrganigrammaPersona::aggiornato:
         * @persona:
         *
         */
@@ -254,26 +254,26 @@ persona_class_init (PersonaClass *klass)
 }
 
 static void
-persona_init (Persona *persona)
+organigramma_persona_init (OrganigrammaPersona *persona)
 {
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 }
 
 /**
- * persona_new:
+ * organigramma_persona_new:
  * @commons:
  * @id:
  *
- * Returns: the newly created #Persona object.
+ * Returns: the newly created #OrganigrammaPersona object.
  */
-Persona
-*persona_new (OrganigrammaCommons *commons, gint id)
+OrganigrammaPersona
+*organigramma_persona_new (OrganigrammaCommons *commons, gint id)
 {
        GError *error;
 
-       Persona *a = PERSONA (g_object_new (persona_get_type (), NULL));
+       OrganigrammaPersona *a = ORGANIGRAMMA_PERSONA (g_object_new (organigramma_persona_get_type (), NULL));
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (a);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (a);
 
        priv->commons = commons;
 
@@ -281,12 +281,12 @@ Persona
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
                                           g_strsplit (g_strconcat (
                                           "lstore_titoli"
-                                          "|lstore_persona_incarichi"
-                                          "|lstore_persona_nodi"
-                                          "|lstore_persona_nodo_recapiti"
-                                          "|lstore_persona_uffici"
-                                          "|lstore_persona_ufficio_recapiti"
-                                          "|lstore_persona_recapiti"
+                                          "|lstore_organigramma_persona_incarichi"
+                                          "|lstore_organigramma_persona_nodi"
+                                          "|lstore_organigramma_persona_nodo_recapiti"
+                                          "|lstore_organigramma_persona_uffici"
+                                          "|lstore_organigramma_persona_ufficio_recapiti"
+                                          "|lstore_organigramma_persona_recapiti"
                                           "|w_persona", NULL), "|", -1),
                                           &error);
        if (error != NULL)
@@ -303,16 +303,16 @@ Persona
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label67",
-                                                     "lstore_persona_incarichi",
-                                                     "lstore_persona_nodi",
-                                                     "lstore_persona_nodo_recapiti",
-                                                     "lstore_persona_uffici",
-                                                     "lstore_persona_ufficio_recapiti",
-                                                     "lstore_persona_recapiti",
+                                                     "lstore_organigramma_persona_incarichi",
+                                                     "lstore_organigramma_persona_nodi",
+                                                     "lstore_organigramma_persona_nodo_recapiti",
+                                                     "lstore_organigramma_persona_uffici",
+                                                     "lstore_organigramma_persona_ufficio_recapiti",
+                                                     "lstore_organigramma_persona_recapiti",
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (persona_on_w_persona_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_persona_on_w_organigramma_persona_delete_event), (gpointer *)a);
 
        priv->sel_incarichi = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview16")));
        priv->sel_nodi = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview13")));
@@ -322,68 +322,68 @@ Persona
        priv->sel_recapiti = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview15")));
 
        g_signal_connect (priv->sel_nodi,
-                         "changed", G_CALLBACK (persona_on_nodi_sel_changed), (gpointer)a);
+                         "changed", G_CALLBACK (organigramma_persona_on_nodi_sel_changed), (gpointer)a);
        g_signal_connect (priv->sel_uffici,
-                         "changed", G_CALLBACK (persona_on_uffici_sel_changed), (gpointer)a);
+                         "changed", G_CALLBACK (organigramma_persona_on_uffici_sel_changed), (gpointer)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button79")),
-                         "clicked", G_CALLBACK (persona_on_btn_incarico_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_incarico_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button80")),
-                         "clicked", G_CALLBACK (persona_on_btn_incarico_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_incarico_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button81")),
-                         "clicked", G_CALLBACK (persona_on_btn_incarico_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_incarico_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview16")),
-                         "row-activated", G_CALLBACK (persona_on_trv_incarichi_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_persona_on_trv_incarichi_row_activated), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button70")),
-                         "clicked", G_CALLBACK (persona_on_btn_nodo_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_nodo_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button71")),
-                         "clicked", G_CALLBACK (persona_on_btn_nodo_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_nodo_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button72")),
-                         "clicked", G_CALLBACK (persona_on_btn_nodo_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_nodo_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview13")),
-                         "row-activated", G_CALLBACK (persona_on_trv_nodi_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_persona_on_trv_nodi_row_activated), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button73")),
-                         "clicked", G_CALLBACK (persona_on_btn_nodo_recapito_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_nodo_recapito_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button74")),
-                         "clicked", G_CALLBACK (persona_on_btn_nodo_recapito_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_nodo_recapito_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button75")),
-                         "clicked", G_CALLBACK (persona_on_btn_nodo_recapito_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_nodo_recapito_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview14")),
-                         "row-activated", G_CALLBACK (persona_on_trv_nodo_recapiti_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_persona_on_trv_nodo_recapiti_row_activated), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button62")),
-                         "clicked", G_CALLBACK (persona_on_btn_ufficio_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_ufficio_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button63")),
-                         "clicked", G_CALLBACK (persona_on_btn_ufficio_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_ufficio_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button64")),
-                         "clicked", G_CALLBACK (persona_on_btn_ufficio_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_ufficio_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview11")),
-                         "row-activated", G_CALLBACK (persona_on_trv_uffici_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_persona_on_trv_uffici_row_activated), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button67")),
-                         "clicked", G_CALLBACK (persona_on_btn_ufficio_recapito_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_ufficio_recapito_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button68")),
-                         "clicked", G_CALLBACK (persona_on_btn_ufficio_recapito_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_ufficio_recapito_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button69")),
-                         "clicked", G_CALLBACK (persona_on_btn_ufficio_recapito_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_ufficio_recapito_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview12")),
-                         "row-activated", G_CALLBACK (persona_on_trv_ufficio_recapiti_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_persona_on_trv_ufficio_recapiti_row_activated), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button76")),
-                         "clicked", G_CALLBACK (persona_on_btn_recapito_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_recapito_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button77")),
-                         "clicked", G_CALLBACK (persona_on_btn_recapito_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_recapito_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button78")),
-                         "clicked", G_CALLBACK (persona_on_btn_recapito_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_recapito_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview15")),
-                         "row-activated", G_CALLBACK (persona_on_trv_recapiti_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_persona_on_trv_recapiti_row_activated), (gpointer *)a);
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button65"),
-                         "clicked", G_CALLBACK (persona_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button66"),
-                         "clicked", G_CALLBACK (persona_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
 
@@ -398,44 +398,44 @@ Persona
        else
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
-                       persona_carica (a);
+                       organigramma_persona_carica (a);
                }
 
        return a;
 }
 
 /**
- * persona_get_widget:
+ * organigramma_persona_get_widget:
  * @persona:
  *
  */
 GtkWidget
-*persona_get_widget (Persona *persona)
+*organigramma_persona_get_widget (OrganigrammaPersona *persona)
 {
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-persona_carica (Persona *persona)
+organigramma_persona_carica (OrganigrammaPersona *persona)
 {
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_form_fill_from_table (priv->form))
                {
-                       persona_carica_incarichi (persona);
-                       persona_carica_nodi (persona);
-                       persona_carica_nodo_recapiti (persona);
-                       persona_carica_uffici (persona);
-                       persona_carica_ufficio_recapiti (persona);
-                       persona_carica_recapiti (persona);
+                       organigramma_persona_carica_incarichi (persona);
+                       organigramma_persona_carica_nodi (persona);
+                       organigramma_persona_carica_nodo_recapiti (persona);
+                       organigramma_persona_carica_uffici (persona);
+                       organigramma_persona_carica_ufficio_recapiti (persona);
+                       organigramma_persona_carica_recapiti (persona);
                }
 }
 
 static void
-persona_salva (Persona *persona)
+organigramma_persona_salva (OrganigrammaPersona *persona)
 {
        GError *error = NULL;
        gchar *sql;
@@ -444,9 +444,9 @@ persona_salva (Persona *persona)
        GDate *da;
        GDate *a;
 
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (!gtk_form_check (priv->form, (priv->id != 0), NULL, TRUE, priv->w, TRUE))
                {
@@ -500,19 +500,19 @@ persona_salva (Persona *persona)
 }
 
 static void
-persona_carica_incarichi (Persona *persona)
+organigramma_persona_carica_incarichi (OrganigrammaPersona *persona)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_INCARICHI]));
 
        sql = g_strdup_printf ("SELECT pi.id, pi.da_data, pi.a_data, pi.descrizione"
-                              " FROM persona_incarichi AS pi"
+                              " FROM organigramma_persona_incarichi AS pi"
                               " WHERE pi.id_persone = %d"
                               " AND pi.status <> 'E'"
                               " ORDER BY pi.da_data, pi.a_data, pi.descrizione",
@@ -540,19 +540,19 @@ persona_carica_incarichi (Persona *persona)
 }
 
 static void
-persona_carica_nodi (Persona *persona)
+organigramma_persona_carica_nodi (OrganigrammaPersona *persona)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_NODI]));
 
        sql = g_strdup_printf ("SELECT pu.id, tn.nome AS tipo_nodo, u.nome, pu.da_data, pu.a_data"
-                              " FROM persona_nodi AS pu INNER JOIN nodi AS u ON pu.id_nodi = u.id"
+                              " FROM organigramma_persona_nodi AS pu INNER JOIN nodi AS u ON pu.id_nodi = u.id"
                               " INNER JOIN tipi_nodo AS tn ON u.id_tipi_nodo = tn.id"
                               " WHERE pu.id_persone = %d"
                               " AND pu.status <> 'E'"
@@ -582,7 +582,7 @@ persona_carica_nodi (Persona *persona)
 }
 
 static void
-persona_carica_nodo_recapiti (Persona *persona)
+organigramma_persona_carica_nodo_recapiti (OrganigrammaPersona *persona)
 {
        gchar *sql;
        GdaDataModel *dm;
@@ -592,7 +592,7 @@ persona_carica_nodo_recapiti (Persona *persona)
        GtkTreeIter iter;
        guint id_nodi;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_NODO_RECAPITI]));
 
@@ -604,7 +604,7 @@ persona_carica_nodo_recapiti (Persona *persona)
                }
 
        sql = g_strdup_printf ("SELECT pur.id, tr.nome, pur.recapito"
-                              " FROM persona_nodo_recapiti AS pur INNER JOIN tipi_recapito AS tr ON"
+                              " FROM organigramma_persona_nodo_recapiti AS pur INNER JOIN tipi_recapito AS tr ON"
                               " pur.id_tipi_recapito = tr.id"
                               " WHERE pur.id_persone = %d"
                               " AND pur.id_nodi = %d"
@@ -634,19 +634,19 @@ persona_carica_nodo_recapiti (Persona *persona)
 }
 
 static void
-persona_carica_uffici (Persona *persona)
+organigramma_persona_carica_uffici (OrganigrammaPersona *persona)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_UFFICI]));
 
        sql = g_strdup_printf ("SELECT pu.id, u.nome, pu.da_data, pu.a_data"
-                              " FROM persona_uffici AS pu INNER JOIN uffici AS u ON"
+                              " FROM organigramma_persona_uffici AS pu INNER JOIN uffici AS u ON"
                               " pu.id_uffici = u.id"
                               " WHERE pu.id_persone = %d"
                               " AND pu.status <> 'E'"
@@ -675,7 +675,7 @@ persona_carica_uffici (Persona *persona)
 }
 
 static void
-persona_carica_ufficio_recapiti (Persona *persona)
+organigramma_persona_carica_ufficio_recapiti (OrganigrammaPersona *persona)
 {
        gchar *sql;
        GdaDataModel *dm;
@@ -685,7 +685,7 @@ persona_carica_ufficio_recapiti (Persona *persona)
        GtkTreeIter iter;
        guint id_uffici;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_UFFICIO_RECAPITI]));
 
@@ -697,7 +697,7 @@ persona_carica_ufficio_recapiti (Persona *persona)
                }
 
        sql = g_strdup_printf ("SELECT pur.id, tr.nome, pur.recapito"
-                              " FROM persona_ufficio_recapiti AS pur INNER JOIN tipi_recapito AS tr ON"
+                              " FROM organigramma_persona_ufficio_recapiti AS pur INNER JOIN tipi_recapito AS tr ON"
                               " pur.id_tipi_recapito = tr.id"
                               " WHERE pur.id_persone = %d"
                               " AND pur.id_uffici = %d"
@@ -727,19 +727,19 @@ persona_carica_ufficio_recapiti (Persona *persona)
 }
 
 static void
-persona_carica_recapiti (Persona *persona)
+organigramma_persona_carica_recapiti (OrganigrammaPersona *persona)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_RECAPITI]));
 
        sql = g_strdup_printf ("SELECT pr.id, tr.nome, pr.recapito"
-                              " FROM persona_recapiti AS pr INNER JOIN tipi_recapito AS tr ON"
+                              " FROM organigramma_persona_recapiti AS pr INNER JOIN tipi_recapito AS tr ON"
                               " pr.id_tipi_recapito = tr.id"
                               " WHERE pr.id_persone = %d"
                               " AND pr.status <> 'E'"
@@ -767,12 +767,12 @@ persona_carica_recapiti (Persona *persona)
 }
 
 static void
-persona_incarico_modifica (Persona *persona)
+organigramma_persona_incarico_modifica (OrganigrammaPersona *persona)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_incarichi, NULL, &iter))
                {
@@ -783,12 +783,12 @@ persona_incarico_modifica (Persona *persona)
                                            INCARICHI_COL_ID, &id,
                                            -1);
 
-                       PersonaIncarico *a = persona_incarico_new (priv->commons, id, 0);
+                       OrganigrammaPersonaIncarico *a = organigramma_persona_incarico_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (persona_on_incarico_aggiornato), (gpointer)persona);
+                                         G_CALLBACK (organigramma_persona_on_incarico_aggiornato), (gpointer)persona);
 
-                       w = persona_incarico_get_widget (a);
+                       w = organigramma_persona_incarico_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -805,12 +805,12 @@ persona_incarico_modifica (Persona *persona)
 }
 
 static void
-persona_nodo_modifica (Persona *persona)
+organigramma_persona_nodo_modifica (OrganigrammaPersona *persona)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_nodi, NULL, &iter))
                {
@@ -821,12 +821,12 @@ persona_nodo_modifica (Persona *persona)
                                            NODI_COL_ID, &id,
                                            -1);
 
-                       PersonaNodo *a = persona_nodo_new (priv->commons, id, 0);
+                       OrganigrammaPersonaNodo *a = organigramma_persona_nodo_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (persona_on_nodo_aggiornato), (gpointer)persona);
+                                         G_CALLBACK (organigramma_persona_on_nodo_aggiornato), (gpointer)persona);
 
-                       w = persona_nodo_get_widget (a);
+                       w = organigramma_persona_nodo_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -843,12 +843,12 @@ persona_nodo_modifica (Persona *persona)
 }
 
 static void
-persona_nodo_recapito_modifica (Persona *persona)
+organigramma_persona_nodo_recapito_modifica (OrganigrammaPersona *persona)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        guint id_nodi;
        if (gtk_tree_selection_get_selected (priv->sel_nodi, NULL, &iter))
@@ -879,12 +879,12 @@ persona_nodo_recapito_modifica (Persona *persona)
                                            NODO_RECAPITI_COL_ID, &id,
                                            -1);
 
-                       PersonaNodoRecapito *a = persona_nodo_recapito_new (priv->commons, id, 0, 0);
+                       OrganigrammaPersonaNodoRecapito *a = organigramma_persona_nodo_recapito_new (priv->commons, id, 0, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (persona_on_nodo_recapito_aggiornato), (gpointer)persona);
+                                         G_CALLBACK (organigramma_persona_on_nodo_recapito_aggiornato), (gpointer)persona);
 
-                       w = persona_nodo_recapito_get_widget (a);
+                       w = organigramma_persona_nodo_recapito_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -901,12 +901,12 @@ persona_nodo_recapito_modifica (Persona *persona)
 }
 
 static void
-persona_ufficio_modifica (Persona *persona)
+organigramma_persona_ufficio_modifica (OrganigrammaPersona *persona)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_uffici, NULL, &iter))
                {
@@ -917,12 +917,12 @@ persona_ufficio_modifica (Persona *persona)
                                            UFFICI_COL_ID, &id,
                                            -1);
 
-                       PersonaUfficio *a = persona_ufficio_new (priv->commons, id, 0);
+                       OrganigrammaPersonaUfficio *a = organigramma_persona_ufficio_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (persona_on_ufficio_aggiornato), (gpointer)persona);
+                                         G_CALLBACK (organigramma_persona_on_ufficio_aggiornato), (gpointer)persona);
 
-                       w = persona_ufficio_get_widget (a);
+                       w = organigramma_persona_ufficio_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -939,12 +939,12 @@ persona_ufficio_modifica (Persona *persona)
 }
 
 static void
-persona_ufficio_recapito_modifica (Persona *persona)
+organigramma_persona_ufficio_recapito_modifica (OrganigrammaPersona *persona)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        guint id_uffici;
        if (gtk_tree_selection_get_selected (priv->sel_uffici, NULL, &iter))
@@ -975,12 +975,12 @@ persona_ufficio_recapito_modifica (Persona *persona)
                                            UFFICIO_RECAPITI_COL_ID, &id,
                                            -1);
 
-                       PersonaUfficioRecapito *a = persona_ufficio_recapito_new (priv->commons, id, 0, 0);
+                       OrganigrammaPersonaUfficioRecapito *a = organigramma_persona_ufficio_recapito_new (priv->commons, id, 0, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (persona_on_ufficio_recapito_aggiornato), (gpointer)persona);
+                                         G_CALLBACK (organigramma_persona_on_ufficio_recapito_aggiornato), (gpointer)persona);
 
-                       w = persona_ufficio_recapito_get_widget (a);
+                       w = organigramma_persona_ufficio_recapito_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -997,12 +997,12 @@ persona_ufficio_recapito_modifica (Persona *persona)
 }
 
 static void
-persona_recapito_modifica (Persona *persona)
+organigramma_persona_recapito_modifica (OrganigrammaPersona *persona)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_recapiti, NULL, &iter))
                {
@@ -1013,12 +1013,12 @@ persona_recapito_modifica (Persona *persona)
                                            RECAPITI_COL_ID, &id,
                                            -1);
 
-                       PersonaRecapito *a = persona_recapito_new (priv->commons, id, 0);
+                       OrganigrammaPersonaRecapito *a = organigramma_persona_recapito_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (persona_on_recapito_aggiornato), (gpointer)persona);
+                                         G_CALLBACK (organigramma_persona_on_recapito_aggiornato), (gpointer)persona);
 
-                       w = persona_recapito_get_widget (a);
+                       w = organigramma_persona_recapito_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -1035,11 +1035,11 @@ persona_recapito_modifica (Persona *persona)
 }
 
 static void
-persona_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_persona_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Persona *persona = PERSONA (object);
+       OrganigrammaPersona *persona = ORGANIGRAMMA_PERSONA (object);
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        switch (property_id)
                {
@@ -1050,11 +1050,11 @@ persona_set_property (GObject *object, guint property_id, const GValue *value, G
 }
 
 static void
-persona_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_persona_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Persona *persona = PERSONA (object);
+       OrganigrammaPersona *persona = ORGANIGRAMMA_PERSONA (object);
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        switch (property_id)
                {
@@ -1065,13 +1065,13 @@ persona_get_property (GObject *object, guint property_id, GValue *value, GParamS
 }
 
 static gboolean
-persona_conferma_chiusura (Persona *persona)
+organigramma_persona_conferma_chiusura (OrganigrammaPersona *persona)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        ret = TRUE;
        if (gtk_form_is_changed (priv->form))
@@ -1093,106 +1093,106 @@ persona_conferma_chiusura (Persona *persona)
 
 /* CALLBACK */
 static void
-persona_on_incarico_aggiornato (gpointer instance, gpointer user_data)
+organigramma_persona_on_incarico_aggiornato (gpointer instance, gpointer user_data)
 {
-       Persona *persona = (Persona *)user_data;
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
 
-       persona_carica_incarichi (persona);
+       organigramma_persona_carica_incarichi (persona);
 }
 
 static void
-persona_on_nodo_aggiornato (gpointer instance, gpointer user_data)
+organigramma_persona_on_nodo_aggiornato (gpointer instance, gpointer user_data)
 {
-       Persona *persona = (Persona *)user_data;
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
 
-       persona_carica_nodi (persona);
+       organigramma_persona_carica_nodi (persona);
 }
 
 static void
-persona_on_nodo_recapito_aggiornato (gpointer instance, gpointer user_data)
+organigramma_persona_on_nodo_recapito_aggiornato (gpointer instance, gpointer user_data)
 {
-       Persona *persona = (Persona *)user_data;
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
 
-       persona_carica_nodo_recapiti (persona);
+       organigramma_persona_carica_nodo_recapiti (persona);
 }
 
 static void
-persona_on_ufficio_aggiornato (gpointer instance, gpointer user_data)
+organigramma_persona_on_ufficio_aggiornato (gpointer instance, gpointer user_data)
 {
-       Persona *persona = (Persona *)user_data;
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
 
-       persona_carica_uffici (persona);
+       organigramma_persona_carica_uffici (persona);
 }
 
 static void
-persona_on_ufficio_recapito_aggiornato (gpointer instance, gpointer user_data)
+organigramma_persona_on_ufficio_recapito_aggiornato (gpointer instance, gpointer user_data)
 {
-       Persona *persona = (Persona *)user_data;
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
 
-       persona_carica_ufficio_recapiti (persona);
+       organigramma_persona_carica_ufficio_recapiti (persona);
 }
 
 static void
-persona_on_recapito_aggiornato (gpointer instance, gpointer user_data)
+organigramma_persona_on_recapito_aggiornato (gpointer instance, gpointer user_data)
 {
-       Persona *persona = (Persona *)user_data;
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
 
-       persona_carica_recapiti (persona);
+       organigramma_persona_carica_recapiti (persona);
 }
 
 static gboolean
-persona_on_w_persona_delete_event (GtkWidget *widget,
+organigramma_persona_on_w_organigramma_persona_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !persona_conferma_chiusura ((Persona *)user_data);
+       return !organigramma_persona_conferma_chiusura ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_incarico_nuovo_clicked (GtkButton *button,
+organigramma_persona_on_btn_incarico_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
-       PersonaIncarico *a = persona_incarico_new (priv->commons, 0, priv->id);
+       OrganigrammaPersonaIncarico *a = organigramma_persona_incarico_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (persona_on_incarico_aggiornato), (gpointer)persona);
+                         G_CALLBACK (organigramma_persona_on_incarico_aggiornato), (gpointer)persona);
 
-       w = persona_incarico_get_widget (a);
+       w = organigramma_persona_incarico_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-persona_on_btn_incarico_modifica_clicked (GtkButton *button,
+organigramma_persona_on_btn_incarico_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       persona_incarico_modifica ((Persona *)user_data);
+       organigramma_persona_incarico_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_incarico_elimina_clicked (GtkButton *button,
+organigramma_persona_on_btn_incarico_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_incarichi, NULL, &iter))
                {
@@ -1211,12 +1211,12 @@ persona_on_btn_incarico_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE persona_incarichi"
+                                                      g_strdup_printf ("UPDATE organigramma_persona_incarichi"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       persona_carica_incarichi (persona);
+                                       organigramma_persona_carica_incarichi (persona);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1233,53 +1233,53 @@ persona_on_btn_incarico_elimina_clicked (GtkButton *button,
 }
 
 static void
-persona_on_trv_incarichi_row_activated (GtkTreeView *tree_view,
+organigramma_persona_on_trv_incarichi_row_activated (GtkTreeView *tree_view,
                                      GtkTreePath *tree_path,
                                      GtkTreeViewColumn *column,
                                      gpointer user_data)
 {
-       persona_incarico_modifica ((Persona *)user_data);
+       organigramma_persona_incarico_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_nodo_nuovo_clicked (GtkButton *button,
+organigramma_persona_on_btn_nodo_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
-       PersonaNodo *a = persona_nodo_new (priv->commons, 0, priv->id);
+       OrganigrammaPersonaNodo *a = organigramma_persona_nodo_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (persona_on_nodo_aggiornato), (gpointer)persona);
+                         G_CALLBACK (organigramma_persona_on_nodo_aggiornato), (gpointer)persona);
 
-       w = persona_nodo_get_widget (a);
+       w = organigramma_persona_nodo_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-persona_on_btn_nodo_modifica_clicked (GtkButton *button,
+organigramma_persona_on_btn_nodo_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       persona_nodo_modifica ((Persona *)user_data);
+       organigramma_persona_nodo_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_nodo_elimina_clicked (GtkButton *button,
+organigramma_persona_on_btn_nodo_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_nodi, NULL, &iter))
                {
@@ -1298,12 +1298,12 @@ persona_on_btn_nodo_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE persona_nodi"
+                                                      g_strdup_printf ("UPDATE organigramma_persona_nodi"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       persona_carica_nodi (persona);
+                                       organigramma_persona_carica_nodi (persona);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1320,31 +1320,31 @@ persona_on_btn_nodo_elimina_clicked (GtkButton *button,
 }
 
 static void
-persona_on_trv_nodi_row_activated (GtkTreeView *tree_view,
+organigramma_persona_on_trv_nodi_row_activated (GtkTreeView *tree_view,
                                      GtkTreePath *tree_path,
                                      GtkTreeViewColumn *column,
                                      gpointer user_data)
 {
-       persona_nodo_modifica ((Persona *)user_data);
+       organigramma_persona_nodo_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_nodi_sel_changed (GtkTreeSelection *selection,
+organigramma_persona_on_nodi_sel_changed (GtkTreeSelection *selection,
                                     gpointer user_data)
 {
-       persona_carica_nodo_recapiti ((Persona *)user_data);
+       organigramma_persona_carica_nodo_recapiti ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_nodo_recapito_nuovo_clicked (GtkButton *button,
+organigramma_persona_on_btn_nodo_recapito_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
        GtkTreeIter iter;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        guint id_nodi;
        if (gtk_tree_selection_get_selected (priv->sel_nodi, NULL, &iter))
@@ -1366,25 +1366,25 @@ persona_on_btn_nodo_recapito_nuovo_clicked (GtkButton *button,
                        return;
                }
 
-       PersonaNodoRecapito *a = persona_nodo_recapito_new (priv->commons, 0, priv->id, id_nodi);
+       OrganigrammaPersonaNodoRecapito *a = organigramma_persona_nodo_recapito_new (priv->commons, 0, priv->id, id_nodi);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (persona_on_nodo_recapito_aggiornato), (gpointer)persona);
+                         G_CALLBACK (organigramma_persona_on_nodo_recapito_aggiornato), (gpointer)persona);
 
-       w = persona_nodo_recapito_get_widget (a);
+       w = organigramma_persona_nodo_recapito_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-persona_on_btn_nodo_recapito_modifica_clicked (GtkButton *button,
+organigramma_persona_on_btn_nodo_recapito_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       persona_nodo_recapito_modifica ((Persona *)user_data);
+       organigramma_persona_nodo_recapito_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_nodo_recapito_elimina_clicked (GtkButton *button,
+organigramma_persona_on_btn_nodo_recapito_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
@@ -1392,10 +1392,10 @@ persona_on_btn_nodo_recapito_elimina_clicked (GtkButton *button,
        guint risp;
        guint id_nodi;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_nodi, NULL, &iter))
                {
@@ -1433,12 +1433,12 @@ persona_on_btn_nodo_recapito_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE persona_nodo_recapiti"
+                                                      g_strdup_printf ("UPDATE organigramma_persona_nodo_recapiti"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       persona_carica_nodo_recapiti (persona);
+                                       organigramma_persona_carica_nodo_recapiti (persona);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1455,53 +1455,53 @@ persona_on_btn_nodo_recapito_elimina_clicked (GtkButton *button,
 }
 
 static void
-persona_on_trv_nodo_recapiti_row_activated (GtkTreeView *tree_view,
+organigramma_persona_on_trv_nodo_recapiti_row_activated (GtkTreeView *tree_view,
                                      GtkTreePath *tree_path,
                                      GtkTreeViewColumn *column,
                                      gpointer user_data)
 {
-       persona_nodo_recapito_modifica ((Persona *)user_data);
+       organigramma_persona_nodo_recapito_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_ufficio_nuovo_clicked (GtkButton *button,
+organigramma_persona_on_btn_ufficio_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
-       PersonaUfficio *a = persona_ufficio_new (priv->commons, 0, priv->id);
+       OrganigrammaPersonaUfficio *a = organigramma_persona_ufficio_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (persona_on_ufficio_aggiornato), (gpointer)persona);
+                         G_CALLBACK (organigramma_persona_on_ufficio_aggiornato), (gpointer)persona);
 
-       w = persona_ufficio_get_widget (a);
+       w = organigramma_persona_ufficio_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-persona_on_btn_ufficio_modifica_clicked (GtkButton *button,
+organigramma_persona_on_btn_ufficio_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       persona_ufficio_modifica ((Persona *)user_data);
+       organigramma_persona_ufficio_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_ufficio_elimina_clicked (GtkButton *button,
+organigramma_persona_on_btn_ufficio_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_uffici, NULL, &iter))
                {
@@ -1520,12 +1520,12 @@ persona_on_btn_ufficio_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE persona_uffici"
+                                                      g_strdup_printf ("UPDATE organigramma_persona_uffici"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       persona_carica_uffici (persona);
+                                       organigramma_persona_carica_uffici (persona);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1542,31 +1542,31 @@ persona_on_btn_ufficio_elimina_clicked (GtkButton *button,
 }
 
 static void
-persona_on_trv_uffici_row_activated (GtkTreeView *tree_view,
+organigramma_persona_on_trv_uffici_row_activated (GtkTreeView *tree_view,
                                      GtkTreePath *tree_path,
                                      GtkTreeViewColumn *column,
                                      gpointer user_data)
 {
-       persona_ufficio_modifica ((Persona *)user_data);
+       organigramma_persona_ufficio_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_uffici_sel_changed (GtkTreeSelection *selection,
+organigramma_persona_on_uffici_sel_changed (GtkTreeSelection *selection,
                                     gpointer user_data)
 {
-       persona_carica_ufficio_recapiti ((Persona *)user_data);
+       organigramma_persona_carica_ufficio_recapiti ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_ufficio_recapito_nuovo_clicked (GtkButton *button,
+organigramma_persona_on_btn_ufficio_recapito_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
        GtkTreeIter iter;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        guint id_uffici;
        if (gtk_tree_selection_get_selected (priv->sel_uffici, NULL, &iter))
@@ -1588,25 +1588,25 @@ persona_on_btn_ufficio_recapito_nuovo_clicked (GtkButton *button,
                        return;
                }
 
-       PersonaUfficioRecapito *a = persona_ufficio_recapito_new (priv->commons, 0, priv->id, id_uffici);
+       OrganigrammaPersonaUfficioRecapito *a = organigramma_persona_ufficio_recapito_new (priv->commons, 0, priv->id, id_uffici);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (persona_on_ufficio_recapito_aggiornato), (gpointer)persona);
+                         G_CALLBACK (organigramma_persona_on_ufficio_recapito_aggiornato), (gpointer)persona);
 
-       w = persona_ufficio_recapito_get_widget (a);
+       w = organigramma_persona_ufficio_recapito_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-persona_on_btn_ufficio_recapito_modifica_clicked (GtkButton *button,
+organigramma_persona_on_btn_ufficio_recapito_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       persona_ufficio_recapito_modifica ((Persona *)user_data);
+       organigramma_persona_ufficio_recapito_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_ufficio_recapito_elimina_clicked (GtkButton *button,
+organigramma_persona_on_btn_ufficio_recapito_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
@@ -1614,10 +1614,10 @@ persona_on_btn_ufficio_recapito_elimina_clicked (GtkButton *button,
        guint risp;
        guint id_uffici;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_uffici, NULL, &iter))
                {
@@ -1655,12 +1655,12 @@ persona_on_btn_ufficio_recapito_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE persona_ufficio_recapiti"
+                                                      g_strdup_printf ("UPDATE organigramma_persona_ufficio_recapiti"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       persona_carica_ufficio_recapiti (persona);
+                                       organigramma_persona_carica_ufficio_recapiti (persona);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1677,53 +1677,53 @@ persona_on_btn_ufficio_recapito_elimina_clicked (GtkButton *button,
 }
 
 static void
-persona_on_trv_ufficio_recapiti_row_activated (GtkTreeView *tree_view,
+organigramma_persona_on_trv_ufficio_recapiti_row_activated (GtkTreeView *tree_view,
                                      GtkTreePath *tree_path,
                                      GtkTreeViewColumn *column,
                                      gpointer user_data)
 {
-       persona_ufficio_recapito_modifica ((Persona *)user_data);
+       organigramma_persona_ufficio_recapito_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_recapito_nuovo_clicked (GtkButton *button,
+organigramma_persona_on_btn_recapito_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
-       PersonaRecapito *a = persona_recapito_new (priv->commons, 0, priv->id);
+       OrganigrammaPersonaRecapito *a = organigramma_persona_recapito_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (persona_on_recapito_aggiornato), (gpointer)persona);
+                         G_CALLBACK (organigramma_persona_on_recapito_aggiornato), (gpointer)persona);
 
-       w = persona_recapito_get_widget (a);
+       w = organigramma_persona_recapito_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-persona_on_btn_recapito_modifica_clicked (GtkButton *button,
+organigramma_persona_on_btn_recapito_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       persona_recapito_modifica ((Persona *)user_data);
+       organigramma_persona_recapito_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_recapito_elimina_clicked (GtkButton *button,
+organigramma_persona_on_btn_recapito_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaClass *klass = PERSONA_GET_CLASS (persona);
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaClass *klass = ORGANIGRAMMA_PERSONA_GET_CLASS (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
        if (gtk_tree_selection_get_selected (priv->sel_recapiti, NULL, &iter))
                {
@@ -1742,12 +1742,12 @@ persona_on_btn_recapito_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE persona_recapiti"
+                                                      g_strdup_printf ("UPDATE organigramma_persona_recapiti"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       persona_carica_recapiti (persona);
+                                       organigramma_persona_carica_recapiti (persona);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1764,28 +1764,28 @@ persona_on_btn_recapito_elimina_clicked (GtkButton *button,
 }
 
 static void
-persona_on_trv_recapiti_row_activated (GtkTreeView *tree_view,
+organigramma_persona_on_trv_recapiti_row_activated (GtkTreeView *tree_view,
                                      GtkTreePath *tree_path,
                                      GtkTreeViewColumn *column,
                                      gpointer user_data)
 {
-       persona_recapito_modifica ((Persona *)user_data);
+       organigramma_persona_recapito_modifica ((OrganigrammaPersona *)user_data);
 }
 
 static void
-persona_on_btn_annulla_clicked (GtkButton *button,
+organigramma_persona_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       Persona *persona = (Persona *)user_data;
+       OrganigrammaPersona *persona = (OrganigrammaPersona *)user_data;
 
-       PersonaPrivate *priv = PERSONA_GET_PRIVATE (persona);
+       OrganigrammaPersonaPrivate *priv = ORGANIGRAMMA_PERSONA_GET_PRIVATE (persona);
 
-       if (persona_conferma_chiusura (persona)) gtk_widget_destroy (priv->w);
+       if (organigramma_persona_conferma_chiusura (persona)) gtk_widget_destroy (priv->w);
 }
 
 static void
-persona_on_btn_salva_clicked (GtkButton *button,
+organigramma_persona_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       persona_salva ((Persona *)user_data);
+       organigramma_persona_salva ((OrganigrammaPersona *)user_data);
 }

diff --git a/src/persona.h b/src/persona.h
index 31121ba00358ccbe97205b5709b5ab50c14ae3ef..0869514d0853adc9f5d7c02acdf02a65b9a5a1d3 100644 (file)
--- a/src/persona.h
+++ b/src/persona.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __PERSONA_H__
-#define __PERSONA_H__
+#ifndef __ORGANIGRAMMA_PERSONA_H__
+#define __ORGANIGRAMMA_PERSONA_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_PERSONA                 (persona_get_type ())
-#define PERSONA(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PERSONA, Persona))
-#define PERSONA_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PERSONA, PersonaClass))
-#define IS_PERSONA(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PERSONA))
-#define IS_PERSONA_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PERSONA))
-#define PERSONA_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PERSONA, PersonaClass))
+#define TYPE_ORGANIGRAMMA_PERSONA                 (organigramma_persona_get_type ())
+#define ORGANIGRAMMA_PERSONA(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_PERSONA, OrganigrammaPersona))
+#define ORGANIGRAMMA_PERSONA_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_PERSONA, OrganigrammaPersonaClass))
+#define IS_ORGANIGRAMMA_PERSONA(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_PERSONA))
+#define IS_ORGANIGRAMMA_PERSONA_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_PERSONA))
+#define ORGANIGRAMMA_PERSONA_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_PERSONA, OrganigrammaPersonaClass))
 
 
-typedef struct _Persona Persona;
-typedef struct _PersonaClass PersonaClass;
+typedef struct _OrganigrammaPersona OrganigrammaPersona;
+typedef struct _OrganigrammaPersonaClass OrganigrammaPersonaClass;
 
-struct _Persona
+struct _OrganigrammaPersona
        {
                GObject parent;
        };
 
-struct _PersonaClass
+struct _OrganigrammaPersonaClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType persona_get_type (void) G_GNUC_CONST;
+GType organigramma_persona_get_type (void) G_GNUC_CONST;
 
-Persona *persona_new (OrganigrammaCommons *commons, gint id);
+OrganigrammaPersona *organigramma_persona_new (OrganigrammaCommons *commons, gint id);
 
-GtkWidget *persona_get_widget (Persona *persona);
+GtkWidget *organigramma_persona_get_widget (OrganigrammaPersona *persona);
 
 
 G_END_DECLS
 
-#endif /* __PERSONA_H__ */
+#endif /* __ORGANIGRAMMA_PERSONA_H__ */

diff --git a/src/personaincarico.c b/src/personaincarico.c
index f7d1ec798aa0d966252752068296df40f625fffb..542b55223b074a70a9e8c47289aa533e8c40511d 100644 (file)
--- a/src/personaincarico.c
+++ b/src/personaincarico.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -26,34 +26,34 @@
 #include "personaincarico.h"
 #include "nodi.h"
 
-static void persona_incarico_class_init (PersonaIncaricoClass *klass);
-static void persona_incarico_init (PersonaIncarico *persona_incarico);
+static void organigramma_persona_incarico_class_init (OrganigrammaPersonaIncaricoClass *klass);
+static void organigramma_persona_incarico_init (OrganigrammaPersonaIncarico *organigramma_persona_incarico);
 
-static void persona_incarico_carica (PersonaIncarico *persona_incarico);
-static void persona_incarico_salva (PersonaIncarico *persona_incarico);
+static void organigramma_persona_incarico_carica (OrganigrammaPersonaIncarico *organigramma_persona_incarico);
+static void organigramma_persona_incarico_salva (OrganigrammaPersonaIncarico *organigramma_persona_incarico);
 
-static gboolean persona_incarico_conferma_chiusura (PersonaIncarico *persona_incarico);
+static gboolean organigramma_persona_incarico_conferma_chiusura (OrganigrammaPersonaIncarico *organigramma_persona_incarico);
 
-static void persona_incarico_set_property (GObject *object,
+static void organigramma_persona_incarico_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void persona_incarico_get_property (GObject *object,
+static void organigramma_persona_incarico_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean persona_incarico_on_w_persona_incarico_delete_event (GtkWidget *widget,
+static gboolean organigramma_persona_incarico_on_w_organigramma_persona_incarico_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void persona_incarico_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_persona_incarico_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_incarico_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_persona_incarico_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define PERSONA_INCARICO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PERSONA_INCARICO, PersonaIncaricoPrivate))
+#define ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_PERSONA_INCARICO, OrganigrammaPersonaIncaricoPrivate))
 
 enum
 {
@@ -61,8 +61,8 @@ enum
        LBL_ID_PERSONE
 };
 
-typedef struct _PersonaIncaricoPrivate PersonaIncaricoPrivate;
-struct _PersonaIncaricoPrivate
+typedef struct _OrganigrammaPersonaIncaricoPrivate OrganigrammaPersonaIncaricoPrivate;
+struct _OrganigrammaPersonaIncaricoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -75,21 +75,21 @@ struct _PersonaIncaricoPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (PersonaIncarico, persona_incarico, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaPersonaIncarico, organigramma_persona_incarico, G_TYPE_OBJECT)
 
 static void
-persona_incarico_class_init (PersonaIncaricoClass *klass)
+organigramma_persona_incarico_class_init (OrganigrammaPersonaIncaricoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (PersonaIncaricoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaPersonaIncaricoPrivate));
 
-       object_class->set_property = persona_incarico_set_property;
-       object_class->get_property = persona_incarico_get_property;
+       object_class->set_property = organigramma_persona_incarico_set_property;
+       object_class->get_property = organigramma_persona_incarico_get_property;
 
        /**
-        * PersonaIncarico::aggiornato:
-        * @persona_incarico:
+        * OrganigrammaPersonaIncarico::aggiornato:
+        * @organigramma_persona_incarico:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -104,27 +104,27 @@ persona_incarico_class_init (PersonaIncaricoClass *klass)
 }
 
 static void
-persona_incarico_init (PersonaIncarico *persona_incarico)
+organigramma_persona_incarico_init (OrganigrammaPersonaIncarico *organigramma_persona_incarico)
 {
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (persona_incarico);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (organigramma_persona_incarico);
 }
 
 /**
- * persona_incarico_new:
+ * organigramma_persona_incarico_new:
  * @commons:
  * @id:
  * @id_persone:
  *
- * Returns: the newly created #PersonaIncarico object.
+ * Returns: the newly created #OrganigrammaPersonaIncarico object.
  */
-PersonaIncarico
-*persona_incarico_new (OrganigrammaCommons *commons, guint id, guint id_persone)
+OrganigrammaPersonaIncarico
+*organigramma_persona_incarico_new (OrganigrammaCommons *commons, guint id, guint id_persone)
 {
        GError *error;
 
-       PersonaIncarico *a = PERSONA_INCARICO (g_object_new (persona_incarico_get_type (), NULL));
+       OrganigrammaPersonaIncarico *a = ORGANIGRAMMA_PERSONA_INCARICO (g_object_new (organigramma_persona_incarico_get_type (), NULL));
 
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (a);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
@@ -136,7 +136,7 @@ PersonaIncarico
                                           "|lstore_posizioni_economiche"
                                           "|lstore_tipi_prestazione"
                                           "|lstore_profili_professionali"
-                                          "|w_persona_incarico", "|", -1),
+                                          "|w_organigramma_persona_incarico", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -146,9 +146,9 @@ PersonaIncarico
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "persona_incarico.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_persona_incarico.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_incarico"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_persona_incarico"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label129",
@@ -156,12 +156,12 @@ PersonaIncarico
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (persona_incarico_on_w_persona_incarico_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_persona_incarico_on_w_organigramma_persona_incarico_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button98")),
-                         "clicked", G_CALLBACK (persona_incarico_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_incarico_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button99")),
-                         "clicked", G_CALLBACK (persona_incarico_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_incarico_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -175,33 +175,33 @@ PersonaIncarico
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       persona_incarico_carica (a);
+                       organigramma_persona_incarico_carica (a);
                }
 
        return a;
 }
 
 /**
- * persona_incarico_get_widget:
- * @persona_incarico:
+ * organigramma_persona_incarico_get_widget:
+ * @organigramma_persona_incarico:
  *
  */
 GtkWidget
-*persona_incarico_get_widget (PersonaIncarico *persona_incarico)
+*organigramma_persona_incarico_get_widget (OrganigrammaPersonaIncarico *organigramma_persona_incarico)
 {
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (persona_incarico);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (organigramma_persona_incarico);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-persona_incarico_carica (PersonaIncarico *persona_incarico)
+organigramma_persona_incarico_carica (OrganigrammaPersonaIncarico *organigramma_persona_incarico)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (persona_incarico);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (organigramma_persona_incarico);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -209,14 +209,14 @@ persona_incarico_carica (PersonaIncarico *persona_incarico)
 }
 
 static void
-persona_incarico_salva (PersonaIncarico *persona_incarico)
+organigramma_persona_incarico_salva (OrganigrammaPersonaIncarico *organigramma_persona_incarico)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       PersonaIncaricoClass *klass = PERSONA_INCARICO_GET_CLASS (persona_incarico);
+       OrganigrammaPersonaIncaricoClass *klass = ORGANIGRAMMA_PERSONA_INCARICO_GET_CLASS (organigramma_persona_incarico);
 
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (persona_incarico);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (organigramma_persona_incarico);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -234,7 +234,7 @@ persona_incarico_salva (PersonaIncarico *persona_incarico)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (persona_incarico, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_persona_incarico, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -264,11 +264,11 @@ persona_incarico_salva (PersonaIncarico *persona_incarico)
 }
 
 static void
-persona_incarico_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_persona_incarico_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       PersonaIncarico *persona_incarico = PERSONA_INCARICO (object);
+       OrganigrammaPersonaIncarico *organigramma_persona_incarico = ORGANIGRAMMA_PERSONA_INCARICO (object);
 
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (persona_incarico);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (organigramma_persona_incarico);
 
        switch (property_id)
                {
@@ -279,11 +279,11 @@ persona_incarico_set_property (GObject *object, guint property_id, const GValue
 }
 
 static void
-persona_incarico_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_persona_incarico_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       PersonaIncarico *persona_incarico = PERSONA_INCARICO (object);
+       OrganigrammaPersonaIncarico *organigramma_persona_incarico = ORGANIGRAMMA_PERSONA_INCARICO (object);
 
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (persona_incarico);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (organigramma_persona_incarico);
 
        switch (property_id)
                {
@@ -294,13 +294,13 @@ persona_incarico_get_property (GObject *object, guint property_id, GValue *value
 }
 
 static gboolean
-persona_incarico_conferma_chiusura (PersonaIncarico *persona_incarico)
+organigramma_persona_incarico_conferma_chiusura (OrganigrammaPersonaIncarico *organigramma_persona_incarico)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (persona_incarico);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (organigramma_persona_incarico);
 
        ret = TRUE;
 
@@ -323,27 +323,27 @@ persona_incarico_conferma_chiusura (PersonaIncarico *persona_incarico)
 
 /* CALLBACK */
 static gboolean
-persona_incarico_on_w_persona_incarico_delete_event (GtkWidget *widget,
+organigramma_persona_incarico_on_w_organigramma_persona_incarico_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !persona_incarico_conferma_chiusura ((PersonaIncarico *)user_data);
+       return !organigramma_persona_incarico_conferma_chiusura ((OrganigrammaPersonaIncarico *)user_data);
 }
 
 static void
-persona_incarico_on_btn_annulla_clicked (GtkButton *button,
+organigramma_persona_incarico_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       PersonaIncarico *persona_incarico = (PersonaIncarico *)user_data;
+       OrganigrammaPersonaIncarico *organigramma_persona_incarico = (OrganigrammaPersonaIncarico *)user_data;
 
-       PersonaIncaricoPrivate *priv = PERSONA_INCARICO_GET_PRIVATE (persona_incarico);
+       OrganigrammaPersonaIncaricoPrivate *priv = ORGANIGRAMMA_PERSONA_INCARICO_GET_PRIVATE (organigramma_persona_incarico);
 
-       if (persona_incarico_conferma_chiusura (persona_incarico)) gtk_widget_destroy (priv->w);
+       if (organigramma_persona_incarico_conferma_chiusura (organigramma_persona_incarico)) gtk_widget_destroy (priv->w);
 }
 
 static void
-persona_incarico_on_btn_salva_clicked (GtkButton *button,
+organigramma_persona_incarico_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       persona_incarico_salva ((PersonaIncarico *)user_data);
+       organigramma_persona_incarico_salva ((OrganigrammaPersonaIncarico *)user_data);
 }

diff --git a/src/personaincarico.h b/src/personaincarico.h
index 6a33cc450482960c5cb6c98df7f131e3c84fcf5b..826bf2d6799a78d29ca33bc8220e092b5fdee32d 100644 (file)
--- a/src/personaincarico.h
+++ b/src/personaincarico.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __PERSONA_INCARICO_H__
-#define __PERSONA_INCARICO_H__
+#ifndef __ORGANIGRAMMA_PERSONA_INCARICO_H__
+#define __ORGANIGRAMMA_PERSONA_INCARICO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_PERSONA_INCARICO                 (persona_incarico_get_type ())
-#define PERSONA_INCARICO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PERSONA_INCARICO, PersonaIncarico))
-#define PERSONA_INCARICO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PERSONA_INCARICO, PersonaIncaricoClass))
-#define IS_PERSONA_INCARICO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PERSONA_INCARICO))
-#define IS_PERSONA_INCARICO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PERSONA_INCARICO))
-#define PERSONA_INCARICO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PERSONA_INCARICO, PersonaIncaricoClass))
+#define TYPE_ORGANIGRAMMA_PERSONA_INCARICO                 (organigramma_persona_incarico_get_type ())
+#define ORGANIGRAMMA_PERSONA_INCARICO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_PERSONA_INCARICO, OrganigrammaPersonaIncarico))
+#define ORGANIGRAMMA_PERSONA_INCARICO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_PERSONA_INCARICO, OrganigrammaPersonaIncaricoClass))
+#define IS_ORGANIGRAMMA_PERSONA_INCARICO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_PERSONA_INCARICO))
+#define IS_ORGANIGRAMMA_PERSONA_INCARICO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_PERSONA_INCARICO))
+#define ORGANIGRAMMA_PERSONA_INCARICO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_PERSONA_INCARICO, OrganigrammaPersonaIncaricoClass))
 
 
-typedef struct _PersonaIncarico PersonaIncarico;
-typedef struct _PersonaIncaricoClass PersonaIncaricoClass;
+typedef struct _OrganigrammaPersonaIncarico OrganigrammaPersonaIncarico;
+typedef struct _OrganigrammaPersonaIncaricoClass OrganigrammaPersonaIncaricoClass;
 
-struct _PersonaIncarico
+struct _OrganigrammaPersonaIncarico
        {
                GObject parent;
        };
 
-struct _PersonaIncaricoClass
+struct _OrganigrammaPersonaIncaricoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType persona_incarico_get_type (void) G_GNUC_CONST;
+GType organigramma_persona_incarico_get_type (void) G_GNUC_CONST;
 
-PersonaIncarico *persona_incarico_new (OrganigrammaCommons *commons, guint id, guint id_persone);
+OrganigrammaPersonaIncarico *organigramma_persona_incarico_new (OrganigrammaCommons *commons, guint id, guint id_persone);
 
-GtkWidget *persona_incarico_get_widget (PersonaIncarico *persona_incarico);
+GtkWidget *organigramma_persona_incarico_get_widget (OrganigrammaPersonaIncarico *organigramma_persona_incarico);
 
 
 G_END_DECLS
 
-#endif /* __PERSONA_INCARICO_H__ */
+#endif /* __ORGANIGRAMMA_PERSONA_INCARICO_H__ */

diff --git a/src/personanodo.c b/src/personanodo.c
index f6baa3cfeb336f503465a804dcb7ceee962449fa..29a3d7ab3f3f273fbdca1a3f5782c3dc269e4395 100644 (file)
--- a/src/personanodo.c
+++ b/src/personanodo.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -26,41 +26,41 @@
 #include "personanodo.h"
 #include "nodi.h"
 
-static void persona_nodo_class_init (PersonaNodoClass *klass);
-static void persona_nodo_init (PersonaNodo *persona_nodo);
+static void organigramma_persona_nodo_class_init (OrganigrammaPersonaNodoClass *klass);
+static void organigramma_persona_nodo_init (OrganigrammaPersonaNodo *organigramma_persona_nodo);
 
-static void persona_nodo_carica (PersonaNodo *persona_nodo);
-static void persona_nodo_salva (PersonaNodo *persona_nodo);
+static void organigramma_persona_nodo_carica (OrganigrammaPersonaNodo *organigramma_persona_nodo);
+static void organigramma_persona_nodo_salva (OrganigrammaPersonaNodo *organigramma_persona_nodo);
 
-static void persona_nodo_carica_nodo (PersonaNodo *indirizzo);
+static void organigramma_persona_nodo_carica_nodo (OrganigrammaPersonaNodo *indirizzo);
 
-static gboolean persona_nodo_conferma_chiusura (PersonaNodo *persona_nodo);
+static gboolean organigramma_persona_nodo_conferma_chiusura (OrganigrammaPersonaNodo *organigramma_persona_nodo);
 
-static void persona_nodo_on_nodo_selezionato (gpointer instance,
+static void organigramma_persona_nodo_on_nodo_selezionato (gpointer instance,
                                           guint id, gpointer user_data);
 
-static void persona_nodo_set_property (GObject *object,
+static void organigramma_persona_nodo_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void persona_nodo_get_property (GObject *object,
+static void organigramma_persona_nodo_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean persona_nodo_on_w_persona_nodo_delete_event (GtkWidget *widget,
+static gboolean organigramma_persona_nodo_on_w_organigramma_persona_nodo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void persona_nodo_on_btn_ricerca_via_clicked (GtkButton *button,
+static void organigramma_persona_nodo_on_btn_ricerca_via_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_nodo_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_persona_nodo_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_nodo_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_persona_nodo_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define PERSONA_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PERSONA_NODO, PersonaNodoPrivate))
+#define ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_PERSONA_NODO, OrganigrammaPersonaNodoPrivate))
 
 enum
 {
@@ -68,8 +68,8 @@ enum
        LBL_ID_PERSONE
 };
 
-typedef struct _PersonaNodoPrivate PersonaNodoPrivate;
-struct _PersonaNodoPrivate
+typedef struct _OrganigrammaPersonaNodoPrivate OrganigrammaPersonaNodoPrivate;
+struct _OrganigrammaPersonaNodoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -82,21 +82,21 @@ struct _PersonaNodoPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (PersonaNodo, persona_nodo, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaPersonaNodo, organigramma_persona_nodo, G_TYPE_OBJECT)
 
 static void
-persona_nodo_class_init (PersonaNodoClass *klass)
+organigramma_persona_nodo_class_init (OrganigrammaPersonaNodoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (PersonaNodoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaPersonaNodoPrivate));
 
-       object_class->set_property = persona_nodo_set_property;
-       object_class->get_property = persona_nodo_get_property;
+       object_class->set_property = organigramma_persona_nodo_set_property;
+       object_class->get_property = organigramma_persona_nodo_get_property;
 
        /**
-        * PersonaNodo::aggiornato:
-        * @persona_nodo:
+        * OrganigrammaPersonaNodo::aggiornato:
+        * @organigramma_persona_nodo:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -111,34 +111,34 @@ persona_nodo_class_init (PersonaNodoClass *klass)
 }
 
 static void
-persona_nodo_init (PersonaNodo *persona_nodo)
+organigramma_persona_nodo_init (OrganigrammaPersonaNodo *organigramma_persona_nodo)
 {
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (persona_nodo);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo);
 }
 
 /**
- * persona_nodo_new:
+ * organigramma_persona_nodo_new:
  * @commons:
  * @id:
  * @id_persone:
  *
- * Returns: the newly created #PersonaNodo object.
+ * Returns: the newly created #OrganigrammaPersonaNodo object.
  */
-PersonaNodo
-*persona_nodo_new (OrganigrammaCommons *commons, guint id, guint id_persone)
+OrganigrammaPersonaNodo
+*organigramma_persona_nodo_new (OrganigrammaCommons *commons, guint id, guint id_persone)
 {
        GError *error;
 
-       PersonaNodo *a = PERSONA_NODO (g_object_new (persona_nodo_get_type (), NULL));
+       OrganigrammaPersonaNodo *a = ORGANIGRAMMA_PERSONA_NODO (g_object_new (organigramma_persona_nodo_get_type (), NULL));
 
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (a);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("w_persona_nodo", "|", -1),
+                                          g_strsplit ("w_organigramma_persona_nodo", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -148,9 +148,9 @@ PersonaNodo
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "persona_nodo.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_persona_nodo.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_nodo"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_persona_nodo"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label116",
@@ -158,15 +158,15 @@ PersonaNodo
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (persona_nodo_on_w_persona_nodo_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_persona_nodo_on_w_organigramma_persona_nodo_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button90")),
-                         "clicked", G_CALLBACK (persona_nodo_on_btn_ricerca_via_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_ricerca_via_clicked), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button91")),
-                         "clicked", G_CALLBACK (persona_nodo_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button92")),
-                         "clicked", G_CALLBACK (persona_nodo_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_nodo_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -180,33 +180,33 @@ PersonaNodo
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       persona_nodo_carica (a);
+                       organigramma_persona_nodo_carica (a);
                }
 
        return a;
 }
 
 /**
- * persona_nodo_get_widget:
- * @persona_nodo:
+ * organigramma_persona_nodo_get_widget:
+ * @organigramma_persona_nodo:
  *
  */
 GtkWidget
-*persona_nodo_get_widget (PersonaNodo *persona_nodo)
+*organigramma_persona_nodo_get_widget (OrganigrammaPersonaNodo *organigramma_persona_nodo)
 {
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (persona_nodo);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-persona_nodo_carica (PersonaNodo *persona_nodo)
+organigramma_persona_nodo_carica (OrganigrammaPersonaNodo *organigramma_persona_nodo)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (persona_nodo);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -214,14 +214,14 @@ persona_nodo_carica (PersonaNodo *persona_nodo)
 }
 
 static void
-persona_nodo_salva (PersonaNodo *persona_nodo)
+organigramma_persona_nodo_salva (OrganigrammaPersonaNodo *organigramma_persona_nodo)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       PersonaNodoClass *klass = PERSONA_NODO_GET_CLASS (persona_nodo);
+       OrganigrammaPersonaNodoClass *klass = ORGANIGRAMMA_PERSONA_NODO_GET_CLASS (organigramma_persona_nodo);
 
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (persona_nodo);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -239,7 +239,7 @@ persona_nodo_salva (PersonaNodo *persona_nodo)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (persona_nodo, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_persona_nodo, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -269,21 +269,20 @@ persona_nodo_salva (PersonaNodo *persona_nodo)
 }
 
 static void
-persona_nodo_on_nodo_selezionato (gpointer instance, guint id, gpointer user_data)
+organigramma_persona_nodo_on_nodo_selezionato (gpointer instance, guint id, gpointer user_data)
 {
-       PersonaNodo *ia = (PersonaNodo *)user_data;
+       OrganigrammaPersonaNodo *ia = (OrganigrammaPersonaNodo *)user_data;
 
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (ia);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (ia);
 
        gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "label115"), g_strdup_printf ("%d", id));
 }
 
 static void
-persona_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_persona_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       PersonaNodo *persona_nodo = PERSONA_NODO (object);
-
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (persona_nodo);
+       OrganigrammaPersonaNodo *organigramma_persona_nodo = ORGANIGRAMMA_PERSONA_NODO (object);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo);
 
        switch (property_id)
                {
@@ -294,11 +293,10 @@ persona_nodo_set_property (GObject *object, guint property_id, const GValue *val
 }
 
 static void
-persona_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_persona_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       PersonaNodo *persona_nodo = PERSONA_NODO (object);
-
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (persona_nodo);
+       OrganigrammaPersonaNodo *organigramma_persona_nodo = ORGANIGRAMMA_PERSONA_NODO (object);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo);
 
        switch (property_id)
                {
@@ -309,13 +307,13 @@ persona_nodo_get_property (GObject *object, guint property_id, GValue *value, GP
 }
 
 static gboolean
-persona_nodo_conferma_chiusura (PersonaNodo *persona_nodo)
+organigramma_persona_nodo_conferma_chiusura (OrganigrammaPersonaNodo *organigramma_persona_nodo)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (persona_nodo);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo);
 
        ret = TRUE;
 
@@ -338,46 +336,46 @@ persona_nodo_conferma_chiusura (PersonaNodo *persona_nodo)
 
 /* CALLBACK */
 static gboolean
-persona_nodo_on_w_persona_nodo_delete_event (GtkWidget *widget,
+organigramma_persona_nodo_on_w_organigramma_persona_nodo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !persona_nodo_conferma_chiusura ((PersonaNodo *)user_data);
+       return !organigramma_persona_nodo_conferma_chiusura ((OrganigrammaPersonaNodo *)user_data);
 }
 
 static void
-persona_nodo_on_btn_ricerca_via_clicked (GtkButton *button,
+organigramma_persona_nodo_on_btn_ricerca_via_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       PersonaNodo *ia = (PersonaNodo *)user_data;
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (ia);
+       OrganigrammaPersonaNodo *ia = (OrganigrammaPersonaNodo *)user_data;
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (ia);
 
-       Nodi *v = nodi_new (priv->commons, TRUE);
+       OrganigrammaNodi *v = organigramma_nodi_new (priv->commons, TRUE);
 
        g_signal_connect (G_OBJECT (v), "selezionato",
-                         G_CALLBACK (persona_nodo_on_nodo_selezionato), (gpointer)ia);
+                         G_CALLBACK (organigramma_persona_nodo_on_nodo_selezionato), user_data);
 
-       w = nodi_get_widget (v);
+       w = organigramma_nodi_get_widget (v);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-persona_nodo_on_btn_annulla_clicked (GtkButton *button,
+organigramma_persona_nodo_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       PersonaNodo *persona_nodo = (PersonaNodo *)user_data;
+       OrganigrammaPersonaNodo *organigramma_persona_nodo = (OrganigrammaPersonaNodo *)user_data;
 
-       PersonaNodoPrivate *priv = PERSONA_NODO_GET_PRIVATE (persona_nodo);
+       OrganigrammaPersonaNodoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_GET_PRIVATE (organigramma_persona_nodo);
 
-       if (persona_nodo_conferma_chiusura (persona_nodo)) gtk_widget_destroy (priv->w);
+       if (organigramma_persona_nodo_conferma_chiusura (organigramma_persona_nodo)) gtk_widget_destroy (priv->w);
 }
 
 static void
-persona_nodo_on_btn_salva_clicked (GtkButton *button,
+organigramma_persona_nodo_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       persona_nodo_salva ((PersonaNodo *)user_data);
+       organigramma_persona_nodo_salva ((OrganigrammaPersonaNodo *)user_data);
 }

diff --git a/src/personanodo.h b/src/personanodo.h
index 26a9ab96bb30ec1cdcc771bd5e33aec11374d3f3..ea6f826070fb1cf7aff5832e7af78d9a7e530010 100644 (file)
--- a/src/personanodo.h
+++ b/src/personanodo.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __PERSONA_NODO_H__
-#define __PERSONA_NODO_H__
+#ifndef __ORGANIGRAMMA_PERSONA_NODO_H__
+#define __ORGANIGRAMMA_PERSONA_NODO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_PERSONA_NODO                 (persona_nodo_get_type ())
-#define PERSONA_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PERSONA_NODO, PersonaNodo))
-#define PERSONA_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PERSONA_NODO, PersonaNodoClass))
-#define IS_PERSONA_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PERSONA_NODO))
-#define IS_PERSONA_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PERSONA_NODO))
-#define PERSONA_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PERSONA_NODO, PersonaNodoClass))
+#define TYPE_ORGANIGRAMMA_PERSONA_NODO                 (organigramma_persona_nodo_get_type ())
+#define ORGANIGRAMMA_PERSONA_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_PERSONA_NODO, OrganigrammaPersonaNodo))
+#define ORGANIGRAMMA_PERSONA_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_PERSONA_NODO, OrganigrammaPersonaNodoClass))
+#define IS_ORGANIGRAMMA_PERSONA_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_PERSONA_NODO))
+#define IS_ORGANIGRAMMA_PERSONA_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_PERSONA_NODO))
+#define ORGANIGRAMMA_PERSONA_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_PERSONA_NODO, OrganigrammaPersonaNodoClass))
 
 
-typedef struct _PersonaNodo PersonaNodo;
-typedef struct _PersonaNodoClass PersonaNodoClass;
+typedef struct _OrganigrammaPersonaNodo OrganigrammaPersonaNodo;
+typedef struct _OrganigrammaPersonaNodoClass OrganigrammaPersonaNodoClass;
 
-struct _PersonaNodo
+struct _OrganigrammaPersonaNodo
        {
                GObject parent;
        };
 
-struct _PersonaNodoClass
+struct _OrganigrammaPersonaNodoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType persona_nodo_get_type (void) G_GNUC_CONST;
+GType organigramma_persona_nodo_get_type (void) G_GNUC_CONST;
 
-PersonaNodo *persona_nodo_new (OrganigrammaCommons *commons, guint id, guint id_persone);
+OrganigrammaPersonaNodo *organigramma_persona_nodo_new (OrganigrammaCommons *commons, guint id, guint id_persone);
 
-GtkWidget *persona_nodo_get_widget (PersonaNodo *persona_nodo);
+GtkWidget *organigramma_persona_nodo_get_widget (OrganigrammaPersonaNodo *organigramma_persona_nodo);
 
 
 G_END_DECLS
 
-#endif /* __PERSONA_NODO_H__ */
+#endif /* __ORGANIGRAMMA_PERSONA_NODO_H__ */

diff --git a/src/personanodorecapito.c b/src/personanodorecapito.c
index f3d2d09147646c843040c1e5d54f826871aa54a2..51a8efbf3d1860f935e91d9afff317eb13b44819 100644 (file)
--- a/src/personanodorecapito.c
+++ b/src/personanodorecapito.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -25,34 +25,34 @@
 
 #include "personanodorecapito.h"
 
-static void persona_nodo_recapito_class_init (PersonaNodoRecapitoClass *klass);
-static void persona_nodo_recapito_init (PersonaNodoRecapito *persona_nodo_recapito);
+static void organigramma_persona_nodo_recapito_class_init (OrganigrammaPersonaNodoRecapitoClass *klass);
+static void organigramma_persona_nodo_recapito_init (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito);
 
-static void persona_nodo_recapito_carica (PersonaNodoRecapito *persona_nodo_recapito);
-static void persona_nodo_recapito_salva (PersonaNodoRecapito *persona_nodo_recapito);
+static void organigramma_persona_nodo_recapito_carica (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito);
+static void organigramma_persona_nodo_recapito_salva (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito);
 
-static gboolean persona_nodo_recapito_conferma_chiusura (PersonaNodoRecapito *persona_nodo_recapito);
+static gboolean organigramma_persona_nodo_recapito_conferma_chiusura (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito);
 
-static void persona_nodo_recapito_set_property (GObject *object,
+static void organigramma_persona_nodo_recapito_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void persona_nodo_recapito_get_property (GObject *object,
+static void organigramma_persona_nodo_recapito_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean persona_nodo_recapito_on_w_persona_nodo_recapito_delete_event (GtkWidget *widget,
+static gboolean organigramma_persona_nodo_recapito_on_w_organigramma_persona_nodo_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void persona_nodo_recapito_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_persona_nodo_recapito_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_nodo_recapito_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_persona_nodo_recapito_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define PERSONA_NODO_RECAPITO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PERSONA_NODO_RECAPITO, PersonaNodoRecapitoPrivate))
+#define ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_PERSONA_NODO_RECAPITO, OrganigrammaPersonaNodoRecapitoPrivate))
 
 enum
 {
@@ -61,8 +61,8 @@ enum
        LBL_ID_NODI
 };
 
-typedef struct _PersonaNodoRecapitoPrivate PersonaNodoRecapitoPrivate;
-struct _PersonaNodoRecapitoPrivate
+typedef struct _OrganigrammaPersonaNodoRecapitoPrivate OrganigrammaPersonaNodoRecapitoPrivate;
+struct _OrganigrammaPersonaNodoRecapitoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -75,21 +75,21 @@ struct _PersonaNodoRecapitoPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (PersonaNodoRecapito, persona_nodo_recapito, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaPersonaNodoRecapito, organigramma_persona_nodo_recapito, G_TYPE_OBJECT)
 
 static void
-persona_nodo_recapito_class_init (PersonaNodoRecapitoClass *klass)
+organigramma_persona_nodo_recapito_class_init (OrganigrammaPersonaNodoRecapitoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (PersonaNodoRecapitoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaPersonaNodoRecapitoPrivate));
 
-       object_class->set_property = persona_nodo_recapito_set_property;
-       object_class->get_property = persona_nodo_recapito_get_property;
+       object_class->set_property = organigramma_persona_nodo_recapito_set_property;
+       object_class->get_property = organigramma_persona_nodo_recapito_get_property;
 
        /**
-        * PersonaNodoRecapito::aggiornato:
-        * @persona_nodo_recapito:
+        * OrganigrammaPersonaNodoRecapito::aggiornato:
+        * @organigramma_persona_nodo_recapito:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -104,35 +104,35 @@ persona_nodo_recapito_class_init (PersonaNodoRecapitoClass *klass)
 }
 
 static void
-persona_nodo_recapito_init (PersonaNodoRecapito *persona_nodo_recapito)
+organigramma_persona_nodo_recapito_init (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito)
 {
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
 }
 
 /**
- * persona_nodo_recapito_new:
+ * organigramma_persona_nodo_recapito_new:
  * @commons:
  * @id:
  * @id_persone:
  * @id_nodi:
  *
- * Returns: the newly created #PersonaNodoRecapito object.
+ * Returns: the newly created #OrganigrammaPersonaNodoRecapito object.
  */
-PersonaNodoRecapito
-*persona_nodo_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_nodi)
+OrganigrammaPersonaNodoRecapito
+*organigramma_persona_nodo_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_nodi)
 {
        GError *error;
 
-       PersonaNodoRecapito *a = PERSONA_NODO_RECAPITO (g_object_new (persona_nodo_recapito_get_type (), NULL));
+       OrganigrammaPersonaNodoRecapito *a = ORGANIGRAMMA_PERSONA_NODO_RECAPITO (g_object_new (organigramma_persona_nodo_recapito_get_type (), NULL));
 
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (a);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("lstore_tipi_recapito|w_persona_nodo_recapito", "|", -1),
+                                          g_strsplit ("lstore_tipi_recapito|w_organigramma_persona_nodo_recapito", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -142,9 +142,9 @@ PersonaNodoRecapito
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "persona_nodo_recapito.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_persona_nodo_recapito.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_nodo_recapito"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_persona_nodo_recapito"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label122",
@@ -153,12 +153,12 @@ PersonaNodoRecapito
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (persona_nodo_recapito_on_w_persona_nodo_recapito_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_persona_nodo_recapito_on_w_organigramma_persona_nodo_recapito_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button93")),
-                         "clicked", G_CALLBACK (persona_nodo_recapito_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_nodo_recapito_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button94")),
-                         "clicked", G_CALLBACK (persona_nodo_recapito_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_nodo_recapito_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -173,33 +173,33 @@ PersonaNodoRecapito
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       persona_nodo_recapito_carica (a);
+                       organigramma_persona_nodo_recapito_carica (a);
                }
 
        return a;
 }
 
 /**
- * persona_nodo_recapito_get_widget:
- * @persona_nodo_recapito:
+ * organigramma_persona_nodo_recapito_get_widget:
+ * @organigramma_persona_nodo_recapito:
  *
  */
 GtkWidget
-*persona_nodo_recapito_get_widget (PersonaNodoRecapito *persona_nodo_recapito)
+*organigramma_persona_nodo_recapito_get_widget (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito)
 {
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-persona_nodo_recapito_carica (PersonaNodoRecapito *persona_nodo_recapito)
+organigramma_persona_nodo_recapito_carica (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -207,14 +207,14 @@ persona_nodo_recapito_carica (PersonaNodoRecapito *persona_nodo_recapito)
 }
 
 static void
-persona_nodo_recapito_salva (PersonaNodoRecapito *persona_nodo_recapito)
+organigramma_persona_nodo_recapito_salva (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       PersonaNodoRecapitoClass *klass = PERSONA_NODO_RECAPITO_GET_CLASS (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoClass *klass = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_CLASS (organigramma_persona_nodo_recapito);
 
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -232,7 +232,7 @@ persona_nodo_recapito_salva (PersonaNodoRecapito *persona_nodo_recapito)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (persona_nodo_recapito, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_persona_nodo_recapito, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -262,11 +262,11 @@ persona_nodo_recapito_salva (PersonaNodoRecapito *persona_nodo_recapito)
 }
 
 static void
-persona_nodo_recapito_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_persona_nodo_recapito_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       PersonaNodoRecapito *persona_nodo_recapito = PERSONA_NODO_RECAPITO (object);
+       OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito = ORGANIGRAMMA_PERSONA_NODO_RECAPITO (object);
 
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
 
        switch (property_id)
                {
@@ -277,11 +277,11 @@ persona_nodo_recapito_set_property (GObject *object, guint property_id, const GV
 }
 
 static void
-persona_nodo_recapito_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_persona_nodo_recapito_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       PersonaNodoRecapito *persona_nodo_recapito = PERSONA_NODO_RECAPITO (object);
+       OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito = ORGANIGRAMMA_PERSONA_NODO_RECAPITO (object);
 
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
 
        switch (property_id)
                {
@@ -292,13 +292,13 @@ persona_nodo_recapito_get_property (GObject *object, guint property_id, GValue *
 }
 
 static gboolean
-persona_nodo_recapito_conferma_chiusura (PersonaNodoRecapito *persona_nodo_recapito)
+organigramma_persona_nodo_recapito_conferma_chiusura (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
 
        ret = TRUE;
 
@@ -321,27 +321,27 @@ persona_nodo_recapito_conferma_chiusura (PersonaNodoRecapito *persona_nodo_recap
 
 /* CALLBACK */
 static gboolean
-persona_nodo_recapito_on_w_persona_nodo_recapito_delete_event (GtkWidget *widget,
+organigramma_persona_nodo_recapito_on_w_organigramma_persona_nodo_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !persona_nodo_recapito_conferma_chiusura ((PersonaNodoRecapito *)user_data);
+       return !organigramma_persona_nodo_recapito_conferma_chiusura ((OrganigrammaPersonaNodoRecapito *)user_data);
 }
 
 static void
-persona_nodo_recapito_on_btn_annulla_clicked (GtkButton *button,
+organigramma_persona_nodo_recapito_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       PersonaNodoRecapito *persona_nodo_recapito = (PersonaNodoRecapito *)user_data;
+       OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito = (OrganigrammaPersonaNodoRecapito *)user_data;
 
-       PersonaNodoRecapitoPrivate *priv = PERSONA_NODO_RECAPITO_GET_PRIVATE (persona_nodo_recapito);
+       OrganigrammaPersonaNodoRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_PRIVATE (organigramma_persona_nodo_recapito);
 
-       if (persona_nodo_recapito_conferma_chiusura (persona_nodo_recapito)) gtk_widget_destroy (priv->w);
+       if (organigramma_persona_nodo_recapito_conferma_chiusura (organigramma_persona_nodo_recapito)) gtk_widget_destroy (priv->w);
 }
 
 static void
-persona_nodo_recapito_on_btn_salva_clicked (GtkButton *button,
+organigramma_persona_nodo_recapito_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       persona_nodo_recapito_salva ((PersonaNodoRecapito *)user_data);
+       organigramma_persona_nodo_recapito_salva ((OrganigrammaPersonaNodoRecapito *)user_data);
 }

diff --git a/src/personanodorecapito.h b/src/personanodorecapito.h
index 22c44cc098108f2fc5458359dc55f0ba174062d4..1f33941f0ee0d9a0fe07754e02f36dc4a41dddc5 100644 (file)
--- a/src/personanodorecapito.h
+++ b/src/personanodorecapito.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __PERSONA_NODO_RECAPITO_H__
-#define __PERSONA_NODO_RECAPITO_H__
+#ifndef __ORGANIGRAMMA_PERSONA_NODO_RECAPITO_H__
+#define __ORGANIGRAMMA_PERSONA_NODO_RECAPITO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_PERSONA_NODO_RECAPITO                 (persona_nodo_recapito_get_type ())
-#define PERSONA_NODO_RECAPITO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PERSONA_NODO_RECAPITO, PersonaNodoRecapito))
-#define PERSONA_NODO_RECAPITO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PERSONA_NODO_RECAPITO, PersonaNodoRecapitoClass))
-#define IS_PERSONA_NODO_RECAPITO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PERSONA_NODO_RECAPITO))
-#define IS_PERSONA_NODO_RECAPITO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PERSONA_NODO_RECAPITO))
-#define PERSONA_NODO_RECAPITO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PERSONA_NODO_RECAPITO, PersonaNodoRecapitoClass))
+#define TYPE_ORGANIGRAMMA_PERSONA_NODO_RECAPITO                 (organigramma_persona_nodo_recapito_get_type ())
+#define ORGANIGRAMMA_PERSONA_NODO_RECAPITO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_PERSONA_NODO_RECAPITO, OrganigrammaPersonaNodoRecapito))
+#define ORGANIGRAMMA_PERSONA_NODO_RECAPITO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_PERSONA_NODO_RECAPITO, OrganigrammaPersonaNodoRecapitoClass))
+#define IS_ORGANIGRAMMA_PERSONA_NODO_RECAPITO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_PERSONA_NODO_RECAPITO))
+#define IS_ORGANIGRAMMA_PERSONA_NODO_RECAPITO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_PERSONA_NODO_RECAPITO))
+#define ORGANIGRAMMA_PERSONA_NODO_RECAPITO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_PERSONA_NODO_RECAPITO, OrganigrammaPersonaNodoRecapitoClass))
 
 
-typedef struct _PersonaNodoRecapito PersonaNodoRecapito;
-typedef struct _PersonaNodoRecapitoClass PersonaNodoRecapitoClass;
+typedef struct _OrganigrammaPersonaNodoRecapito OrganigrammaPersonaNodoRecapito;
+typedef struct _OrganigrammaPersonaNodoRecapitoClass OrganigrammaPersonaNodoRecapitoClass;
 
-struct _PersonaNodoRecapito
+struct _OrganigrammaPersonaNodoRecapito
        {
                GObject parent;
        };
 
-struct _PersonaNodoRecapitoClass
+struct _OrganigrammaPersonaNodoRecapitoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType persona_nodo_recapito_get_type (void) G_GNUC_CONST;
+GType organigramma_persona_nodo_recapito_get_type (void) G_GNUC_CONST;
 
-PersonaNodoRecapito *persona_nodo_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_nodi);
+OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_nodi);
 
-GtkWidget *persona_nodo_recapito_get_widget (PersonaNodoRecapito *persona_nodo_recapito);
+GtkWidget *organigramma_persona_nodo_recapito_get_widget (OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito);
 
 
 G_END_DECLS
 
-#endif /* __PERSONA_NODO_RECAPITO_H__ */
+#endif /* __ORGANIGRAMMA_PERSONA_NODO_RECAPITO_H__ */

diff --git a/src/personarecapito.c b/src/personarecapito.c
index b17a5ae78b84e534587c48beb95307e89eb2bceb..f411f2929f9a3dc047374e9d8572061452116c62 100644 (file)
--- a/src/personarecapito.c
+++ b/src/personarecapito.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -25,34 +25,34 @@
 
 #include "personarecapito.h"
 
-static void persona_recapito_class_init (PersonaRecapitoClass *klass);
-static void persona_recapito_init (PersonaRecapito *persona_recapito);
+static void organigramma_persona_recapito_class_init (OrganigrammaPersonaRecapitoClass *klass);
+static void organigramma_persona_recapito_init (OrganigrammaPersonaRecapito *organigramma_persona_recapito);
 
-static void persona_recapito_carica (PersonaRecapito *persona_recapito);
-static void persona_recapito_salva (PersonaRecapito *persona_recapito);
+static void organigramma_persona_recapito_carica (OrganigrammaPersonaRecapito *organigramma_persona_recapito);
+static void organigramma_persona_recapito_salva (OrganigrammaPersonaRecapito *organigramma_persona_recapito);
 
-static gboolean persona_recapito_conferma_chiusura (PersonaRecapito *persona_recapito);
+static gboolean organigramma_persona_recapito_conferma_chiusura (OrganigrammaPersonaRecapito *organigramma_persona_recapito);
 
-static void persona_recapito_set_property (GObject *object,
+static void organigramma_persona_recapito_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void persona_recapito_get_property (GObject *object,
+static void organigramma_persona_recapito_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean persona_recapito_on_w_persona_recapito_delete_event (GtkWidget *widget,
+static gboolean organigramma_persona_recapito_on_w_organigramma_persona_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void persona_recapito_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_persona_recapito_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_recapito_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_persona_recapito_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define PERSONA_RECAPITO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PERSONA_RECAPITO, PersonaRecapitoPrivate))
+#define ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_PERSONA_RECAPITO, OrganigrammaPersonaRecapitoPrivate))
 
 enum
 {
@@ -60,8 +60,8 @@ enum
        LBL_ID_PERSONE
 };
 
-typedef struct _PersonaRecapitoPrivate PersonaRecapitoPrivate;
-struct _PersonaRecapitoPrivate
+typedef struct _OrganigrammaPersonaRecapitoPrivate OrganigrammaPersonaRecapitoPrivate;
+struct _OrganigrammaPersonaRecapitoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -74,21 +74,21 @@ struct _PersonaRecapitoPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (PersonaRecapito, persona_recapito, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaPersonaRecapito, organigramma_persona_recapito, G_TYPE_OBJECT)
 
 static void
-persona_recapito_class_init (PersonaRecapitoClass *klass)
+organigramma_persona_recapito_class_init (OrganigrammaPersonaRecapitoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (PersonaRecapitoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaPersonaRecapitoPrivate));
 
-       object_class->set_property = persona_recapito_set_property;
-       object_class->get_property = persona_recapito_get_property;
+       object_class->set_property = organigramma_persona_recapito_set_property;
+       object_class->get_property = organigramma_persona_recapito_get_property;
 
        /**
-        * PersonaRecapito::aggiornato:
-        * @persona_recapito:
+        * OrganigrammaPersonaRecapito::aggiornato:
+        * @organigramma_persona_recapito:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -103,34 +103,34 @@ persona_recapito_class_init (PersonaRecapitoClass *klass)
 }
 
 static void
-persona_recapito_init (PersonaRecapito *persona_recapito)
+organigramma_persona_recapito_init (OrganigrammaPersonaRecapito *organigramma_persona_recapito)
 {
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (persona_recapito);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_recapito);
 }
 
 /**
- * persona_recapito_new:
+ * organigramma_persona_recapito_new:
  * @commons:
  * @id:
  * @id_persone:
  *
- * Returns: the newly created #PersonaRecapito object.
+ * Returns: the newly created #OrganigrammaPersonaRecapito object.
  */
-PersonaRecapito
-*persona_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone)
+OrganigrammaPersonaRecapito
+*organigramma_persona_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone)
 {
        GError *error;
 
-       PersonaRecapito *a = PERSONA_RECAPITO (g_object_new (persona_recapito_get_type (), NULL));
+       OrganigrammaPersonaRecapito *a = ORGANIGRAMMA_PERSONA_RECAPITO (g_object_new (organigramma_persona_recapito_get_type (), NULL));
 
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (a);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("lstore_tipi_recapito|w_persona_recapito", "|", -1),
+                                          g_strsplit ("lstore_tipi_recapito|w_organigramma_persona_recapito", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -140,9 +140,9 @@ PersonaRecapito
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "persona_recapito.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_persona_recapito.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_recapito"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_persona_recapito"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label103",
@@ -150,12 +150,12 @@ PersonaRecapito
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (persona_recapito_on_w_persona_recapito_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_persona_recapito_on_w_organigramma_persona_recapito_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button87")),
-                         "clicked", G_CALLBACK (persona_recapito_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_recapito_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button88")),
-                         "clicked", G_CALLBACK (persona_recapito_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_recapito_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -169,33 +169,33 @@ PersonaRecapito
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       persona_recapito_carica (a);
+                       organigramma_persona_recapito_carica (a);
                }
 
        return a;
 }
 
 /**
- * persona_recapito_get_widget:
- * @persona_recapito:
+ * organigramma_persona_recapito_get_widget:
+ * @organigramma_persona_recapito:
  *
  */
 GtkWidget
-*persona_recapito_get_widget (PersonaRecapito *persona_recapito)
+*organigramma_persona_recapito_get_widget (OrganigrammaPersonaRecapito *organigramma_persona_recapito)
 {
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (persona_recapito);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_recapito);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-persona_recapito_carica (PersonaRecapito *persona_recapito)
+organigramma_persona_recapito_carica (OrganigrammaPersonaRecapito *organigramma_persona_recapito)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (persona_recapito);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_recapito);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -203,14 +203,14 @@ persona_recapito_carica (PersonaRecapito *persona_recapito)
 }
 
 static void
-persona_recapito_salva (PersonaRecapito *persona_recapito)
+organigramma_persona_recapito_salva (OrganigrammaPersonaRecapito *organigramma_persona_recapito)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       PersonaRecapitoClass *klass = PERSONA_RECAPITO_GET_CLASS (persona_recapito);
+       OrganigrammaPersonaRecapitoClass *klass = ORGANIGRAMMA_PERSONA_RECAPITO_GET_CLASS (organigramma_persona_recapito);
 
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (persona_recapito);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_recapito);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -228,7 +228,7 @@ persona_recapito_salva (PersonaRecapito *persona_recapito)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (persona_recapito, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_persona_recapito, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -258,11 +258,11 @@ persona_recapito_salva (PersonaRecapito *persona_recapito)
 }
 
 static void
-persona_recapito_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_persona_recapito_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       PersonaRecapito *persona_recapito = PERSONA_RECAPITO (object);
+       OrganigrammaPersonaRecapito *organigramma_persona_recapito = ORGANIGRAMMA_PERSONA_RECAPITO (object);
 
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (persona_recapito);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_recapito);
 
        switch (property_id)
                {
@@ -273,11 +273,11 @@ persona_recapito_set_property (GObject *object, guint property_id, const GValue
 }
 
 static void
-persona_recapito_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_persona_recapito_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       PersonaRecapito *persona_recapito = PERSONA_RECAPITO (object);
+       OrganigrammaPersonaRecapito *organigramma_persona_recapito = ORGANIGRAMMA_PERSONA_RECAPITO (object);
 
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (persona_recapito);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_recapito);
 
        switch (property_id)
                {
@@ -288,13 +288,13 @@ persona_recapito_get_property (GObject *object, guint property_id, GValue *value
 }
 
 static gboolean
-persona_recapito_conferma_chiusura (PersonaRecapito *persona_recapito)
+organigramma_persona_recapito_conferma_chiusura (OrganigrammaPersonaRecapito *organigramma_persona_recapito)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (persona_recapito);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_recapito);
 
        ret = TRUE;
 
@@ -317,27 +317,27 @@ persona_recapito_conferma_chiusura (PersonaRecapito *persona_recapito)
 
 /* CALLBACK */
 static gboolean
-persona_recapito_on_w_persona_recapito_delete_event (GtkWidget *widget,
+organigramma_persona_recapito_on_w_organigramma_persona_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !persona_recapito_conferma_chiusura ((PersonaRecapito *)user_data);
+       return !organigramma_persona_recapito_conferma_chiusura ((OrganigrammaPersonaRecapito *)user_data);
 }
 
 static void
-persona_recapito_on_btn_annulla_clicked (GtkButton *button,
+organigramma_persona_recapito_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       PersonaRecapito *persona_recapito = (PersonaRecapito *)user_data;
+       OrganigrammaPersonaRecapito *organigramma_persona_recapito = (OrganigrammaPersonaRecapito *)user_data;
 
-       PersonaRecapitoPrivate *priv = PERSONA_RECAPITO_GET_PRIVATE (persona_recapito);
+       OrganigrammaPersonaRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_RECAPITO_GET_PRIVATE (organigramma_persona_recapito);
 
-       if (persona_recapito_conferma_chiusura (persona_recapito)) gtk_widget_destroy (priv->w);
+       if (organigramma_persona_recapito_conferma_chiusura (organigramma_persona_recapito)) gtk_widget_destroy (priv->w);
 }
 
 static void
-persona_recapito_on_btn_salva_clicked (GtkButton *button,
+organigramma_persona_recapito_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       persona_recapito_salva ((PersonaRecapito *)user_data);
+       organigramma_persona_recapito_salva ((OrganigrammaPersonaRecapito *)user_data);
 }

diff --git a/src/personarecapito.h b/src/personarecapito.h
index 52baecbe9134dcbd95cc6583fe14f8d0a6e4d71e..2512cb24df2f8ea9632457bc84eb3e19ce247c98 100644 (file)
--- a/src/personarecapito.h
+++ b/src/personarecapito.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __PERSONA_RECAPITO_H__
-#define __PERSONA_RECAPITO_H__
+#ifndef __ORGANIGRAMMA_PERSONA_RECAPITO_H__
+#define __ORGANIGRAMMA_PERSONA_RECAPITO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_PERSONA_RECAPITO                 (persona_recapito_get_type ())
-#define PERSONA_RECAPITO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PERSONA_RECAPITO, PersonaRecapito))
-#define PERSONA_RECAPITO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PERSONA_RECAPITO, PersonaRecapitoClass))
-#define IS_PERSONA_RECAPITO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PERSONA_RECAPITO))
-#define IS_PERSONA_RECAPITO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PERSONA_RECAPITO))
-#define PERSONA_RECAPITO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PERSONA_RECAPITO, PersonaRecapitoClass))
+#define TYPE_ORGANIGRAMMA_PERSONA_RECAPITO                 (organigramma_persona_recapito_get_type ())
+#define ORGANIGRAMMA_PERSONA_RECAPITO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_PERSONA_RECAPITO, OrganigrammaPersonaRecapito))
+#define ORGANIGRAMMA_PERSONA_RECAPITO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_PERSONA_RECAPITO, OrganigrammaPersonaRecapitoClass))
+#define IS_ORGANIGRAMMA_PERSONA_RECAPITO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_PERSONA_RECAPITO))
+#define IS_ORGANIGRAMMA_PERSONA_RECAPITO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_PERSONA_RECAPITO))
+#define ORGANIGRAMMA_PERSONA_RECAPITO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_PERSONA_RECAPITO, OrganigrammaPersonaRecapitoClass))
 
 
-typedef struct _PersonaRecapito PersonaRecapito;
-typedef struct _PersonaRecapitoClass PersonaRecapitoClass;
+typedef struct _OrganigrammaPersonaRecapito OrganigrammaPersonaRecapito;
+typedef struct _OrganigrammaPersonaRecapitoClass OrganigrammaPersonaRecapitoClass;
 
-struct _PersonaRecapito
+struct _OrganigrammaPersonaRecapito
        {
                GObject parent;
        };
 
-struct _PersonaRecapitoClass
+struct _OrganigrammaPersonaRecapitoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType persona_recapito_get_type (void) G_GNUC_CONST;
+GType organigramma_persona_recapito_get_type (void) G_GNUC_CONST;
 
-PersonaRecapito *persona_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone);
+OrganigrammaPersonaRecapito *organigramma_persona_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone);
 
-GtkWidget *persona_recapito_get_widget (PersonaRecapito *persona_recapito);
+GtkWidget *organigramma_persona_recapito_get_widget (OrganigrammaPersonaRecapito *organigramma_persona_recapito);
 
 
 G_END_DECLS
 
-#endif /* __PERSONA_RECAPITO_H__ */
+#endif /* __ORGANIGRAMMA_PERSONA_RECAPITO_H__ */

diff --git a/src/personaufficio.c b/src/personaufficio.c
index 519f4c7517f157da95d1128d8e84b272335e9b78..ba1996ffac577d17f5b9d5cbe27ebe3458bd86da 100644 (file)
--- a/src/personaufficio.c
+++ b/src/personaufficio.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -26,41 +26,41 @@
 #include "personaufficio.h"
 #include "uffici.h"
 
-static void persona_ufficio_class_init (PersonaUfficioClass *klass);
-static void persona_ufficio_init (PersonaUfficio *persona_ufficio);
+static void organigramma_persona_ufficio_class_init (OrganigrammaPersonaUfficioClass *klass);
+static void organigramma_persona_ufficio_init (OrganigrammaPersonaUfficio *organigramma_persona_ufficio);
 
-static void persona_ufficio_carica (PersonaUfficio *persona_ufficio);
-static void persona_ufficio_salva (PersonaUfficio *persona_ufficio);
+static void organigramma_persona_ufficio_carica (OrganigrammaPersonaUfficio *organigramma_persona_ufficio);
+static void organigramma_persona_ufficio_salva (OrganigrammaPersonaUfficio *organigramma_persona_ufficio);
 
-static void persona_ufficio_carica_ufficio (PersonaUfficio *indirizzo);
+static void organigramma_persona_ufficio_carica_ufficio (OrganigrammaPersonaUfficio *indirizzo);
 
-static gboolean persona_ufficio_conferma_chiusura (PersonaUfficio *persona_ufficio);
+static gboolean organigramma_persona_ufficio_conferma_chiusura (OrganigrammaPersonaUfficio *organigramma_persona_ufficio);
 
-static void persona_ufficio_on_ufficio_selezionato (gpointer instance,
+static void organigramma_persona_ufficio_on_ufficio_selezionato (gpointer instance,
                                           guint id, gpointer user_data);
 
-static void persona_ufficio_set_property (GObject *object,
+static void organigramma_persona_ufficio_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void persona_ufficio_get_property (GObject *object,
+static void organigramma_persona_ufficio_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean persona_ufficio_on_w_persona_ufficio_delete_event (GtkWidget *widget,
+static gboolean organigramma_persona_ufficio_on_w_organigramma_persona_ufficio_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void persona_ufficio_on_btn_ricerca_via_clicked (GtkButton *button,
+static void organigramma_persona_ufficio_on_btn_ricerca_via_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_ufficio_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_persona_ufficio_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_ufficio_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_persona_ufficio_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define PERSONA_UFFICIO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PERSONA_UFFICIO, PersonaUfficioPrivate))
+#define ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO, OrganigrammaPersonaUfficioPrivate))
 
 enum
 {
@@ -68,8 +68,8 @@ enum
        LBL_ID_PERSONE
 };
 
-typedef struct _PersonaUfficioPrivate PersonaUfficioPrivate;
-struct _PersonaUfficioPrivate
+typedef struct _OrganigrammaPersonaUfficioPrivate OrganigrammaPersonaUfficioPrivate;
+struct _OrganigrammaPersonaUfficioPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -82,21 +82,21 @@ struct _PersonaUfficioPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (PersonaUfficio, persona_ufficio, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaPersonaUfficio, organigramma_persona_ufficio, G_TYPE_OBJECT)
 
 static void
-persona_ufficio_class_init (PersonaUfficioClass *klass)
+organigramma_persona_ufficio_class_init (OrganigrammaPersonaUfficioClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (PersonaUfficioPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaPersonaUfficioPrivate));
 
-       object_class->set_property = persona_ufficio_set_property;
-       object_class->get_property = persona_ufficio_get_property;
+       object_class->set_property = organigramma_persona_ufficio_set_property;
+       object_class->get_property = organigramma_persona_ufficio_get_property;
 
        /**
-        * PersonaUfficio::aggiornato:
-        * @persona_ufficio:
+        * OrganigrammaPersonaUfficio::aggiornato:
+        * @organigramma_persona_ufficio:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -111,34 +111,34 @@ persona_ufficio_class_init (PersonaUfficioClass *klass)
 }
 
 static void
-persona_ufficio_init (PersonaUfficio *persona_ufficio)
+organigramma_persona_ufficio_init (OrganigrammaPersonaUfficio *organigramma_persona_ufficio)
 {
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (persona_ufficio);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (organigramma_persona_ufficio);
 }
 
 /**
- * persona_ufficio_new:
+ * organigramma_persona_ufficio_new:
  * @commons:
  * @id:
  * @id_persone:
  *
- * Returns: the newly created #PersonaUfficio object.
+ * Returns: the newly created #OrganigrammaPersonaUfficio object.
  */
-PersonaUfficio
-*persona_ufficio_new (OrganigrammaCommons *commons, guint id, guint id_persone)
+OrganigrammaPersonaUfficio
+*organigramma_persona_ufficio_new (OrganigrammaCommons *commons, guint id, guint id_persone)
 {
        GError *error;
 
-       PersonaUfficio *a = PERSONA_UFFICIO (g_object_new (persona_ufficio_get_type (), NULL));
+       OrganigrammaPersonaUfficio *a = ORGANIGRAMMA_PERSONA_UFFICIO (g_object_new (organigramma_persona_ufficio_get_type (), NULL));
 
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (a);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("w_persona_ufficio", "|", -1),
+                                          g_strsplit ("w_organigramma_persona_ufficio", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -148,9 +148,9 @@ PersonaUfficio
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "persona_ufficio.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_persona_ufficio.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_ufficio"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_persona_ufficio"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label90",
@@ -158,15 +158,15 @@ PersonaUfficio
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (persona_ufficio_on_w_persona_ufficio_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_persona_ufficio_on_w_organigramma_persona_ufficio_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button82")),
-                         "clicked", G_CALLBACK (persona_ufficio_on_btn_ricerca_via_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_ufficio_on_btn_ricerca_via_clicked), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button83")),
-                         "clicked", G_CALLBACK (persona_ufficio_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_ufficio_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button84")),
-                         "clicked", G_CALLBACK (persona_ufficio_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_ufficio_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -180,33 +180,33 @@ PersonaUfficio
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       persona_ufficio_carica (a);
+                       organigramma_persona_ufficio_carica (a);
                }
 
        return a;
 }
 
 /**
- * persona_ufficio_get_widget:
- * @persona_ufficio:
+ * organigramma_persona_ufficio_get_widget:
+ * @organigramma_persona_ufficio:
  *
  */
 GtkWidget
-*persona_ufficio_get_widget (PersonaUfficio *persona_ufficio)
+*organigramma_persona_ufficio_get_widget (OrganigrammaPersonaUfficio *organigramma_persona_ufficio)
 {
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (persona_ufficio);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (organigramma_persona_ufficio);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-persona_ufficio_carica (PersonaUfficio *persona_ufficio)
+organigramma_persona_ufficio_carica (OrganigrammaPersonaUfficio *organigramma_persona_ufficio)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (persona_ufficio);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (organigramma_persona_ufficio);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -214,14 +214,14 @@ persona_ufficio_carica (PersonaUfficio *persona_ufficio)
 }
 
 static void
-persona_ufficio_salva (PersonaUfficio *persona_ufficio)
+organigramma_persona_ufficio_salva (OrganigrammaPersonaUfficio *organigramma_persona_ufficio)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       PersonaUfficioClass *klass = PERSONA_UFFICIO_GET_CLASS (persona_ufficio);
+       OrganigrammaPersonaUfficioClass *klass = ORGANIGRAMMA_PERSONA_UFFICIO_GET_CLASS (organigramma_persona_ufficio);
 
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (persona_ufficio);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (organigramma_persona_ufficio);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -239,7 +239,7 @@ persona_ufficio_salva (PersonaUfficio *persona_ufficio)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (persona_ufficio, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_persona_ufficio, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -269,21 +269,21 @@ persona_ufficio_salva (PersonaUfficio *persona_ufficio)
 }
 
 static void
-persona_ufficio_on_ufficio_selezionato (gpointer instance, guint id, gpointer user_data)
+organigramma_persona_ufficio_on_ufficio_selezionato (gpointer instance, guint id, gpointer user_data)
 {
-       PersonaUfficio *ia = (PersonaUfficio *)user_data;
+       OrganigrammaPersonaUfficio *ia = (OrganigrammaPersonaUfficio *)user_data;
 
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (ia);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (ia);
 
        gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "label89"), g_strdup_printf ("%d", id));
 }
 
 static void
-persona_ufficio_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_persona_ufficio_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       PersonaUfficio *persona_ufficio = PERSONA_UFFICIO (object);
+       OrganigrammaPersonaUfficio *organigramma_persona_ufficio = ORGANIGRAMMA_PERSONA_UFFICIO (object);
 
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (persona_ufficio);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (organigramma_persona_ufficio);
 
        switch (property_id)
                {
@@ -294,11 +294,11 @@ persona_ufficio_set_property (GObject *object, guint property_id, const GValue *
 }
 
 static void
-persona_ufficio_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_persona_ufficio_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       PersonaUfficio *persona_ufficio = PERSONA_UFFICIO (object);
+       OrganigrammaPersonaUfficio *organigramma_persona_ufficio = ORGANIGRAMMA_PERSONA_UFFICIO (object);
 
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (persona_ufficio);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (organigramma_persona_ufficio);
 
        switch (property_id)
                {
@@ -309,13 +309,13 @@ persona_ufficio_get_property (GObject *object, guint property_id, GValue *value,
 }
 
 static gboolean
-persona_ufficio_conferma_chiusura (PersonaUfficio *persona_ufficio)
+organigramma_persona_ufficio_conferma_chiusura (OrganigrammaPersonaUfficio *organigramma_persona_ufficio)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (persona_ufficio);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (organigramma_persona_ufficio);
 
        ret = TRUE;
 
@@ -338,46 +338,46 @@ persona_ufficio_conferma_chiusura (PersonaUfficio *persona_ufficio)
 
 /* CALLBACK */
 static gboolean
-persona_ufficio_on_w_persona_ufficio_delete_event (GtkWidget *widget,
+organigramma_persona_ufficio_on_w_organigramma_persona_ufficio_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !persona_ufficio_conferma_chiusura ((PersonaUfficio *)user_data);
+       return !organigramma_persona_ufficio_conferma_chiusura ((OrganigrammaPersonaUfficio *)user_data);
 }
 
 static void
-persona_ufficio_on_btn_ricerca_via_clicked (GtkButton *button,
+organigramma_persona_ufficio_on_btn_ricerca_via_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       PersonaUfficio *ia = (PersonaUfficio *)user_data;
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (ia);
+       OrganigrammaPersonaUfficio *ia = (OrganigrammaPersonaUfficio *)user_data;
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (ia);
 
-       Uffici *v = uffici_new (priv->commons, TRUE);
+       OrganigrammaUffici *v = organigramma_uffici_new (priv->commons, TRUE);
 
        g_signal_connect (G_OBJECT (v), "selezionato",
-                         G_CALLBACK (persona_ufficio_on_ufficio_selezionato), (gpointer)ia);
+                         G_CALLBACK (organigramma_persona_ufficio_on_ufficio_selezionato), (gpointer)ia);
 
-       w = uffici_get_widget (v);
+       w = organigramma_uffici_get_widget (v);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-persona_ufficio_on_btn_annulla_clicked (GtkButton *button,
+organigramma_persona_ufficio_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       PersonaUfficio *persona_ufficio = (PersonaUfficio *)user_data;
+       OrganigrammaPersonaUfficio *organigramma_persona_ufficio = (OrganigrammaPersonaUfficio *)user_data;
 
-       PersonaUfficioPrivate *priv = PERSONA_UFFICIO_GET_PRIVATE (persona_ufficio);
+       OrganigrammaPersonaUfficioPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_GET_PRIVATE (organigramma_persona_ufficio);
 
-       if (persona_ufficio_conferma_chiusura (persona_ufficio)) gtk_widget_destroy (priv->w);
+       if (organigramma_persona_ufficio_conferma_chiusura (organigramma_persona_ufficio)) gtk_widget_destroy (priv->w);
 }
 
 static void
-persona_ufficio_on_btn_salva_clicked (GtkButton *button,
+organigramma_persona_ufficio_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       persona_ufficio_salva ((PersonaUfficio *)user_data);
+       organigramma_persona_ufficio_salva ((OrganigrammaPersonaUfficio *)user_data);
 }

diff --git a/src/personaufficio.h b/src/personaufficio.h
index de2726d246decabe0ee041a67238b38695665e4d..01331f56beb2a55cb9b8d1846fc2dca6a760822a 100644 (file)
--- a/src/personaufficio.h
+++ b/src/personaufficio.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __PERSONA_UFFICIO_H__
-#define __PERSONA_UFFICIO_H__
+#ifndef __ORGANIGRAMMA_PERSONA_UFFICIO_H__
+#define __ORGANIGRAMMA_PERSONA_UFFICIO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_PERSONA_UFFICIO                 (persona_ufficio_get_type ())
-#define PERSONA_UFFICIO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PERSONA_UFFICIO, PersonaUfficio))
-#define PERSONA_UFFICIO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PERSONA_UFFICIO, PersonaUfficioClass))
-#define IS_PERSONA_UFFICIO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PERSONA_UFFICIO))
-#define IS_PERSONA_UFFICIO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PERSONA_UFFICIO))
-#define PERSONA_UFFICIO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PERSONA_UFFICIO, PersonaUfficioClass))
+#define TYPE_ORGANIGRAMMA_PERSONA_UFFICIO                 (organigramma_persona_ufficio_get_type ())
+#define ORGANIGRAMMA_PERSONA_UFFICIO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO, OrganigrammaPersonaUfficio))
+#define ORGANIGRAMMA_PERSONA_UFFICIO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO, OrganigrammaPersonaUfficioClass))
+#define IS_ORGANIGRAMMA_PERSONA_UFFICIO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO))
+#define IS_ORGANIGRAMMA_PERSONA_UFFICIO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO))
+#define ORGANIGRAMMA_PERSONA_UFFICIO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO, OrganigrammaPersonaUfficioClass))
 
 
-typedef struct _PersonaUfficio PersonaUfficio;
-typedef struct _PersonaUfficioClass PersonaUfficioClass;
+typedef struct _OrganigrammaPersonaUfficio OrganigrammaPersonaUfficio;
+typedef struct _OrganigrammaPersonaUfficioClass OrganigrammaPersonaUfficioClass;
 
-struct _PersonaUfficio
+struct _OrganigrammaPersonaUfficio
        {
                GObject parent;
        };
 
-struct _PersonaUfficioClass
+struct _OrganigrammaPersonaUfficioClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType persona_ufficio_get_type (void) G_GNUC_CONST;
+GType organigramma_persona_ufficio_get_type (void) G_GNUC_CONST;
 
-PersonaUfficio *persona_ufficio_new (OrganigrammaCommons *commons, guint id, guint id_persone);
+OrganigrammaPersonaUfficio *organigramma_persona_ufficio_new (OrganigrammaCommons *commons, guint id, guint id_persone);
 
-GtkWidget *persona_ufficio_get_widget (PersonaUfficio *persona_ufficio);
+GtkWidget *organigramma_persona_ufficio_get_widget (OrganigrammaPersonaUfficio *organigramma_persona_ufficio);
 
 
 G_END_DECLS
 
-#endif /* __PERSONA_UFFICIO_H__ */
+#endif /* __ORGANIGRAMMA_PERSONA_UFFICIO_H__ */

diff --git a/src/personaufficiorecapito.c b/src/personaufficiorecapito.c
index 83ed423bc147c2aba920234291c55e6593ac9b39..3e6a77515fe4b3ddacc798efd502cc7c12ac0213 100644 (file)
--- a/src/personaufficiorecapito.c
+++ b/src/personaufficiorecapito.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -25,34 +25,34 @@
 
 #include "personaufficiorecapito.h"
 
-static void persona_ufficio_recapito_class_init (PersonaUfficioRecapitoClass *klass);
-static void persona_ufficio_recapito_init (PersonaUfficioRecapito *persona_ufficio_recapito);
+static void organigramma_persona_ufficio_recapito_class_init (OrganigrammaPersonaUfficioRecapitoClass *klass);
+static void organigramma_persona_ufficio_recapito_init (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito);
 
-static void persona_ufficio_recapito_carica (PersonaUfficioRecapito *persona_ufficio_recapito);
-static void persona_ufficio_recapito_salva (PersonaUfficioRecapito *persona_ufficio_recapito);
+static void organigramma_persona_ufficio_recapito_carica (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito);
+static void organigramma_persona_ufficio_recapito_salva (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito);
 
-static gboolean persona_ufficio_recapito_conferma_chiusura (PersonaUfficioRecapito *persona_ufficio_recapito);
+static gboolean organigramma_persona_ufficio_recapito_conferma_chiusura (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito);
 
-static void persona_ufficio_recapito_set_property (GObject *object,
+static void organigramma_persona_ufficio_recapito_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void persona_ufficio_recapito_get_property (GObject *object,
+static void organigramma_persona_ufficio_recapito_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean persona_ufficio_recapito_on_w_persona_ufficio_recapito_delete_event (GtkWidget *widget,
+static gboolean organigramma_persona_ufficio_recapito_on_w_organigramma_persona_ufficio_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void persona_ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_persona_ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persona_ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_persona_ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define PERSONA_UFFICIO_RECAPITO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PERSONA_UFFICIO_RECAPITO, PersonaUfficioRecapitoPrivate))
+#define ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO, OrganigrammaPersonaUfficioRecapitoPrivate))
 
 enum
 {
@@ -61,8 +61,8 @@ enum
        LBL_ID_UFFICI
 };
 
-typedef struct _PersonaUfficioRecapitoPrivate PersonaUfficioRecapitoPrivate;
-struct _PersonaUfficioRecapitoPrivate
+typedef struct _OrganigrammaPersonaUfficioRecapitoPrivate OrganigrammaPersonaUfficioRecapitoPrivate;
+struct _OrganigrammaPersonaUfficioRecapitoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -75,21 +75,21 @@ struct _PersonaUfficioRecapitoPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (PersonaUfficioRecapito, persona_ufficio_recapito, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaPersonaUfficioRecapito, organigramma_persona_ufficio_recapito, G_TYPE_OBJECT)
 
 static void
-persona_ufficio_recapito_class_init (PersonaUfficioRecapitoClass *klass)
+organigramma_persona_ufficio_recapito_class_init (OrganigrammaPersonaUfficioRecapitoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (PersonaUfficioRecapitoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaPersonaUfficioRecapitoPrivate));
 
-       object_class->set_property = persona_ufficio_recapito_set_property;
-       object_class->get_property = persona_ufficio_recapito_get_property;
+       object_class->set_property = organigramma_persona_ufficio_recapito_set_property;
+       object_class->get_property = organigramma_persona_ufficio_recapito_get_property;
 
        /**
-        * PersonaUfficioRecapito::aggiornato:
-        * @persona_ufficio_recapito:
+        * OrganigrammaPersonaUfficioRecapito::aggiornato:
+        * @organigramma_persona_ufficio_recapito:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -104,35 +104,35 @@ persona_ufficio_recapito_class_init (PersonaUfficioRecapitoClass *klass)
 }
 
 static void
-persona_ufficio_recapito_init (PersonaUfficioRecapito *persona_ufficio_recapito)
+organigramma_persona_ufficio_recapito_init (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito)
 {
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_ufficio_recapito);
 }
 
 /**
- * persona_ufficio_recapito_new:
+ * organigramma_persona_ufficio_recapito_new:
  * @commons:
  * @id:
  * @id_persone:
  * @id_uffici:
  *
- * Returns: the newly created #PersonaUfficioRecapito object.
+ * Returns: the newly created #OrganigrammaPersonaUfficioRecapito object.
  */
-PersonaUfficioRecapito
-*persona_ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_uffici)
+OrganigrammaPersonaUfficioRecapito
+*organigramma_persona_ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_uffici)
 {
        GError *error;
 
-       PersonaUfficioRecapito *a = PERSONA_UFFICIO_RECAPITO (g_object_new (persona_ufficio_recapito_get_type (), NULL));
+       OrganigrammaPersonaUfficioRecapito *a = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO (g_object_new (organigramma_persona_ufficio_recapito_get_type (), NULL));
 
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (a);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("lstore_tipi_recapito|w_persona_ufficio_recapito", "|", -1),
+                                          g_strsplit ("lstore_tipi_recapito|w_organigramma_persona_ufficio_recapito", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -142,9 +142,9 @@ PersonaUfficioRecapito
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "persona_ufficio_recapito.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_persona_ufficio_recapito.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_persona_ufficio_recapito"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_persona_ufficio_recapito"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label96",
@@ -153,12 +153,12 @@ PersonaUfficioRecapito
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (persona_ufficio_recapito_on_w_persona_ufficio_recapito_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_persona_ufficio_recapito_on_w_organigramma_persona_ufficio_recapito_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button85")),
-                         "clicked", G_CALLBACK (persona_ufficio_recapito_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_ufficio_recapito_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button86")),
-                         "clicked", G_CALLBACK (persona_ufficio_recapito_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_persona_ufficio_recapito_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -173,33 +173,33 @@ PersonaUfficioRecapito
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       persona_ufficio_recapito_carica (a);
+                       organigramma_persona_ufficio_recapito_carica (a);
                }
 
        return a;
 }
 
 /**
- * persona_ufficio_recapito_get_widget:
- * @persona_ufficio_recapito:
+ * organigramma_persona_ufficio_recapito_get_widget:
+ * @organigramma_persona_ufficio_recapito:
  *
  */
 GtkWidget
-*persona_ufficio_recapito_get_widget (PersonaUfficioRecapito *persona_ufficio_recapito)
+*organigramma_persona_ufficio_recapito_get_widget (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito)
 {
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_ufficio_recapito);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-persona_ufficio_recapito_carica (PersonaUfficioRecapito *persona_ufficio_recapito)
+organigramma_persona_ufficio_recapito_carica (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_ufficio_recapito);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -207,14 +207,14 @@ persona_ufficio_recapito_carica (PersonaUfficioRecapito *persona_ufficio_recapit
 }
 
 static void
-persona_ufficio_recapito_salva (PersonaUfficioRecapito *persona_ufficio_recapito)
+organigramma_persona_ufficio_recapito_salva (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       PersonaUfficioRecapitoClass *klass = PERSONA_UFFICIO_RECAPITO_GET_CLASS (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoClass *klass = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_CLASS (organigramma_persona_ufficio_recapito);
 
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_ufficio_recapito);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -232,7 +232,7 @@ persona_ufficio_recapito_salva (PersonaUfficioRecapito *persona_ufficio_recapito
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (persona_ufficio_recapito, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_persona_ufficio_recapito, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -262,11 +262,11 @@ persona_ufficio_recapito_salva (PersonaUfficioRecapito *persona_ufficio_recapito
 }
 
 static void
-persona_ufficio_recapito_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_persona_ufficio_recapito_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       PersonaUfficioRecapito *persona_ufficio_recapito = PERSONA_UFFICIO_RECAPITO (object);
+       OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO (object);
 
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_ufficio_recapito);
 
        switch (property_id)
                {
@@ -277,11 +277,11 @@ persona_ufficio_recapito_set_property (GObject *object, guint property_id, const
 }
 
 static void
-persona_ufficio_recapito_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_persona_ufficio_recapito_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       PersonaUfficioRecapito *persona_ufficio_recapito = PERSONA_UFFICIO_RECAPITO (object);
+       OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO (object);
 
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_ufficio_recapito);
 
        switch (property_id)
                {
@@ -292,13 +292,13 @@ persona_ufficio_recapito_get_property (GObject *object, guint property_id, GValu
 }
 
 static gboolean
-persona_ufficio_recapito_conferma_chiusura (PersonaUfficioRecapito *persona_ufficio_recapito)
+organigramma_persona_ufficio_recapito_conferma_chiusura (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_ufficio_recapito);
 
        ret = TRUE;
 
@@ -321,27 +321,27 @@ persona_ufficio_recapito_conferma_chiusura (PersonaUfficioRecapito *persona_uffi
 
 /* CALLBACK */
 static gboolean
-persona_ufficio_recapito_on_w_persona_ufficio_recapito_delete_event (GtkWidget *widget,
+organigramma_persona_ufficio_recapito_on_w_organigramma_persona_ufficio_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !persona_ufficio_recapito_conferma_chiusura ((PersonaUfficioRecapito *)user_data);
+       return !organigramma_persona_ufficio_recapito_conferma_chiusura ((OrganigrammaPersonaUfficioRecapito *)user_data);
 }
 
 static void
-persona_ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
+organigramma_persona_ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       PersonaUfficioRecapito *persona_ufficio_recapito = (PersonaUfficioRecapito *)user_data;
+       OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito = (OrganigrammaPersonaUfficioRecapito *)user_data;
 
-       PersonaUfficioRecapitoPrivate *priv = PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (persona_ufficio_recapito);
+       OrganigrammaPersonaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_persona_ufficio_recapito);
 
-       if (persona_ufficio_recapito_conferma_chiusura (persona_ufficio_recapito)) gtk_widget_destroy (priv->w);
+       if (organigramma_persona_ufficio_recapito_conferma_chiusura (organigramma_persona_ufficio_recapito)) gtk_widget_destroy (priv->w);
 }
 
 static void
-persona_ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
+organigramma_persona_ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       persona_ufficio_recapito_salva ((PersonaUfficioRecapito *)user_data);
+       organigramma_persona_ufficio_recapito_salva ((OrganigrammaPersonaUfficioRecapito *)user_data);
 }

diff --git a/src/personaufficiorecapito.h b/src/personaufficiorecapito.h
index f2a2a4b7116dcc80c567d333d4c173439c1655f1..a26ffcfb698c8f8bf2e5ad91eaa0d71a87e178c2 100644 (file)
--- a/src/personaufficiorecapito.h
+++ b/src/personaufficiorecapito.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __PERSONA_UFFICIO_RECAPITO_H__
-#define __PERSONA_UFFICIO_RECAPITO_H__
+#ifndef __ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_H__
+#define __ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_PERSONA_UFFICIO_RECAPITO                 (persona_ufficio_recapito_get_type ())
-#define PERSONA_UFFICIO_RECAPITO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PERSONA_UFFICIO_RECAPITO, PersonaUfficioRecapito))
-#define PERSONA_UFFICIO_RECAPITO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PERSONA_UFFICIO_RECAPITO, PersonaUfficioRecapitoClass))
-#define IS_PERSONA_UFFICIO_RECAPITO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PERSONA_UFFICIO_RECAPITO))
-#define IS_PERSONA_UFFICIO_RECAPITO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PERSONA_UFFICIO_RECAPITO))
-#define PERSONA_UFFICIO_RECAPITO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PERSONA_UFFICIO_RECAPITO, PersonaUfficioRecapitoClass))
+#define TYPE_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO                 (organigramma_persona_ufficio_recapito_get_type ())
+#define ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO, OrganigrammaPersonaUfficioRecapito))
+#define ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO, OrganigrammaPersonaUfficioRecapitoClass))
+#define IS_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO))
+#define IS_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO))
+#define ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO, OrganigrammaPersonaUfficioRecapitoClass))
 
 
-typedef struct _PersonaUfficioRecapito PersonaUfficioRecapito;
-typedef struct _PersonaUfficioRecapitoClass PersonaUfficioRecapitoClass;
+typedef struct _OrganigrammaPersonaUfficioRecapito OrganigrammaPersonaUfficioRecapito;
+typedef struct _OrganigrammaPersonaUfficioRecapitoClass OrganigrammaPersonaUfficioRecapitoClass;
 
-struct _PersonaUfficioRecapito
+struct _OrganigrammaPersonaUfficioRecapito
        {
                GObject parent;
        };
 
-struct _PersonaUfficioRecapitoClass
+struct _OrganigrammaPersonaUfficioRecapitoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType persona_ufficio_recapito_get_type (void) G_GNUC_CONST;
+GType organigramma_persona_ufficio_recapito_get_type (void) G_GNUC_CONST;
 
-PersonaUfficioRecapito *persona_ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_uffici);
+OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_uffici);
 
-GtkWidget *persona_ufficio_recapito_get_widget (PersonaUfficioRecapito *persona_ufficio_recapito);
+GtkWidget *organigramma_persona_ufficio_recapito_get_widget (OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito);
 
 
 G_END_DECLS
 
-#endif /* __PERSONA_UFFICIO_RECAPITO_H__ */
+#endif /* __ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO_H__ */

diff --git a/src/persone.c b/src/persone.c
index 1bf3219d143e81749511e7e4fb8d44237ea7495c..8d6aa5a9d2281237a0bc098a9c34e1d1319a8cd0 100644 (file)
--- a/src/persone.c
+++ b/src/persone.c
@@ -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
@@ -20,41 +20,41 @@
 #include "persone.h"
 #include "persona.h"
 
-static void persone_class_init (PersoneClass *klass);
-static void persone_init (Persone *persone);
+static void organigramma_persone_class_init (OrganigrammaPersoneClass *klass);
+static void organigramma_persone_init (OrganigrammaPersone *persone);
 
-static void persone_carica (Persone *persone);
-static void persone_modifica (Persone *persone);
+static void organigramma_persone_carica (OrganigrammaPersone *persone);
+static void organigramma_persone_modifica (OrganigrammaPersone *persone);
 
-static void persone_selezionato (Persone *persone);
-static void persone_on_persona_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_persone_selezionato (OrganigrammaPersone *persone);
+static void organigramma_persone_on_organigramma_persona_aggiornato (gpointer instance, gpointer user_data);
 
-static void persone_set_property (GObject *object,
+static void organigramma_persone_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void persone_get_property (GObject *object,
+static void organigramma_persone_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void persone_on_btn_nuovo_clicked (GtkButton *button,
+static void organigramma_persone_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data);
-static void persone_on_btn_modifica_clicked (GtkButton *button,
+static void organigramma_persone_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data);
-static void persone_on_btn_elimina_clicked (GtkButton *button,
+static void organigramma_persone_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data);
-static void persone_on_trv_persone_row_activated (GtkTreeView *tree_view,
+static void organigramma_persone_on_trv_organigramma_persone_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void persone_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_persone_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void persone_on_btn_seleziona_clicked (GtkButton *button,
+static void organigramma_persone_on_btn_seleziona_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define PERSONE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PERSONE, PersonePrivate))
+#define ORGANIGRAMMA_PERSONE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_PERSONE, OrganigrammaPersonePrivate))
 
 enum
 {
@@ -62,8 +62,8 @@ enum
        COL_NOME
 };
 
-typedef struct _PersonePrivate PersonePrivate;
-struct _PersonePrivate
+typedef struct _OrganigrammaPersonePrivate OrganigrammaPersonePrivate;
+struct _OrganigrammaPersonePrivate
        {
                OrganigrammaCommons *commons;
 
@@ -75,20 +75,20 @@ struct _PersonePrivate
                GtkWindow *wtransient;
        };
 
-G_DEFINE_TYPE (Persone, persone, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaPersone, organigramma_persone, G_TYPE_OBJECT)
 
 static void
-persone_class_init (PersoneClass *klass)
+organigramma_persone_class_init (OrganigrammaPersoneClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (PersonePrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaPersonePrivate));
 
-       object_class->set_property = persone_set_property;
-       object_class->get_property = persone_get_property;
+       object_class->set_property = organigramma_persone_set_property;
+       object_class->get_property = organigramma_persone_get_property;
 
        /**
-        * Persone::selezionato:
+        * OrganigrammaPersone::selezionato:
         * @persone:
         *
         */
@@ -104,26 +104,26 @@ persone_class_init (PersoneClass *klass)
 }
 
 static void
-persone_init (Persone *persone)
+organigramma_persone_init (OrganigrammaPersone *persone)
 {
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 }
 
 /**
- * persone_new:
+ * organigramma_persone_new:
  * @commons:
  * @selezione:
  *
- * Returns: the newly created #Persone object.
+ * Returns: the newly created #OrganigrammaPersone object.
  */
-Persone
-*persone_new (OrganigrammaCommons *commons, gboolean selezione)
+OrganigrammaPersone
+*organigramma_persone_new (OrganigrammaCommons *commons, gboolean selezione)
 {
        GError *error;
 
-       Persone *a = PERSONE (g_object_new (persone_get_type (), NULL));
+       OrganigrammaPersone *a = ORGANIGRAMMA_PERSONE (g_object_new (organigramma_persone_get_type (), NULL));
 
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (a);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (a);
 
        priv->commons = commons;
        priv->selezione = selezione;
@@ -154,21 +154,21 @@ Persone
                }
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button102"),
-                         "clicked", G_CALLBACK (persone_on_btn_nuovo_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_persone_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button103"),
-                         "clicked", G_CALLBACK (persone_on_btn_modifica_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_persone_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button104"),
-                         "clicked", G_CALLBACK (persone_on_btn_elimina_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_persone_on_btn_elimina_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview18"),
-                         "row-activated", G_CALLBACK (persone_on_trv_persone_row_activated), (gpointer)a);
+                         "row-activated", G_CALLBACK (organigramma_persone_on_trv_organigramma_persone_row_activated), (gpointer)a);
 
        if (priv->selezione)
                {
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "label139")));
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button107"),
-                                         "clicked", G_CALLBACK (persone_on_btn_annulla_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_persone_on_btn_annulla_clicked), (gpointer)a);
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button108"),
-                                         "clicked", G_CALLBACK (persone_on_btn_seleziona_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_persone_on_btn_seleziona_clicked), (gpointer)a);
                }
        else
                {
@@ -176,27 +176,27 @@ Persone
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "button108")));
                }
 
-       persone_carica (a);
+       organigramma_persone_carica (a);
 
        return a;
 }
 
 /**
- * persone_get_widget:
+ * organigramma_persone_get_widget:
  * @persone:
  *
  */
 GtkWidget
-*persone_get_widget (Persone *persone)
+*organigramma_persone_get_widget (OrganigrammaPersone *persone)
 {
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 
        return priv->widget;
 }
 
 /* PRIVATE */
 static void
-persone_carica (Persone *persone)
+organigramma_persone_carica (OrganigrammaPersone *persone)
 {
        GtkTreeIter iter;
        GdaDataModel *dm;
@@ -204,7 +204,7 @@ persone_carica (Persone *persone)
        gint rows;
        gint row;
 
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 
        gtk_list_store_clear (priv->lstore_persone);
 
@@ -231,12 +231,12 @@ persone_carica (Persone *persone)
 }
 
 static void
-persone_modifica (Persone *persone)
+organigramma_persone_modifica (OrganigrammaPersone *persone)
 {
        GtkTreeIter iter;
        guint id;
 
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -246,12 +246,12 @@ persone_modifica (Persone *persone)
                                            COL_ID, &id,
                                            -1);
 
-                       Persona *c = persona_new (priv->commons, id);
+                       OrganigrammaPersona *c = organigramma_persona_new (priv->commons, id);
 
                        g_signal_connect (G_OBJECT (c), "aggiornato",
-                                         G_CALLBACK (persone_on_persona_aggiornato), (gpointer)persone);
+                                         G_CALLBACK (organigramma_persone_on_organigramma_persona_aggiornato), (gpointer)persone);
 
-                       w = persona_get_widget (c);
+                       w = organigramma_persona_get_widget (c);
                        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
                        gtk_widget_show (w);
                }
@@ -268,13 +268,13 @@ persone_modifica (Persone *persone)
 }
 
 static void
-persone_selezionato (Persone *persone)
+organigramma_persone_selezionato (OrganigrammaPersone *persone)
 {
        GtkTreeIter iter;
        guint *id;
 
-       PersoneClass *klass = PERSONE_GET_CLASS (persone);
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersoneClass *klass = ORGANIGRAMMA_PERSONE_GET_CLASS (persone);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -300,17 +300,17 @@ persone_selezionato (Persone *persone)
 }
 
 static void
-persone_on_persona_aggiornato (gpointer instance, gpointer user_data)
+organigramma_persone_on_organigramma_persona_aggiornato (gpointer instance, gpointer user_data)
 {
-       persone_carica ((Persone *)user_data);
+       organigramma_persone_carica ((OrganigrammaPersone *)user_data);
 }
 
 static void
-persone_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_persone_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Persone *persone = PERSONE (object);
+       OrganigrammaPersone *persone = ORGANIGRAMMA_PERSONE (object);
 
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 
        switch (property_id)
                {
@@ -321,11 +321,11 @@ persone_set_property (GObject *object, guint property_id, const GValue *value, G
 }
 
 static void
-persone_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_persone_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Persone *persone = PERSONE (object);
+       OrganigrammaPersone *persone = ORGANIGRAMMA_PERSONE (object);
 
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 
        switch (property_id)
                {
@@ -337,33 +337,33 @@ persone_get_property (GObject *object, guint property_id, GValue *value, GParamS
 
 /* CALLBACK */
 static void
-persone_on_btn_nuovo_clicked (GtkButton *button,
+organigramma_persone_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data)
 {
        GtkWidget *w;
 
-       Persone *persone = (Persone *)user_data;
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersone *persone = (OrganigrammaPersone *)user_data;
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 
-       Persona *c = persona_new (priv->commons, 0);
+       OrganigrammaPersona *c = organigramma_persona_new (priv->commons, 0);
 
        g_signal_connect (G_OBJECT (c), "aggiornato",
-                         G_CALLBACK (persone_on_persona_aggiornato), (gpointer)persone);
+                         G_CALLBACK (organigramma_persone_on_organigramma_persona_aggiornato), (gpointer)persone);
 
-       w = persona_get_widget (c);
+       w = organigramma_persona_get_widget (c);
        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
        gtk_widget_show (w);
 }
 
 static void
-persone_on_btn_modifica_clicked (GtkButton *button,
+organigramma_persone_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       persone_modifica ((Persone *)user_data);
+       organigramma_persone_modifica ((OrganigrammaPersone *)user_data);
 }
 
 static void
-persone_on_btn_elimina_clicked (GtkButton *button,
+organigramma_persone_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data)
 {
        GtkWidget *dialog;
@@ -372,8 +372,8 @@ persone_on_btn_elimina_clicked (GtkButton *button,
        GtkTreeIter iter;
        guint id;
 
-       Persone *persone = (Persone *)user_data;
-       PersonePrivate *priv = PERSONE_GET_PRIVATE (persone);
+       OrganigrammaPersone *persone = (OrganigrammaPersone *)user_data;
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE (persone);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -392,7 +392,7 @@ persone_on_btn_elimina_clicked (GtkButton *button,
                                        gdaex_execute (priv->commons->gdaex,
                                                       g_strdup_printf ("UPDATE persone SET status = 'E' WHERE id = %d", id));
 
-                                       persone_carica (persone);
+                                       organigramma_persone_carica (persone);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -409,37 +409,37 @@ persone_on_btn_elimina_clicked (GtkButton *button,
 }
 
 static void
-persone_on_trv_persone_row_activated (GtkTreeView *tree_view,
+organigramma_persone_on_trv_organigramma_persone_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data)
 {
-       PersonePrivate *priv = PERSONE_GET_PRIVATE ((Persone *)user_data);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE ((OrganigrammaPersone *)user_data);
 
        if (priv->selezione)
                {
-                       persone_selezionato ((Persone *)user_data);
+                       organigramma_persone_selezionato ((OrganigrammaPersone *)user_data);
                }
        else
                {
-                       persone_modifica ((Persone *)user_data);
+                       organigramma_persone_modifica ((OrganigrammaPersone *)user_data);
                }
 }
 
 
 static void
-persone_on_btn_annulla_clicked (GtkButton *button,
+organigramma_persone_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       PersonePrivate *priv = PERSONE_GET_PRIVATE ((Persone *)user_data);
+       OrganigrammaPersonePrivate *priv = ORGANIGRAMMA_PERSONE_GET_PRIVATE ((OrganigrammaPersone *)user_data);
 
        gtk_widget_destroy (priv->widget);
        g_object_unref (G_OBJECT (user_data));
 }
 
 static void
-persone_on_btn_seleziona_clicked (GtkButton *button,
+organigramma_persone_on_btn_seleziona_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       persone_selezionato ((Persone *)user_data);
+       organigramma_persone_selezionato ((OrganigrammaPersone *)user_data);
 }

diff --git a/src/persone.h b/src/persone.h
index b5adbb1def64c76fb759b44845b97a3d9edf539c..ff8de5b21859fc82fc26a799af528fb3e4fab13a 100644 (file)
--- a/src/persone.h
+++ b/src/persone.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __PERSONE_H__
-#define __PERSONE_H__
+#ifndef __ORGANIGRAMMA_PERSONE_H__
+#define __ORGANIGRAMMA_PERSONE_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_PERSONE                 (persone_get_type ())
-#define PERSONE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PERSONE, Persone))
-#define PERSONE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PERSONE, PersoneClass))
-#define IS_PERSONE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PERSONE))
-#define IS_PERSONE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PERSONE))
-#define PERSONE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PERSONE, PersoneClass))
+#define TYPE_ORGANIGRAMMA_PERSONE                 (organigramma_persone_get_type ())
+#define ORGANIGRAMMA_PERSONE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_PERSONE, OrganigrammaPersone))
+#define ORGANIGRAMMA_PERSONE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_PERSONE, OrganigrammaPersoneClass))
+#define IS_ORGANIGRAMMA_PERSONE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_PERSONE))
+#define IS_ORGANIGRAMMA_PERSONE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_PERSONE))
+#define ORGANIGRAMMA_PERSONE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_PERSONE, OrganigrammaPersoneClass))
 
 
-typedef struct _Persone Persone;
-typedef struct _PersoneClass PersoneClass;
+typedef struct _OrganigrammaPersone OrganigrammaPersone;
+typedef struct _OrganigrammaPersoneClass OrganigrammaPersoneClass;
 
-struct _Persone
+struct _OrganigrammaPersone
        {
                GObject parent;
        };
 
-struct _PersoneClass
+struct _OrganigrammaPersoneClass
        {
                GObjectClass parent_class;
 
                guint selezionato_signal_id;
        };
 
-GType persone_get_type (void) G_GNUC_CONST;
+GType organigramma_persone_get_type (void) G_GNUC_CONST;
 
-Persone *persone_new (OrganigrammaCommons *commons, gboolean selezione);
+OrganigrammaPersone *organigramma_persone_new (OrganigrammaCommons *commons, gboolean selezione);
 
-GtkWidget *persone_get_widget (Persone *persone);
+GtkWidget *organigramma_persone_get_widget (OrganigrammaPersone *persone);
 
 
 G_END_DECLS
 
-#endif /* __PERSONE_H__ */
+#endif /* __ORGANIGRAMMA_PERSONE_H__ */

diff --git a/src/struttura.c b/src/struttura.c
index c50229c3e5373d5cbd1b333f5864a28e118bfb34..e163f04edc978b022f5976e3adcd270c4290c631 100644 (file)
--- a/src/struttura.c
+++ b/src/struttura.c
@@ -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
@@ -22,50 +22,50 @@
 #include "struttura.h"
 #include "strutturaindirizzo.h"
 
-static void struttura_class_init (StrutturaClass *klass);
-static void struttura_init (Struttura *struttura);
+static void organigramma_struttura_class_init (OrganigrammaStrutturaClass *klass);
+static void organigramma_struttura_init (OrganigrammaStruttura *struttura);
 
-static void struttura_carica (Struttura *struttura);
-static void struttura_salva (Struttura *struttura);
+static void organigramma_struttura_carica (OrganigrammaStruttura *struttura);
+static void organigramma_struttura_salva (OrganigrammaStruttura *struttura);
 
-static void struttura_carica_indirizzi (Struttura *struttura);
+static void organigramma_struttura_carica_indirizzi (OrganigrammaStruttura *struttura);
 
-static void struttura_indirizzo_modifica (Struttura *struttura);
+static void organigramma_struttura_indirizzo_modifica (OrganigrammaStruttura *struttura);
 
-static gboolean struttura_conferma_chiusura (Struttura *struttura);
+static gboolean organigramma_struttura_conferma_chiusura (OrganigrammaStruttura *struttura);
 
-static void struttura_set_property (GObject *object,
+static void organigramma_struttura_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void struttura_get_property (GObject *object,
+static void organigramma_struttura_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void struttura_on_indirizzo_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_struttura_on_indirizzo_aggiornato (gpointer instance, gpointer user_data);
 
-static gboolean struttura_on_w_struttura_delete_event (GtkWidget *widget,
+static gboolean organigramma_struttura_on_w_organigramma_struttura_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void struttura_on_btn_indirizzo_nuovo_clicked (GtkButton *button,
+static void organigramma_struttura_on_btn_indirizzo_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void struttura_on_btn_indirizzo_modifica_clicked (GtkButton *button,
+static void organigramma_struttura_on_btn_indirizzo_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void struttura_on_btn_indirizzo_elimina_clicked (GtkButton *button,
+static void organigramma_struttura_on_btn_indirizzo_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void struttura_on_trv_indirizzi_row_activated (GtkTreeView *tree_view,
+static void organigramma_struttura_on_trv_indirizzi_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void struttura_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_struttura_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void struttura_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_struttura_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define STRUTTURA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_STRUTTURA, StrutturaPrivate))
+#define ORGANIGRAMMA_STRUTTURA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_STRUTTURA, OrganigrammaStrutturaPrivate))
 
 enum
 {
@@ -79,8 +79,8 @@ enum
        INDIRIZZI_COL_INDIRIZZO
 };
 
-typedef struct _StrutturaPrivate StrutturaPrivate;
-struct _StrutturaPrivate
+typedef struct _OrganigrammaStrutturaPrivate OrganigrammaStrutturaPrivate;
+struct _OrganigrammaStrutturaPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -95,20 +95,20 @@ struct _StrutturaPrivate
                gint id;
        };
 
-G_DEFINE_TYPE (Struttura, struttura, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaStruttura, organigramma_struttura, G_TYPE_OBJECT)
 
 static void
-struttura_class_init (StrutturaClass *klass)
+organigramma_struttura_class_init (OrganigrammaStrutturaClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (StrutturaPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaStrutturaPrivate));
 
-       object_class->set_property = struttura_set_property;
-       object_class->get_property = struttura_get_property;
+       object_class->set_property = organigramma_struttura_set_property;
+       object_class->get_property = organigramma_struttura_get_property;
 
        /**
-        * Struttura::aggiornato:
+        * OrganigrammaStruttura::aggiornato:
         * @struttura:
         *
         */
@@ -124,32 +124,32 @@ struttura_class_init (StrutturaClass *klass)
 }
 
 static void
-struttura_init (Struttura *struttura)
+organigramma_struttura_init (OrganigrammaStruttura *struttura)
 {
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 }
 
 /**
- * struttura_new:
+ * organigramma_struttura_new:
  * @commons:
  * @id:
  *
- * Returns: the newly created #Struttura object.
+ * Returns: the newly created #OrganigrammaStruttura object.
  */
-Struttura
-*struttura_new (OrganigrammaCommons *commons, gint id)
+OrganigrammaStruttura
+*organigramma_struttura_new (OrganigrammaCommons *commons, gint id)
 {
        GError *error;
 
-       Struttura *a = STRUTTURA (g_object_new (struttura_get_type (), NULL));
+       OrganigrammaStruttura *a = ORGANIGRAMMA_STRUTTURA (g_object_new (organigramma_struttura_get_type (), NULL));
 
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (a);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit (g_strconcat ("lstore_struttura_indirizzi",
+                                          g_strsplit (g_strconcat ("lstore_organigramma_struttura_indirizzi",
                                           "|w_struttura", NULL), "|", -1),
                                           &error);
        if (error != NULL)
@@ -166,27 +166,27 @@ Struttura
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label31",
-                                                     "lstore_struttura_indirizzi",
+                                                     "lstore_organigramma_struttura_indirizzi",
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (struttura_on_w_struttura_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_struttura_on_w_organigramma_struttura_delete_event), (gpointer *)a);
 
        priv->sel_indirizzi = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview9")));
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button47")),
-                         "clicked", G_CALLBACK (struttura_on_btn_indirizzo_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_struttura_on_btn_indirizzo_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button50")),
-                         "clicked", G_CALLBACK (struttura_on_btn_indirizzo_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_struttura_on_btn_indirizzo_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button51")),
-                         "clicked", G_CALLBACK (struttura_on_btn_indirizzo_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_struttura_on_btn_indirizzo_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview9")),
-                         "row-activated", G_CALLBACK (struttura_on_trv_indirizzi_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_struttura_on_trv_indirizzi_row_activated), (gpointer *)a);
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button39"),
-                         "clicked", G_CALLBACK (struttura_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_struttura_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button40"),
-                         "clicked", G_CALLBACK (struttura_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_struttura_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
 
@@ -201,39 +201,39 @@ Struttura
        else
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
-                       struttura_carica (a);
+                       organigramma_struttura_carica (a);
                }
 
        return a;
 }
 
 /**
- * struttura_get_widget:
+ * organigramma_struttura_get_widget:
  * @struttura:
  *
  */
 GtkWidget
-*struttura_get_widget (Struttura *struttura)
+*organigramma_struttura_get_widget (OrganigrammaStruttura *struttura)
 {
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-struttura_carica (Struttura *struttura)
+organigramma_struttura_carica (OrganigrammaStruttura *struttura)
 {
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        if (gtk_form_fill_from_table (priv->form))
                {
-                       struttura_carica_indirizzi (struttura);
+                       organigramma_struttura_carica_indirizzi (struttura);
                }
 }
 
 static void
-struttura_salva (Struttura *struttura)
+organigramma_struttura_salva (OrganigrammaStruttura *struttura)
 {
        GError *error = NULL;
        gchar *sql;
@@ -242,9 +242,9 @@ struttura_salva (Struttura *struttura)
        GDate *da;
        GDate *a;
 
-       StrutturaClass *klass = STRUTTURA_GET_CLASS (struttura);
+       OrganigrammaStrutturaClass *klass = ORGANIGRAMMA_STRUTTURA_GET_CLASS (struttura);
 
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        if (!gtk_form_check (priv->form, (priv->id != 0), NULL, TRUE, priv->w, TRUE))
                {
@@ -298,19 +298,19 @@ struttura_salva (Struttura *struttura)
 }
 
 static void
-struttura_carica_indirizzi (Struttura *struttura)
+organigramma_struttura_carica_indirizzi (OrganigrammaStruttura *struttura)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_INDIRIZZI]));
 
        sql = g_strdup_printf ("SELECT si.id, v.nome, si.civico"
-                              " FROM struttura_indirizzi si INNER JOIN vie v ON"
+                              " FROM organigramma_struttura_indirizzi si INNER JOIN vie v ON"
                               " si.id_vie = v.id"
                               " WHERE si.id_strutture = %d"
                               " AND status <> 'E'",
@@ -337,12 +337,12 @@ struttura_carica_indirizzi (Struttura *struttura)
 }
 
 static void
-struttura_indirizzo_modifica (Struttura *struttura)
+organigramma_struttura_indirizzo_modifica (OrganigrammaStruttura *struttura)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        if (gtk_tree_selection_get_selected (priv->sel_indirizzi, NULL, &iter))
                {
@@ -353,12 +353,12 @@ struttura_indirizzo_modifica (Struttura *struttura)
                                            INDIRIZZI_COL_ID, &id,
                                            -1);
 
-                       StrutturaIndirizzo *a = struttura_indirizzo_new (priv->commons, id, 0);
+                       OrganigrammaStrutturaIndirizzo *a = organigramma_struttura_indirizzo_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (struttura_on_indirizzo_aggiornato), (gpointer)struttura);
+                                         G_CALLBACK (organigramma_struttura_on_indirizzo_aggiornato), (gpointer)struttura);
 
-                       w = struttura_indirizzo_get_widget (a);
+                       w = organigramma_struttura_indirizzo_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -375,11 +375,10 @@ struttura_indirizzo_modifica (Struttura *struttura)
 }
 
 static void
-struttura_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_struttura_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Struttura *struttura = STRUTTURA (object);
-
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStruttura *struttura = ORGANIGRAMMA_STRUTTURA (object);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        switch (property_id)
                {
@@ -390,11 +389,10 @@ struttura_set_property (GObject *object, guint property_id, const GValue *value,
 }
 
 static void
-struttura_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_struttura_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Struttura *struttura = STRUTTURA (object);
-
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStruttura *struttura = ORGANIGRAMMA_STRUTTURA (object);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        switch (property_id)
                {
@@ -405,13 +403,13 @@ struttura_get_property (GObject *object, guint property_id, GValue *value, GPara
 }
 
 static gboolean
-struttura_conferma_chiusura (Struttura *struttura)
+organigramma_struttura_conferma_chiusura (OrganigrammaStruttura *struttura)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        ret = TRUE;
        if (gtk_form_is_changed (priv->form))
@@ -433,61 +431,61 @@ struttura_conferma_chiusura (Struttura *struttura)
 
 /* CALLBACK */
 static void
-struttura_on_indirizzo_aggiornato (gpointer instance, gpointer user_data)
+organigramma_struttura_on_indirizzo_aggiornato (gpointer instance, gpointer user_data)
 {
-       Struttura *struttura = (Struttura *)user_data;
-       StrutturaClass *klass = STRUTTURA_GET_CLASS (struttura);
+       OrganigrammaStruttura *struttura = (OrganigrammaStruttura *)user_data;
+       OrganigrammaStrutturaClass *klass = ORGANIGRAMMA_STRUTTURA_GET_CLASS (struttura);
 
-       struttura_carica_indirizzi (struttura);
+       organigramma_struttura_carica_indirizzi (struttura);
 }
 
 static gboolean
-struttura_on_w_struttura_delete_event (GtkWidget *widget,
+organigramma_struttura_on_w_organigramma_struttura_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !struttura_conferma_chiusura ((Struttura *)user_data);
+       return !organigramma_struttura_conferma_chiusura ((OrganigrammaStruttura *)user_data);
 }
 
 static void
-struttura_on_btn_indirizzo_nuovo_clicked (GtkButton *button,
+organigramma_struttura_on_btn_indirizzo_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Struttura *struttura = (Struttura *)user_data;
+       OrganigrammaStruttura *struttura = (OrganigrammaStruttura *)user_data;
 
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
-       StrutturaIndirizzo *a = struttura_indirizzo_new (priv->commons, 0, priv->id);
+       OrganigrammaStrutturaIndirizzo *a = organigramma_struttura_indirizzo_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (struttura_on_indirizzo_aggiornato), (gpointer)struttura);
+                         G_CALLBACK (organigramma_struttura_on_indirizzo_aggiornato), (gpointer)struttura);
 
-       w = struttura_indirizzo_get_widget (a);
+       w = organigramma_struttura_indirizzo_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-struttura_on_btn_indirizzo_modifica_clicked (GtkButton *button,
+organigramma_struttura_on_btn_indirizzo_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       struttura_indirizzo_modifica ((Struttura *)user_data);
+       organigramma_struttura_indirizzo_modifica ((OrganigrammaStruttura *)user_data);
 }
 
 static void
-struttura_on_btn_indirizzo_elimina_clicked (GtkButton *button,
+organigramma_struttura_on_btn_indirizzo_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Struttura *struttura = (Struttura *)user_data;
+       OrganigrammaStruttura *struttura = (OrganigrammaStruttura *)user_data;
 
-       StrutturaClass *klass = STRUTTURA_GET_CLASS (struttura);
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaClass *klass = ORGANIGRAMMA_STRUTTURA_GET_CLASS (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
        if (gtk_tree_selection_get_selected (priv->sel_indirizzi, NULL, &iter))
                {
@@ -506,12 +504,12 @@ struttura_on_btn_indirizzo_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE struttura_indirizzi"
+                                                      g_strdup_printf ("UPDATE organigramma_struttura_indirizzi"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       struttura_carica_indirizzi (struttura);
+                                       organigramma_struttura_carica_indirizzi (struttura);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -528,28 +526,28 @@ struttura_on_btn_indirizzo_elimina_clicked (GtkButton *button,
 }
 
 static void
-struttura_on_trv_indirizzi_row_activated (GtkTreeView *tree_view,
+organigramma_struttura_on_trv_indirizzi_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                                                                         GtkTreeViewColumn *column,
                                                                                         gpointer user_data)
 {
-       struttura_indirizzo_modifica ((Struttura *)user_data);
+       organigramma_struttura_indirizzo_modifica ((OrganigrammaStruttura *)user_data);
 }
 
 static void
-struttura_on_btn_annulla_clicked (GtkButton *button,
+organigramma_struttura_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       Struttura *struttura = (Struttura *)user_data;
+       OrganigrammaStruttura *struttura = (OrganigrammaStruttura *)user_data;
 
-       StrutturaPrivate *priv = STRUTTURA_GET_PRIVATE (struttura);
+       OrganigrammaStrutturaPrivate *priv = ORGANIGRAMMA_STRUTTURA_GET_PRIVATE (struttura);
 
-       if (struttura_conferma_chiusura (struttura)) gtk_widget_destroy (priv->w);
+       if (organigramma_struttura_conferma_chiusura (struttura)) gtk_widget_destroy (priv->w);
 }
 
 static void
-struttura_on_btn_salva_clicked (GtkButton *button,
+organigramma_struttura_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       struttura_salva ((Struttura *)user_data);
+       organigramma_struttura_salva ((OrganigrammaStruttura *)user_data);
 }

diff --git a/src/struttura.h b/src/struttura.h
index 377ac5569ccc9f11792b95a8a0851570d842fc28..1517f0a0070e08072edaa38f5e33c1a0f3b05849 100644 (file)
--- a/src/struttura.h
+++ b/src/struttura.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __STRUTTURA_H__
-#define __STRUTTURA_H__
+#ifndef __ORGANIGRAMMA_STRUTTURA_H__
+#define __ORGANIGRAMMA_STRUTTURA_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_STRUTTURA                 (struttura_get_type ())
-#define STRUTTURA(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_STRUTTURA, Struttura))
-#define STRUTTURA_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_STRUTTURA, StrutturaClass))
-#define IS_STRUTTURA(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_STRUTTURA))
-#define IS_STRUTTURA_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_STRUTTURA))
-#define STRUTTURA_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_STRUTTURA, StrutturaClass))
+#define TYPE_ORGANIGRAMMA_STRUTTURA                 (organigramma_struttura_get_type ())
+#define ORGANIGRAMMA_STRUTTURA(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_STRUTTURA, OrganigrammaStruttura))
+#define ORGANIGRAMMA_STRUTTURA_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_STRUTTURA, OrganigrammaStrutturaClass))
+#define IS_ORGANIGRAMMA_STRUTTURA(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_STRUTTURA))
+#define IS_ORGANIGRAMMA_STRUTTURA_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_STRUTTURA))
+#define ORGANIGRAMMA_STRUTTURA_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_STRUTTURA, OrganigrammaStrutturaClass))
 
 
-typedef struct _Struttura Struttura;
-typedef struct _StrutturaClass StrutturaClass;
+typedef struct _OrganigrammaStruttura OrganigrammaStruttura;
+typedef struct _OrganigrammaStrutturaClass OrganigrammaStrutturaClass;
 
-struct _Struttura
+struct _OrganigrammaStruttura
        {
                GObject parent;
        };
 
-struct _StrutturaClass
+struct _OrganigrammaStrutturaClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType struttura_get_type (void) G_GNUC_CONST;
+GType organigramma_struttura_get_type (void) G_GNUC_CONST;
 
-Struttura *struttura_new (OrganigrammaCommons *commons, gint id);
+OrganigrammaStruttura *organigramma_struttura_new (OrganigrammaCommons *commons, gint id);
 
-GtkWidget *struttura_get_widget (Struttura *struttura);
+GtkWidget *organigramma_struttura_get_widget (OrganigrammaStruttura *struttura);
 
 
 G_END_DECLS
 
-#endif /* __STRUTTURA_H__ */
+#endif /* __ORGANIGRAMMA_STRUTTURA_H__ */

diff --git a/src/strutturaindirizzo.c b/src/strutturaindirizzo.c
index 81f0f82ad5f6ded66572da62fa5138f1bf82f72e..c0bd4b1b2e4fd37dfe68178986d3ef445630c435 100644 (file)
--- a/src/strutturaindirizzo.c
+++ b/src/strutturaindirizzo.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -27,41 +27,41 @@
 
 #include "vie.h"
 
-static void struttura_indirizzo_class_init (StrutturaIndirizzoClass *klass);
-static void struttura_indirizzo_init (StrutturaIndirizzo *struttura_indirizzo);
+static void organigramma_struttura_indirizzo_class_init (OrganigrammaStrutturaIndirizzoClass *klass);
+static void organigramma_struttura_indirizzo_init (OrganigrammaStrutturaIndirizzo *struttura_indirizzo);
 
-static void struttura_indirizzo_carica (StrutturaIndirizzo *struttura_indirizzo);
-static void struttura_indirizzo_salva (StrutturaIndirizzo *struttura_indirizzo);
+static void organigramma_struttura_indirizzo_carica (OrganigrammaStrutturaIndirizzo *struttura_indirizzo);
+static void organigramma_struttura_indirizzo_salva (OrganigrammaStrutturaIndirizzo *struttura_indirizzo);
 
-static void struttura_indirizzo_carica_indirizzo (StrutturaIndirizzo *indirizzo);
+static void organigramma_struttura_indirizzo_carica_indirizzo (OrganigrammaStrutturaIndirizzo *indirizzo);
 
-static gboolean struttura_indirizzo_conferma_chiusura (StrutturaIndirizzo *struttura_indirizzo);
+static gboolean organigramma_struttura_indirizzo_conferma_chiusura (OrganigrammaStrutturaIndirizzo *struttura_indirizzo);
 
 static void indirizzo_on_vie_selezionato (gpointer instance,
                                           guint id, gpointer user_data);
 
-static void struttura_indirizzo_set_property (GObject *object,
+static void organigramma_struttura_indirizzo_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void struttura_indirizzo_get_property (GObject *object,
+static void organigramma_struttura_indirizzo_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean struttura_indirizzo_on_w_struttura_indirizzo_delete_event (GtkWidget *widget,
+static gboolean organigramma_struttura_indirizzo_on_w_organigramma_struttura_indirizzo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void struttura_indirizzo_on_btn_ricerca_via_clicked (GtkButton *button,
+static void organigramma_struttura_indirizzo_on_btn_ricerca_via_clicked (GtkButton *button,
                                     gpointer user_data);
-static void struttura_indirizzo_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_struttura_indirizzo_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void struttura_indirizzo_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_struttura_indirizzo_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define STRUTTURA_INDIRIZZO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_STRUTTURA_INDIRIZZO, StrutturaIndirizzoPrivate))
+#define ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_STRUTTURA_INDIRIZZO, OrganigrammaStrutturaIndirizzoPrivate))
 
 enum
 {
@@ -70,8 +70,8 @@ enum
        LBL_ID_VIE
 };
 
-typedef struct _StrutturaIndirizzoPrivate StrutturaIndirizzoPrivate;
-struct _StrutturaIndirizzoPrivate
+typedef struct _OrganigrammaStrutturaIndirizzoPrivate OrganigrammaStrutturaIndirizzoPrivate;
+struct _OrganigrammaStrutturaIndirizzoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -84,20 +84,20 @@ struct _StrutturaIndirizzoPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (StrutturaIndirizzo, struttura_indirizzo, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaStrutturaIndirizzo, organigramma_struttura_indirizzo, G_TYPE_OBJECT)
 
 static void
-struttura_indirizzo_class_init (StrutturaIndirizzoClass *klass)
+organigramma_struttura_indirizzo_class_init (OrganigrammaStrutturaIndirizzoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (StrutturaIndirizzoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaStrutturaIndirizzoPrivate));
 
-       object_class->set_property = struttura_indirizzo_set_property;
-       object_class->get_property = struttura_indirizzo_get_property;
+       object_class->set_property = organigramma_struttura_indirizzo_set_property;
+       object_class->get_property = organigramma_struttura_indirizzo_get_property;
 
        /**
-        * StrutturaIndirizzo::aggiornato:
+        * OrganigrammaStrutturaIndirizzo::aggiornato:
         * @struttura_indirizzo:
         *
         */
@@ -113,27 +113,27 @@ struttura_indirizzo_class_init (StrutturaIndirizzoClass *klass)
 }
 
 static void
-struttura_indirizzo_init (StrutturaIndirizzo *struttura_indirizzo)
+organigramma_struttura_indirizzo_init (OrganigrammaStrutturaIndirizzo *struttura_indirizzo)
 {
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
 }
 
 /**
- * struttura_indirizzo_new:
+ * organigramma_struttura_indirizzo_new:
  * @commons:
  * @id:
  * @id_strutture:
  *
- * Returns: the newly created #StrutturaIndirizzo object.
+ * Returns: the newly created #OrganigrammaStrutturaIndirizzo object.
  */
-StrutturaIndirizzo
-*struttura_indirizzo_new (OrganigrammaCommons *commons, guint id, guint id_strutture)
+OrganigrammaStrutturaIndirizzo
+*organigramma_struttura_indirizzo_new (OrganigrammaCommons *commons, guint id, guint id_strutture)
 {
        GError *error;
 
-       StrutturaIndirizzo *a = STRUTTURA_INDIRIZZO (g_object_new (struttura_indirizzo_get_type (), NULL));
+       OrganigrammaStrutturaIndirizzo *a = ORGANIGRAMMA_STRUTTURA_INDIRIZZO (g_object_new (organigramma_struttura_indirizzo_get_type (), NULL));
 
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (a);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
@@ -161,15 +161,15 @@ StrutturaIndirizzo
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (struttura_indirizzo_on_w_struttura_indirizzo_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_struttura_indirizzo_on_w_organigramma_struttura_indirizzo_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button54")),
-                         "clicked", G_CALLBACK (struttura_indirizzo_on_btn_ricerca_via_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_struttura_indirizzo_on_btn_ricerca_via_clicked), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button55")),
-                         "clicked", G_CALLBACK (struttura_indirizzo_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_struttura_indirizzo_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button56")),
-                         "clicked", G_CALLBACK (struttura_indirizzo_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_struttura_indirizzo_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -183,33 +183,33 @@ StrutturaIndirizzo
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       struttura_indirizzo_carica (a);
+                       organigramma_struttura_indirizzo_carica (a);
                }
 
        return a;
 }
 
 /**
- * struttura_indirizzo_get_widget:
+ * organigramma_struttura_indirizzo_get_widget:
  * @struttura_indirizzo:
  *
  */
 GtkWidget
-*struttura_indirizzo_get_widget (StrutturaIndirizzo *struttura_indirizzo)
+*organigramma_struttura_indirizzo_get_widget (OrganigrammaStrutturaIndirizzo *struttura_indirizzo)
 {
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-struttura_indirizzo_carica (StrutturaIndirizzo *struttura_indirizzo)
+organigramma_struttura_indirizzo_carica (OrganigrammaStrutturaIndirizzo *struttura_indirizzo)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -217,14 +217,14 @@ struttura_indirizzo_carica (StrutturaIndirizzo *struttura_indirizzo)
 }
 
 static void
-struttura_indirizzo_salva (StrutturaIndirizzo *struttura_indirizzo)
+organigramma_struttura_indirizzo_salva (OrganigrammaStrutturaIndirizzo *struttura_indirizzo)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       StrutturaIndirizzoClass *klass = STRUTTURA_INDIRIZZO_GET_CLASS (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoClass *klass = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_CLASS (struttura_indirizzo);
 
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -272,21 +272,21 @@ struttura_indirizzo_salva (StrutturaIndirizzo *struttura_indirizzo)
 }
 
 static void
-struttura_indirizzo_on_vie_selezionato (gpointer instance, guint id, gpointer user_data)
+organigramma_struttura_indirizzo_on_vie_selezionato (gpointer instance, guint id, gpointer user_data)
 {
-       StrutturaIndirizzo *ia = (StrutturaIndirizzo *)user_data;
+       OrganigrammaStrutturaIndirizzo *ia = (OrganigrammaStrutturaIndirizzo *)user_data;
 
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (ia);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (ia);
 
        gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "label46"), g_strdup_printf ("%d", id));
 }
 
 static void
-struttura_indirizzo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_struttura_indirizzo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       StrutturaIndirizzo *struttura_indirizzo = STRUTTURA_INDIRIZZO (object);
+       OrganigrammaStrutturaIndirizzo *struttura_indirizzo = ORGANIGRAMMA_STRUTTURA_INDIRIZZO (object);
 
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
 
        switch (property_id)
                {
@@ -297,11 +297,11 @@ struttura_indirizzo_set_property (GObject *object, guint property_id, const GVal
 }
 
 static void
-struttura_indirizzo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_struttura_indirizzo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       StrutturaIndirizzo *struttura_indirizzo = STRUTTURA_INDIRIZZO (object);
+       OrganigrammaStrutturaIndirizzo *struttura_indirizzo = ORGANIGRAMMA_STRUTTURA_INDIRIZZO (object);
 
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
 
        switch (property_id)
                {
@@ -312,13 +312,13 @@ struttura_indirizzo_get_property (GObject *object, guint property_id, GValue *va
 }
 
 static gboolean
-struttura_indirizzo_conferma_chiusura (StrutturaIndirizzo *struttura_indirizzo)
+organigramma_struttura_indirizzo_conferma_chiusura (OrganigrammaStrutturaIndirizzo *struttura_indirizzo)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
 
        ret = TRUE;
 
@@ -341,26 +341,26 @@ struttura_indirizzo_conferma_chiusura (StrutturaIndirizzo *struttura_indirizzo)
 
 /* CALLBACK */
 static gboolean
-struttura_indirizzo_on_w_struttura_indirizzo_delete_event (GtkWidget *widget,
+organigramma_struttura_indirizzo_on_w_organigramma_struttura_indirizzo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !struttura_indirizzo_conferma_chiusura ((StrutturaIndirizzo *)user_data);
+       return !organigramma_struttura_indirizzo_conferma_chiusura ((OrganigrammaStrutturaIndirizzo *)user_data);
 }
 
 static void
-struttura_indirizzo_on_btn_ricerca_via_clicked (GtkButton *button,
+organigramma_struttura_indirizzo_on_btn_ricerca_via_clicked (GtkButton *button,
                                     gpointer user_data)                                  
 {
        GtkWidget *w;
 
-       StrutturaIndirizzo *ia = (StrutturaIndirizzo *)user_data;
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (ia);
+       OrganigrammaStrutturaIndirizzo *ia = (OrganigrammaStrutturaIndirizzo *)user_data;
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (ia);
 
        Vie *v = vie_new (priv->commons);
 
        g_signal_connect (G_OBJECT (v), "selezionato",
-                         G_CALLBACK (struttura_indirizzo_on_vie_selezionato), (gpointer)ia);
+                         G_CALLBACK (organigramma_struttura_indirizzo_on_vie_selezionato), (gpointer)ia);
 
        w = vie_get_widget (v);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
@@ -368,19 +368,19 @@ struttura_indirizzo_on_btn_ricerca_via_clicked (GtkButton *button,
 }
 
 static void
-struttura_indirizzo_on_btn_annulla_clicked (GtkButton *button,
+organigramma_struttura_indirizzo_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       StrutturaIndirizzo *struttura_indirizzo = (StrutturaIndirizzo *)user_data;
+       OrganigrammaStrutturaIndirizzo *struttura_indirizzo = (OrganigrammaStrutturaIndirizzo *)user_data;
 
-       StrutturaIndirizzoPrivate *priv = STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
+       OrganigrammaStrutturaIndirizzoPrivate *priv = ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_PRIVATE (struttura_indirizzo);
 
-       if (struttura_indirizzo_conferma_chiusura (struttura_indirizzo)) gtk_widget_destroy (priv->w);
+       if (organigramma_struttura_indirizzo_conferma_chiusura (struttura_indirizzo)) gtk_widget_destroy (priv->w);
 }
 
 static void
-struttura_indirizzo_on_btn_salva_clicked (GtkButton *button,
+organigramma_struttura_indirizzo_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       struttura_indirizzo_salva ((StrutturaIndirizzo *)user_data);
+       organigramma_struttura_indirizzo_salva ((OrganigrammaStrutturaIndirizzo *)user_data);
 }

diff --git a/src/strutturaindirizzo.h b/src/strutturaindirizzo.h
index 0efb7bc165f175b1e4600abb197100f4d1aef80b..ba15cbf1d8334f3d9fdb949bc2fecb02510e4793 100644 (file)
--- a/src/strutturaindirizzo.h
+++ b/src/strutturaindirizzo.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __STRUTTURA_INDIRIZZO_H__
-#define __STRUTTURA_INDIRIZZO_H__
+#ifndef __ORGANIGRAMMA_STRUTTURA_INDIRIZZO_H__
+#define __ORGANIGRAMMA_STRUTTURA_INDIRIZZO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_STRUTTURA_INDIRIZZO                 (struttura_indirizzo_get_type ())
-#define STRUTTURA_INDIRIZZO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_STRUTTURA_INDIRIZZO, StrutturaIndirizzo))
-#define STRUTTURA_INDIRIZZO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_STRUTTURA_INDIRIZZO, StrutturaIndirizzoClass))
-#define IS_STRUTTURA_INDIRIZZO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_STRUTTURA_INDIRIZZO))
-#define IS_STRUTTURA_INDIRIZZO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_STRUTTURA_INDIRIZZO))
-#define STRUTTURA_INDIRIZZO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_STRUTTURA_INDIRIZZO, StrutturaIndirizzoClass))
+#define TYPE_ORGANIGRAMMA_STRUTTURA_INDIRIZZO                 (organigramma_struttura_indirizzo_get_type ())
+#define ORGANIGRAMMA_STRUTTURA_INDIRIZZO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_STRUTTURA_INDIRIZZO, OrganigrammaStrutturaIndirizzo))
+#define ORGANIGRAMMA_STRUTTURA_INDIRIZZO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_STRUTTURA_INDIRIZZO, OrganigrammaStrutturaIndirizzoClass))
+#define IS_ORGANIGRAMMA_STRUTTURA_INDIRIZZO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_STRUTTURA_INDIRIZZO))
+#define IS_ORGANIGRAMMA_STRUTTURA_INDIRIZZO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_STRUTTURA_INDIRIZZO))
+#define ORGANIGRAMMA_STRUTTURA_INDIRIZZO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_STRUTTURA_INDIRIZZO, OrganigrammaStrutturaIndirizzoClass))
 
 
-typedef struct _StrutturaIndirizzo StrutturaIndirizzo;
-typedef struct _StrutturaIndirizzoClass StrutturaIndirizzoClass;
+typedef struct _OrganigrammaStrutturaIndirizzo OrganigrammaStrutturaIndirizzo;
+typedef struct _OrganigrammaStrutturaIndirizzoClass OrganigrammaStrutturaIndirizzoClass;
 
-struct _StrutturaIndirizzo
+struct _OrganigrammaStrutturaIndirizzo
        {
                GObject parent;
        };
 
-struct _StrutturaIndirizzoClass
+struct _OrganigrammaStrutturaIndirizzoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType struttura_indirizzo_get_type (void) G_GNUC_CONST;
+GType organigramma_struttura_indirizzo_get_type (void) G_GNUC_CONST;
 
-StrutturaIndirizzo *struttura_indirizzo_new (OrganigrammaCommons *commons, guint id, guint id_strutture);
+OrganigrammaStrutturaIndirizzo *organigramma_struttura_indirizzo_new (OrganigrammaCommons *commons, guint id, guint id_strutture);
 
-GtkWidget *struttura_indirizzo_get_widget (StrutturaIndirizzo *struttura_indirizzo);
+GtkWidget *organigramma_struttura_indirizzo_get_widget (OrganigrammaStrutturaIndirizzo *struttura_indirizzo);
 
 
 G_END_DECLS
 
-#endif /* __STRUTTURA_INDIRIZZO_H__ */
+#endif /* __ORGANIGRAMMA_STRUTTURA_INDIRIZZO_H__ */

diff --git a/src/strutture.c b/src/strutture.c
index 3a1e9084d7db90b7e93707ec02746f1ade1f96a8..d96345286b03549f39ac0226145c1bb4c93c7e98 100644 (file)
--- a/src/strutture.c
+++ b/src/strutture.c
@@ -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
@@ -20,41 +20,41 @@
 #include "strutture.h"
 #include "struttura.h"
 
-static void strutture_class_init (StruttureClass *klass);
-static void strutture_init (Strutture *strutture);
+static void organigramma_strutture_class_init (OrganigrammaStruttureClass *klass);
+static void organigramma_strutture_init (OrganigrammaStrutture *strutture);
 
-static void strutture_carica (Strutture *strutture);
-static void strutture_modifica (Strutture *strutture);
+static void organigramma_strutture_carica (OrganigrammaStrutture *strutture);
+static void organigramma_strutture_modifica (OrganigrammaStrutture *strutture);
 
-static void strutture_selezionato (Strutture *strutture);
-static void strutture_on_struttura_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_strutture_selezionato (OrganigrammaStrutture *strutture);
+static void organigramma_strutture_on_organigramma_struttura_aggiornato (gpointer instance, gpointer user_data);
 
-static void strutture_set_property (GObject *object,
+static void organigramma_strutture_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void strutture_get_property (GObject *object,
+static void organigramma_strutture_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void strutture_on_btn_nuovo_clicked (GtkButton *button,
+static void organigramma_strutture_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data);
-static void strutture_on_btn_modifica_clicked (GtkButton *button,
+static void organigramma_strutture_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data);
-static void strutture_on_btn_elimina_clicked (GtkButton *button,
+static void organigramma_strutture_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data);
-static void strutture_on_trv_strutture_row_activated (GtkTreeView *tree_view,
+static void organigramma_strutture_on_trv_organigramma_strutture_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void strutture_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_strutture_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void strutture_on_btn_seleziona_clicked (GtkButton *button,
+static void organigramma_strutture_on_btn_seleziona_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define STRUTTURE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_STRUTTURE, StrutturePrivate))
+#define ORGANIGRAMMA_STRUTTURE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_STRUTTURE, OrganigrammaStrutturePrivate))
 
 enum
 {
@@ -62,8 +62,8 @@ enum
        COL_NOME
 };
 
-typedef struct _StrutturePrivate StrutturePrivate;
-struct _StrutturePrivate
+typedef struct _OrganigrammaStrutturePrivate OrganigrammaStrutturePrivate;
+struct _OrganigrammaStrutturePrivate
        {
                OrganigrammaCommons *commons;
 
@@ -75,20 +75,20 @@ struct _StrutturePrivate
                GtkWindow *wtransient;
        };
 
-G_DEFINE_TYPE (Strutture, strutture, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaStrutture, organigramma_strutture, G_TYPE_OBJECT)
 
 static void
-strutture_class_init (StruttureClass *klass)
+organigramma_strutture_class_init (OrganigrammaStruttureClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (StrutturePrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaStrutturePrivate));
 
-       object_class->set_property = strutture_set_property;
-       object_class->get_property = strutture_get_property;
+       object_class->set_property = organigramma_strutture_set_property;
+       object_class->get_property = organigramma_strutture_get_property;
 
        /**
-        * Strutture::selezionato:
+        * OrganigrammaStrutture::selezionato:
         * @strutture:
         *
         */
@@ -104,26 +104,26 @@ strutture_class_init (StruttureClass *klass)
 }
 
 static void
-strutture_init (Strutture *strutture)
+organigramma_strutture_init (OrganigrammaStrutture *strutture)
 {
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 }
 
 /**
- * strutture_new:
+ * organigramma_strutture_new:
  * @commons:
  * @selezione:
  *
- * Returns: the newly created #Strutture object.
+ * Returns: the newly created #OrganigrammaStrutture object.
  */
-Strutture
-*strutture_new (OrganigrammaCommons *commons, gboolean selezione)
+OrganigrammaStrutture
+*organigramma_strutture_new (OrganigrammaCommons *commons, gboolean selezione)
 {
        GError *error;
 
-       Strutture *a = STRUTTURE (g_object_new (strutture_get_type (), NULL));
+       OrganigrammaStrutture *a = ORGANIGRAMMA_STRUTTURE (g_object_new (organigramma_strutture_get_type (), NULL));
 
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (a);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (a);
 
        priv->commons = commons;
        priv->selezione = selezione;
@@ -154,21 +154,21 @@ Strutture
                }
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button32"),
-                         "clicked", G_CALLBACK (strutture_on_btn_nuovo_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_strutture_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button33"),
-                         "clicked", G_CALLBACK (strutture_on_btn_modifica_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_strutture_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button34"),
-                         "clicked", G_CALLBACK (strutture_on_btn_elimina_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_strutture_on_btn_elimina_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview5"),
-                         "row-activated", G_CALLBACK (strutture_on_trv_strutture_row_activated), (gpointer)a);
+                         "row-activated", G_CALLBACK (organigramma_strutture_on_trv_organigramma_strutture_row_activated), (gpointer)a);
 
        if (priv->selezione)
                {
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "label26")));
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button35"),
-                                         "clicked", G_CALLBACK (strutture_on_btn_annulla_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_strutture_on_btn_annulla_clicked), (gpointer)a);
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button36"),
-                                         "clicked", G_CALLBACK (strutture_on_btn_seleziona_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_strutture_on_btn_seleziona_clicked), (gpointer)a);
                }
        else
                {
@@ -176,27 +176,27 @@ Strutture
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "button36")));
                }
 
-       strutture_carica (a);
+       organigramma_strutture_carica (a);
 
        return a;
 }
 
 /**
- * strutture_get_widget:
+ * organigramma_strutture_get_widget:
  * @strutture:
  *
  */
 GtkWidget
-*strutture_get_widget (Strutture *strutture)
+*organigramma_strutture_get_widget (OrganigrammaStrutture *strutture)
 {
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
        return priv->widget;
 }
 
 /* PRIVATE */
 static void
-strutture_carica (Strutture *strutture)
+organigramma_strutture_carica (OrganigrammaStrutture *strutture)
 {
        GtkTreeIter iter;
        GdaDataModel *dm;
@@ -204,7 +204,7 @@ strutture_carica (Strutture *strutture)
        gint rows;
        gint row;
 
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
        gtk_list_store_clear (priv->lstore_strutture);
 
@@ -231,12 +231,12 @@ strutture_carica (Strutture *strutture)
 }
 
 static void
-strutture_modifica (Strutture *strutture)
+organigramma_strutture_modifica (OrganigrammaStrutture *strutture)
 {
        GtkTreeIter iter;
        guint id;
 
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -246,12 +246,12 @@ strutture_modifica (Strutture *strutture)
                                            COL_ID, &id,
                                            -1);
 
-                       Struttura *c = struttura_new (priv->commons, id);
+                       OrganigrammaStruttura *c = organigramma_struttura_new (priv->commons, id);
 
                        g_signal_connect (G_OBJECT (c), "aggiornato",
-                                         G_CALLBACK (strutture_on_struttura_aggiornato), (gpointer)strutture);
+                                         G_CALLBACK (organigramma_strutture_on_organigramma_struttura_aggiornato), (gpointer)strutture);
 
-                       w = struttura_get_widget (c);
+                       w = organigramma_struttura_get_widget (c);
                        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
                        gtk_widget_show (w);
                }
@@ -268,13 +268,13 @@ strutture_modifica (Strutture *strutture)
 }
 
 static void
-strutture_selezionato (Strutture *strutture)
+organigramma_strutture_selezionato (OrganigrammaStrutture *strutture)
 {
        GtkTreeIter iter;
        guint *id;
 
-       StruttureClass *klass = STRUTTURE_GET_CLASS (strutture);
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStruttureClass *klass = ORGANIGRAMMA_STRUTTURE_GET_CLASS (strutture);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -300,17 +300,17 @@ strutture_selezionato (Strutture *strutture)
 }
 
 static void
-strutture_on_struttura_aggiornato (gpointer instance, gpointer user_data)
+organigramma_strutture_on_organigramma_struttura_aggiornato (gpointer instance, gpointer user_data)
 {
-       strutture_carica ((Strutture *)user_data);
+       organigramma_strutture_carica ((OrganigrammaStrutture *)user_data);
 }
 
 static void
-strutture_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_strutture_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Strutture *strutture = STRUTTURE (object);
+       OrganigrammaStrutture *strutture = ORGANIGRAMMA_STRUTTURE (object);
 
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
        switch (property_id)
                {
@@ -321,11 +321,11 @@ strutture_set_property (GObject *object, guint property_id, const GValue *value,
 }
 
 static void
-strutture_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_strutture_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Strutture *strutture = STRUTTURE (object);
+       OrganigrammaStrutture *strutture = ORGANIGRAMMA_STRUTTURE (object);
 
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
        switch (property_id)
                {
@@ -337,33 +337,33 @@ strutture_get_property (GObject *object, guint property_id, GValue *value, GPara
 
 /* CALLBACK */
 static void
-strutture_on_btn_nuovo_clicked (GtkButton *button,
+organigramma_strutture_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data)
 {
        GtkWidget *w;
 
-       Strutture *strutture = (Strutture *)user_data;
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStrutture *strutture = (OrganigrammaStrutture *)user_data;
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
-       Struttura *c = struttura_new (priv->commons, 0);
+       OrganigrammaStruttura *c = organigramma_struttura_new (priv->commons, 0);
 
        g_signal_connect (G_OBJECT (c), "aggiornato",
-                         G_CALLBACK (strutture_on_struttura_aggiornato), (gpointer)strutture);
+                         G_CALLBACK (organigramma_strutture_on_organigramma_struttura_aggiornato), (gpointer)strutture);
 
-       w = struttura_get_widget (c);
+       w = organigramma_struttura_get_widget (c);
        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
        gtk_widget_show (w);
 }
 
 static void
-strutture_on_btn_modifica_clicked (GtkButton *button,
+organigramma_strutture_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       strutture_modifica ((Strutture *)user_data);
+       organigramma_strutture_modifica ((OrganigrammaStrutture *)user_data);
 }
 
 static void
-strutture_on_btn_elimina_clicked (GtkButton *button,
+organigramma_strutture_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data)
 {
        GtkWidget *dialog;
@@ -372,8 +372,8 @@ strutture_on_btn_elimina_clicked (GtkButton *button,
        GtkTreeIter iter;
        guint id;
 
-       Strutture *strutture = (Strutture *)user_data;
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE (strutture);
+       OrganigrammaStrutture *strutture = (OrganigrammaStrutture *)user_data;
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE (strutture);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -392,7 +392,7 @@ strutture_on_btn_elimina_clicked (GtkButton *button,
                                        gdaex_execute (priv->commons->gdaex,
                                                       g_strdup_printf ("UPDATE strutture SET status = 'E' WHERE id = %d", id));
 
-                                       strutture_carica (strutture);
+                                       organigramma_strutture_carica (strutture);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -409,37 +409,37 @@ strutture_on_btn_elimina_clicked (GtkButton *button,
 }
 
 static void
-strutture_on_trv_strutture_row_activated (GtkTreeView *tree_view,
+organigramma_strutture_on_trv_organigramma_strutture_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data)
 {
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE ((Strutture *)user_data);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE ((OrganigrammaStrutture *)user_data);
 
        if (priv->selezione)
                {
-                       strutture_selezionato ((Strutture *)user_data);
+                       organigramma_strutture_selezionato ((OrganigrammaStrutture *)user_data);
                }
        else
                {
-                       strutture_modifica ((Strutture *)user_data);
+                       organigramma_strutture_modifica ((OrganigrammaStrutture *)user_data);
                }
 }
 
 
 static void
-strutture_on_btn_annulla_clicked (GtkButton *button,
+organigramma_strutture_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       StrutturePrivate *priv = STRUTTURE_GET_PRIVATE ((Strutture *)user_data);
+       OrganigrammaStrutturePrivate *priv = ORGANIGRAMMA_STRUTTURE_GET_PRIVATE ((OrganigrammaStrutture *)user_data);
 
        gtk_widget_destroy (priv->widget);
        g_object_unref (G_OBJECT (user_data));
 }
 
 static void
-strutture_on_btn_seleziona_clicked (GtkButton *button,
+organigramma_strutture_on_btn_seleziona_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       strutture_selezionato ((Strutture *)user_data);
+       organigramma_strutture_selezionato ((OrganigrammaStrutture *)user_data);
 }

diff --git a/src/strutture.h b/src/strutture.h
index 65a8892f1aad39e94e5c51625069785ac7cb9153..a1137fdaec88918fe0d0adc64e4241bb38aa9671 100644 (file)
--- a/src/strutture.h
+++ b/src/strutture.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __STRUTTURE_H__
-#define __STRUTTURE_H__
+#ifndef __ORGANIGRAMMA_STRUTTURE_H__
+#define __ORGANIGRAMMA_STRUTTURE_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_STRUTTURE                 (strutture_get_type ())
-#define STRUTTURE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_STRUTTURE, Strutture))
-#define STRUTTURE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_STRUTTURE, StruttureClass))
-#define IS_STRUTTURE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_STRUTTURE))
-#define IS_STRUTTURE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_STRUTTURE))
-#define STRUTTURE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_STRUTTURE, StruttureClass))
+#define TYPE_ORGANIGRAMMA_STRUTTURE                 (organigramma_strutture_get_type ())
+#define ORGANIGRAMMA_STRUTTURE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_STRUTTURE, OrganigrammaStrutture))
+#define ORGANIGRAMMA_STRUTTURE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_STRUTTURE, OrganigrammaStruttureClass))
+#define IS_ORGANIGRAMMA_STRUTTURE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_STRUTTURE))
+#define IS_ORGANIGRAMMA_STRUTTURE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_STRUTTURE))
+#define ORGANIGRAMMA_STRUTTURE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_STRUTTURE, OrganigrammaStruttureClass))
 
 
-typedef struct _Strutture Strutture;
-typedef struct _StruttureClass StruttureClass;
+typedef struct _OrganigrammaStrutture OrganigrammaStrutture;
+typedef struct _OrganigrammaStruttureClass OrganigrammaStruttureClass;
 
-struct _Strutture
+struct _OrganigrammaStrutture
        {
                GObject parent;
        };
 
-struct _StruttureClass
+struct _OrganigrammaStruttureClass
        {
                GObjectClass parent_class;
 
                guint selezionato_signal_id;
        };
 
-GType strutture_get_type (void) G_GNUC_CONST;
+GType organigramma_strutture_get_type (void) G_GNUC_CONST;
 
-Strutture *strutture_new (OrganigrammaCommons *commons, gboolean selezione);
+OrganigrammaStrutture *organigramma_strutture_new (OrganigrammaCommons *commons, gboolean selezione);
 
-GtkWidget *strutture_get_widget (Strutture *strutture);
+GtkWidget *organigramma_strutture_get_widget (OrganigrammaStrutture *strutture);
 
 
 G_END_DECLS
 
-#endif /* __STRUTTURE_H__ */
+#endif /* __ORGANIGRAMMA_STRUTTURE_H__ */

diff --git a/src/tipinodo.c b/src/tipinodo.c
index 3a889f2f30d8753c5e0f140ae146ddedf2d242e6..d272de89a2d6d23b9681a469070a86d04246fabc 100644 (file)
--- a/src/tipinodo.c
+++ b/src/tipinodo.c
@@ -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
@@ -20,44 +20,44 @@
 #include "tipinodo.h"
 #include "tiponodo.h"
 
-static void tipi_nodo_class_init (TipiNodoClass *klass);
-static void tipi_nodo_init (TipiNodo *tipi_nodo);
+static void organigramma_tipi_nodo_class_init (OrganigrammaTipiNodoClass *klass);
+static void organigramma_tipi_nodo_init (OrganigrammaTipiNodo *tipi_nodo);
 
-static void tipi_nodo_carica (TipiNodo *tipi_nodo);
-static void tipi_nodo_modifica (TipiNodo *tipi_nodo);
+static void organigramma_tipi_nodo_carica (OrganigrammaTipiNodo *tipi_nodo);
+static void organigramma_tipi_nodo_modifica (OrganigrammaTipiNodo *tipi_nodo);
 
-static void tipi_nodo_selezionato (TipiNodo *tipi_nodo);
-static void tipi_nodo_on_tipo_nodo_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_tipi_nodo_selezionato (OrganigrammaTipiNodo *tipi_nodo);
+static void organigramma_tipi_nodo_on_organigramma_tipo_nodo_aggiornato (gpointer instance, gpointer user_data);
 
-static void tipi_nodo_set_property (GObject *object,
+static void organigramma_tipi_nodo_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void tipi_nodo_get_property (GObject *object,
+static void organigramma_tipi_nodo_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void tipi_nodo_on_btn_nuovo_clicked (GtkButton *button,
+static void organigramma_tipi_nodo_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data);
-static void tipi_nodo_on_btn_modifica_clicked (GtkButton *button,
+static void organigramma_tipi_nodo_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data);
-static void tipi_nodo_on_btn_elimina_clicked (GtkButton *button,
+static void organigramma_tipi_nodo_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data);
-static void tipi_nodo_on_trv_tipi_nodo_row_activated (GtkTreeView *tree_view,
+static void organigramma_tipi_nodo_on_trv_organigramma_tipi_nodo_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void tipi_nodo_on_btn_ricerca_clicked (GtkButton *button,
+static void organigramma_tipi_nodo_on_btn_ricerca_clicked (GtkButton *button,
                                     gpointer user_data);
 
-static void tipi_nodo_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_tipi_nodo_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void tipi_nodo_on_btn_seleziona_clicked (GtkButton *button,
+static void organigramma_tipi_nodo_on_btn_seleziona_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define TIPI_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_TIPI_NODO, TipiNodoPrivate))
+#define ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_TIPI_NODO, OrganigrammaTipiNodoPrivate))
 
 enum
 {
@@ -65,8 +65,8 @@ enum
        COL_NOME
 };
 
-typedef struct _TipiNodoPrivate TipiNodoPrivate;
-struct _TipiNodoPrivate
+typedef struct _OrganigrammaTipiNodoPrivate OrganigrammaTipiNodoPrivate;
+struct _OrganigrammaTipiNodoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -77,20 +77,20 @@ struct _TipiNodoPrivate
                gboolean selezione;
        };
 
-G_DEFINE_TYPE (TipiNodo, tipi_nodo, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaTipiNodo, organigramma_tipi_nodo, G_TYPE_OBJECT)
 
 static void
-tipi_nodo_class_init (TipiNodoClass *klass)
+organigramma_tipi_nodo_class_init (OrganigrammaTipiNodoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (TipiNodoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaTipiNodoPrivate));
 
-       object_class->set_property = tipi_nodo_set_property;
-       object_class->get_property = tipi_nodo_get_property;
+       object_class->set_property = organigramma_tipi_nodo_set_property;
+       object_class->get_property = organigramma_tipi_nodo_get_property;
 
        /**
-        * TipiNodo::selezionato:
+        * OrganigrammaTipiNodo::selezionato:
         * @tipi_nodo:
         *
         */
@@ -106,26 +106,26 @@ tipi_nodo_class_init (TipiNodoClass *klass)
 }
 
 static void
-tipi_nodo_init (TipiNodo *tipi_nodo)
+organigramma_tipi_nodo_init (OrganigrammaTipiNodo *tipi_nodo)
 {
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 }
 
 /**
- * tipi_nodo_new:
+ * organigramma_tipi_nodo_new:
  * @commons:
  * @selezione:
  *
- * Returns: the newly created #TipiNodo object.
+ * Returns: the newly created #OrganigrammaTipiNodo object.
  */
-TipiNodo
-*tipi_nodo_new (OrganigrammaCommons *commons, gboolean selezione)
+OrganigrammaTipiNodo
+*organigramma_tipi_nodo_new (OrganigrammaCommons *commons, gboolean selezione)
 {
        GError *error;
 
-       TipiNodo *a = TIPI_NODO (g_object_new (tipi_nodo_get_type (), NULL));
+       OrganigrammaTipiNodo *a = ORGANIGRAMMA_TIPI_NODO (g_object_new (organigramma_tipi_nodo_get_type (), NULL));
 
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (a);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (a);
 
        priv->commons = commons;
        priv->selezione = selezione;
@@ -147,21 +147,21 @@ TipiNodo
        priv->lstore_tipi_nodo = GTK_LIST_STORE (gtk_builder_get_object (priv->commons->gtkbuilder, "lstore_tipi_nodo"));
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button7"),
-                         "clicked", G_CALLBACK (tipi_nodo_on_btn_nuovo_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_tipi_nodo_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button10"),
-                         "clicked", G_CALLBACK (tipi_nodo_on_btn_modifica_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_tipi_nodo_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button11"),
-                         "clicked", G_CALLBACK (tipi_nodo_on_btn_elimina_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_tipi_nodo_on_btn_elimina_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview2"),
-                         "row-activated", G_CALLBACK (tipi_nodo_on_trv_tipi_nodo_row_activated), (gpointer)a);
+                         "row-activated", G_CALLBACK (organigramma_tipi_nodo_on_trv_organigramma_tipi_nodo_row_activated), (gpointer)a);
 
        if (priv->selezione)
                {
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "label7")));
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button12"),
-                                         "clicked", G_CALLBACK (tipi_nodo_on_btn_annulla_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_tipi_nodo_on_btn_annulla_clicked), (gpointer)a);
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button13"),
-                                         "clicked", G_CALLBACK (tipi_nodo_on_btn_seleziona_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_tipi_nodo_on_btn_seleziona_clicked), (gpointer)a);
                }
        else
                {
@@ -169,27 +169,27 @@ TipiNodo
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "button13")));
                }
 
-       tipi_nodo_carica (a);
+       organigramma_tipi_nodo_carica (a);
 
        return a;
 }
 
 /**
- * tipi_nodo_get_widget:
+ * organigramma_tipi_nodo_get_widget:
  * @tipi_nodo:
  *
  */
 GtkWidget
-*tipi_nodo_get_widget (TipiNodo *tipi_nodo)
+*organigramma_tipi_nodo_get_widget (OrganigrammaTipiNodo *tipi_nodo)
 {
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 
        return priv->widget;
 }
 
 /* PRIVATE */
 static void
-tipi_nodo_carica (TipiNodo *tipi_nodo)
+organigramma_tipi_nodo_carica (OrganigrammaTipiNodo *tipi_nodo)
 {
        GtkTreeIter iter;
        GdaDataModel *dm;
@@ -203,7 +203,7 @@ tipi_nodo_carica (TipiNodo *tipi_nodo)
        gint rows;
        gint row;
 
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 
        gtk_list_store_clear (priv->lstore_tipi_nodo);
 
@@ -259,7 +259,7 @@ tipi_nodo_carica (TipiNodo *tipi_nodo)
 
                                        gtk_list_store_set (priv->lstore_tipi_nodo, &iter,
                                                            COL_ID, gdaex_data_model_get_field_value_stringify_at (dm, row, "id"),
-                                                                               COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
+                                                           COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"),
                                                            -1);
                                }
 
@@ -268,12 +268,12 @@ tipi_nodo_carica (TipiNodo *tipi_nodo)
 }
 
 static void
-tipi_nodo_modifica (TipiNodo *tipi_nodo)
+organigramma_tipi_nodo_modifica (OrganigrammaTipiNodo *tipi_nodo)
 {
        GtkTreeIter iter;
        gchar *id;
 
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -281,14 +281,14 @@ tipi_nodo_modifica (TipiNodo *tipi_nodo)
 
                        gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_tipi_nodo), &iter,
                                            COL_ID, &id,
-                                                               -1);
+                                           -1);
 
-                       TipoNodo *c = tipo_nodo_new (priv->commons, strtol (id, NULL, 10));
+                       OrganigrammaTipoNodo *c = organigramma_tipo_nodo_new (priv->commons, strtol (id, NULL, 10));
 
                        g_signal_connect (G_OBJECT (c), "aggiornato",
-                                         G_CALLBACK (tipi_nodo_on_tipo_nodo_aggiornato), (gpointer)tipi_nodo);
+                                         G_CALLBACK (organigramma_tipi_nodo_on_organigramma_tipo_nodo_aggiornato), (gpointer)tipi_nodo);
 
-                       w = tipo_nodo_get_widget (c);
+                       w = organigramma_tipo_nodo_get_widget (c);
                        if (priv->selezione)
                                {
                                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->widget));
@@ -312,19 +312,19 @@ tipi_nodo_modifica (TipiNodo *tipi_nodo)
 }
 
 static void
-tipi_nodo_selezionato (TipiNodo *tipi_nodo)
+organigramma_tipi_nodo_selezionato (OrganigrammaTipiNodo *tipi_nodo)
 {
        GtkTreeIter iter;
        guint id;
 
-       TipiNodoClass *klass = TIPI_NODO_GET_CLASS (tipi_nodo);
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodoClass *klass = ORGANIGRAMMA_TIPI_NODO_GET_CLASS (tipi_nodo);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
                        gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_tipi_nodo), &iter,
                                            COL_ID, &id,
-                                                               -1);
+                                           -1);
 
                        g_signal_emit (G_OBJECT (tipi_nodo), klass->selezionato_signal_id, 0, id);
 
@@ -344,17 +344,16 @@ tipi_nodo_selezionato (TipiNodo *tipi_nodo)
 }
 
 static void
-tipi_nodo_on_tipo_nodo_aggiornato (gpointer instance, gpointer user_data)
+organigramma_tipi_nodo_on_organigramma_tipo_nodo_aggiornato (gpointer instance, gpointer user_data)
 {
-       tipi_nodo_carica ((TipiNodo *)user_data);
+       organigramma_tipi_nodo_carica ((OrganigrammaTipiNodo *)user_data);
 }
 
 static void
-tipi_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_tipi_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       TipiNodo *tipi_nodo = TIPI_NODO (object);
-
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodo *tipi_nodo = ORGANIGRAMMA_TIPI_NODO (object);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 
        switch (property_id)
                {
@@ -365,11 +364,10 @@ tipi_nodo_set_property (GObject *object, guint property_id, const GValue *value,
 }
 
 static void
-tipi_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_tipi_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       TipiNodo *tipi_nodo = TIPI_NODO (object);
-
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodo *tipi_nodo = ORGANIGRAMMA_TIPI_NODO (object);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 
        switch (property_id)
                {
@@ -381,20 +379,20 @@ tipi_nodo_get_property (GObject *object, guint property_id, GValue *value, GPara
 
 /* CALLBACK */
 static void
-tipi_nodo_on_btn_nuovo_clicked (GtkButton *button,
+organigramma_tipi_nodo_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data)
 {
        GtkWidget *w;
 
-       TipiNodo *tipi_nodo = (TipiNodo *)user_data;
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodo *tipi_nodo = (OrganigrammaTipiNodo *)user_data;
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 
-       TipoNodo *c = tipo_nodo_new (priv->commons, 0);
+       OrganigrammaTipoNodo *c = organigramma_tipo_nodo_new (priv->commons, 0);
 
        g_signal_connect (G_OBJECT (c), "aggiornato",
-                         G_CALLBACK (tipi_nodo_on_tipo_nodo_aggiornato), (gpointer)tipi_nodo);
+                         G_CALLBACK (organigramma_tipi_nodo_on_organigramma_tipo_nodo_aggiornato), user_data);
 
-       w = tipo_nodo_get_widget (c);
+       w = organigramma_tipo_nodo_get_widget (c);
        if (priv->selezione)
                {
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->widget));
@@ -407,14 +405,14 @@ tipi_nodo_on_btn_nuovo_clicked (GtkButton *button,
 }
 
 static void
-tipi_nodo_on_btn_modifica_clicked (GtkButton *button,
+organigramma_tipi_nodo_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       tipi_nodo_modifica ((TipiNodo *)user_data);
+       organigramma_tipi_nodo_modifica ((OrganigrammaTipiNodo *)user_data);
 }
 
 static void
-tipi_nodo_on_btn_elimina_clicked (GtkButton *button,
+organigramma_tipi_nodo_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data)
 {
        GtkWidget *dialog;
@@ -423,8 +421,8 @@ tipi_nodo_on_btn_elimina_clicked (GtkButton *button,
        GtkTreeIter iter;
        gchar *id;
 
-       TipiNodo *tipi_nodo = (TipiNodo *)user_data;
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE (tipi_nodo);
+       OrganigrammaTipiNodo *tipi_nodo = (OrganigrammaTipiNodo *)user_data;
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE (tipi_nodo);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -437,13 +435,13 @@ tipi_nodo_on_btn_elimina_clicked (GtkButton *button,
                        if (risp == GTK_RESPONSE_YES)
                                {
                                        gtk_tree_model_get (GTK_TREE_MODEL (priv->lstore_tipi_nodo), &iter,
-                                                                                       COL_ID, &id,
-                                                                                       -1);
+                                                           COL_ID, &id,
+                                                           -1);
 
                                        gdaex_execute (priv->commons->gdaex,
                                                       g_strdup_printf ("UPDATE tipi_nodo SET status = 'E' WHERE id = %d", strtol (id, NULL, 10)));
 
-                                       tipi_nodo_carica (tipi_nodo);
+                                       organigramma_tipi_nodo_carica (tipi_nodo);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -460,36 +458,36 @@ tipi_nodo_on_btn_elimina_clicked (GtkButton *button,
 }
 
 static void
-tipi_nodo_on_trv_tipi_nodo_row_activated (GtkTreeView *tree_view,
+organigramma_tipi_nodo_on_trv_organigramma_tipi_nodo_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                                                                         GtkTreeViewColumn *column,
                                                                                         gpointer user_data)
 {
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE ((TipiNodo *)user_data);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE ((OrganigrammaTipiNodo *)user_data);
 
        if (priv->selezione)
                {
-                       tipi_nodo_selezionato ((TipiNodo *)user_data);          
+                       organigramma_tipi_nodo_selezionato ((OrganigrammaTipiNodo *)user_data);
                }
        else
                {
-                       tipi_nodo_modifica ((TipiNodo *)user_data);
+                       organigramma_tipi_nodo_modifica ((OrganigrammaTipiNodo *)user_data);
                }
 }
 
 static void
-tipi_nodo_on_btn_annulla_clicked (GtkButton *button,
+organigramma_tipi_nodo_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       TipiNodoPrivate *priv = TIPI_NODO_GET_PRIVATE ((TipiNodo *)user_data);
+       OrganigrammaTipiNodoPrivate *priv = ORGANIGRAMMA_TIPI_NODO_GET_PRIVATE ((OrganigrammaTipiNodo *)user_data);
 
        gtk_widget_destroy (priv->widget);
        g_object_unref (G_OBJECT (user_data));
 }
 
 static void
-tipi_nodo_on_btn_seleziona_clicked (GtkButton *button,
+organigramma_tipi_nodo_on_btn_seleziona_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       tipi_nodo_selezionato ((TipiNodo *)user_data);
+       organigramma_tipi_nodo_selezionato ((OrganigrammaTipiNodo *)user_data);
 }

diff --git a/src/tipinodo.h b/src/tipinodo.h
index a045edf3f8a9e073b12eb5a0a7cb58db923fa5a3..a51430a093e0cc89d2f851c8835ae3a039263dfc 100644 (file)
--- a/src/tipinodo.h
+++ b/src/tipinodo.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __TIPI_NODO_H__
-#define __TIPI_NODO_H__
+#ifndef __ORGANIGRAMMA_TIPI_NODO_H__
+#define __ORGANIGRAMMA_TIPI_NODO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_TIPI_NODO                 (tipi_nodo_get_type ())
-#define TIPI_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TIPI_NODO, TipiNodo))
-#define TIPI_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TIPI_NODO, TipiNodoClass))
-#define IS_TIPI_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TIPI_NODO))
-#define IS_TIPI_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TIPI_NODO))
-#define TIPI_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TIPI_NODO, TipiNodoClass))
+#define TYPE_ORGANIGRAMMA_TIPI_NODO                 (organigramma_tipi_nodo_get_type ())
+#define ORGANIGRAMMA_TIPI_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_TIPI_NODO, OrganigrammaTipiNodo))
+#define ORGANIGRAMMA_TIPI_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_TIPI_NODO, OrganigrammaTipiNodoClass))
+#define IS_ORGANIGRAMMA_TIPI_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_TIPI_NODO))
+#define IS_ORGANIGRAMMA_TIPI_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_TIPI_NODO))
+#define ORGANIGRAMMA_TIPI_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_TIPI_NODO, OrganigrammaTipiNodoClass))
 
 
-typedef struct _TipiNodo TipiNodo;
-typedef struct _TipiNodoClass TipiNodoClass;
+typedef struct _OrganigrammaTipiNodo OrganigrammaTipiNodo;
+typedef struct _OrganigrammaTipiNodoClass OrganigrammaTipiNodoClass;
 
-struct _TipiNodo
+struct _OrganigrammaTipiNodo
        {
                GObject parent;
        };
 
-struct _TipiNodoClass
+struct _OrganigrammaTipiNodoClass
        {
                GObjectClass parent_class;
 
                guint selezionato_signal_id;
        };
 
-GType tipi_nodo_get_type (void) G_GNUC_CONST;
+GType organigramma_tipi_nodo_get_type (void) G_GNUC_CONST;
 
-TipiNodo *tipi_nodo_new (OrganigrammaCommons *commons, gboolean selezione);
+OrganigrammaTipiNodo *organigramma_tipi_nodo_new (OrganigrammaCommons *commons, gboolean selezione);
 
-GtkWidget *tipi_nodo_get_widget (TipiNodo *tipi_nodo);
+GtkWidget *organigramma_tipi_nodo_get_widget (OrganigrammaTipiNodo *tipi_nodo);
 
 
 G_END_DECLS
 
-#endif /* __TIPI_NODO_H__ */
+#endif /* __ORGANIGRAMMA_TIPI_NODO_H__ */

diff --git a/src/tiponodo.c b/src/tiponodo.c
index 35c4ae16e59036be5fac7fa8c08957b6f23542da..5c2028ad2bfb4d52652376514ac355837a2a2d20 100644 (file)
--- a/src/tiponodo.c
+++ b/src/tiponodo.c
@@ -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
@@ -22,41 +22,41 @@
 
 #include "tiponodo.h"
 
-static void tipo_nodo_class_init (TipoNodoClass *klass);
-static void tipo_nodo_init (TipoNodo *tipo_nodo);
+static void organigramma_tipo_nodo_class_init (OrganigrammaTipoNodoClass *klass);
+static void organigramma_tipo_nodo_init (OrganigrammaTipoNodo *organigramma_tipo_nodo);
 
-static void tipo_nodo_carica (TipoNodo *tipo_nodo);
-static void tipo_nodo_salva (TipoNodo *tipo_nodo);
+static void organigramma_tipo_nodo_carica (OrganigrammaTipoNodo *organigramma_tipo_nodo);
+static void organigramma_tipo_nodo_salva (OrganigrammaTipoNodo *organigramma_tipo_nodo);
 
-static gboolean tipo_nodo_conferma_chiusura (TipoNodo *tipo_nodo);
+static gboolean organigramma_tipo_nodo_conferma_chiusura (OrganigrammaTipoNodo *organigramma_tipo_nodo);
 
-static void tipo_nodo_set_property (GObject *object,
+static void organigramma_tipo_nodo_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void tipo_nodo_get_property (GObject *object,
+static void organigramma_tipo_nodo_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean tipo_nodo_on_w_tipo_nodo_delete_event (GtkWidget *widget,
+static gboolean organigramma_tipo_nodo_on_w_organigramma_tipo_nodo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void tipo_nodo_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_tipo_nodo_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void tipo_nodo_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_tipo_nodo_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define TIPO_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_TIPO_NODO, TipoNodoPrivate))
+#define ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_TIPO_NODO, OrganigrammaTipoNodoPrivate))
 
 enum
 {
        LBL_ID
 };
 
-typedef struct _TipoNodoPrivate TipoNodoPrivate;
-struct _TipoNodoPrivate
+typedef struct _OrganigrammaTipoNodoPrivate OrganigrammaTipoNodoPrivate;
+struct _OrganigrammaTipoNodoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -69,21 +69,21 @@ struct _TipoNodoPrivate
                gint id;
        };
 
-G_DEFINE_TYPE (TipoNodo, tipo_nodo, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaTipoNodo, organigramma_tipo_nodo, G_TYPE_OBJECT)
 
 static void
-tipo_nodo_class_init (TipoNodoClass *klass)
+organigramma_tipo_nodo_class_init (OrganigrammaTipoNodoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (TipoNodoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaTipoNodoPrivate));
 
-       object_class->set_property = tipo_nodo_set_property;
-       object_class->get_property = tipo_nodo_get_property;
+       object_class->set_property = organigramma_tipo_nodo_set_property;
+       object_class->get_property = organigramma_tipo_nodo_get_property;
 
        /**
-        * TipoNodo::aggiornato:
-        * @tipo_nodo:
+        * OrganigrammaTipoNodo::aggiornato:
+        * @organigramma_tipo_nodo:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -98,26 +98,26 @@ tipo_nodo_class_init (TipoNodoClass *klass)
 }
 
 static void
-tipo_nodo_init (TipoNodo *tipo_nodo)
+organigramma_tipo_nodo_init (OrganigrammaTipoNodo *organigramma_tipo_nodo)
 {
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (tipo_nodo);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (organigramma_tipo_nodo);
 }
 
 /**
- * tipo_nodo_new:
+ * organigramma_tipo_nodo_new:
  * @commons:
  * @id:
  *
- * Returns: the newly created #TipoNodo object.
+ * Returns: the newly created #OrganigrammaTipoNodo object.
  */
-TipoNodo
-*tipo_nodo_new (OrganigrammaCommons *commons, gint id)
+OrganigrammaTipoNodo
+*organigramma_tipo_nodo_new (OrganigrammaCommons *commons, gint id)
 {
        GError *error;
 
-       TipoNodo *a = TIPO_NODO (g_object_new (tipo_nodo_get_type (), NULL));
+       OrganigrammaTipoNodo *a = ORGANIGRAMMA_TIPO_NODO (g_object_new (organigramma_tipo_nodo_get_type (), NULL));
 
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (a);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
@@ -131,7 +131,7 @@ TipoNodo
                        return NULL;
                }
 
-       priv->form = gtk_form_new_from_file (g_build_filename (priv->commons->formdir, "tipo_nodo.form", NULL), priv->commons->gtkbuilder);
+       priv->form = gtk_form_new_from_file (g_build_filename (priv->commons->formdir, "organigramma_tipo_nodo.form", NULL), priv->commons->gtkbuilder);
 
        g_object_set (priv->form, "gdaex", priv->commons->gdaex, NULL);
 
@@ -142,12 +142,12 @@ TipoNodo
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (tipo_nodo_on_w_tipo_nodo_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_tipo_nodo_on_w_organigramma_tipo_nodo_delete_event), (gpointer *)a);
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button8"),
-                         "clicked", G_CALLBACK (tipo_nodo_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_tipo_nodo_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button9"),
-                         "clicked", G_CALLBACK (tipo_nodo_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_tipo_nodo_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
 
@@ -160,30 +160,30 @@ TipoNodo
        else
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
-                       tipo_nodo_carica (a);
+                       organigramma_tipo_nodo_carica (a);
                }
 
        return a;
 }
 
 /**
- * tipo_nodo_get_widget:
- * @tipo_nodo:
+ * organigramma_tipo_nodo_get_widget:
+ * @organigramma_tipo_nodo:
  *
  */
 GtkWidget
-*tipo_nodo_get_widget (TipoNodo *tipo_nodo)
+*organigramma_tipo_nodo_get_widget (OrganigrammaTipoNodo *organigramma_tipo_nodo)
 {
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (tipo_nodo);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (organigramma_tipo_nodo);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-tipo_nodo_carica (TipoNodo *tipo_nodo)
+organigramma_tipo_nodo_carica (OrganigrammaTipoNodo *organigramma_tipo_nodo)
 {
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (tipo_nodo);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (organigramma_tipo_nodo);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -191,7 +191,7 @@ tipo_nodo_carica (TipoNodo *tipo_nodo)
 }
 
 static void
-tipo_nodo_salva (TipoNodo *tipo_nodo)
+organigramma_tipo_nodo_salva (OrganigrammaTipoNodo *organigramma_tipo_nodo)
 {
        GError *error = NULL;
        gchar *sql;
@@ -200,9 +200,9 @@ tipo_nodo_salva (TipoNodo *tipo_nodo)
        GDate *da;
        GDate *a;
 
-       TipoNodoClass *klass = TIPO_NODO_GET_CLASS (tipo_nodo);
+       OrganigrammaTipoNodoClass *klass = ORGANIGRAMMA_TIPO_NODO_GET_CLASS (organigramma_tipo_nodo);
 
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (tipo_nodo);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (organigramma_tipo_nodo);
 
        if (!gtk_form_check (priv->form, (priv->id != 0), NULL, TRUE, priv->w, TRUE))
                {
@@ -220,7 +220,7 @@ tipo_nodo_salva (TipoNodo *tipo_nodo)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (tipo_nodo, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_tipo_nodo, klass->aggiornato_signal_id, 0);
 
                        gtk_form_set_as_origin (priv->form);
 
@@ -255,11 +255,11 @@ tipo_nodo_salva (TipoNodo *tipo_nodo)
 }
 
 static void
-tipo_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_tipo_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       TipoNodo *tipo_nodo = TIPO_NODO (object);
+       OrganigrammaTipoNodo *organigramma_tipo_nodo = ORGANIGRAMMA_TIPO_NODO (object);
 
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (tipo_nodo);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (organigramma_tipo_nodo);
 
        switch (property_id)
                {
@@ -270,11 +270,11 @@ tipo_nodo_set_property (GObject *object, guint property_id, const GValue *value,
 }
 
 static void
-tipo_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_tipo_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       TipoNodo *tipo_nodo = TIPO_NODO (object);
+       OrganigrammaTipoNodo *organigramma_tipo_nodo = ORGANIGRAMMA_TIPO_NODO (object);
 
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (tipo_nodo);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (organigramma_tipo_nodo);
 
        switch (property_id)
                {
@@ -285,13 +285,13 @@ tipo_nodo_get_property (GObject *object, guint property_id, GValue *value, GPara
 }
 
 static gboolean
-tipo_nodo_conferma_chiusura (TipoNodo *tipo_nodo)
+organigramma_tipo_nodo_conferma_chiusura (OrganigrammaTipoNodo *organigramma_tipo_nodo)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (tipo_nodo);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (organigramma_tipo_nodo);
 
        ret = TRUE;
        if (gtk_form_is_changed (priv->form))
@@ -313,27 +313,27 @@ tipo_nodo_conferma_chiusura (TipoNodo *tipo_nodo)
 
 /* CALLBACK */
 static gboolean
-tipo_nodo_on_w_tipo_nodo_delete_event (GtkWidget *widget,
+organigramma_tipo_nodo_on_w_organigramma_tipo_nodo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !tipo_nodo_conferma_chiusura ((TipoNodo *)user_data);
+       return !organigramma_tipo_nodo_conferma_chiusura ((OrganigrammaTipoNodo *)user_data);
 }
 
 static void
-tipo_nodo_on_btn_annulla_clicked (GtkButton *button,
+organigramma_tipo_nodo_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       TipoNodo *tipo_nodo = (TipoNodo *)user_data;
+       OrganigrammaTipoNodo *organigramma_tipo_nodo = (OrganigrammaTipoNodo *)user_data;
 
-       TipoNodoPrivate *priv = TIPO_NODO_GET_PRIVATE (tipo_nodo);
+       OrganigrammaTipoNodoPrivate *priv = ORGANIGRAMMA_TIPO_NODO_GET_PRIVATE (organigramma_tipo_nodo);
 
-       if (tipo_nodo_conferma_chiusura (tipo_nodo)) gtk_widget_destroy (priv->w);
+       if (organigramma_tipo_nodo_conferma_chiusura (organigramma_tipo_nodo)) gtk_widget_destroy (priv->w);
 }
 
 static void
-tipo_nodo_on_btn_salva_clicked (GtkButton *button,
+organigramma_tipo_nodo_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       tipo_nodo_salva ((TipoNodo *)user_data);
+       organigramma_tipo_nodo_salva ((OrganigrammaTipoNodo *)user_data);
 }

diff --git a/src/tiponodo.h b/src/tiponodo.h
index 85660538dc977996c75e286932da292009f39c52..f732f77e04ad8fd8f7521a6e29c33e5577e496f8 100644 (file)
--- a/src/tiponodo.h
+++ b/src/tiponodo.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __TIPO_NODO_H__
-#define __TIPO_NODO_H__
+#ifndef __ORGANIGRAMMA_TIPO_NODO_H__
+#define __ORGANIGRAMMA_TIPO_NODO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_TIPO_NODO                 (tipo_nodo_get_type ())
-#define TIPO_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TIPO_NODO, TipoNodo))
-#define TIPO_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TIPO_NODO, TipoNodoClass))
-#define IS_TIPO_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TIPO_NODO))
-#define IS_TIPO_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TIPO_NODO))
-#define TIPO_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TIPO_NODO, TipoNodoClass))
+#define TYPE_ORGANIGRAMMA_TIPO_NODO                 (organigramma_tipo_nodo_get_type ())
+#define ORGANIGRAMMA_TIPO_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_TIPO_NODO, OrganigrammaTipoNodo))
+#define ORGANIGRAMMA_TIPO_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_TIPO_NODO, OrganigrammaTipoNodoClass))
+#define IS_ORGANIGRAMMA_TIPO_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_TIPO_NODO))
+#define IS_ORGANIGRAMMA_TIPO_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_TIPO_NODO))
+#define ORGANIGRAMMA_TIPO_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_TIPO_NODO, OrganigrammaTipoNodoClass))
 
 
-typedef struct _TipoNodo TipoNodo;
-typedef struct _TipoNodoClass TipoNodoClass;
+typedef struct _OrganigrammaTipoNodo OrganigrammaTipoNodo;
+typedef struct _OrganigrammaTipoNodoClass OrganigrammaTipoNodoClass;
 
-struct _TipoNodo
+struct _OrganigrammaTipoNodo
        {
                GObject parent;
        };
 
-struct _TipoNodoClass
+struct _OrganigrammaTipoNodoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType tipo_nodo_get_type (void) G_GNUC_CONST;
+GType organigramma_tipo_nodo_get_type (void) G_GNUC_CONST;
 
-TipoNodo *tipo_nodo_new (OrganigrammaCommons *commons, gint id);
+OrganigrammaTipoNodo *organigramma_tipo_nodo_new (OrganigrammaCommons *commons, gint id);
 
-GtkWidget *tipo_nodo_get_widget (TipoNodo *tipo_nodo);
+GtkWidget *organigramma_tipo_nodo_get_widget (OrganigrammaTipoNodo *tipo_nodo);
 
 
 G_END_DECLS
 
-#endif /* __TIPO_NODO_H__ */
+#endif /* __ORGANIGRAMMA_TIPO_NODO_H__ */

diff --git a/src/titoli.c b/src/titoli.c
index d1a9cc41a99203b501af529f3b2ad077bc1157e9..5ecd53dcd7763c8a2f8e2b159616f3bb27a8eeee 100644 (file)
--- a/src/titoli.c
+++ b/src/titoli.c
@@ -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
@@ -20,41 +20,41 @@
 #include "titoli.h"
 #include "titolo.h"
 
-static void titoli_class_init (TitoliClass *klass);
-static void titoli_init (Titoli *titoli);
+static void organigramma_titoli_class_init (OrganigrammaTitoliClass *klass);
+static void organigramma_titoli_init (OrganigrammaTitoli *titoli);
 
-static void titoli_carica (Titoli *titoli);
-static void titoli_modifica (Titoli *titoli);
+static void organigramma_titoli_carica (OrganigrammaTitoli *titoli);
+static void organigramma_titoli_modifica (OrganigrammaTitoli *titoli);
 
-static void titoli_selezionato (Titoli *titoli);
-static void titoli_on_titolo_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_titoli_selezionato (OrganigrammaTitoli *titoli);
+static void organigramma_titoli_on_titolo_aggiornato (gpointer instance, gpointer user_data);
 
-static void titoli_set_property (GObject *object,
+static void organigramma_titoli_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void titoli_get_property (GObject *object,
+static void organigramma_titoli_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void titoli_on_btn_nuovo_clicked (GtkButton *button,
+static void organigramma_titoli_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data);
-static void titoli_on_btn_modifica_clicked (GtkButton *button,
+static void organigramma_titoli_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data);
-static void titoli_on_btn_elimina_clicked (GtkButton *button,
+static void organigramma_titoli_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data);
-static void titoli_on_trv_titoli_row_activated (GtkTreeView *tree_view,
+static void organigramma_titoli_on_trv_organigramma_titoli_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void titoli_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_titoli_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void titoli_on_btn_seleziona_clicked (GtkButton *button,
+static void organigramma_titoli_on_btn_seleziona_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define TITOLI_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_TITOLI, TitoliPrivate))
+#define ORGANIGRAMMA_TITOLI_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_TITOLI, OrganigrammaTitoliPrivate))
 
 enum
 {
@@ -63,8 +63,8 @@ enum
        COL_DESCRIZIONE
 };
 
-typedef struct _TitoliPrivate TitoliPrivate;
-struct _TitoliPrivate
+typedef struct _OrganigrammaTitoliPrivate OrganigrammaTitoliPrivate;
+struct _OrganigrammaTitoliPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -76,20 +76,20 @@ struct _TitoliPrivate
                GtkWindow *wtransient;
        };
 
-G_DEFINE_TYPE (Titoli, titoli, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaTitoli, organigramma_titoli, G_TYPE_OBJECT)
 
 static void
-titoli_class_init (TitoliClass *klass)
+organigramma_titoli_class_init (OrganigrammaTitoliClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (TitoliPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaTitoliPrivate));
 
-       object_class->set_property = titoli_set_property;
-       object_class->get_property = titoli_get_property;
+       object_class->set_property = organigramma_titoli_set_property;
+       object_class->get_property = organigramma_titoli_get_property;
 
        /**
-        * Titoli::selezionato:
+        * OrganigrammaTitoli::selezionato:
         * @titoli:
         *
         */
@@ -105,26 +105,26 @@ titoli_class_init (TitoliClass *klass)
 }
 
 static void
-titoli_init (Titoli *titoli)
+organigramma_titoli_init (OrganigrammaTitoli *titoli)
 {
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 }
 
 /**
- * titoli_new:
+ * organigramma_titoli_new:
  * @commons:
  * @selezione:
  *
- * Returns: the newly created #Titoli object.
+ * Returns: the newly created #OrganigrammaTitoli object.
  */
-Titoli
-*titoli_new (OrganigrammaCommons *commons, gboolean selezione)
+OrganigrammaTitoli
+*organigramma_titoli_new (OrganigrammaCommons *commons, gboolean selezione)
 {
        GError *error;
 
-       Titoli *a = TITOLI (g_object_new (titoli_get_type (), NULL));
+       OrganigrammaTitoli *a = ORGANIGRAMMA_TITOLI (g_object_new (organigramma_titoli_get_type (), NULL));
 
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (a);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (a);
 
        priv->commons = commons;
        priv->selezione = selezione;
@@ -155,21 +155,21 @@ Titoli
                }
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button95"),
-                         "clicked", G_CALLBACK (titoli_on_btn_nuovo_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_titoli_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button96"),
-                         "clicked", G_CALLBACK (titoli_on_btn_modifica_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_titoli_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button97"),
-                         "clicked", G_CALLBACK (titoli_on_btn_elimina_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_titoli_on_btn_elimina_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview17"),
-                         "row-activated", G_CALLBACK (titoli_on_trv_titoli_row_activated), (gpointer)a);
+                         "row-activated", G_CALLBACK (organigramma_titoli_on_trv_organigramma_titoli_row_activated), (gpointer)a);
 
        if (priv->selezione)
                {
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "label137")));
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button100"),
-                                         "clicked", G_CALLBACK (titoli_on_btn_annulla_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_titoli_on_btn_annulla_clicked), (gpointer)a);
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button101"),
-                                         "clicked", G_CALLBACK (titoli_on_btn_seleziona_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_titoli_on_btn_seleziona_clicked), (gpointer)a);
                }
        else
                {
@@ -177,27 +177,27 @@ Titoli
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "button101")));
                }
 
-       titoli_carica (a);
+       organigramma_titoli_carica (a);
 
        return a;
 }
 
 /**
- * titoli_get_widget:
+ * organigramma_titoli_get_widget:
  * @titoli:
  *
  */
 GtkWidget
-*titoli_get_widget (Titoli *titoli)
+*organigramma_titoli_get_widget (OrganigrammaTitoli *titoli)
 {
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 
        return priv->widget;
 }
 
 /* PRIVATE */
 static void
-titoli_carica (Titoli *titoli)
+organigramma_titoli_carica (OrganigrammaTitoli *titoli)
 {
        GtkTreeIter iter;
        GdaDataModel *dm;
@@ -205,7 +205,7 @@ titoli_carica (Titoli *titoli)
        gint rows;
        gint row;
 
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 
        gtk_list_store_clear (priv->lstore_titoli);
 
@@ -233,12 +233,12 @@ titoli_carica (Titoli *titoli)
 }
 
 static void
-titoli_modifica (Titoli *titoli)
+organigramma_titoli_modifica (OrganigrammaTitoli *titoli)
 {
        GtkTreeIter iter;
        gchar *id;
 
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -248,12 +248,12 @@ titoli_modifica (Titoli *titoli)
                                            COL_ID, &id,
                                            -1);
 
-                       Titolo *c = titolo_new (priv->commons, strtol (id, NULL, 10));
+                       OrganigrammaTitolo *c = organigramma_titolo_new (priv->commons, strtol (id, NULL, 10));
 
                        g_signal_connect (G_OBJECT (c), "aggiornato",
-                                         G_CALLBACK (titoli_on_titolo_aggiornato), (gpointer)titoli);
+                                         G_CALLBACK (organigramma_titoli_on_titolo_aggiornato), (gpointer)titoli);
 
-                       w = titolo_get_widget (c);
+                       w = organigramma_titolo_get_widget (c);
                        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
                        gtk_widget_show (w);
                }
@@ -270,13 +270,13 @@ titoli_modifica (Titoli *titoli)
 }
 
 static void
-titoli_selezionato (Titoli *titoli)
+organigramma_titoli_selezionato (OrganigrammaTitoli *titoli)
 {
        GtkTreeIter iter;
        gchar *id;
 
-       TitoliClass *klass = TITOLI_GET_CLASS (titoli);
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoliClass *klass = ORGANIGRAMMA_TITOLI_GET_CLASS (titoli);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -302,17 +302,17 @@ titoli_selezionato (Titoli *titoli)
 }
 
 static void
-titoli_on_titolo_aggiornato (gpointer instance, gpointer user_data)
+organigramma_titoli_on_titolo_aggiornato (gpointer instance, gpointer user_data)
 {
-       titoli_carica ((Titoli *)user_data);
+       organigramma_titoli_carica ((OrganigrammaTitoli *)user_data);
 }
 
 static void
-titoli_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_titoli_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Titoli *titoli = TITOLI (object);
+       OrganigrammaTitoli *titoli = ORGANIGRAMMA_TITOLI (object);
 
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 
        switch (property_id)
                {
@@ -323,11 +323,11 @@ titoli_set_property (GObject *object, guint property_id, const GValue *value, GP
 }
 
 static void
-titoli_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_titoli_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Titoli *titoli = TITOLI (object);
+       OrganigrammaTitoli *titoli = ORGANIGRAMMA_TITOLI (object);
 
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 
        switch (property_id)
                {
@@ -339,33 +339,33 @@ titoli_get_property (GObject *object, guint property_id, GValue *value, GParamSp
 
 /* CALLBACK */
 static void
-titoli_on_btn_nuovo_clicked (GtkButton *button,
+organigramma_titoli_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data)
 {
        GtkWidget *w;
 
-       Titoli *titoli = (Titoli *)user_data;
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoli *titoli = (OrganigrammaTitoli *)user_data;
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 
-       Titolo *c = titolo_new (priv->commons, 0);
+       OrganigrammaTitolo *c = organigramma_titolo_new (priv->commons, 0);
 
        g_signal_connect (G_OBJECT (c), "aggiornato",
-                         G_CALLBACK (titoli_on_titolo_aggiornato), (gpointer)titoli);
+                         G_CALLBACK (organigramma_titoli_on_titolo_aggiornato), (gpointer)titoli);
 
-       w = titolo_get_widget (c);
+       w = organigramma_titolo_get_widget (c);
        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
        gtk_widget_show (w);
 }
 
 static void
-titoli_on_btn_modifica_clicked (GtkButton *button,
+organigramma_titoli_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       titoli_modifica ((Titoli *)user_data);
+       organigramma_titoli_modifica ((OrganigrammaTitoli *)user_data);
 }
 
 static void
-titoli_on_btn_elimina_clicked (GtkButton *button,
+organigramma_titoli_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data)
 {
        GtkWidget *dialog;
@@ -374,8 +374,8 @@ titoli_on_btn_elimina_clicked (GtkButton *button,
        GtkTreeIter iter;
        gchar *id;
 
-       Titoli *titoli = (Titoli *)user_data;
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE (titoli);
+       OrganigrammaTitoli *titoli = (OrganigrammaTitoli *)user_data;
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE (titoli);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -394,7 +394,7 @@ titoli_on_btn_elimina_clicked (GtkButton *button,
                                        gdaex_execute (priv->commons->gdaex,
                                                       g_strdup_printf ("UPDATE titoli SET status = 'E' WHERE id = %d", strtol (id, NULL, 10)));
 
-                                       titoli_carica (titoli);
+                                       organigramma_titoli_carica (titoli);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -411,37 +411,37 @@ titoli_on_btn_elimina_clicked (GtkButton *button,
 }
 
 static void
-titoli_on_trv_titoli_row_activated (GtkTreeView *tree_view,
+organigramma_titoli_on_trv_organigramma_titoli_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data)
 {
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE ((Titoli *)user_data);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE ((OrganigrammaTitoli *)user_data);
 
        if (priv->selezione)
                {
-                       titoli_selezionato ((Titoli *)user_data);
+                       organigramma_titoli_selezionato ((OrganigrammaTitoli *)user_data);
                }
        else
                {
-                       titoli_modifica ((Titoli *)user_data);
+                       organigramma_titoli_modifica ((OrganigrammaTitoli *)user_data);
                }
 }
 
 
 static void
-titoli_on_btn_annulla_clicked (GtkButton *button,
+organigramma_titoli_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       TitoliPrivate *priv = TITOLI_GET_PRIVATE ((Titoli *)user_data);
+       OrganigrammaTitoliPrivate *priv = ORGANIGRAMMA_TITOLI_GET_PRIVATE ((OrganigrammaTitoli *)user_data);
 
        gtk_widget_destroy (priv->widget);
        g_object_unref (G_OBJECT (user_data));
 }
 
 static void
-titoli_on_btn_seleziona_clicked (GtkButton *button,
+organigramma_titoli_on_btn_seleziona_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       titoli_selezionato ((Titoli *)user_data);
+       organigramma_titoli_selezionato ((OrganigrammaTitoli *)user_data);
 }

diff --git a/src/titoli.h b/src/titoli.h
index 146d9162e6a011e9acbfb2c803835ec12e939df7..8c939125496afe9a6ab9be8829dd5d686ce54af5 100644 (file)
--- a/src/titoli.h
+++ b/src/titoli.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __TITOLI_H__
-#define __TITOLI_H__
+#ifndef __ORGANIGRAMMA_TITOLI_H__
+#define __ORGANIGRAMMA_TITOLI_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_TITOLI                 (titoli_get_type ())
-#define TITOLI(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TITOLI, Titoli))
-#define TITOLI_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TITOLI, TitoliClass))
-#define IS_TITOLI(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TITOLI))
-#define IS_TITOLI_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TITOLI))
-#define TITOLI_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TITOLI, TitoliClass))
+#define TYPE_ORGANIGRAMMA_TITOLI                 (organigramma_titoli_get_type ())
+#define ORGANIGRAMMA_TITOLI(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_TITOLI, OrganigrammaTitoli))
+#define ORGANIGRAMMA_TITOLI_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_TITOLI, OrganigrammaTitoliClass))
+#define IS_ORGANIGRAMMA_TITOLI(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_TITOLI))
+#define IS_ORGANIGRAMMA_TITOLI_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_TITOLI))
+#define ORGANIGRAMMA_TITOLI_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_TITOLI, OrganigrammaTitoliClass))
 
 
-typedef struct _Titoli Titoli;
-typedef struct _TitoliClass TitoliClass;
+typedef struct _OrganigrammaTitoli OrganigrammaTitoli;
+typedef struct _OrganigrammaTitoliClass OrganigrammaTitoliClass;
 
-struct _Titoli
+struct _OrganigrammaTitoli
        {
                GObject parent;
        };
 
-struct _TitoliClass
+struct _OrganigrammaTitoliClass
        {
                GObjectClass parent_class;
 
                guint selezionato_signal_id;
        };
 
-GType titoli_get_type (void) G_GNUC_CONST;
+GType organigramma_titoli_get_type (void) G_GNUC_CONST;
 
-Titoli *titoli_new (OrganigrammaCommons *commons, gboolean selezione);
+OrganigrammaTitoli *organigramma_titoli_new (OrganigrammaCommons *commons, gboolean selezione);
 
-GtkWidget *titoli_get_widget (Titoli *titoli);
+GtkWidget *organigramma_titoli_get_widget (OrganigrammaTitoli *titoli);
 
 
 G_END_DECLS
 
-#endif /* __TITOLI_H__ */
+#endif /* __ORGANIGRAMMA_TITOLI_H__ */

diff --git a/src/titolo.c b/src/titolo.c
index 7f022926ed79292428ecb998dcd8ffb14d8e1b56..08b10d422da4d63023495449a52fff5eff9a22bc 100644 (file)
--- a/src/titolo.c
+++ b/src/titolo.c
@@ -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
@@ -21,41 +21,41 @@
 
 #include "titolo.h"
 
-static void titolo_class_init (TitoloClass *klass);
-static void titolo_init (Titolo *titolo);
+static void organigramma_titolo_class_init (OrganigrammaTitoloClass *klass);
+static void organigramma_titolo_init (OrganigrammaTitolo *titolo);
 
-static void titolo_carica (Titolo *titolo);
-static void titolo_salva (Titolo *titolo);
+static void organigramma_titolo_carica (OrganigrammaTitolo *titolo);
+static void organigramma_titolo_salva (OrganigrammaTitolo *titolo);
 
-static gboolean titolo_conferma_chiusura (Titolo *titolo);
+static gboolean organigramma_titolo_conferma_chiusura (OrganigrammaTitolo *titolo);
 
-static void titolo_set_property (GObject *object,
+static void organigramma_titolo_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void titolo_get_property (GObject *object,
+static void organigramma_titolo_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean titolo_on_w_titolo_delete_event (GtkWidget *widget,
+static gboolean organigramma_titolo_on_w_organigramma_titolo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void titolo_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_titolo_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void titolo_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_titolo_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define TITOLO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_TITOLO, TitoloPrivate))
+#define ORGANIGRAMMA_TITOLO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_TITOLO, OrganigrammaTitoloPrivate))
 
 enum
 {
        LBL_ID
 };
 
-typedef struct _TitoloPrivate TitoloPrivate;
-struct _TitoloPrivate
+typedef struct _OrganigrammaTitoloPrivate OrganigrammaTitoloPrivate;
+struct _OrganigrammaTitoloPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -68,20 +68,20 @@ struct _TitoloPrivate
                gint id;
        };
 
-G_DEFINE_TYPE (Titolo, titolo, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaTitolo, organigramma_titolo, G_TYPE_OBJECT)
 
 static void
-titolo_class_init (TitoloClass *klass)
+organigramma_titolo_class_init (OrganigrammaTitoloClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (TitoloPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaTitoloPrivate));
 
-       object_class->set_property = titolo_set_property;
-       object_class->get_property = titolo_get_property;
+       object_class->set_property = organigramma_titolo_set_property;
+       object_class->get_property = organigramma_titolo_get_property;
 
        /**
-        * Titolo::aggiornato:
+        * OrganigrammaTitolo::aggiornato:
         * @titolo:
         *
         */
@@ -97,26 +97,26 @@ titolo_class_init (TitoloClass *klass)
 }
 
 static void
-titolo_init (Titolo *titolo)
+organigramma_titolo_init (OrganigrammaTitolo *titolo)
 {
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (titolo);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (titolo);
 }
 
 /**
- * titolo_new:
+ * organigramma_titolo_new:
  * @commons:
  * @id:
  *
- * Returns: the newly created #Titolo object.
+ * Returns: the newly created #OrganigrammaTitolo object.
  */
-Titolo
-*titolo_new (OrganigrammaCommons *commons, gint id)
+OrganigrammaTitolo
+*organigramma_titolo_new (OrganigrammaCommons *commons, gint id)
 {
        GError *error;
 
-       Titolo *a = TITOLO (g_object_new (titolo_get_type (), NULL));
+       OrganigrammaTitolo *a = ORGANIGRAMMA_TITOLO (g_object_new (organigramma_titolo_get_type (), NULL));
 
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (a);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
@@ -141,12 +141,12 @@ Titolo
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (titolo_on_w_titolo_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_titolo_on_w_organigramma_titolo_delete_event), (gpointer *)a);
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button105"),
-                         "clicked", G_CALLBACK (titolo_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_titolo_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button106"),
-                         "clicked", G_CALLBACK (titolo_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_titolo_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
 
@@ -159,30 +159,30 @@ Titolo
        else
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
-                       titolo_carica (a);
+                       organigramma_titolo_carica (a);
                }
 
        return a;
 }
 
 /**
- * titolo_get_widget:
+ * organigramma_titolo_get_widget:
  * @titolo:
  *
  */
 GtkWidget
-*titolo_get_widget (Titolo *titolo)
+*organigramma_titolo_get_widget (OrganigrammaTitolo *titolo)
 {
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (titolo);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (titolo);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-titolo_carica (Titolo *titolo)
+organigramma_titolo_carica (OrganigrammaTitolo *titolo)
 {
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (titolo);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (titolo);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -190,7 +190,7 @@ titolo_carica (Titolo *titolo)
 }
 
 static void
-titolo_salva (Titolo *titolo)
+organigramma_titolo_salva (OrganigrammaTitolo *titolo)
 {
        GError *error = NULL;
        gchar *sql;
@@ -199,9 +199,9 @@ titolo_salva (Titolo *titolo)
        GDate *da;
        GDate *a;
 
-       TitoloClass *klass = TITOLO_GET_CLASS (titolo);
+       OrganigrammaTitoloClass *klass = ORGANIGRAMMA_TITOLO_GET_CLASS (titolo);
 
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (titolo);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (titolo);
 
        if (!gtk_form_check (priv->form, (priv->id != 0), NULL, TRUE, priv->w, TRUE))
                {
@@ -254,11 +254,11 @@ titolo_salva (Titolo *titolo)
 }
 
 static void
-titolo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_titolo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Titolo *titolo = TITOLO (object);
+       OrganigrammaTitolo *titolo = ORGANIGRAMMA_TITOLO (object);
 
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (titolo);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (titolo);
 
        switch (property_id)
                {
@@ -269,11 +269,11 @@ titolo_set_property (GObject *object, guint property_id, const GValue *value, GP
 }
 
 static void
-titolo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_titolo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Titolo *titolo = TITOLO (object);
+       OrganigrammaTitolo *titolo = ORGANIGRAMMA_TITOLO (object);
 
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (titolo);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (titolo);
 
        switch (property_id)
                {
@@ -284,13 +284,13 @@ titolo_get_property (GObject *object, guint property_id, GValue *value, GParamSp
 }
 
 static gboolean
-titolo_conferma_chiusura (Titolo *titolo)
+organigramma_titolo_conferma_chiusura (OrganigrammaTitolo *titolo)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (titolo);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (titolo);
 
        ret = TRUE;
        if (gtk_form_is_changed (priv->form))
@@ -312,27 +312,27 @@ titolo_conferma_chiusura (Titolo *titolo)
 
 /* CALLBACK */
 static gboolean
-titolo_on_w_titolo_delete_event (GtkWidget *widget,
+organigramma_titolo_on_w_organigramma_titolo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !titolo_conferma_chiusura ((Titolo *)user_data);
+       return !organigramma_titolo_conferma_chiusura ((OrganigrammaTitolo *)user_data);
 }
 
 static void
-titolo_on_btn_annulla_clicked (GtkButton *button,
+organigramma_titolo_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       Titolo *titolo = (Titolo *)user_data;
+       OrganigrammaTitolo *titolo = (OrganigrammaTitolo *)user_data;
 
-       TitoloPrivate *priv = TITOLO_GET_PRIVATE (titolo);
+       OrganigrammaTitoloPrivate *priv = ORGANIGRAMMA_TITOLO_GET_PRIVATE (titolo);
 
-       if (titolo_conferma_chiusura (titolo)) gtk_widget_destroy (priv->w);
+       if (organigramma_titolo_conferma_chiusura (titolo)) gtk_widget_destroy (priv->w);
 }
 
 static void
-titolo_on_btn_salva_clicked (GtkButton *button,
+organigramma_titolo_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       titolo_salva ((Titolo *)user_data);
+       organigramma_titolo_salva ((OrganigrammaTitolo *)user_data);
 }

diff --git a/src/titolo.h b/src/titolo.h
index 2ec870666f2a5a136c4868ca95dd76266b71453b..99f5aed49c27a1747534ca4242c32f6b184c6035 100644 (file)
--- a/src/titolo.h
+++ b/src/titolo.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __TITOLO_H__
-#define __TITOLO_H__
+#ifndef __ORGANIGRAMMA_TITOLO_H__
+#define __ORGANIGRAMMA_TITOLO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_TITOLO                 (titolo_get_type ())
-#define TITOLO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TITOLO, Titolo))
-#define TITOLO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TITOLO, TitoloClass))
-#define IS_TITOLO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TITOLO))
-#define IS_TITOLO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TITOLO))
-#define TITOLO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TITOLO, TitoloClass))
+#define TYPE_ORGANIGRAMMA_TITOLO                 (organigramma_titolo_get_type ())
+#define ORGANIGRAMMA_TITOLO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_TITOLO, OrganigrammaTitolo))
+#define ORGANIGRAMMA_TITOLO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_TITOLO, OrganigrammaTitoloClass))
+#define IS_ORGANIGRAMMA_TITOLO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_TITOLO))
+#define IS_ORGANIGRAMMA_TITOLO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_TITOLO))
+#define ORGANIGRAMMA_TITOLO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_TITOLO, OrganigrammaTitoloClass))
 
 
-typedef struct _Titolo Titolo;
-typedef struct _TitoloClass TitoloClass;
+typedef struct _OrganigrammaTitolo OrganigrammaTitolo;
+typedef struct _OrganigrammaTitoloClass OrganigrammaTitoloClass;
 
-struct _Titolo
+struct _OrganigrammaTitolo
        {
                GObject parent;
        };
 
-struct _TitoloClass
+struct _OrganigrammaTitoloClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType titolo_get_type (void) G_GNUC_CONST;
+GType organigramma_titolo_get_type (void) G_GNUC_CONST;
 
-Titolo *titolo_new (OrganigrammaCommons *commons, gint id);
+OrganigrammaTitolo *organigramma_titolo_new (OrganigrammaCommons *commons, gint id);
 
-GtkWidget *titolo_get_widget (Titolo *titolo);
+GtkWidget *organigramma_titolo_get_widget (OrganigrammaTitolo *titolo);
 
 
 G_END_DECLS
 
-#endif /* __TITOLO_H__ */
+#endif /* __ORGANIGRAMMA_TITOLO_H__ */

diff --git a/src/uffici.c b/src/uffici.c
index adde892371630ac9eb0593af3467be5946735766..bfcbce34118d648e4bca882d19f336e1a77cf6e9 100644 (file)
--- a/src/uffici.c
+++ b/src/uffici.c
@@ -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
@@ -20,41 +20,41 @@
 #include "uffici.h"
 #include "ufficio.h"
 
-static void uffici_class_init (UfficiClass *klass);
-static void uffici_init (Uffici *uffici);
+static void organigramma_uffici_class_init (OrganigrammaUfficiClass *klass);
+static void organigramma_uffici_init (OrganigrammaUffici *uffici);
 
-static void uffici_carica (Uffici *uffici);
-static void uffici_modifica (Uffici *uffici);
+static void organigramma_uffici_carica (OrganigrammaUffici *uffici);
+static void organigramma_uffici_modifica (OrganigrammaUffici *uffici);
 
-static void uffici_selezionato (Uffici *uffici);
-static void uffici_on_costo_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_uffici_selezionato (OrganigrammaUffici *uffici);
+static void organigramma_uffici_on_costo_aggiornato (gpointer instance, gpointer user_data);
 
-static void uffici_set_property (GObject *object,
+static void organigramma_uffici_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void uffici_get_property (GObject *object,
+static void organigramma_uffici_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void uffici_on_btn_nuovo_clicked (GtkButton *button,
+static void organigramma_uffici_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data);
-static void uffici_on_btn_modifica_clicked (GtkButton *button,
+static void organigramma_uffici_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data);
-static void uffici_on_btn_elimina_clicked (GtkButton *button,
+static void organigramma_uffici_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data);
-static void uffici_on_trv_uffici_row_activated (GtkTreeView *tree_view,
+static void organigramma_uffici_on_trv_organigramma_uffici_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void uffici_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_uffici_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void uffici_on_btn_seleziona_clicked (GtkButton *button,
+static void organigramma_uffici_on_btn_seleziona_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define UFFICI_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_UFFICI, UfficiPrivate))
+#define ORGANIGRAMMA_UFFICI_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_UFFICI, OrganigrammaUfficiPrivate))
 
 enum
 {
@@ -62,8 +62,8 @@ enum
        COL_NOME
 };
 
-typedef struct _UfficiPrivate UfficiPrivate;
-struct _UfficiPrivate
+typedef struct _OrganigrammaUfficiPrivate OrganigrammaUfficiPrivate;
+struct _OrganigrammaUfficiPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -75,20 +75,20 @@ struct _UfficiPrivate
                GtkWindow *wtransient;
        };
 
-G_DEFINE_TYPE (Uffici, uffici, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaUffici, organigramma_uffici, G_TYPE_OBJECT)
 
 static void
-uffici_class_init (UfficiClass *klass)
+organigramma_uffici_class_init (OrganigrammaUfficiClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (UfficiPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaUfficiPrivate));
 
-       object_class->set_property = uffici_set_property;
-       object_class->get_property = uffici_get_property;
+       object_class->set_property = organigramma_uffici_set_property;
+       object_class->get_property = organigramma_uffici_get_property;
 
        /**
-        * Uffici::selezionato:
+        * OrganigrammaUffici::selezionato:
         * @uffici:
         *
         */
@@ -104,26 +104,26 @@ uffici_class_init (UfficiClass *klass)
 }
 
 static void
-uffici_init (Uffici *uffici)
+organigramma_uffici_init (OrganigrammaUffici *uffici)
 {
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 }
 
 /**
- * uffici_new:
+ * organigramma_uffici_new:
  * @commons:
  * @selezione:
  *
- * Returns: the newly created #Uffici object.
+ * Returns: the newly created #OrganigrammaUffici object.
  */
-Uffici
-*uffici_new (OrganigrammaCommons *commons, gboolean selezione)
+OrganigrammaUffici
+*organigramma_uffici_new (OrganigrammaCommons *commons, gboolean selezione)
 {
        GError *error;
 
-       Uffici *a = UFFICI (g_object_new (uffici_get_type (), NULL));
+       OrganigrammaUffici *a = ORGANIGRAMMA_UFFICI (g_object_new (organigramma_uffici_get_type (), NULL));
 
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (a);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (a);
 
        priv->commons = commons;
        priv->selezione = selezione;
@@ -154,21 +154,21 @@ Uffici
                }
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button23"),
-                         "clicked", G_CALLBACK (uffici_on_btn_nuovo_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_uffici_on_btn_nuovo_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button24"),
-                         "clicked", G_CALLBACK (uffici_on_btn_modifica_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_uffici_on_btn_modifica_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button25"),
-                         "clicked", G_CALLBACK (uffici_on_btn_elimina_clicked), (gpointer)a);
+                         "clicked", G_CALLBACK (organigramma_uffici_on_btn_elimina_clicked), (gpointer)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview4"),
-                         "row-activated", G_CALLBACK (uffici_on_trv_uffici_row_activated), (gpointer)a);
+                         "row-activated", G_CALLBACK (organigramma_uffici_on_trv_organigramma_uffici_row_activated), (gpointer)a);
 
        if (priv->selezione)
                {
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "label17")));
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button26"),
-                                         "clicked", G_CALLBACK (uffici_on_btn_annulla_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_uffici_on_btn_annulla_clicked), (gpointer)a);
                        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button27"),
-                                         "clicked", G_CALLBACK (uffici_on_btn_seleziona_clicked), (gpointer)a);
+                                         "clicked", G_CALLBACK (organigramma_uffici_on_btn_seleziona_clicked), (gpointer)a);
                }
        else
                {
@@ -176,27 +176,27 @@ Uffici
                        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "button27")));
                }
 
-       uffici_carica (a);
+       organigramma_uffici_carica (a);
 
        return a;
 }
 
 /**
- * uffici_get_widget:
+ * organigramma_uffici_get_widget:
  * @uffici:
  *
  */
 GtkWidget
-*uffici_get_widget (Uffici *uffici)
+*organigramma_uffici_get_widget (OrganigrammaUffici *uffici)
 {
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 
        return priv->widget;
 }
 
 /* PRIVATE */
 static void
-uffici_carica (Uffici *uffici)
+organigramma_uffici_carica (OrganigrammaUffici *uffici)
 {
        GtkTreeIter iter;
        GdaDataModel *dm;
@@ -204,7 +204,7 @@ uffici_carica (Uffici *uffici)
        gint rows;
        gint row;
 
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 
        gtk_list_store_clear (priv->lstore_uffici);
 
@@ -231,12 +231,12 @@ uffici_carica (Uffici *uffici)
 }
 
 static void
-uffici_modifica (Uffici *uffici)
+organigramma_uffici_modifica (OrganigrammaUffici *uffici)
 {
        GtkTreeIter iter;
        guint id;
 
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -246,12 +246,12 @@ uffici_modifica (Uffici *uffici)
                                            COL_ID, &id,
                                            -1);
 
-                       Ufficio *c = ufficio_new (priv->commons, id);
+                       OrganigrammaUfficio *c = organigramma_ufficio_new (priv->commons, id);
 
                        g_signal_connect (G_OBJECT (c), "aggiornato",
-                                         G_CALLBACK (uffici_on_costo_aggiornato), (gpointer)uffici);
+                                         G_CALLBACK (organigramma_uffici_on_costo_aggiornato), (gpointer)uffici);
 
-                       w = ufficio_get_widget (c);
+                       w = organigramma_ufficio_get_widget (c);
                        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
                        gtk_widget_show (w);
                }
@@ -268,13 +268,13 @@ uffici_modifica (Uffici *uffici)
 }
 
 static void
-uffici_selezionato (Uffici *uffici)
+organigramma_uffici_selezionato (OrganigrammaUffici *uffici)
 {
        GtkTreeIter iter;
        guint *id;
 
-       UfficiClass *klass = UFFICI_GET_CLASS (uffici);
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUfficiClass *klass = ORGANIGRAMMA_UFFICI_GET_CLASS (uffici);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -300,17 +300,17 @@ uffici_selezionato (Uffici *uffici)
 }
 
 static void
-uffici_on_costo_aggiornato (gpointer instance, gpointer user_data)
+organigramma_uffici_on_costo_aggiornato (gpointer instance, gpointer user_data)
 {
-       uffici_carica ((Uffici *)user_data);
+       organigramma_uffici_carica ((OrganigrammaUffici *)user_data);
 }
 
 static void
-uffici_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_uffici_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Uffici *uffici = UFFICI (object);
+       OrganigrammaUffici *uffici = ORGANIGRAMMA_UFFICI (object);
 
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 
        switch (property_id)
                {
@@ -321,11 +321,11 @@ uffici_set_property (GObject *object, guint property_id, const GValue *value, GP
 }
 
 static void
-uffici_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_uffici_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Uffici *uffici = UFFICI (object);
+       OrganigrammaUffici *uffici = ORGANIGRAMMA_UFFICI (object);
 
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 
        switch (property_id)
                {
@@ -337,33 +337,33 @@ uffici_get_property (GObject *object, guint property_id, GValue *value, GParamSp
 
 /* CALLBACK */
 static void
-uffici_on_btn_nuovo_clicked (GtkButton *button,
+organigramma_uffici_on_btn_nuovo_clicked (GtkButton *button,
                       gpointer user_data)
 {
        GtkWidget *w;
 
-       Uffici *uffici = (Uffici *)user_data;
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUffici *uffici = (OrganigrammaUffici *)user_data;
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 
-       Ufficio *c = ufficio_new (priv->commons, 0);
+       OrganigrammaUfficio *c = organigramma_ufficio_new (priv->commons, 0);
 
        g_signal_connect (G_OBJECT (c), "aggiornato",
-                         G_CALLBACK (uffici_on_costo_aggiornato), (gpointer)uffici);
+                         G_CALLBACK (organigramma_uffici_on_costo_aggiornato), (gpointer)uffici);
 
-       w = ufficio_get_widget (c);
+       w = organigramma_ufficio_get_widget (c);
        gtk_window_set_transient_for (GTK_WINDOW (w), priv->wtransient);
        gtk_widget_show (w);
 }
 
 static void
-uffici_on_btn_modifica_clicked (GtkButton *button,
+organigramma_uffici_on_btn_modifica_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       uffici_modifica ((Uffici *)user_data);
+       organigramma_uffici_modifica ((OrganigrammaUffici *)user_data);
 }
 
 static void
-uffici_on_btn_elimina_clicked (GtkButton *button,
+organigramma_uffici_on_btn_elimina_clicked (GtkButton *button,
                         gpointer user_data)
 {
        GtkWidget *dialog;
@@ -372,8 +372,8 @@ uffici_on_btn_elimina_clicked (GtkButton *button,
        GtkTreeIter iter;
        guint id;
 
-       Uffici *uffici = (Uffici *)user_data;
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE (uffici);
+       OrganigrammaUffici *uffici = (OrganigrammaUffici *)user_data;
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE (uffici);
 
        if (gtk_tree_selection_get_selected (priv->selection, NULL, &iter))
                {
@@ -392,7 +392,7 @@ uffici_on_btn_elimina_clicked (GtkButton *button,
                                        gdaex_execute (priv->commons->gdaex,
                                                       g_strdup_printf ("UPDATE uffici SET status = 'E' WHERE id = %d", id));
 
-                                       uffici_carica (uffici);
+                                       organigramma_uffici_carica (uffici);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -409,37 +409,37 @@ uffici_on_btn_elimina_clicked (GtkButton *button,
 }
 
 static void
-uffici_on_trv_uffici_row_activated (GtkTreeView *tree_view,
+organigramma_uffici_on_trv_organigramma_uffici_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data)
 {
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE ((Uffici *)user_data);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE ((OrganigrammaUffici *)user_data);
 
        if (priv->selezione)
                {
-                       uffici_selezionato ((Uffici *)user_data);
+                       organigramma_uffici_selezionato ((OrganigrammaUffici *)user_data);
                }
        else
                {
-                       uffici_modifica ((Uffici *)user_data);
+                       organigramma_uffici_modifica ((OrganigrammaUffici *)user_data);
                }
 }
 
 
 static void
-uffici_on_btn_annulla_clicked (GtkButton *button,
+organigramma_uffici_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       UfficiPrivate *priv = UFFICI_GET_PRIVATE ((Uffici *)user_data);
+       OrganigrammaUfficiPrivate *priv = ORGANIGRAMMA_UFFICI_GET_PRIVATE ((OrganigrammaUffici *)user_data);
 
        gtk_widget_destroy (priv->widget);
        g_object_unref (G_OBJECT (user_data));
 }
 
 static void
-uffici_on_btn_seleziona_clicked (GtkButton *button,
+organigramma_uffici_on_btn_seleziona_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       uffici_selezionato ((Uffici *)user_data);
+       organigramma_uffici_selezionato ((OrganigrammaUffici *)user_data);
 }

diff --git a/src/uffici.h b/src/uffici.h
index 039e3807c1a0a09a9757c499341d28eaa5b2c447..1ee62e7af7772440f6692b20ae10b39a9bf1a070 100644 (file)
--- a/src/uffici.h
+++ b/src/uffici.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __UFFICI_H__
-#define __UFFICI_H__
+#ifndef __ORGANIGRAMMA_UFFICI_H__
+#define __ORGANIGRAMMA_UFFICI_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_UFFICI                 (uffici_get_type ())
-#define UFFICI(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UFFICI, Uffici))
-#define UFFICI_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_UFFICI, UfficiClass))
-#define IS_UFFICI(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UFFICI))
-#define IS_UFFICI_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_UFFICI))
-#define UFFICI_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_UFFICI, UfficiClass))
+#define TYPE_ORGANIGRAMMA_UFFICI                 (organigramma_uffici_get_type ())
+#define ORGANIGRAMMA_UFFICI(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_UFFICI, OrganigrammaUffici))
+#define ORGANIGRAMMA_UFFICI_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_UFFICI, OrganigrammaUfficiClass))
+#define IS_ORGANIGRAMMA_UFFICI(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_UFFICI))
+#define IS_ORGANIGRAMMA_UFFICI_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_UFFICI))
+#define ORGANIGRAMMA_UFFICI_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_UFFICI, OrganigrammaUfficiClass))
 
 
-typedef struct _Uffici Uffici;
-typedef struct _UfficiClass UfficiClass;
+typedef struct _OrganigrammaUffici OrganigrammaUffici;
+typedef struct _OrganigrammaUfficiClass OrganigrammaUfficiClass;
 
-struct _Uffici
+struct _OrganigrammaUffici
        {
                GObject parent;
        };
 
-struct _UfficiClass
+struct _OrganigrammaUfficiClass
        {
                GObjectClass parent_class;
 
                guint selezionato_signal_id;
        };
 
-GType uffici_get_type (void) G_GNUC_CONST;
+GType organigramma_uffici_get_type (void) G_GNUC_CONST;
 
-Uffici *uffici_new (OrganigrammaCommons *commons, gboolean selezione);
+OrganigrammaUffici *organigramma_uffici_new (OrganigrammaCommons *commons, gboolean selezione);
 
-GtkWidget *uffici_get_widget (Uffici *uffici);
+GtkWidget *organigramma_uffici_get_widget (OrganigrammaUffici *uffici);
 
 
 G_END_DECLS
 
-#endif /* __UFFICI_H__ */
+#endif /* __ORGANIGRAMMA_UFFICI_H__ */

diff --git a/src/ufficio.c b/src/ufficio.c
index ae94d3ea4133fa0359dca8579d5934ae75071e1f..61d75d975ee7bbae902b0daa9c7d236868967f90 100644 (file)
--- a/src/ufficio.c
+++ b/src/ufficio.c
@@ -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
@@ -26,97 +26,97 @@
 #include "ufficiorecapito.h"
 #include "ufficiostanza.h"
 
-static void ufficio_class_init (UfficioClass *klass);
-static void ufficio_init (Ufficio *ufficio);
+static void organigramma_ufficio_class_init (OrganigrammaUfficioClass *klass);
+static void organigramma_ufficio_init (OrganigrammaUfficio *ufficio);
 
-static void ufficio_carica (Ufficio *ufficio);
-static void ufficio_salva (Ufficio *ufficio);
+static void organigramma_ufficio_carica (OrganigrammaUfficio *ufficio);
+static void organigramma_ufficio_salva (OrganigrammaUfficio *ufficio);
 
-static void ufficio_carica_nodi (Ufficio *ufficio);
-static void ufficio_carica_stanze (Ufficio *ufficio);
-static void ufficio_carica_recapiti (Ufficio *ufficio);
-static void ufficio_carica_orari (Ufficio *ufficio);
+static void organigramma_ufficio_carica_nodi (OrganigrammaUfficio *ufficio);
+static void organigramma_ufficio_carica_stanze (OrganigrammaUfficio *ufficio);
+static void organigramma_ufficio_carica_recapiti (OrganigrammaUfficio *ufficio);
+static void organigramma_ufficio_carica_orari (OrganigrammaUfficio *ufficio);
 
-static void ufficio_nodo_modifica (Ufficio *ufficio);
-static void ufficio_stanza_modifica (Ufficio *ufficio);
-static void ufficio_recapito_modifica (Ufficio *ufficio);
-static void ufficio_orario_modifica (Ufficio *ufficio);
+static void organigramma_ufficio_nodo_modifica (OrganigrammaUfficio *ufficio);
+static void organigramma_ufficio_stanza_modifica (OrganigrammaUfficio *ufficio);
+static void organigramma_ufficio_recapito_modifica (OrganigrammaUfficio *ufficio);
+static void organigramma_ufficio_orario_modifica (OrganigrammaUfficio *ufficio);
 
-static gboolean ufficio_conferma_chiusura (Ufficio *ufficio);
+static gboolean organigramma_ufficio_conferma_chiusura (OrganigrammaUfficio *ufficio);
 
-static void ufficio_set_property (GObject *object,
+static void organigramma_ufficio_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void ufficio_get_property (GObject *object,
+static void organigramma_ufficio_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static void ufficio_on_nodo_aggiornato (gpointer instance, gpointer user_data);
-static void ufficio_on_stanza_aggiornato (gpointer instance, gpointer user_data);
-static void ufficio_on_recapito_aggiornato (gpointer instance, gpointer user_data);
-static void ufficio_on_orario_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_ufficio_on_nodo_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_ufficio_on_stanza_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_ufficio_on_recapito_aggiornato (gpointer instance, gpointer user_data);
+static void organigramma_ufficio_on_orario_aggiornato (gpointer instance, gpointer user_data);
 
-static void ufficio_on_struttura_selezionato (gpointer instance, guint id, gpointer user_data);
+static void organigramma_ufficio_on_struttura_selezionato (gpointer instance, guint id, gpointer user_data);
 
-static gboolean ufficio_on_w_ufficio_delete_event (GtkWidget *widget,
+static gboolean organigramma_ufficio_on_w_organigramma_ufficio_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void ufficio_on_btn_ufficio_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_organigramma_ufficio_clicked (GtkButton *button,
                       gpointer user_data);
 
-static void ufficio_on_btn_nodo_nuovo_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_nodo_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_nodo_modifica_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_nodo_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_nodo_elimina_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_nodo_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_trv_nodi_row_activated (GtkTreeView *tree_view,
+static void organigramma_ufficio_on_trv_nodi_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void ufficio_on_btn_stanza_nuovo_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_stanza_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_stanza_modifica_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_stanza_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_stanza_elimina_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_stanza_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_trv_stanze_row_activated (GtkTreeView *tree_view,
+static void organigramma_ufficio_on_trv_stanze_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void ufficio_on_btn_recapito_nuovo_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_recapito_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_recapito_modifica_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_recapito_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_recapito_elimina_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_recapito_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_trv_recapiti_row_activated (GtkTreeView *tree_view,
+static void organigramma_ufficio_on_trv_recapiti_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void ufficio_on_btn_orario_nuovo_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_orario_nuovo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_orario_modifica_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_orario_modifica_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_orario_elimina_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_orario_elimina_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_trv_orari_row_activated (GtkTreeView *tree_view,
+static void organigramma_ufficio_on_trv_orari_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                              GtkTreeViewColumn *column,
                                              gpointer user_data);
 
-static void ufficio_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_ufficio_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
-#define UFFICIO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_UFFICIO, UfficioPrivate))
+#define ORGANIGRAMMA_UFFICIO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_UFFICIO, OrganigrammaUfficioPrivate))
 
 enum
 {
@@ -156,8 +156,8 @@ enum
        ORARI_COL_ORARIO
 };
 
-typedef struct _UfficioPrivate UfficioPrivate;
-struct _UfficioPrivate
+typedef struct _OrganigrammaUfficioPrivate OrganigrammaUfficioPrivate;
+struct _OrganigrammaUfficioPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -175,20 +175,20 @@ struct _UfficioPrivate
                gint id;
        };
 
-G_DEFINE_TYPE (Ufficio, ufficio, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaUfficio, organigramma_ufficio, G_TYPE_OBJECT)
 
 static void
-ufficio_class_init (UfficioClass *klass)
+organigramma_ufficio_class_init (OrganigrammaUfficioClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (UfficioPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaUfficioPrivate));
 
-       object_class->set_property = ufficio_set_property;
-       object_class->get_property = ufficio_get_property;
+       object_class->set_property = organigramma_ufficio_set_property;
+       object_class->get_property = organigramma_ufficio_get_property;
 
        /**
-        * Ufficio::aggiornato:
+        * OrganigrammaUfficio::aggiornato:
         * @ufficio:
         *
         */
@@ -204,35 +204,35 @@ ufficio_class_init (UfficioClass *klass)
 }
 
 static void
-ufficio_init (Ufficio *ufficio)
+organigramma_ufficio_init (OrganigrammaUfficio *ufficio)
 {
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 }
 
 /**
- * ufficio_new:
+ * organigramma_ufficio_new:
  * @commons:
  * @id:
  *
- * Returns: the newly created #Ufficio object.
+ * Returns: the newly created #OrganigrammaUfficio object.
  */
-Ufficio
-*ufficio_new (OrganigrammaCommons *commons, gint id)
+OrganigrammaUfficio
+*organigramma_ufficio_new (OrganigrammaCommons *commons, gint id)
 {
        GError *error;
 
-       Ufficio *a = UFFICIO (g_object_new (ufficio_get_type (), NULL));
+       OrganigrammaUfficio *a = ORGANIGRAMMA_UFFICIO (g_object_new (organigramma_ufficio_get_type (), NULL));
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (a);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("lstore_ufficio_nodi"
-                                          "|lstore_ufficio_stanze"
-                                          "|lstore_ufficio_recapiti"
-                                          "|lstore_ufficio_orari"
+                                          g_strsplit ("lstore_organigramma_ufficio_nodi"
+                                          "|lstore_organigramma_ufficio_stanze"
+                                          "|lstore_organigramma_ufficio_recapiti"
+                                          "|lstore_organigramma_ufficio_orari"
                                           "|w_ufficio", "|", -1),
                                           &error);
        if (error != NULL)
@@ -249,10 +249,10 @@ Ufficio
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label23",
-                                                     "lstore_ufficio_nodi",
-                                                     "lstore_ufficio_stanze",
-                                                     "lstore_ufficio_recapiti",
-                                                     "lstore_ufficio_orari",
+                                                     "lstore_organigramma_ufficio_nodi",
+                                                     "lstore_organigramma_ufficio_stanze",
+                                                     "lstore_organigramma_ufficio_recapiti",
+                                                     "lstore_organigramma_ufficio_orari",
                                                      NULL);
 
        priv->sel_nodi = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview7")));
@@ -261,51 +261,51 @@ Ufficio
        priv->sel_orari = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview10")));
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (ufficio_on_w_ufficio_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_ufficio_on_w_organigramma_ufficio_delete_event), (gpointer *)a);
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button31"),
-                         "clicked", G_CALLBACK (ufficio_on_btn_ufficio_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_organigramma_ufficio_clicked), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button28")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_nodo_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_nodo_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button42")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_nodo_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_nodo_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button43")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_nodo_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_nodo_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview7")),
-                         "row-activated", G_CALLBACK (ufficio_on_trv_nodi_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_ufficio_on_trv_nodi_row_activated), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button137")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_stanza_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_stanza_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button140")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_stanza_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_stanza_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button141")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_stanza_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_stanza_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview23")),
-                         "row-activated", G_CALLBACK (ufficio_on_trv_stanze_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_ufficio_on_trv_stanze_row_activated), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button37")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_recapito_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_recapito_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button38")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_recapito_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_recapito_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button41")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_recapito_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_recapito_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview6")),
-                         "row-activated", G_CALLBACK (ufficio_on_trv_recapiti_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_ufficio_on_trv_recapiti_row_activated), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button59")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_orario_nuovo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_orario_nuovo_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button60")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_orario_modifica_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_orario_modifica_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button61")),
-                         "clicked", G_CALLBACK (ufficio_on_btn_orario_elimina_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_orario_elimina_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview10")),
-                         "row-activated", G_CALLBACK (ufficio_on_trv_orari_row_activated), (gpointer *)a);
+                         "row-activated", G_CALLBACK (organigramma_ufficio_on_trv_orari_row_activated), (gpointer *)a);
 
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button29"),
-                         "clicked", G_CALLBACK (ufficio_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button30"),
-                         "clicked", G_CALLBACK (ufficio_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
 
@@ -320,42 +320,42 @@ Ufficio
        else
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
-                       ufficio_carica (a);
+                       organigramma_ufficio_carica (a);
                }
 
        return a;
 }
 
 /**
- * ufficio_get_widget:
+ * organigramma_ufficio_get_widget:
  * @ufficio:
  *
  */
 GtkWidget
-*ufficio_get_widget (Ufficio *ufficio)
+*organigramma_ufficio_get_widget (OrganigrammaUfficio *ufficio)
 {
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-ufficio_carica (Ufficio *ufficio)
+organigramma_ufficio_carica (OrganigrammaUfficio *ufficio)
 {
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_form_fill_from_table (priv->form))
                {
-                       ufficio_carica_nodi (ufficio);
-                       ufficio_carica_stanze (ufficio);
-                       ufficio_carica_recapiti (ufficio);
-                       ufficio_carica_orari (ufficio);
+                       organigramma_ufficio_carica_nodi (ufficio);
+                       organigramma_ufficio_carica_stanze (ufficio);
+                       organigramma_ufficio_carica_recapiti (ufficio);
+                       organigramma_ufficio_carica_orari (ufficio);
                }
 }
 
 static void
-ufficio_salva (Ufficio *ufficio)
+organigramma_ufficio_salva (OrganigrammaUfficio *ufficio)
 {
        GError *error = NULL;
        gchar *sql;
@@ -364,9 +364,9 @@ ufficio_salva (Ufficio *ufficio)
        GDate *da;
        GDate *a;
 
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (!gtk_form_check (priv->form, (priv->id != 0), NULL, TRUE, priv->w, TRUE))
                {
@@ -420,19 +420,19 @@ ufficio_salva (Ufficio *ufficio)
 }
 
 static void
-ufficio_carica_nodi (Ufficio *ufficio)
+organigramma_ufficio_carica_nodi (OrganigrammaUfficio *ufficio)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_NODI]));
 
        sql = g_strdup_printf ("SELECT tn.nome AS tipo, si.id, v.nome AS nome"
-                              " FROM ufficio_nodi si INNER JOIN nodi v ON si.id_nodi = v.id"
+                              " FROM organigramma_ufficio_nodi si INNER JOIN nodi v ON si.id_nodi = v.id"
                               " INNER JOIN tipi_nodo tn ON v.id_tipi_nodo = tn.id"
                               " WHERE si.id_uffici = %d"
                               " AND si.status <> 'E'",
@@ -459,19 +459,19 @@ ufficio_carica_nodi (Ufficio *ufficio)
 }
 
 static void
-ufficio_carica_stanze (Ufficio *ufficio)
+organigramma_ufficio_carica_stanze (OrganigrammaUfficio *ufficio)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_STANZE]));
 
        sql = g_strdup_printf ("SELECT us.id, us.piano, us.da_stanza, us.a_stanza"
-                              " FROM ufficio_stanze AS us"
+                              " FROM organigramma_ufficio_stanze AS us"
                               " WHERE us.id_uffici = %d"
                               " AND us.status <> 'E'"
                               " ORDER BY us.piano, us.da_stanza, us.a_stanza",
@@ -499,19 +499,19 @@ ufficio_carica_stanze (Ufficio *ufficio)
 }
 
 static void
-ufficio_carica_recapiti (Ufficio *ufficio)
+organigramma_ufficio_carica_recapiti (OrganigrammaUfficio *ufficio)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_RECAPITI]));
 
        sql = g_strdup_printf ("SELECT v.nome AS tipo, si.id, si.recapito"
-                              " FROM ufficio_recapiti si INNER JOIN tipi_recapito v ON si.id_tipi_recapito = v.id"
+                              " FROM organigramma_ufficio_recapiti si INNER JOIN tipi_recapito v ON si.id_tipi_recapito = v.id"
                               " WHERE si.id_uffici = %d"
                               " AND si.status <> 'E'",
                               priv->id);
@@ -537,19 +537,19 @@ ufficio_carica_recapiti (Ufficio *ufficio)
 }
 
 static void
-ufficio_carica_orari (Ufficio *ufficio)
+organigramma_ufficio_carica_orari (OrganigrammaUfficio *ufficio)
 {
        gchar *sql;
        GdaDataModel *dm;
        guint row;
        guint rows;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        gtk_list_store_clear (GTK_LIST_STORE (priv->objects[LSTORE_ORARI]));
 
        sql = g_strdup_printf ("SELECT *"
-                              " FROM ufficio_orari si"
+                              " FROM organigramma_ufficio_orari si"
                               " WHERE si.id_uffici = %d"
                               " AND si.status <> 'E'",
                               priv->id);
@@ -574,12 +574,12 @@ ufficio_carica_orari (Ufficio *ufficio)
 }
 
 static void
-ufficio_nodo_modifica (Ufficio *ufficio)
+organigramma_ufficio_nodo_modifica (OrganigrammaUfficio *ufficio)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_tree_selection_get_selected (priv->sel_nodi, NULL, &iter))
                {
@@ -590,12 +590,12 @@ ufficio_nodo_modifica (Ufficio *ufficio)
                                            NODI_COL_ID, &id,
                                            -1);
 
-                       UfficioNodo *a = ufficio_nodo_new (priv->commons, id, 0);
+                       OrganigrammaUfficioNodo *a = organigramma_ufficio_nodo_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (ufficio_on_nodo_aggiornato), (gpointer)ufficio);
+                                         G_CALLBACK (organigramma_ufficio_on_nodo_aggiornato), (gpointer)ufficio);
 
-                       w = ufficio_nodo_get_widget (a);
+                       w = organigramma_ufficio_nodo_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -612,12 +612,12 @@ ufficio_nodo_modifica (Ufficio *ufficio)
 }
 
 static void
-ufficio_stanza_modifica (Ufficio *ufficio)
+organigramma_ufficio_stanza_modifica (OrganigrammaUfficio *ufficio)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_tree_selection_get_selected (priv->sel_stanze, NULL, &iter))
                {
@@ -628,12 +628,12 @@ ufficio_stanza_modifica (Ufficio *ufficio)
                                            STANZE_COL_ID, &id,
                                            -1);
 
-                       UfficioStanza *a = ufficio_stanza_new (priv->commons, id, 0);
+                       OrganigrammaUfficioStanza *a = organigramma_ufficio_stanza_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (ufficio_on_stanza_aggiornato), (gpointer)ufficio);
+                                         G_CALLBACK (organigramma_ufficio_on_stanza_aggiornato), (gpointer)ufficio);
 
-                       w = ufficio_stanza_get_widget (a);
+                       w = organigramma_ufficio_stanza_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -650,12 +650,12 @@ ufficio_stanza_modifica (Ufficio *ufficio)
 }
 
 static void
-ufficio_recapito_modifica (Ufficio *ufficio)
+organigramma_ufficio_recapito_modifica (OrganigrammaUfficio *ufficio)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_tree_selection_get_selected (priv->sel_recapiti, NULL, &iter))
                {
@@ -666,12 +666,12 @@ ufficio_recapito_modifica (Ufficio *ufficio)
                                            RECAPITI_COL_ID, &id,
                                            -1);
 
-                       UfficioRecapito *a = ufficio_recapito_new (priv->commons, id, 0);
+                       OrganigrammaUfficioRecapito *a = organigramma_ufficio_recapito_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (ufficio_on_recapito_aggiornato), (gpointer)ufficio);
+                                         G_CALLBACK (organigramma_ufficio_on_recapito_aggiornato), (gpointer)ufficio);
 
-                       w = ufficio_recapito_get_widget (a);
+                       w = organigramma_ufficio_recapito_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -688,12 +688,12 @@ ufficio_recapito_modifica (Ufficio *ufficio)
 }
 
 static void
-ufficio_orario_modifica (Ufficio *ufficio)
+organigramma_ufficio_orario_modifica (OrganigrammaUfficio *ufficio)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_tree_selection_get_selected (priv->sel_orari, NULL, &iter))
                {
@@ -704,12 +704,12 @@ ufficio_orario_modifica (Ufficio *ufficio)
                                            ORARI_COL_ID, &id,
                                            -1);
 
-                       UfficioOrario *a = ufficio_orario_new (priv->commons, id, 0);
+                       OrganigrammaUfficioOrario *a = organigramma_ufficio_orario_new (priv->commons, id, 0);
 
                        g_signal_connect (G_OBJECT (a), "aggiornato",
-                                         G_CALLBACK (ufficio_on_orario_aggiornato), (gpointer)ufficio);
+                                         G_CALLBACK (organigramma_ufficio_on_orario_aggiornato), (gpointer)ufficio);
 
-                       w = ufficio_orario_get_widget (a);
+                       w = organigramma_ufficio_orario_get_widget (a);
                        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
                        gtk_widget_show (w);
                }
@@ -726,11 +726,11 @@ ufficio_orario_modifica (Ufficio *ufficio)
 }
 
 static void
-ufficio_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_ufficio_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       Ufficio *ufficio = UFFICIO (object);
+       OrganigrammaUfficio *ufficio = ORGANIGRAMMA_UFFICIO (object);
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        switch (property_id)
                {
@@ -741,11 +741,11 @@ ufficio_set_property (GObject *object, guint property_id, const GValue *value, G
 }
 
 static void
-ufficio_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_ufficio_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       Ufficio *ufficio = UFFICIO (object);
+       OrganigrammaUfficio *ufficio = ORGANIGRAMMA_UFFICIO (object);
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        switch (property_id)
                {
@@ -756,13 +756,13 @@ ufficio_get_property (GObject *object, guint property_id, GValue *value, GParamS
 }
 
 static gboolean
-ufficio_conferma_chiusura (Ufficio *ufficio)
+organigramma_ufficio_conferma_chiusura (OrganigrammaUfficio *ufficio)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        ret = TRUE;
        if (gtk_form_is_changed (priv->form))
@@ -784,117 +784,117 @@ ufficio_conferma_chiusura (Ufficio *ufficio)
 
 /* CALLBACK */
 static void
-ufficio_on_struttura_selezionato (gpointer instance, guint id, gpointer user_data)
+organigramma_ufficio_on_struttura_selezionato (gpointer instance, guint id, gpointer user_data)
 {
-       Ufficio *f = (Ufficio *)user_data;
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (f);
+       OrganigrammaUfficio *f = (OrganigrammaUfficio *)user_data;
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (f);
 
        gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "label25"), g_strdup_printf ("%d", id));
 }
 
 static void
-ufficio_on_nodo_aggiornato (gpointer instance, gpointer user_data)
+organigramma_ufficio_on_nodo_aggiornato (gpointer instance, gpointer user_data)
 {
-       Ufficio *ufficio = (Ufficio *)user_data;
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
 
-       ufficio_carica_nodi (ufficio);
+       organigramma_ufficio_carica_nodi (ufficio);
 }
 
 static void
-ufficio_on_stanza_aggiornato (gpointer instance, gpointer user_data)
+organigramma_ufficio_on_stanza_aggiornato (gpointer instance, gpointer user_data)
 {
-       Ufficio *ufficio = (Ufficio *)user_data;
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
 
-       ufficio_carica_stanze (ufficio);
+       organigramma_ufficio_carica_stanze (ufficio);
 }
 
 static void
-ufficio_on_recapito_aggiornato (gpointer instance, gpointer user_data)
+organigramma_ufficio_on_recapito_aggiornato (gpointer instance, gpointer user_data)
 {
-       Ufficio *ufficio = (Ufficio *)user_data;
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
 
-       ufficio_carica_recapiti (ufficio);
+       organigramma_ufficio_carica_recapiti (ufficio);
 }
 
 static void
-ufficio_on_orario_aggiornato (gpointer instance, gpointer user_data)
+organigramma_ufficio_on_orario_aggiornato (gpointer instance, gpointer user_data)
 {
-       Ufficio *ufficio = (Ufficio *)user_data;
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
 
-       ufficio_carica_orari (ufficio);
+       organigramma_ufficio_carica_orari (ufficio);
 }
 
 static gboolean
-ufficio_on_w_ufficio_delete_event (GtkWidget *widget,
+organigramma_ufficio_on_w_organigramma_ufficio_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !ufficio_conferma_chiusura ((Ufficio *)user_data);
+       return !organigramma_ufficio_conferma_chiusura ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_ufficio_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_organigramma_ufficio_clicked (GtkButton *button,
                       gpointer user_data)
 {
        GtkWidget *w;
 
-       Ufficio *rf = (Ufficio *)user_data;
+       OrganigrammaUfficio *rf = (OrganigrammaUfficio *)user_data;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (rf);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (rf);
 
-       Strutture *c = strutture_new (priv->commons, TRUE);
+       OrganigrammaStrutture *c = organigramma_strutture_new (priv->commons, TRUE);
 
        g_signal_connect (G_OBJECT (c), "selezionato",
-                         G_CALLBACK (ufficio_on_struttura_selezionato), user_data);
+                         G_CALLBACK (organigramma_ufficio_on_struttura_selezionato), user_data);
 
-       w = strutture_get_widget (c);
+       w = organigramma_strutture_get_widget (c);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-ufficio_on_btn_nodo_nuovo_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_nodo_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
-       UfficioNodo *a = ufficio_nodo_new (priv->commons, 0, priv->id);
+       OrganigrammaUfficioNodo *a = organigramma_ufficio_nodo_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (ufficio_on_nodo_aggiornato), (gpointer)ufficio);
+                         G_CALLBACK (organigramma_ufficio_on_nodo_aggiornato), (gpointer)ufficio);
 
-       w = ufficio_nodo_get_widget (a);
+       w = organigramma_ufficio_nodo_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-ufficio_on_btn_nodo_modifica_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_nodo_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       ufficio_nodo_modifica ((Ufficio *)user_data);
+       organigramma_ufficio_nodo_modifica ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_nodo_elimina_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_nodo_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_tree_selection_get_selected (priv->sel_nodi, NULL, &iter))
                {
@@ -913,12 +913,12 @@ ufficio_on_btn_nodo_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE ufficio_nodi"
+                                                      g_strdup_printf ("UPDATE organigramma_ufficio_nodi"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       ufficio_carica_nodi (ufficio);
+                                       organigramma_ufficio_carica_nodi (ufficio);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -935,53 +935,53 @@ ufficio_on_btn_nodo_elimina_clicked (GtkButton *button,
 }
 
 static void
-ufficio_on_trv_nodi_row_activated (GtkTreeView *tree_view,
+organigramma_ufficio_on_trv_nodi_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                                                                         GtkTreeViewColumn *column,
                                                                                         gpointer user_data)
 {
-       ufficio_nodo_modifica ((Ufficio *)user_data);
+       organigramma_ufficio_nodo_modifica ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_stanza_nuovo_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_stanza_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
-       UfficioStanza *a = ufficio_stanza_new (priv->commons, 0, priv->id);
+       OrganigrammaUfficioStanza *a = organigramma_ufficio_stanza_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (ufficio_on_stanza_aggiornato), (gpointer)ufficio);
+                         G_CALLBACK (organigramma_ufficio_on_stanza_aggiornato), (gpointer)ufficio);
 
-       w = ufficio_stanza_get_widget (a);
+       w = organigramma_ufficio_stanza_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-ufficio_on_btn_stanza_modifica_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_stanza_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       ufficio_stanza_modifica ((Ufficio *)user_data);
+       organigramma_ufficio_stanza_modifica ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_stanza_elimina_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_stanza_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_tree_selection_get_selected (priv->sel_stanze, NULL, &iter))
                {
@@ -1000,12 +1000,12 @@ ufficio_on_btn_stanza_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE ufficio_stanze"
+                                                      g_strdup_printf ("UPDATE organigramma_ufficio_stanze"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       ufficio_carica_stanze (ufficio);
+                                       organigramma_ufficio_carica_stanze (ufficio);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1022,53 +1022,53 @@ ufficio_on_btn_stanza_elimina_clicked (GtkButton *button,
 }
 
 static void
-ufficio_on_trv_stanze_row_activated (GtkTreeView *tree_view,
+organigramma_ufficio_on_trv_stanze_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                                                                         GtkTreeViewColumn *column,
                                                                                         gpointer user_data)
 {
-       ufficio_stanza_modifica ((Ufficio *)user_data);
+       organigramma_ufficio_stanza_modifica ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_recapito_nuovo_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_recapito_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
-       UfficioRecapito *a = ufficio_recapito_new (priv->commons, 0, priv->id);
+       OrganigrammaUfficioRecapito *a = organigramma_ufficio_recapito_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (ufficio_on_recapito_aggiornato), (gpointer)ufficio);
+                         G_CALLBACK (organigramma_ufficio_on_recapito_aggiornato), (gpointer)ufficio);
 
-       w = ufficio_recapito_get_widget (a);
+       w = organigramma_ufficio_recapito_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-ufficio_on_btn_recapito_modifica_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_recapito_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       ufficio_recapito_modifica ((Ufficio *)user_data);
+       organigramma_ufficio_recapito_modifica ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_recapito_elimina_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_recapito_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_tree_selection_get_selected (priv->sel_recapiti, NULL, &iter))
                {
@@ -1087,12 +1087,12 @@ ufficio_on_btn_recapito_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE ufficio_recapiti"
+                                                      g_strdup_printf ("UPDATE organigramma_ufficio_recapiti"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       ufficio_carica_recapiti (ufficio);
+                                       organigramma_ufficio_carica_recapiti (ufficio);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1109,53 +1109,53 @@ ufficio_on_btn_recapito_elimina_clicked (GtkButton *button,
 }
 
 static void
-ufficio_on_trv_recapiti_row_activated (GtkTreeView *tree_view,
+organigramma_ufficio_on_trv_recapiti_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                                                                         GtkTreeViewColumn *column,
                                                                                         gpointer user_data)
 {
-       ufficio_recapito_modifica ((Ufficio *)user_data);
+       organigramma_ufficio_recapito_modifica ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_orario_nuovo_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_orario_nuovo_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkWidget *w;
 
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
-       UfficioOrario *a = ufficio_orario_new (priv->commons, 0, priv->id);
+       OrganigrammaUfficioOrario *a = organigramma_ufficio_orario_new (priv->commons, 0, priv->id);
 
        g_signal_connect (G_OBJECT (a), "aggiornato",
-                         G_CALLBACK (ufficio_on_orario_aggiornato), (gpointer)ufficio);
+                         G_CALLBACK (organigramma_ufficio_on_orario_aggiornato), (gpointer)ufficio);
 
-       w = ufficio_orario_get_widget (a);
+       w = organigramma_ufficio_orario_get_widget (a);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-ufficio_on_btn_orario_modifica_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_orario_modifica_clicked (GtkButton *button,
                                     gpointer user_data)
 {
-       ufficio_orario_modifica ((Ufficio *)user_data);
+       organigramma_ufficio_orario_modifica ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_orario_elimina_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_orario_elimina_clicked (GtkButton *button,
                                     gpointer user_data)
 {
        GtkTreeIter iter;
        GtkWidget *dialog;
        guint risp;
 
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioClass *klass = UFFICIO_GET_CLASS (ufficio);
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioClass *klass = ORGANIGRAMMA_UFFICIO_GET_CLASS (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
        if (gtk_tree_selection_get_selected (priv->sel_orari, NULL, &iter))
                {
@@ -1174,12 +1174,12 @@ ufficio_on_btn_orario_elimina_clicked (GtkButton *button,
                                                            -1);
 
                                        gdaex_execute (priv->commons->gdaex,
-                                                      g_strdup_printf ("UPDATE ufficio_orari"
+                                                      g_strdup_printf ("UPDATE organigramma_ufficio_orari"
                                                                        " SET status = 'E'"
                                                                        " WHERE id = %d",
                                                                        id));
 
-                                       ufficio_carica_orari (ufficio);
+                                       organigramma_ufficio_carica_orari (ufficio);
                                }
                        gtk_widget_destroy (dialog);
                }
@@ -1196,28 +1196,28 @@ ufficio_on_btn_orario_elimina_clicked (GtkButton *button,
 }
 
 static void
-ufficio_on_trv_orari_row_activated (GtkTreeView *tree_view,
+organigramma_ufficio_on_trv_orari_row_activated (GtkTreeView *tree_view,
                                              GtkTreePath *tree_path,
                                                                                         GtkTreeViewColumn *column,
                                                                                         gpointer user_data)
 {
-       ufficio_orario_modifica ((Ufficio *)user_data);
+       organigramma_ufficio_orario_modifica ((OrganigrammaUfficio *)user_data);
 }
 
 static void
-ufficio_on_btn_annulla_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       Ufficio *ufficio = (Ufficio *)user_data;
+       OrganigrammaUfficio *ufficio = (OrganigrammaUfficio *)user_data;
 
-       UfficioPrivate *priv = UFFICIO_GET_PRIVATE (ufficio);
+       OrganigrammaUfficioPrivate *priv = ORGANIGRAMMA_UFFICIO_GET_PRIVATE (ufficio);
 
-       if (ufficio_conferma_chiusura (ufficio)) gtk_widget_destroy (priv->w);
+       if (organigramma_ufficio_conferma_chiusura (ufficio)) gtk_widget_destroy (priv->w);
 }
 
 static void
-ufficio_on_btn_salva_clicked (GtkButton *button,
+organigramma_ufficio_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       ufficio_salva ((Ufficio *)user_data);
+       organigramma_ufficio_salva ((OrganigrammaUfficio *)user_data);
 }

diff --git a/src/ufficio.h b/src/ufficio.h
index a94ec5249787aa50a18aa69ed1c3c1bcf8ddc610..b157c39152641b358b58dd9786f9c539f70d863e 100644 (file)
--- a/src/ufficio.h
+++ b/src/ufficio.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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __UFFICIO_H__
-#define __UFFICIO_H__
+#ifndef __ORGANIGRAMMA_UFFICIO_H__
+#define __ORGANIGRAMMA_UFFICIO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_UFFICIO                 (ufficio_get_type ())
-#define UFFICIO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UFFICIO, Ufficio))
-#define UFFICIO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_UFFICIO, UfficioClass))
-#define IS_UFFICIO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UFFICIO))
-#define IS_UFFICIO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_UFFICIO))
-#define UFFICIO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_UFFICIO, UfficioClass))
+#define TYPE_ORGANIGRAMMA_UFFICIO                 (organigramma_ufficio_get_type ())
+#define ORGANIGRAMMA_UFFICIO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_UFFICIO, OrganigrammaUfficio))
+#define ORGANIGRAMMA_UFFICIO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_UFFICIO, OrganigrammaUfficioClass))
+#define IS_ORGANIGRAMMA_UFFICIO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_UFFICIO))
+#define IS_ORGANIGRAMMA_UFFICIO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_UFFICIO))
+#define ORGANIGRAMMA_UFFICIO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_UFFICIO, OrganigrammaUfficioClass))
 
 
-typedef struct _Ufficio Ufficio;
-typedef struct _UfficioClass UfficioClass;
+typedef struct _OrganigrammaUfficio OrganigrammaUfficio;
+typedef struct _OrganigrammaUfficioClass OrganigrammaUfficioClass;
 
-struct _Ufficio
+struct _OrganigrammaUfficio
        {
                GObject parent;
        };
 
-struct _UfficioClass
+struct _OrganigrammaUfficioClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType ufficio_get_type (void) G_GNUC_CONST;
+GType organigramma_ufficio_get_type (void) G_GNUC_CONST;
 
-Ufficio *ufficio_new (OrganigrammaCommons *commons, gint id);
+OrganigrammaUfficio *organigramma_ufficio_new (OrganigrammaCommons *commons, gint id);
 
-GtkWidget *ufficio_get_widget (Ufficio *ufficio);
+GtkWidget *organigramma_ufficio_get_widget (OrganigrammaUfficio *ufficio);
 
 
 G_END_DECLS
 
-#endif /* __UFFICIO_H__ */
+#endif /* __ORGANIGRAMMA_UFFICIO_H__ */

diff --git a/src/ufficionodo.c b/src/ufficionodo.c
index 5bd6301648d734a2f3587b5f6f889cb6935e3158..51d8d4049821aa4576b7112fdd8de38b7f69a445 100644 (file)
--- a/src/ufficionodo.c
+++ b/src/ufficionodo.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -26,41 +26,41 @@
 #include "ufficionodo.h"
 #include "nodi.h"
 
-static void ufficio_nodo_class_init (UfficioNodoClass *klass);
-static void ufficio_nodo_init (UfficioNodo *ufficio_nodo);
+static void organigramma_ufficio_nodo_class_init (OrganigrammaUfficioNodoClass *klass);
+static void organigramma_ufficio_nodo_init (OrganigrammaUfficioNodo *organigramma_ufficio_nodo);
 
-static void ufficio_nodo_carica (UfficioNodo *ufficio_nodo);
-static void ufficio_nodo_salva (UfficioNodo *ufficio_nodo);
+static void organigramma_ufficio_nodo_carica (OrganigrammaUfficioNodo *organigramma_ufficio_nodo);
+static void organigramma_ufficio_nodo_salva (OrganigrammaUfficioNodo *organigramma_ufficio_nodo);
 
-static void ufficio_nodo_carica_indirizzo (UfficioNodo *indirizzo);
+static void organigramma_ufficio_nodo_carica_indirizzo (OrganigrammaUfficioNodo *indirizzo);
 
-static gboolean ufficio_nodo_conferma_chiusura (UfficioNodo *ufficio_nodo);
+static gboolean organigramma_ufficio_nodo_conferma_chiusura (OrganigrammaUfficioNodo *organigramma_ufficio_nodo);
 
 static void indirizzo_on_nodo_selezionato (gpointer instance,
                                           guint id, gpointer user_data);
 
-static void ufficio_nodo_set_property (GObject *object,
+static void organigramma_ufficio_nodo_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void ufficio_nodo_get_property (GObject *object,
+static void organigramma_ufficio_nodo_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean ufficio_nodo_on_w_ufficio_nodo_delete_event (GtkWidget *widget,
+static gboolean organigramma_ufficio_nodo_on_w_organigramma_ufficio_nodo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void ufficio_nodo_on_btn_nodo_clicked (GtkButton *button,
+static void organigramma_ufficio_nodo_on_btn_nodo_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_nodo_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_ufficio_nodo_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_nodo_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_ufficio_nodo_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define UFFICIO_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_UFFICIO_NODO, UfficioNodoPrivate))
+#define ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_UFFICIO_NODO, OrganigrammaUfficioNodoPrivate))
 
 enum
 {
@@ -69,8 +69,8 @@ enum
        LBL_ID_NODI
 };
 
-typedef struct _UfficioNodoPrivate UfficioNodoPrivate;
-struct _UfficioNodoPrivate
+typedef struct _OrganigrammaUfficioNodoPrivate OrganigrammaUfficioNodoPrivate;
+struct _OrganigrammaUfficioNodoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -83,21 +83,21 @@ struct _UfficioNodoPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (UfficioNodo, ufficio_nodo, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaUfficioNodo, organigramma_ufficio_nodo, G_TYPE_OBJECT)
 
 static void
-ufficio_nodo_class_init (UfficioNodoClass *klass)
+organigramma_ufficio_nodo_class_init (OrganigrammaUfficioNodoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (UfficioNodoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaUfficioNodoPrivate));
 
-       object_class->set_property = ufficio_nodo_set_property;
-       object_class->get_property = ufficio_nodo_get_property;
+       object_class->set_property = organigramma_ufficio_nodo_set_property;
+       object_class->get_property = organigramma_ufficio_nodo_get_property;
 
        /**
-        * UfficioNodo::aggiornato:
-        * @ufficio_nodo:
+        * OrganigrammaUfficioNodo::aggiornato:
+        * @organigramma_ufficio_nodo:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -112,34 +112,34 @@ ufficio_nodo_class_init (UfficioNodoClass *klass)
 }
 
 static void
-ufficio_nodo_init (UfficioNodo *ufficio_nodo)
+organigramma_ufficio_nodo_init (OrganigrammaUfficioNodo *organigramma_ufficio_nodo)
 {
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ufficio_nodo);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (organigramma_ufficio_nodo);
 }
 
 /**
- * ufficio_nodo_new:
+ * organigramma_ufficio_nodo_new:
  * @commons:
  * @id:
  * @id_uffici:
  *
- * Returns: the newly created #UfficioNodo object.
+ * Returns: the newly created #OrganigrammaUfficioNodo object.
  */
-UfficioNodo
-*ufficio_nodo_new (OrganigrammaCommons *commons, guint id, guint id_uffici)
+OrganigrammaUfficioNodo
+*organigramma_ufficio_nodo_new (OrganigrammaCommons *commons, guint id, guint id_uffici)
 {
        GError *error;
 
-       UfficioNodo *a = UFFICIO_NODO (g_object_new (ufficio_nodo_get_type (), NULL));
+       OrganigrammaUfficioNodo *a = ORGANIGRAMMA_UFFICIO_NODO (g_object_new (organigramma_ufficio_nodo_get_type (), NULL));
 
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (a);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("w_ufficio_nodo", "|", -1),
+                                          g_strsplit ("w_organigramma_ufficio_nodo", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -149,9 +149,9 @@ UfficioNodo
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "ufficio_nodo.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_ufficio_nodo.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_ufficio_nodo"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_ufficio_nodo"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label38",
@@ -160,15 +160,15 @@ UfficioNodo
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (ufficio_nodo_on_w_ufficio_nodo_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_ufficio_nodo_on_w_organigramma_ufficio_nodo_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button44")),
-                         "clicked", G_CALLBACK (ufficio_nodo_on_btn_nodo_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_nodo_on_btn_nodo_clicked), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button45")),
-                         "clicked", G_CALLBACK (ufficio_nodo_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_nodo_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button46")),
-                         "clicked", G_CALLBACK (ufficio_nodo_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_nodo_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -182,33 +182,33 @@ UfficioNodo
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       ufficio_nodo_carica (a);
+                       organigramma_ufficio_nodo_carica (a);
                }
 
        return a;
 }
 
 /**
- * ufficio_nodo_get_widget:
- * @ufficio_nodo:
+ * organigramma_ufficio_nodo_get_widget:
+ * @organigramma_ufficio_nodo:
  *
  */
 GtkWidget
-*ufficio_nodo_get_widget (UfficioNodo *ufficio_nodo)
+*organigramma_ufficio_nodo_get_widget (OrganigrammaUfficioNodo *organigramma_ufficio_nodo)
 {
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ufficio_nodo);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (organigramma_ufficio_nodo);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-ufficio_nodo_carica (UfficioNodo *ufficio_nodo)
+organigramma_ufficio_nodo_carica (OrganigrammaUfficioNodo *organigramma_ufficio_nodo)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ufficio_nodo);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (organigramma_ufficio_nodo);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -216,14 +216,14 @@ ufficio_nodo_carica (UfficioNodo *ufficio_nodo)
 }
 
 static void
-ufficio_nodo_salva (UfficioNodo *ufficio_nodo)
+organigramma_ufficio_nodo_salva (OrganigrammaUfficioNodo *organigramma_ufficio_nodo)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       UfficioNodoClass *klass = UFFICIO_NODO_GET_CLASS (ufficio_nodo);
+       OrganigrammaUfficioNodoClass *klass = ORGANIGRAMMA_UFFICIO_NODO_GET_CLASS (organigramma_ufficio_nodo);
 
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ufficio_nodo);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (organigramma_ufficio_nodo);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -241,7 +241,7 @@ ufficio_nodo_salva (UfficioNodo *ufficio_nodo)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (ufficio_nodo, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_ufficio_nodo, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -271,21 +271,21 @@ ufficio_nodo_salva (UfficioNodo *ufficio_nodo)
 }
 
 static void
-ufficio_nodo_on_nodo_selezionato (gpointer instance, guint id, gpointer user_data)
+organigramma_ufficio_nodo_on_nodo_selezionato (gpointer instance, guint id, gpointer user_data)
 {
-       UfficioNodo *ia = (UfficioNodo *)user_data;
+       OrganigrammaUfficioNodo *ia = (OrganigrammaUfficioNodo *)user_data;
 
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ia);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (ia);
 
        gtk_form_widget_set_value_stringify (gtk_form_get_form_widget_from_name (priv->form, "label37"), g_strdup_printf ("%d", id));
 }
 
 static void
-ufficio_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_ufficio_nodo_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       UfficioNodo *ufficio_nodo = UFFICIO_NODO (object);
+       OrganigrammaUfficioNodo *organigramma_ufficio_nodo = ORGANIGRAMMA_UFFICIO_NODO (object);
 
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ufficio_nodo);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (organigramma_ufficio_nodo);
 
        switch (property_id)
                {
@@ -296,11 +296,11 @@ ufficio_nodo_set_property (GObject *object, guint property_id, const GValue *val
 }
 
 static void
-ufficio_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_ufficio_nodo_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       UfficioNodo *ufficio_nodo = UFFICIO_NODO (object);
+       OrganigrammaUfficioNodo *organigramma_ufficio_nodo = ORGANIGRAMMA_UFFICIO_NODO (object);
 
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ufficio_nodo);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (organigramma_ufficio_nodo);
 
        switch (property_id)
                {
@@ -311,13 +311,13 @@ ufficio_nodo_get_property (GObject *object, guint property_id, GValue *value, GP
 }
 
 static gboolean
-ufficio_nodo_conferma_chiusura (UfficioNodo *ufficio_nodo)
+organigramma_ufficio_nodo_conferma_chiusura (OrganigrammaUfficioNodo *organigramma_ufficio_nodo)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ufficio_nodo);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (organigramma_ufficio_nodo);
 
        ret = TRUE;
 
@@ -340,46 +340,46 @@ ufficio_nodo_conferma_chiusura (UfficioNodo *ufficio_nodo)
 
 /* CALLBACK */
 static gboolean
-ufficio_nodo_on_w_ufficio_nodo_delete_event (GtkWidget *widget,
+organigramma_ufficio_nodo_on_w_organigramma_ufficio_nodo_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !ufficio_nodo_conferma_chiusura ((UfficioNodo *)user_data);
+       return !organigramma_ufficio_nodo_conferma_chiusura ((OrganigrammaUfficioNodo *)user_data);
 }
 
 static void
-ufficio_nodo_on_btn_nodo_clicked (GtkButton *button,
-                                    gpointer user_data)                                  
+organigramma_ufficio_nodo_on_btn_nodo_clicked (GtkButton *button,
+                                    gpointer user_data)
 {
        GtkWidget *w;
 
-       UfficioNodo *ia = (UfficioNodo *)user_data;
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ia);
+       OrganigrammaUfficioNodo *ia = (OrganigrammaUfficioNodo *)user_data;
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (ia);
 
-       Nodi *n = nodi_new (priv->commons, TRUE);
+       OrganigrammaNodi *n = organigramma_nodi_new (priv->commons, TRUE);
 
        g_signal_connect (G_OBJECT (n), "selezionato",
-                         G_CALLBACK (ufficio_nodo_on_nodo_selezionato), (gpointer)ia);
+                         G_CALLBACK (organigramma_ufficio_nodo_on_nodo_selezionato), user_data);
 
-       w = nodi_get_widget (n);
+       w = organigramma_nodi_get_widget (n);
        gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (priv->w));
        gtk_widget_show (w);
 }
 
 static void
-ufficio_nodo_on_btn_annulla_clicked (GtkButton *button,
+organigramma_ufficio_nodo_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       UfficioNodo *ufficio_nodo = (UfficioNodo *)user_data;
+       OrganigrammaUfficioNodo *organigramma_ufficio_nodo = (OrganigrammaUfficioNodo *)user_data;
 
-       UfficioNodoPrivate *priv = UFFICIO_NODO_GET_PRIVATE (ufficio_nodo);
+       OrganigrammaUfficioNodoPrivate *priv = ORGANIGRAMMA_UFFICIO_NODO_GET_PRIVATE (organigramma_ufficio_nodo);
 
-       if (ufficio_nodo_conferma_chiusura (ufficio_nodo)) gtk_widget_destroy (priv->w);
+       if (organigramma_ufficio_nodo_conferma_chiusura (organigramma_ufficio_nodo)) gtk_widget_destroy (priv->w);
 }
 
 static void
-ufficio_nodo_on_btn_salva_clicked (GtkButton *button,
+organigramma_ufficio_nodo_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       ufficio_nodo_salva ((UfficioNodo *)user_data);
+       organigramma_ufficio_nodo_salva ((OrganigrammaUfficioNodo *)user_data);
 }

diff --git a/src/ufficionodo.h b/src/ufficionodo.h
index b59067b0434346c03459aeae96d011ae84164875..14d930d2c3fc940c4d14e079d72eb77e5393d63a 100644 (file)
--- a/src/ufficionodo.h
+++ b/src/ufficionodo.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __UFFICIO_NODO_H__
-#define __UFFICIO_NODO_H__
+#ifndef __ORGANIGRAMMA_UFFICIO_NODO_H__
+#define __ORGANIGRAMMA_UFFICIO_NODO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_UFFICIO_NODO                 (ufficio_nodo_get_type ())
-#define UFFICIO_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UFFICIO_NODO, UfficioNodo))
-#define UFFICIO_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_UFFICIO_NODO, UfficioNodoClass))
-#define IS_UFFICIO_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UFFICIO_NODO))
-#define IS_UFFICIO_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_UFFICIO_NODO))
-#define UFFICIO_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_UFFICIO_NODO, UfficioNodoClass))
+#define TYPE_ORGANIGRAMMA_UFFICIO_NODO                 (organigramma_ufficio_nodo_get_type ())
+#define ORGANIGRAMMA_UFFICIO_NODO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_UFFICIO_NODO, OrganigrammaUfficioNodo))
+#define ORGANIGRAMMA_UFFICIO_NODO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_UFFICIO_NODO, OrganigrammaUfficioNodoClass))
+#define IS_ORGANIGRAMMA_UFFICIO_NODO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_UFFICIO_NODO))
+#define IS_ORGANIGRAMMA_UFFICIO_NODO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_UFFICIO_NODO))
+#define ORGANIGRAMMA_UFFICIO_NODO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_UFFICIO_NODO, OrganigrammaUfficioNodoClass))
 
 
-typedef struct _UfficioNodo UfficioNodo;
-typedef struct _UfficioNodoClass UfficioNodoClass;
+typedef struct _OrganigrammaUfficioNodo OrganigrammaUfficioNodo;
+typedef struct _OrganigrammaUfficioNodoClass OrganigrammaUfficioNodoClass;
 
-struct _UfficioNodo
+struct _OrganigrammaUfficioNodo
        {
                GObject parent;
        };
 
-struct _UfficioNodoClass
+struct _OrganigrammaUfficioNodoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType ufficio_nodo_get_type (void) G_GNUC_CONST;
+GType organigramma_ufficio_nodo_get_type (void) G_GNUC_CONST;
 
-UfficioNodo *ufficio_nodo_new (OrganigrammaCommons *commons, guint id, guint id_uffici);
+OrganigrammaUfficioNodo *organigramma_ufficio_nodo_new (OrganigrammaCommons *commons, guint id, guint id_uffici);
 
-GtkWidget *ufficio_nodo_get_widget (UfficioNodo *ufficio_nodo);
+GtkWidget *organigramma_ufficio_nodo_get_widget (OrganigrammaUfficioNodo *organigramma_ufficio_nodo);
 
 
 G_END_DECLS
 
-#endif /* __UFFICIO_NODO_H__ */
+#endif /* __ORGANIGRAMMA_UFFICIO_NODO_H__ */

diff --git a/src/ufficioorario.c b/src/ufficioorario.c
index 12ec163af034f9c3af8df4c8491a7b38e38c88d4..444960f65acdbb0689be0d7a90ab46ca977769b1 100644 (file)
--- a/src/ufficioorario.c
+++ b/src/ufficioorario.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -25,34 +25,34 @@
 
 #include "ufficioorario.h"
 
-static void ufficio_orario_class_init (UfficioOrarioClass *klass);
-static void ufficio_orario_init (UfficioOrario *ufficio_orario);
+static void organigramma_ufficio_orario_class_init (OrganigrammaUfficioOrarioClass *klass);
+static void organigramma_ufficio_orario_init (OrganigrammaUfficioOrario *organigramma_ufficio_orario);
 
-static void ufficio_orario_carica (UfficioOrario *ufficio_orario);
-static void ufficio_orario_salva (UfficioOrario *ufficio_orario);
+static void organigramma_ufficio_orario_carica (OrganigrammaUfficioOrario *organigramma_ufficio_orario);
+static void organigramma_ufficio_orario_salva (OrganigrammaUfficioOrario *organigramma_ufficio_orario);
 
-static gboolean ufficio_orario_conferma_chiusura (UfficioOrario *ufficio_orario);
+static gboolean organigramma_ufficio_orario_conferma_chiusura (OrganigrammaUfficioOrario *organigramma_ufficio_orario);
 
-static void ufficio_orario_set_property (GObject *object,
+static void organigramma_ufficio_orario_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void ufficio_orario_get_property (GObject *object,
+static void organigramma_ufficio_orario_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean ufficio_orario_on_w_ufficio_orario_delete_event (GtkWidget *widget,
+static gboolean organigramma_ufficio_orario_on_w_organigramma_ufficio_orario_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void ufficio_orario_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_ufficio_orario_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_orario_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_ufficio_orario_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define UFFICIO_ORARIO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_UFFICIO_ORARIO, UfficioOrarioPrivate))
+#define ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_UFFICIO_ORARIO, OrganigrammaUfficioOrarioPrivate))
 
 enum
 {
@@ -60,8 +60,8 @@ enum
        LBL_ID_UFFICI
 };
 
-typedef struct _UfficioOrarioPrivate UfficioOrarioPrivate;
-struct _UfficioOrarioPrivate
+typedef struct _OrganigrammaUfficioOrarioPrivate OrganigrammaUfficioOrarioPrivate;
+struct _OrganigrammaUfficioOrarioPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -74,21 +74,21 @@ struct _UfficioOrarioPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (UfficioOrario, ufficio_orario, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaUfficioOrario, organigramma_ufficio_orario, G_TYPE_OBJECT)
 
 static void
-ufficio_orario_class_init (UfficioOrarioClass *klass)
+organigramma_ufficio_orario_class_init (OrganigrammaUfficioOrarioClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (UfficioOrarioPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaUfficioOrarioPrivate));
 
-       object_class->set_property = ufficio_orario_set_property;
-       object_class->get_property = ufficio_orario_get_property;
+       object_class->set_property = organigramma_ufficio_orario_set_property;
+       object_class->get_property = organigramma_ufficio_orario_get_property;
 
        /**
-        * UfficioOrario::aggiornato:
-        * @ufficio_orario:
+        * OrganigrammaUfficioOrario::aggiornato:
+        * @organigramma_ufficio_orario:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -103,34 +103,34 @@ ufficio_orario_class_init (UfficioOrarioClass *klass)
 }
 
 static void
-ufficio_orario_init (UfficioOrario *ufficio_orario)
+organigramma_ufficio_orario_init (OrganigrammaUfficioOrario *organigramma_ufficio_orario)
 {
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (ufficio_orario);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (organigramma_ufficio_orario);
 }
 
 /**
- * ufficio_orario_new:
+ * organigramma_ufficio_orario_new:
  * @commons:
  * @id:
  * @id_uffici:
  *
- * Returns: the newly created #UfficioOrario object.
+ * Returns: the newly created #OrganigrammaUfficioOrario object.
  */
-UfficioOrario
-*ufficio_orario_new (OrganigrammaCommons *commons, guint id, guint id_uffici)
+OrganigrammaUfficioOrario
+*organigramma_ufficio_orario_new (OrganigrammaCommons *commons, guint id, guint id_uffici)
 {
        GError *error;
 
-       UfficioOrario *a = UFFICIO_ORARIO (g_object_new (ufficio_orario_get_type (), NULL));
+       OrganigrammaUfficioOrario *a = ORGANIGRAMMA_UFFICIO_ORARIO (g_object_new (organigramma_ufficio_orario_get_type (), NULL));
 
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (a);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("adj_week|adj_dmon|lstore_mesi|w_ufficio_orario", "|", -1),
+                                          g_strsplit ("adj_week|adj_dmon|lstore_mesi|w_organigramma_ufficio_orario", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -140,9 +140,9 @@ UfficioOrario
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "ufficio_orario.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_ufficio_orario.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_ufficio_orario"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_ufficio_orario"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label52",
@@ -150,12 +150,12 @@ UfficioOrario
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (ufficio_orario_on_w_ufficio_orario_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_ufficio_orario_on_w_organigramma_ufficio_orario_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button57")),
-                         "clicked", G_CALLBACK (ufficio_orario_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_orario_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button58")),
-                         "clicked", G_CALLBACK (ufficio_orario_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_orario_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -169,33 +169,33 @@ UfficioOrario
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       ufficio_orario_carica (a);
+                       organigramma_ufficio_orario_carica (a);
                }
 
        return a;
 }
 
 /**
- * ufficio_orario_get_widget:
- * @ufficio_orario:
+ * organigramma_ufficio_orario_get_widget:
+ * @organigramma_ufficio_orario:
  *
  */
 GtkWidget
-*ufficio_orario_get_widget (UfficioOrario *ufficio_orario)
+*organigramma_ufficio_orario_get_widget (OrganigrammaUfficioOrario *organigramma_ufficio_orario)
 {
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (ufficio_orario);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (organigramma_ufficio_orario);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-ufficio_orario_carica (UfficioOrario *ufficio_orario)
+organigramma_ufficio_orario_carica (OrganigrammaUfficioOrario *organigramma_ufficio_orario)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (ufficio_orario);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (organigramma_ufficio_orario);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -203,14 +203,14 @@ ufficio_orario_carica (UfficioOrario *ufficio_orario)
 }
 
 static void
-ufficio_orario_salva (UfficioOrario *ufficio_orario)
+organigramma_ufficio_orario_salva (OrganigrammaUfficioOrario *organigramma_ufficio_orario)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       UfficioOrarioClass *klass = UFFICIO_ORARIO_GET_CLASS (ufficio_orario);
+       OrganigrammaUfficioOrarioClass *klass = ORGANIGRAMMA_UFFICIO_ORARIO_GET_CLASS (organigramma_ufficio_orario);
 
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (ufficio_orario);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (organigramma_ufficio_orario);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -228,7 +228,7 @@ ufficio_orario_salva (UfficioOrario *ufficio_orario)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (ufficio_orario, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_ufficio_orario, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -258,11 +258,11 @@ ufficio_orario_salva (UfficioOrario *ufficio_orario)
 }
 
 static void
-ufficio_orario_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_ufficio_orario_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       UfficioOrario *ufficio_orario = UFFICIO_ORARIO (object);
+       OrganigrammaUfficioOrario *organigramma_ufficio_orario = ORGANIGRAMMA_UFFICIO_ORARIO (object);
 
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (ufficio_orario);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (organigramma_ufficio_orario);
 
        switch (property_id)
                {
@@ -273,11 +273,11 @@ ufficio_orario_set_property (GObject *object, guint property_id, const GValue *v
 }
 
 static void
-ufficio_orario_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_ufficio_orario_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       UfficioOrario *ufficio_orario = UFFICIO_ORARIO (object);
+       OrganigrammaUfficioOrario *organigramma_ufficio_orario = ORGANIGRAMMA_UFFICIO_ORARIO (object);
 
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (ufficio_orario);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (organigramma_ufficio_orario);
 
        switch (property_id)
                {
@@ -288,13 +288,13 @@ ufficio_orario_get_property (GObject *object, guint property_id, GValue *value,
 }
 
 static gboolean
-ufficio_orario_conferma_chiusura (UfficioOrario *ufficio_orario)
+organigramma_ufficio_orario_conferma_chiusura (OrganigrammaUfficioOrario *organigramma_ufficio_orario)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (ufficio_orario);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (organigramma_ufficio_orario);
 
        ret = TRUE;
 
@@ -317,27 +317,27 @@ ufficio_orario_conferma_chiusura (UfficioOrario *ufficio_orario)
 
 /* CALLBACK */
 static gboolean
-ufficio_orario_on_w_ufficio_orario_delete_event (GtkWidget *widget,
+organigramma_ufficio_orario_on_w_organigramma_ufficio_orario_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !ufficio_orario_conferma_chiusura ((UfficioOrario *)user_data);
+       return !organigramma_ufficio_orario_conferma_chiusura ((OrganigrammaUfficioOrario *)user_data);
 }
 
 static void
-ufficio_orario_on_btn_annulla_clicked (GtkButton *button,
+organigramma_ufficio_orario_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       UfficioOrario *ufficio_orario = (UfficioOrario *)user_data;
+       OrganigrammaUfficioOrario *organigramma_ufficio_orario = (OrganigrammaUfficioOrario *)user_data;
 
-       UfficioOrarioPrivate *priv = UFFICIO_ORARIO_GET_PRIVATE (ufficio_orario);
+       OrganigrammaUfficioOrarioPrivate *priv = ORGANIGRAMMA_UFFICIO_ORARIO_GET_PRIVATE (organigramma_ufficio_orario);
 
-       if (ufficio_orario_conferma_chiusura (ufficio_orario)) gtk_widget_destroy (priv->w);
+       if (organigramma_ufficio_orario_conferma_chiusura (organigramma_ufficio_orario)) gtk_widget_destroy (priv->w);
 }
 
 static void
-ufficio_orario_on_btn_salva_clicked (GtkButton *button,
+organigramma_ufficio_orario_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       ufficio_orario_salva ((UfficioOrario *)user_data);
+       organigramma_ufficio_orario_salva ((OrganigrammaUfficioOrario *)user_data);
 }

diff --git a/src/ufficioorario.h b/src/ufficioorario.h
index 0707368ee3b6b936963a9ba815a6a24e666a0cd8..3868b45b481718f7e3379cbe8876407c2a318c6c 100644 (file)
--- a/src/ufficioorario.h
+++ b/src/ufficioorario.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __UFFICIO_ORARIO_H__
-#define __UFFICIO_ORARIO_H__
+#ifndef __ORGANIGRAMMA_UFFICIO_ORARIO_H__
+#define __ORGANIGRAMMA_UFFICIO_ORARIO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_UFFICIO_ORARIO                 (ufficio_orario_get_type ())
-#define UFFICIO_ORARIO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UFFICIO_ORARIO, UfficioOrario))
-#define UFFICIO_ORARIO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_UFFICIO_ORARIO, UfficioOrarioClass))
-#define IS_UFFICIO_ORARIO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UFFICIO_ORARIO))
-#define IS_UFFICIO_ORARIO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_UFFICIO_ORARIO))
-#define UFFICIO_ORARIO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_UFFICIO_ORARIO, UfficioOrarioClass))
+#define TYPE_ORGANIGRAMMA_UFFICIO_ORARIO                 (organigramma_ufficio_orario_get_type ())
+#define ORGANIGRAMMA_UFFICIO_ORARIO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_UFFICIO_ORARIO, OrganigrammaUfficioOrario))
+#define ORGANIGRAMMA_UFFICIO_ORARIO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_UFFICIO_ORARIO, OrganigrammaUfficioOrarioClass))
+#define IS_ORGANIGRAMMA_UFFICIO_ORARIO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_UFFICIO_ORARIO))
+#define IS_ORGANIGRAMMA_UFFICIO_ORARIO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_UFFICIO_ORARIO))
+#define ORGANIGRAMMA_UFFICIO_ORARIO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_UFFICIO_ORARIO, OrganigrammaUfficioOrarioClass))
 
 
-typedef struct _UfficioOrario UfficioOrario;
-typedef struct _UfficioOrarioClass UfficioOrarioClass;
+typedef struct _OrganigrammaUfficioOrario OrganigrammaUfficioOrario;
+typedef struct _OrganigrammaUfficioOrarioClass OrganigrammaUfficioOrarioClass;
 
-struct _UfficioOrario
+struct _OrganigrammaUfficioOrario
        {
                GObject parent;
        };
 
-struct _UfficioOrarioClass
+struct _OrganigrammaUfficioOrarioClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType ufficio_orario_get_type (void) G_GNUC_CONST;
+GType organigramma_ufficio_orario_get_type (void) G_GNUC_CONST;
 
-UfficioOrario *ufficio_orario_new (OrganigrammaCommons *commons, guint id, guint id_uffici);
+OrganigrammaUfficioOrario *organigramma_ufficio_orario_new (OrganigrammaCommons *commons, guint id, guint id_uffici);
 
-GtkWidget *ufficio_orario_get_widget (UfficioOrario *ufficio_orario);
+GtkWidget *organigramma_ufficio_orario_get_widget (OrganigrammaUfficioOrario *organigramma_ufficio_orario);
 
 
 G_END_DECLS
 
-#endif /* __UFFICIO_ORARIO_H__ */
+#endif /* __ORGANIGRAMMA_UFFICIO_ORARIO_H__ */

diff --git a/src/ufficiorecapito.c b/src/ufficiorecapito.c
index f24aa2ed68c1308ff252ace460de05dbc9662344..82b41f93f4d35c2e941aa91fbf8443237506f44b 100644 (file)
--- a/src/ufficiorecapito.c
+++ b/src/ufficiorecapito.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -25,34 +25,34 @@
 
 #include "ufficiorecapito.h"
 
-static void ufficio_recapito_class_init (UfficioRecapitoClass *klass);
-static void ufficio_recapito_init (UfficioRecapito *ufficio_recapito);
+static void organigramma_ufficio_recapito_class_init (OrganigrammaUfficioRecapitoClass *klass);
+static void organigramma_ufficio_recapito_init (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito);
 
-static void ufficio_recapito_carica (UfficioRecapito *ufficio_recapito);
-static void ufficio_recapito_salva (UfficioRecapito *ufficio_recapito);
+static void organigramma_ufficio_recapito_carica (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito);
+static void organigramma_ufficio_recapito_salva (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito);
 
-static gboolean ufficio_recapito_conferma_chiusura (UfficioRecapito *ufficio_recapito);
+static gboolean organigramma_ufficio_recapito_conferma_chiusura (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito);
 
-static void ufficio_recapito_set_property (GObject *object,
+static void organigramma_ufficio_recapito_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void ufficio_recapito_get_property (GObject *object,
+static void organigramma_ufficio_recapito_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean ufficio_recapito_on_w_ufficio_recapito_delete_event (GtkWidget *widget,
+static gboolean organigramma_ufficio_recapito_on_w_organigramma_ufficio_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define UFFICIO_RECAPITO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_UFFICIO_RECAPITO, UfficioRecapitoPrivate))
+#define ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_UFFICIO_RECAPITO, OrganigrammaUfficioRecapitoPrivate))
 
 enum
 {
@@ -60,8 +60,8 @@ enum
        LBL_ID_UFFICI
 };
 
-typedef struct _UfficioRecapitoPrivate UfficioRecapitoPrivate;
-struct _UfficioRecapitoPrivate
+typedef struct _OrganigrammaUfficioRecapitoPrivate OrganigrammaUfficioRecapitoPrivate;
+struct _OrganigrammaUfficioRecapitoPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -74,21 +74,21 @@ struct _UfficioRecapitoPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (UfficioRecapito, ufficio_recapito, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaUfficioRecapito, organigramma_ufficio_recapito, G_TYPE_OBJECT)
 
 static void
-ufficio_recapito_class_init (UfficioRecapitoClass *klass)
+organigramma_ufficio_recapito_class_init (OrganigrammaUfficioRecapitoClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (UfficioRecapitoPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaUfficioRecapitoPrivate));
 
-       object_class->set_property = ufficio_recapito_set_property;
-       object_class->get_property = ufficio_recapito_get_property;
+       object_class->set_property = organigramma_ufficio_recapito_set_property;
+       object_class->get_property = organigramma_ufficio_recapito_get_property;
 
        /**
-        * UfficioRecapito::aggiornato:
-        * @ufficio_recapito:
+        * OrganigrammaUfficioRecapito::aggiornato:
+        * @organigramma_ufficio_recapito:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -103,34 +103,34 @@ ufficio_recapito_class_init (UfficioRecapitoClass *klass)
 }
 
 static void
-ufficio_recapito_init (UfficioRecapito *ufficio_recapito)
+organigramma_ufficio_recapito_init (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito)
 {
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (ufficio_recapito);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_recapito);
 }
 
 /**
- * ufficio_recapito_new:
+ * organigramma_ufficio_recapito_new:
  * @commons:
  * @id:
  * @id_uffici:
  *
- * Returns: the newly created #UfficioRecapito object.
+ * Returns: the newly created #OrganigrammaUfficioRecapito object.
  */
-UfficioRecapito
-*ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_uffici)
+OrganigrammaUfficioRecapito
+*organigramma_ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_uffici)
 {
        GError *error;
 
-       UfficioRecapito *a = UFFICIO_RECAPITO (g_object_new (ufficio_recapito_get_type (), NULL));
+       OrganigrammaUfficioRecapito *a = ORGANIGRAMMA_UFFICIO_RECAPITO (g_object_new (organigramma_ufficio_recapito_get_type (), NULL));
 
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (a);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("lstore_tipi_recapito|w_ufficio_recapito", "|", -1),
+                                          g_strsplit ("lstore_tipi_recapito|w_organigramma_ufficio_recapito", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -140,9 +140,9 @@ UfficioRecapito
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "ufficio_recapito.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_ufficio_recapito.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_ufficio_recapito"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_ufficio_recapito"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label41",
@@ -150,12 +150,12 @@ UfficioRecapito
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (ufficio_recapito_on_w_ufficio_recapito_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_ufficio_recapito_on_w_organigramma_ufficio_recapito_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button48")),
-                         "clicked", G_CALLBACK (ufficio_recapito_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_recapito_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button49")),
-                         "clicked", G_CALLBACK (ufficio_recapito_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_recapito_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -169,33 +169,33 @@ UfficioRecapito
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       ufficio_recapito_carica (a);
+                       organigramma_ufficio_recapito_carica (a);
                }
 
        return a;
 }
 
 /**
- * ufficio_recapito_get_widget:
- * @ufficio_recapito:
+ * organigramma_ufficio_recapito_get_widget:
+ * @organigramma_ufficio_recapito:
  *
  */
 GtkWidget
-*ufficio_recapito_get_widget (UfficioRecapito *ufficio_recapito)
+*organigramma_ufficio_recapito_get_widget (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito)
 {
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (ufficio_recapito);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_recapito);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-ufficio_recapito_carica (UfficioRecapito *ufficio_recapito)
+organigramma_ufficio_recapito_carica (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (ufficio_recapito);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_recapito);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -203,14 +203,14 @@ ufficio_recapito_carica (UfficioRecapito *ufficio_recapito)
 }
 
 static void
-ufficio_recapito_salva (UfficioRecapito *ufficio_recapito)
+organigramma_ufficio_recapito_salva (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       UfficioRecapitoClass *klass = UFFICIO_RECAPITO_GET_CLASS (ufficio_recapito);
+       OrganigrammaUfficioRecapitoClass *klass = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_CLASS (organigramma_ufficio_recapito);
 
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (ufficio_recapito);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_recapito);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -228,7 +228,7 @@ ufficio_recapito_salva (UfficioRecapito *ufficio_recapito)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (ufficio_recapito, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_ufficio_recapito, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -258,11 +258,11 @@ ufficio_recapito_salva (UfficioRecapito *ufficio_recapito)
 }
 
 static void
-ufficio_recapito_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_ufficio_recapito_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       UfficioRecapito *ufficio_recapito = UFFICIO_RECAPITO (object);
+       OrganigrammaUfficioRecapito *organigramma_ufficio_recapito = ORGANIGRAMMA_UFFICIO_RECAPITO (object);
 
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (ufficio_recapito);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_recapito);
 
        switch (property_id)
                {
@@ -273,11 +273,11 @@ ufficio_recapito_set_property (GObject *object, guint property_id, const GValue
 }
 
 static void
-ufficio_recapito_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_ufficio_recapito_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       UfficioRecapito *ufficio_recapito = UFFICIO_RECAPITO (object);
+       OrganigrammaUfficioRecapito *organigramma_ufficio_recapito = ORGANIGRAMMA_UFFICIO_RECAPITO (object);
 
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (ufficio_recapito);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_recapito);
 
        switch (property_id)
                {
@@ -288,13 +288,13 @@ ufficio_recapito_get_property (GObject *object, guint property_id, GValue *value
 }
 
 static gboolean
-ufficio_recapito_conferma_chiusura (UfficioRecapito *ufficio_recapito)
+organigramma_ufficio_recapito_conferma_chiusura (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (ufficio_recapito);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_recapito);
 
        ret = TRUE;
 
@@ -317,27 +317,27 @@ ufficio_recapito_conferma_chiusura (UfficioRecapito *ufficio_recapito)
 
 /* CALLBACK */
 static gboolean
-ufficio_recapito_on_w_ufficio_recapito_delete_event (GtkWidget *widget,
+organigramma_ufficio_recapito_on_w_organigramma_ufficio_recapito_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !ufficio_recapito_conferma_chiusura ((UfficioRecapito *)user_data);
+       return !organigramma_ufficio_recapito_conferma_chiusura ((OrganigrammaUfficioRecapito *)user_data);
 }
 
 static void
-ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
+organigramma_ufficio_recapito_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       UfficioRecapito *ufficio_recapito = (UfficioRecapito *)user_data;
+       OrganigrammaUfficioRecapito *organigramma_ufficio_recapito = (OrganigrammaUfficioRecapito *)user_data;
 
-       UfficioRecapitoPrivate *priv = UFFICIO_RECAPITO_GET_PRIVATE (ufficio_recapito);
+       OrganigrammaUfficioRecapitoPrivate *priv = ORGANIGRAMMA_UFFICIO_RECAPITO_GET_PRIVATE (organigramma_ufficio_recapito);
 
-       if (ufficio_recapito_conferma_chiusura (ufficio_recapito)) gtk_widget_destroy (priv->w);
+       if (organigramma_ufficio_recapito_conferma_chiusura (organigramma_ufficio_recapito)) gtk_widget_destroy (priv->w);
 }
 
 static void
-ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
+organigramma_ufficio_recapito_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       ufficio_recapito_salva ((UfficioRecapito *)user_data);
+       organigramma_ufficio_recapito_salva ((OrganigrammaUfficioRecapito *)user_data);
 }

diff --git a/src/ufficiorecapito.h b/src/ufficiorecapito.h
index dae9338a00e333b9b94e9f2f2fd89d8138a1ed19..bad2a73c6453ca1f870d338058318649062cf0b5 100644 (file)
--- a/src/ufficiorecapito.h
+++ b/src/ufficiorecapito.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __UFFICIO_RECAPITO_H__
-#define __UFFICIO_RECAPITO_H__
+#ifndef __ORGANIGRAMMA_UFFICIO_RECAPITO_H__
+#define __ORGANIGRAMMA_UFFICIO_RECAPITO_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_UFFICIO_RECAPITO                 (ufficio_recapito_get_type ())
-#define UFFICIO_RECAPITO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UFFICIO_RECAPITO, UfficioRecapito))
-#define UFFICIO_RECAPITO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_UFFICIO_RECAPITO, UfficioRecapitoClass))
-#define IS_UFFICIO_RECAPITO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UFFICIO_RECAPITO))
-#define IS_UFFICIO_RECAPITO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_UFFICIO_RECAPITO))
-#define UFFICIO_RECAPITO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_UFFICIO_RECAPITO, UfficioRecapitoClass))
+#define TYPE_ORGANIGRAMMA_UFFICIO_RECAPITO                 (organigramma_ufficio_recapito_get_type ())
+#define ORGANIGRAMMA_UFFICIO_RECAPITO(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_UFFICIO_RECAPITO, OrganigrammaUfficioRecapito))
+#define ORGANIGRAMMA_UFFICIO_RECAPITO_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_UFFICIO_RECAPITO, OrganigrammaUfficioRecapitoClass))
+#define IS_ORGANIGRAMMA_UFFICIO_RECAPITO(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_UFFICIO_RECAPITO))
+#define IS_ORGANIGRAMMA_UFFICIO_RECAPITO_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_UFFICIO_RECAPITO))
+#define ORGANIGRAMMA_UFFICIO_RECAPITO_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_UFFICIO_RECAPITO, OrganigrammaUfficioRecapitoClass))
 
 
-typedef struct _UfficioRecapito UfficioRecapito;
-typedef struct _UfficioRecapitoClass UfficioRecapitoClass;
+typedef struct _OrganigrammaUfficioRecapito OrganigrammaUfficioRecapito;
+typedef struct _OrganigrammaUfficioRecapitoClass OrganigrammaUfficioRecapitoClass;
 
-struct _UfficioRecapito
+struct _OrganigrammaUfficioRecapito
        {
                GObject parent;
        };
 
-struct _UfficioRecapitoClass
+struct _OrganigrammaUfficioRecapitoClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType ufficio_recapito_get_type (void) G_GNUC_CONST;
+GType organigramma_ufficio_recapito_get_type (void) G_GNUC_CONST;
 
-UfficioRecapito *ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_uffici);
+OrganigrammaUfficioRecapito *organigramma_ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_uffici);
 
-GtkWidget *ufficio_recapito_get_widget (UfficioRecapito *ufficio_recapito);
+GtkWidget *organigramma_ufficio_recapito_get_widget (OrganigrammaUfficioRecapito *organigramma_ufficio_recapito);
 
 
 G_END_DECLS
 
-#endif /* __UFFICIO_RECAPITO_H__ */
+#endif /* __ORGANIGRAMMA_UFFICIO_RECAPITO_H__ */

diff --git a/src/ufficiostanza.c b/src/ufficiostanza.c
index 2f073f85ee73fa8835b5557235ef31bb06a55d3f..278e4ca6bd0c359e0b6fdd63bb08892d4db1dae3 100644 (file)
--- a/src/ufficiostanza.c
+++ b/src/ufficiostanza.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -25,34 +25,34 @@
 
 #include "ufficiostanza.h"
 
-static void ufficio_stanza_class_init (UfficioStanzaClass *klass);
-static void ufficio_stanza_init (UfficioStanza *ufficio_stanza);
+static void organigramma_ufficio_stanza_class_init (OrganigrammaUfficioStanzaClass *klass);
+static void organigramma_ufficio_stanza_init (OrganigrammaUfficioStanza *organigramma_ufficio_stanza);
 
-static void ufficio_stanza_carica (UfficioStanza *ufficio_stanza);
-static void ufficio_stanza_salva (UfficioStanza *ufficio_stanza);
+static void organigramma_ufficio_stanza_carica (OrganigrammaUfficioStanza *organigramma_ufficio_stanza);
+static void organigramma_ufficio_stanza_salva (OrganigrammaUfficioStanza *organigramma_ufficio_stanza);
 
-static gboolean ufficio_stanza_conferma_chiusura (UfficioStanza *ufficio_stanza);
+static gboolean organigramma_ufficio_stanza_conferma_chiusura (OrganigrammaUfficioStanza *organigramma_ufficio_stanza);
 
-static void ufficio_stanza_set_property (GObject *object,
+static void organigramma_ufficio_stanza_set_property (GObject *object,
                                      guint property_id,
                                      const GValue *value,
                                      GParamSpec *pspec);
-static void ufficio_stanza_get_property (GObject *object,
+static void organigramma_ufficio_stanza_get_property (GObject *object,
                                      guint property_id,
                                      GValue *value,
                                      GParamSpec *pspec);
 
-static gboolean ufficio_stanza_on_w_ufficio_stanza_delete_event (GtkWidget *widget,
+static gboolean organigramma_ufficio_stanza_on_w_organigramma_ufficio_stanza_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data);
 
-static void ufficio_stanza_on_btn_annulla_clicked (GtkButton *button,
+static void organigramma_ufficio_stanza_on_btn_annulla_clicked (GtkButton *button,
                                     gpointer user_data);
-static void ufficio_stanza_on_btn_salva_clicked (GtkButton *button,
+static void organigramma_ufficio_stanza_on_btn_salva_clicked (GtkButton *button,
                                   gpointer user_data);
 
 
-#define UFFICIO_STANZA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_UFFICIO_STANZA, UfficioStanzaPrivate))
+#define ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_ORGANIGRAMMA_UFFICIO_STANZA, OrganigrammaUfficioStanzaPrivate))
 
 enum
 {
@@ -60,8 +60,8 @@ enum
        LBL_ID_UFFICI
 };
 
-typedef struct _UfficioStanzaPrivate UfficioStanzaPrivate;
-struct _UfficioStanzaPrivate
+typedef struct _OrganigrammaUfficioStanzaPrivate OrganigrammaUfficioStanzaPrivate;
+struct _OrganigrammaUfficioStanzaPrivate
        {
                OrganigrammaCommons *commons;
 
@@ -74,21 +74,21 @@ struct _UfficioStanzaPrivate
                guint id;
        };
 
-G_DEFINE_TYPE (UfficioStanza, ufficio_stanza, G_TYPE_OBJECT)
+G_DEFINE_TYPE (OrganigrammaUfficioStanza, organigramma_ufficio_stanza, G_TYPE_OBJECT)
 
 static void
-ufficio_stanza_class_init (UfficioStanzaClass *klass)
+organigramma_ufficio_stanza_class_init (OrganigrammaUfficioStanzaClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (object_class, sizeof (UfficioStanzaPrivate));
+       g_type_class_add_private (object_class, sizeof (OrganigrammaUfficioStanzaPrivate));
 
-       object_class->set_property = ufficio_stanza_set_property;
-       object_class->get_property = ufficio_stanza_get_property;
+       object_class->set_property = organigramma_ufficio_stanza_set_property;
+       object_class->get_property = organigramma_ufficio_stanza_get_property;
 
        /**
-        * UfficioStanza::aggiornato:
-        * @ufficio_stanza:
+        * OrganigrammaUfficioStanza::aggiornato:
+        * @organigramma_ufficio_stanza:
         *
         */
        klass->aggiornato_signal_id = g_signal_new ("aggiornato",
@@ -103,34 +103,34 @@ ufficio_stanza_class_init (UfficioStanzaClass *klass)
 }
 
 static void
-ufficio_stanza_init (UfficioStanza *ufficio_stanza)
+organigramma_ufficio_stanza_init (OrganigrammaUfficioStanza *organigramma_ufficio_stanza)
 {
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (ufficio_stanza);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (organigramma_ufficio_stanza);
 }
 
 /**
- * ufficio_stanza_new:
+ * organigramma_ufficio_stanza_new:
  * @commons:
  * @id:
  * @id_uffici:
  *
- * Returns: the newly created #UfficioStanza object.
+ * Returns: the newly created #OrganigrammaUfficioStanza object.
  */
-UfficioStanza
-*ufficio_stanza_new (OrganigrammaCommons *commons, guint id, guint id_uffici)
+OrganigrammaUfficioStanza
+*organigramma_ufficio_stanza_new (OrganigrammaCommons *commons, guint id, guint id_uffici)
 {
        GError *error;
 
-       UfficioStanza *a = UFFICIO_STANZA (g_object_new (ufficio_stanza_get_type (), NULL));
+       OrganigrammaUfficioStanza *a = ORGANIGRAMMA_UFFICIO_STANZA (g_object_new (organigramma_ufficio_stanza_get_type (), NULL));
 
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (a);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (a);
 
        priv->commons = commons;
 
        error = NULL;
 
        gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile,
-                                          g_strsplit ("w_ufficio_stanza", "|", -1),
+                                          g_strsplit ("w_organigramma_ufficio_stanza", "|", -1),
                                           &error);
        if (error != NULL)
                {
@@ -140,9 +140,9 @@ UfficioStanza
 
        priv->form = gtk_form_new ();
        g_object_set (G_OBJECT (priv->form), "gdaex", priv->commons->gdaex, NULL);
-       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "ufficio_stanza.form", NULL), priv->commons->gtkbuilder);
+       gtk_form_load_from_file (priv->form, g_build_filename (priv->commons->formdir, "organigramma_ufficio_stanza.form", NULL), priv->commons->gtkbuilder);
 
-       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_ufficio_stanza"));
+       priv->w = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_organigramma_ufficio_stanza"));
 
        priv->objects = gtk_form_get_objects_by_name (priv->form,
                                                      "label163",
@@ -150,12 +150,12 @@ UfficioStanza
                                                      NULL);
 
        g_signal_connect (priv->w,
-                         "delete-event", G_CALLBACK (ufficio_stanza_on_w_ufficio_stanza_delete_event), (gpointer *)a);
+                         "delete-event", G_CALLBACK (organigramma_ufficio_stanza_on_w_organigramma_ufficio_stanza_delete_event), (gpointer *)a);
 
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button138")),
-                         "clicked", G_CALLBACK (ufficio_stanza_on_btn_annulla_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_stanza_on_btn_annulla_clicked), (gpointer *)a);
        g_signal_connect (G_OBJECT (gtk_builder_get_object (priv->commons->gtkbuilder, "button139")),
-                         "clicked", G_CALLBACK (ufficio_stanza_on_btn_salva_clicked), (gpointer *)a);
+                         "clicked", G_CALLBACK (organigramma_ufficio_stanza_on_btn_salva_clicked), (gpointer *)a);
 
        priv->id = id;
        if (priv->id == 0)
@@ -169,33 +169,33 @@ UfficioStanza
                {
                        gtk_label_set_text (GTK_LABEL (priv->objects[LBL_ID]), g_strdup_printf ("%d", priv->id));
 
-                       ufficio_stanza_carica (a);
+                       organigramma_ufficio_stanza_carica (a);
                }
 
        return a;
 }
 
 /**
- * ufficio_stanza_get_widget:
- * @ufficio_stanza:
+ * organigramma_ufficio_stanza_get_widget:
+ * @organigramma_ufficio_stanza:
  *
  */
 GtkWidget
-*ufficio_stanza_get_widget (UfficioStanza *ufficio_stanza)
+*organigramma_ufficio_stanza_get_widget (OrganigrammaUfficioStanza *organigramma_ufficio_stanza)
 {
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (ufficio_stanza);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (organigramma_ufficio_stanza);
 
        return priv->w;
 }
 
 /* PRIVATE */
 static void
-ufficio_stanza_carica (UfficioStanza *ufficio_stanza)
+organigramma_ufficio_stanza_carica (OrganigrammaUfficioStanza *organigramma_ufficio_stanza)
 {
        gchar *sql;
        GdaDataModel *dm;
 
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (ufficio_stanza);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (organigramma_ufficio_stanza);
 
        if (gtk_form_fill_from_table (priv->form))
                {
@@ -203,14 +203,14 @@ ufficio_stanza_carica (UfficioStanza *ufficio_stanza)
 }
 
 static void
-ufficio_stanza_salva (UfficioStanza *ufficio_stanza)
+organigramma_ufficio_stanza_salva (OrganigrammaUfficioStanza *organigramma_ufficio_stanza)
 {
        gchar *sql;
        GtkWidget *dialog;
 
-       UfficioStanzaClass *klass = UFFICIO_STANZA_GET_CLASS (ufficio_stanza);
+       OrganigrammaUfficioStanzaClass *klass = ORGANIGRAMMA_UFFICIO_STANZA_GET_CLASS (organigramma_ufficio_stanza);
 
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (ufficio_stanza);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (organigramma_ufficio_stanza);
 
        if (!gtk_form_check (priv->form, FALSE, NULL, TRUE, priv->w, TRUE))
                {
@@ -228,7 +228,7 @@ ufficio_stanza_salva (UfficioStanza *ufficio_stanza)
 
        if (gdaex_execute (priv->commons->gdaex, sql) == 1)
                {
-                       g_signal_emit (ufficio_stanza, klass->aggiornato_signal_id, 0);
+                       g_signal_emit (organigramma_ufficio_stanza, klass->aggiornato_signal_id, 0);
 
                        if (priv->id == 0)
                                {
@@ -258,11 +258,11 @@ ufficio_stanza_salva (UfficioStanza *ufficio_stanza)
 }
 
 static void
-ufficio_stanza_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+organigramma_ufficio_stanza_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       UfficioStanza *ufficio_stanza = UFFICIO_STANZA (object);
+       OrganigrammaUfficioStanza *organigramma_ufficio_stanza = ORGANIGRAMMA_UFFICIO_STANZA (object);
 
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (ufficio_stanza);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (organigramma_ufficio_stanza);
 
        switch (property_id)
                {
@@ -273,11 +273,11 @@ ufficio_stanza_set_property (GObject *object, guint property_id, const GValue *v
 }
 
 static void
-ufficio_stanza_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+organigramma_ufficio_stanza_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       UfficioStanza *ufficio_stanza = UFFICIO_STANZA (object);
+       OrganigrammaUfficioStanza *organigramma_ufficio_stanza = ORGANIGRAMMA_UFFICIO_STANZA (object);
 
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (ufficio_stanza);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (organigramma_ufficio_stanza);
 
        switch (property_id)
                {
@@ -288,13 +288,13 @@ ufficio_stanza_get_property (GObject *object, guint property_id, GValue *value,
 }
 
 static gboolean
-ufficio_stanza_conferma_chiusura (UfficioStanza *ufficio_stanza)
+organigramma_ufficio_stanza_conferma_chiusura (OrganigrammaUfficioStanza *organigramma_ufficio_stanza)
 {
        GtkWidget *dialog;
 
        gboolean ret;
 
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (ufficio_stanza);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (organigramma_ufficio_stanza);
 
        ret = TRUE;
 
@@ -317,27 +317,27 @@ ufficio_stanza_conferma_chiusura (UfficioStanza *ufficio_stanza)
 
 /* CALLBACK */
 static gboolean
-ufficio_stanza_on_w_ufficio_stanza_delete_event (GtkWidget *widget,
+organigramma_ufficio_stanza_on_w_organigramma_ufficio_stanza_delete_event (GtkWidget *widget,
                                GdkEvent *event,
                                gpointer user_data)
 {
-       return !ufficio_stanza_conferma_chiusura ((UfficioStanza *)user_data);
+       return !organigramma_ufficio_stanza_conferma_chiusura ((OrganigrammaUfficioStanza *)user_data);
 }
 
 static void
-ufficio_stanza_on_btn_annulla_clicked (GtkButton *button,
+organigramma_ufficio_stanza_on_btn_annulla_clicked (GtkButton *button,
                         gpointer user_data)
 {
-       UfficioStanza *ufficio_stanza = (UfficioStanza *)user_data;
+       OrganigrammaUfficioStanza *organigramma_ufficio_stanza = (OrganigrammaUfficioStanza *)user_data;
 
-       UfficioStanzaPrivate *priv = UFFICIO_STANZA_GET_PRIVATE (ufficio_stanza);
+       OrganigrammaUfficioStanzaPrivate *priv = ORGANIGRAMMA_UFFICIO_STANZA_GET_PRIVATE (organigramma_ufficio_stanza);
 
-       if (ufficio_stanza_conferma_chiusura (ufficio_stanza)) gtk_widget_destroy (priv->w);
+       if (organigramma_ufficio_stanza_conferma_chiusura (organigramma_ufficio_stanza)) gtk_widget_destroy (priv->w);
 }
 
 static void
-ufficio_stanza_on_btn_salva_clicked (GtkButton *button,
+organigramma_ufficio_stanza_on_btn_salva_clicked (GtkButton *button,
                       gpointer user_data)
 {
-       ufficio_stanza_salva ((UfficioStanza *)user_data);
+       organigramma_ufficio_stanza_salva ((OrganigrammaUfficioStanza *)user_data);
 }

diff --git a/src/ufficiostanza.h b/src/ufficiostanza.h
index 47f12709815b428b7d892e9b30642b7e7a4c314a..5406e863bfabc7eaaeddeee947a28f7d98e28068 100644 (file)
--- a/src/ufficiostanza.h
+++ b/src/ufficiostanza.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2009-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
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __UFFICIO_STANZA_H__
-#define __UFFICIO_STANZA_H__
+#ifndef __ORGANIGRAMMA_UFFICIO_STANZA_H__
+#define __ORGANIGRAMMA_UFFICIO_STANZA_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -30,36 +30,36 @@
 G_BEGIN_DECLS
 
 
-#define TYPE_UFFICIO_STANZA                 (ufficio_stanza_get_type ())
-#define UFFICIO_STANZA(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UFFICIO_STANZA, UfficioStanza))
-#define UFFICIO_STANZA_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_UFFICIO_STANZA, UfficioStanzaClass))
-#define IS_UFFICIO_STANZA(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UFFICIO_STANZA))
-#define IS_UFFICIO_STANZA_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_UFFICIO_STANZA))
-#define UFFICIO_STANZA_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_UFFICIO_STANZA, UfficioStanzaClass))
+#define TYPE_ORGANIGRAMMA_UFFICIO_STANZA                 (organigramma_ufficio_stanza_get_type ())
+#define ORGANIGRAMMA_UFFICIO_STANZA(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ORGANIGRAMMA_UFFICIO_STANZA, OrganigrammaUfficioStanza))
+#define ORGANIGRAMMA_UFFICIO_STANZA_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ORGANIGRAMMA_UFFICIO_STANZA, OrganigrammaUfficioStanzaClass))
+#define IS_ORGANIGRAMMA_UFFICIO_STANZA(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ORGANIGRAMMA_UFFICIO_STANZA))
+#define IS_ORGANIGRAMMA_UFFICIO_STANZA_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ORGANIGRAMMA_UFFICIO_STANZA))
+#define ORGANIGRAMMA_UFFICIO_STANZA_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ORGANIGRAMMA_UFFICIO_STANZA, OrganigrammaUfficioStanzaClass))
 
 
-typedef struct _UfficioStanza UfficioStanza;
-typedef struct _UfficioStanzaClass UfficioStanzaClass;
+typedef struct _OrganigrammaUfficioStanza OrganigrammaUfficioStanza;
+typedef struct _OrganigrammaUfficioStanzaClass OrganigrammaUfficioStanzaClass;
 
-struct _UfficioStanza
+struct _OrganigrammaUfficioStanza
        {
                GObject parent;
        };
 
-struct _UfficioStanzaClass
+struct _OrganigrammaUfficioStanzaClass
        {
                GObjectClass parent_class;
 
                guint aggiornato_signal_id;
        };
 
-GType ufficio_stanza_get_type (void) G_GNUC_CONST;
+GType organigramma_ufficio_stanza_get_type (void) G_GNUC_CONST;
 
-UfficioStanza *ufficio_stanza_new (OrganigrammaCommons *commons, guint id, guint id_uffici);
+OrganigrammaUfficioStanza *organigramma_ufficio_stanza_new (OrganigrammaCommons *commons, guint id, guint id_uffici);
 
-GtkWidget *ufficio_stanza_get_widget (UfficioStanza *ufficio_stanza);
+GtkWidget *organigramma_ufficio_stanza_get_widget (OrganigrammaUfficioStanza *organigramma_ufficio_stanza);
 
 
 G_END_DECLS
 
-#endif /* __UFFICIO_STANZA_H__ */
+#endif /* __ORGANIGRAMMA_UFFICIO_STANZA_H__ */