Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
el-j committed Nov 29, 2013
2 parents 391597a + 6339546 commit 975f24f
Show file tree
Hide file tree
Showing 30 changed files with 805 additions and 150 deletions.
6 changes: 3 additions & 3 deletions bins/core.fzb
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@
</iconView>
</views>
</instance>
<instance moduleIdRef="BreadboardLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/breadboardlogoimage.fzp">
<instance moduleIdRef="newBreadboardLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/newbreadboardlogoimage.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
Expand Down Expand Up @@ -929,7 +929,7 @@
</iconView>
</views>
</instance>
<instance moduleIdRef="SchematicLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/schematiclogoimage.fzp">
<instance moduleIdRef="newSchematicLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/newschematiclogoimage.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
Expand Down Expand Up @@ -967,7 +967,7 @@
</iconView>
</views>
</instance>
<instance moduleIdRef="LogoImageModuleID" modelIndex="57" path=":/resources/parts/core/logoimage.fzp">
<instance moduleIdRef="newLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/newlogoimage.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
Expand Down
16 changes: 11 additions & 5 deletions phoenixresources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -164,16 +164,22 @@
<file>resources/parts/core/roundrect_pcb_two_layers.fzp</file>
<file>resources/parts/core/logotext.fzp</file>
<file>resources/parts/core/logoimage.fzp</file>
<file>resources/parts/core/copper1logotext.fzp</file>
<file>resources/parts/core/silkscreen0logoimage.fzp</file>
<file>resources/parts/core/breadboardlogoimage.fzp</file>
<file>resources/parts/core/copper1logoimage.fzp</file>
<file>resources/parts/core/copper0logotext.fzp</file>
<file>resources/parts/core/copper0logoimage.fzp</file>
<file>resources/parts/core/schematiclogoimage.fzp</file>
<file>resources/parts/core/newlogoimage.fzp</file>
<file>resources/parts/core/newsilkscreen0logoimage.fzp</file>
<file>resources/parts/core/newbreadboardlogoimage.fzp</file>
<file>resources/parts/core/newcopper1logoimage.fzp</file>
<file>resources/parts/core/newcopper0logoimage.fzp</file>
<file>resources/parts/core/newschematiclogoimage.fzp</file>
<file>resources/parts/core/copper1logotext.fzp</file>
<file>resources/parts/core/copper0logotext.fzp</file>
<file>resources/parts/core/silkscreen0logotext.fzp</file>
<file>resources/parts/core/silkscreen0logoimage.fzp</file>
<file>resources/parts/core/schematiclogotext.fzp</file>
<file>resources/parts/core/schematiclogoimage.fzp</file>
<file>resources/parts/core/breadboardlogotext.fzp</file>
<file>resources/parts/core/breadboardlogoimage.fzp</file>
<file>resources/parts/core/boardlogoimage.fzp</file>
<file>resources/parts/core/boardlogoimage_one_layer.fzp</file>
<file>resources/parts/core/ground.fzp</file>
Expand Down
2 changes: 1 addition & 1 deletion resources/parts/core/breadboardlogoimage.fzp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="BreadboardLogoImageModuleID" >
<version>4</version>
<version replacedby="newBreadboardLogoImageModuleID">4</version>
<author>Jonathan Cohen</author>
<title>Breadboard Image</title>
<date>2012-10-23</date>
Expand Down
2 changes: 1 addition & 1 deletion resources/parts/core/copper0logoimage.fzp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="Copper0LogoImageModuleID" >
<version>4</version>
<version replacedby="newCopper0LogoImageModuleID">4</version>
<author>Brendan Howell</author>
<title>Copper Image</title>
<date>2008-11-25</date>
Expand Down
2 changes: 1 addition & 1 deletion resources/parts/core/copper1logoimage.fzp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="Copper1LogoImageModuleID" >
<version>4</version>
<version replacedby="newCopper1LogoImageModuleID">4</version>
<author>Brendan Howell</author>
<title>Copper Image</title>
<date>2008-11-25</date>
Expand Down
2 changes: 1 addition & 1 deletion resources/parts/core/logoimage.fzp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="LogoImageModuleID" >
<version>4</version>
<version replacedby="newLogoImageModuleID">4</version>
<author>Brendan Howell</author>
<title>Silkscreen Image</title>
<date>2008-11-25</date>
Expand Down
47 changes: 47 additions & 0 deletions resources/parts/core/newbreadboardlogoimage.fzp
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="newBreadboardLogoImageModuleID" >
<version>4</version>
<author>Jonathan Cohen</author>
<title>Breadboard Image</title>
<date>2012-10-23</date>
<label>IMG</label>
<tags>
<tag>breadboard</tag>
<tag>part</tag>
<tag>diy</tag>
<tag>fritzing core</tag>
</tags>
<properties>
<property name="family" >Logo</property>
<property name="filename" ></property>
<property name="shape" ></property>
<property name="type" >image</property>
</properties>
<taxonomy>discreteParts.breadboard.logo</taxonomy>
<description>For adding images to the breadboard view</description>
<views>
<defaultUnits>mm</defaultUnits>
<iconView>
<layers image="icon/breadboard_logo.svg" >
<layer layerId="icon" />
</layers>
</iconView>
<breadboardView>
<layers image="breadboard/new Fritzing icon.svg" >
<layer layerId="breadboard" />
</layers>
</breadboardView>
<schematicView>
<layers image="breadboard/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</schematicView>
<pcbView>
<layers image="breadboard/new Fritzing icon.svg" >
<layer layerId="unknown"/>
</layers>
</pcbView>
</views>
<connectors/>
<buses/>
</module>
48 changes: 48 additions & 0 deletions resources/parts/core/newcopper0logoimage.fzp
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="newCopper0LogoImageModuleID" >
<version>4</version>
<author>Brendan Howell</author>
<title>Copper Image</title>
<date>2008-11-25</date>
<label>IMG</label>
<tags>
<tag>pcb</tag>
<tag>part</tag>
<tag>diy</tag>
<tag>fritzing core</tag>
</tags>
<properties>
<property name="family" >Logo</property>
<property name="filename" ></property>
<property name="shape" ></property>
<property name="type" >image</property>
<property name="layer" >copper0</property>
</properties>
<taxonomy>discreteParts.pcb.logo</taxonomy>
<description>For adding images to the bottom copper layer of the board</description>
<views>
<defaultUnits>mm</defaultUnits>
<iconView>
<layers image="icon/copper0_logo.svg" >
<layer layerId="icon" />
</layers>
</iconView>
<breadboardView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</breadboardView>
<schematicView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</schematicView>
<pcbView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="copper0"/>
</layers>
</pcbView>
</views>
<connectors/>
<buses/>
</module>
48 changes: 48 additions & 0 deletions resources/parts/core/newcopper1logoimage.fzp
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="newCopper1LogoImageModuleID" >
<version>4</version>
<author>Brendan Howell</author>
<title>Copper Image</title>
<date>2008-11-25</date>
<label>IMG</label>
<tags>
<tag>pcb</tag>
<tag>part</tag>
<tag>diy</tag>
<tag>fritzing core</tag>
</tags>
<properties>
<property name="family" >Logo</property>
<property name="filename" ></property>
<property name="shape" ></property>
<property name="type" >image</property>
<property name="layer" >copper1</property>
</properties>
<taxonomy>discreteParts.pcb.logo</taxonomy>
<description>For adding images to the top copper layer of the board</description>
<views>
<defaultUnits>mm</defaultUnits>
<iconView>
<layers image="icon/copper1_logo.svg" >
<layer layerId="icon" />
</layers>
</iconView>
<breadboardView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</breadboardView>
<schematicView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</schematicView>
<pcbView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="copper1"/>
</layers>
</pcbView>
</views>
<connectors/>
<buses/>
</module>
48 changes: 48 additions & 0 deletions resources/parts/core/newlogoimage.fzp
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="newLogoImageModuleID" >
<version>4</version>
<author>Brendan Howell</author>
<title>Silkscreen Image</title>
<date>2008-11-25</date>
<label>IMG</label>
<tags>
<tag>pcb</tag>
<tag>part</tag>
<tag>diy</tag>
<tag>fritzing core</tag>
</tags>
<properties>
<property name="family" >Logo</property>
<property name="filename" ></property>
<property name="shape" ></property>
<property name="type" >image</property>
<property name="layer" >silkscreen</property>
</properties>
<taxonomy>discreteParts.pcb.logo</taxonomy>
<description>For adding images to the silkscreen layer of the board</description>
<views>
<defaultUnits>mm</defaultUnits>
<iconView>
<layers image="icon/silkscreen_logo.svg" >
<layer layerId="icon" />
</layers>
</iconView>
<breadboardView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</breadboardView>
<schematicView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</schematicView>
<pcbView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="silkscreen"/>
</layers>
</pcbView>
</views>
<connectors/>
<buses/>
</module>
47 changes: 47 additions & 0 deletions resources/parts/core/newschematiclogoimage.fzp
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="newSchematicLogoImageModuleID" >
<version>4</version>
<author>Brendan Howell</author>
<title>Schematic Image</title>
<date>2008-11-25</date>
<label>IMG</label>
<tags>
<tag>schematic</tag>
<tag>part</tag>
<tag>diy</tag>
<tag>fritzing core</tag>
</tags>
<properties>
<property name="family" >Logo</property>
<property name="filename" ></property>
<property name="shape" ></property>
<property name="type" >image</property>
</properties>
<taxonomy>discreteParts.schematic.logo</taxonomy>
<description>For adding images to the schematic view</description>
<views>
<defaultUnits>mm</defaultUnits>
<iconView>
<layers image="icon/schematic_logo.svg" >
<layer layerId="icon" />
</layers>
</iconView>
<breadboardView>
<layers image="schematic/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</breadboardView>
<schematicView>
<layers image="schematic/new Fritzing icon.svg" >
<layer layerId="schematic" />
</layers>
</schematicView>
<pcbView>
<layers image="schematic/new Fritzing icon.svg" >
<layer layerId="unknown"/>
</layers>
</pcbView>
</views>
<connectors/>
<buses/>
</module>
48 changes: 48 additions & 0 deletions resources/parts/core/newsilkscreen0logoimage.fzp
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="newSilkscreen0LogoImageModuleID" >
<version>4</version>
<author>Brendan Howell</author>
<title>Silkscreen Image</title>
<date>2008-11-25</date>
<label>IMG</label>
<tags>
<tag>pcb</tag>
<tag>part</tag>
<tag>diy</tag>
<tag>fritzing core</tag>
</tags>
<properties>
<property name="family" >Logo</property>
<property name="filename" ></property>
<property name="shape" ></property>
<property name="type" >image</property>
<property name="layer" >silkscreen0</property>
</properties>
<taxonomy>discreteParts.pcb.logo</taxonomy>
<description>For adding images to the silkscreen layer of the board</description>
<views>
<defaultUnits>mm</defaultUnits>
<iconView>
<layers image="icon/silkscreen_logo.svg" >
<layer layerId="icon" />
</layers>
</iconView>
<breadboardView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</breadboardView>
<schematicView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="unknown" />
</layers>
</schematicView>
<pcbView>
<layers image="pcb/new Fritzing icon.svg" >
<layer layerId="silkscreen0"/>
</layers>
</pcbView>
</views>
<connectors/>
<buses/>
</module>
2 changes: 1 addition & 1 deletion resources/parts/core/schematiclogoimage.fzp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="SchematicLogoImageModuleID" >
<version>4</version>
<version replacedby="newSchematicLogoImageModuleID">4</version>
<author>Brendan Howell</author>
<title>Schematic Image</title>
<date>2008-11-25</date>
Expand Down
2 changes: 1 addition & 1 deletion resources/parts/core/silkscreen0logoimage.fzp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<module moduleId="Silkscreen0LogoImageModuleID" >
<version>4</version>
<version replacedby="newSilkscreen0LogoImageModuleID">4</version>
<author>Brendan Howell</author>
<title>Silkscreen Image</title>
<date>2008-11-25</date>
Expand Down
Loading

0 comments on commit 975f24f

Please sign in to comment.