Merge lp:~kicad-gost-committers/kicad/kicad into lp:kicad/product

[Alexander Lunev]

1) implemented document generator conforming to Russian standards (the root regulating document is "GOST 2.001-93"). The generator forms component index and specification documents by means of OpenOffice or LibreOffice

2) implemented component manager (contains only English words and could be used by any KiCad user for general purpose). Features:
   - listing all components and displaying the full component string in the form how it would be printed in the resultant documents
   - adding new circuit variants
   - viewing and working with components in various planes (full list, constant part, variable part for given variant)
   - assigning components to variants
   - possibility to assign a component "not installed" status. This status will be displayed in the component index document and as a result such components will not be printed in the specification document
   - editing component attributes (Title, Value, Type, Precision and so on)
   - components with reference description like "A1C1" are formed into sets and appropriately printed in the resultant documents
   - possibility to edit components as a group by means of multiple selection in the main table of the component manager
   - all changes made in both the eeshema and the component manager are mutually reflected to each other (invisibly to a user)
   - initiating immediate generation of GOST documents from the component manager

[lp:~kicad-gost-committers/kicad/kicad]

4111. By Alexander Lunev on 2013-05-10

merge with lp:kicad branch

[jean-pierre charras (jp-charras)]

Alexander,
This is a very large patch (6400 lines), without any explanation, and not comments in sources.

What is the purpose of this patch?

Many strings are not in English, which could be internationalized.
When not in English, most of developpers cannot understand them (Note there is not French strings in Kicad, and I am a French guy).

review: Needs Information

[Alexander Lunev (al-lunev)]

The explanation was provided: "Implemented document generator conforming to Russian standards."
The root regulating document of these standards is "ГОСТ 2.001-93" (http://www.gostedu.ru/5588.html).

There are comments in sources but not in all places.
Some of the places do not need to be documented in the code because the code is written according to the standards. The standards are the main source of comments. If some code does not conform to the standards then it is buggy and should be corrected according to the standards.

The purpose of this new feature is to automatically generate component index and specification documents by means of OpenOffice or LibreOffice and according to Russian standards.

As you can see, all this code is put into KICAD_GOST conditional compilation section. This section is intended for Russian speaking people only and only for countries where the mentioned above standards are valid. Such countries are Russia, Belarus, Ukraine, Moldova, Kazakhstan, Azerbaijan, Armenia, Kyrgyzstan, Uzbekistan, Tajikistan, Georgia, and Turkmenistan (http://en.wikipedia.org/wiki/GOST).

Thus the strings which are in Russian are put into the resulting forms. The format of these forms is dictated by Russian standards and it must be as it is.

[lp:~kicad-gost-committers/kicad/kicad]

4112. By Alexander Lunev on 2013-05-10

uno_iface.py: supported Python 3

[jean-pierre charras (jp-charras)]

"Implemented document generator" has not a lot of meaning, it covers many things.
And your main link is a russian doc. I am still not able to know what is doing your patch.
Is something a like a Bill of Material ?

If yes, now the right approach is to use the generic xml netlist to extract the schematic info, and external tools (scripts, or other tools) to parse this netlist and create the doc, not to add code inside the existing kicad code.
This is fully transparent for the user.
See Eeschema, chapter 14 for more info.
There are also few examples in python in sources.

I do not agree with the sentence:
"This section is intended for Russian speaking people only and only for countries where the mentioned above standards are valid"
I am talking about Kicad code. It should be readable by all developpers.
You can use English sentences, and internationalization to see them in Russian form or other languages.
When they should be in a given language, at least they can be defined under an English #define keyword

[lp:~kicad-gost-committers/kicad/kicad]

4113. By Alexander Lunev on 2013-05-10

fixed an issue with UTF8 encoding

[Alexander Lunev (al-lunev)]

""Implemented document generator" has not a lot of meaning, it covers many things."

Instead I wrote "Implemented document generator conforming to Russian standards". This means that the generator forms documents according to the set of Russian standards.
In this specific sphere (electronic circuit diagrams and accompanying documentation) we have only one valid standard in Russia. Its name, if translate it to English, is "Unified system for design documentation". The root regulating document of the standard is "ГОСТ 2.001-93". "ГОСТ" can be transliterated to English as "GOST". That is why there is cmake KICAD_GOST option in KiCad.
This new feature (generator) is intended only for Russia users and users of other countries which use the same standard (the standard is in Russian).

"Is something a like a Bill of Material ?
If yes, now the right approach is to use the generic xml netlist to extract the schematic info, and external tools (scripts, or other tools) to parse this netlist and create the doc, not to add code inside the existing kicad code.
This is fully transparent for the user."

Yes, it is like a BOM.
Using an intermediate file is NOT the right approach. It is only possible approach and can be considered as a minimum goal.
And it is not transparent to an ordinary user.

It is transparent to an ordinary user if a user clicks one button and everything works, the user immediately takes the generated documents. It is a more elaborate and difficult task. Moreover, this task has been already completed.

Among cons of using an intermediate file are:
1) e-mails like this: "[kicad-users] Python library script "pcbnew" - where is it?"
2) choosing correct settings by a user in KiCad to generate the right form of an intermediate file
3) synchronizing the source code of GOST-doc-gen and rebuilding it every time when the format of an intermediate file is changed

And I do not understand you. In case of pcad2kicad, standalone executable and an intermediate xml file are bad. But here all these "devils" are good!?

"You can use English sentences, and internationalization to see them in Russian form or other languages."

What for?
Languages other than Russian are not used for these literals.

[jean-pierre charras (jp-charras)]

The intermediate file is not an intermediate file:
it is *the* new netlist format, which exists under 2 format:
a S-expression format (easy to parse with the s-expr internal parser)
a xml format: the same file, easy to parse with external xml parsers.
This netlist contains all data to create BOM and boards ...
Many post processings uses a netlist, so I do not understand why is NOT the right approach.

And yes, using this approach is fully transparent to the user, once the comand line is initialized (see the netlist dialog). Only one click to generate the file. And the user does not know there is an intermediate file (kicad already uses intermediate files).

Yours cons are irrelevant:
1 - the guy has not even had a look to files in kicad (kicad/python)
2 - there is no setting (just a command line which could be predefined)
3 - intermediate file does not change as fast as the kicad internal code.

For kicad2pcad, you forgot what I said you:
1 - Pcbnew includes a plugin mechanism to import files, use it.
2 - the file to convert was a S-expr files, and pcbnew has a very good S-expr parser. Why to write your S-expr code parser to create an inttermediate file with a new parser, this was duplicate and/or useless code.

This is very different from the BOM generation

About Russian literals, one time more, I am saying I am talking about internal Kicad code.
Your patch come with not comments, and many sentences not readable for non Russian contributors
It means this work cannot be modified and used by some other contributor which want mo modify the BOM to make their own BOM format.
Each company has its BOM format, therefore GOST format is only one of multiple existing formats.
Creating code which cannot be understood by contributors is not the spirit of free open source software.

Besides, the patch creates a heavy dependance of Kicad sources with openoffice/libreoffice sdk.
This is a *major drawback*.
This can be easily avoided by a fully external script.

If it is only for Russian users, no problem with Russian literals.
But if it is only for Russian users, there is no room for this patch inside Kicad code.
Code inside Kicad is made for everybody.

Therefore I cannot accept your patch.

[Alexander Lunev (al-lunev)]

Now I generated netlist file and there are not at least the following fields:
TITLE_BLOCK.GetTitle()
TITLE_BLOCK.GetComment1()
TITLE_BLOCK.GetComment2()
TITLE_BLOCK.GetComment3()
TITLE_BLOCK.GetComment4()
and so on.
These fields and many other are necessary for GOST-doc-gen. All the necessary fields are easily accessible inside of KiCad eeschema.

"And yes, using this approach is fully transparent to the user, once the comand line is initialized (see the netlist dialog). Only one click to generate the file. And the user does not know there is an intermediate file"

And what is next?
1) A user clicked 2) the user does not know there is an intermediate file 3) and what is next? Where are the resultant GOST documents?

"Yours cons are irrelevant:
1 - the guy has not even had a look to files in kicad (kicad/python)
2 - there is no setting (just a command line which could be predefined)
3 - intermediate file does not change as fast as the kicad internal code."

1,2 - explain, please, the whole picture in detail (from the click up to getting the resultant GOST documents).
3 - file formats of KiCad change quite often. In case of embedding GOST-doc-gen inside of eeschema sources, any changes in eeschema will be synchronously made in both the eeschema and GOST-doc-gen part. And it is transparent to a user because a user does not need to search for compatible GOST-doc-gen executible if such even exists. Taking the same benefit for pcad2kicad into a account I agreed with Wayne to transform standalone executable into pcad2kicad Pcbnew plugin.

And I do not understand why you are so insisting on separating everything from KiCad.
According to your logic, may be let us remove Gerber or VRML generation from Pcbnew? Because it is enough to have the external kicad_pcb file format? May be let us have external tools to generate Gerber and so on?

By the way, where is pcad2kicadsch in the KiCad source tree?
The whole year has already passed however pcad2kicadsch still lives as a separate project. And all this despite all your and the rest of KiCad admin caprices were satisfied!

"About Russian literals, one time more, I am saying I am talking about internal Kicad code.
Your patch come with not comments, and many sentences not readable for non Russian contributors
It means this work cannot be modified and used by some other contributor which want mo modify the BOM to make their own BOM format.
Each company has its BOM format, therefore GOST format is only one of multiple existing formats."

Once more again, "Your patch come with not comments" is not the truth. There are comments but in not all places. I am going to add more comments.
I doubt that adopting my work by other non Russian speaking contributors for countries which do not use the GOST makes sense. I mean the specific part of code which implements GOST requirements and contains Russian literals.

I suggest you to compile KICAD_GOST version and take a look at generated forms (no source dependencies, only OpenOffice or LibreOffice needs to be installed). There is a sample circuit in demos (demos/GOST/multivibrator.sch).
If you really thinks that such forms of documents can be adopted then no problem, I, of...

[lp:~kicad-gost-committers/kicad/kicad]

4114. By Alexander Lunev on 2013-05-12

added GOST component manager

4115. By Alexander Lunev on 2013-05-12

fixed an issue with processing the first line of the main table (listCtrl);
fixed an issue with eeschema not asking to save project if component attributes actually changed;
supported floating window of component manager (from now on the component manager can lose focus without the need to close its windows)

[Konstantin Baranovskiy (baranovskiykonstantin)]

@jean-pierre charras, function GOST_doc_gen really a very important tool in the design of electronic circuits and implemented it qualitatively (thanks to Alexander Lunev). I see no reason to give up the proposed functionality. All the more so implemented interfaces can be used by other developers to implement new features.

[Wayne Stambaugh (stambaughw)]

This merge request is a highly domain specific (GOST) solution that's only purpose it to create a BOM in the GOST format. Given the support issues with our current BOM output (not the generic netlist support), the last thing we need is yet another BOM generator that users will complain about. Check the users mailing list on Yahoo if you don't believe this is an issue. It also pulls in the OpenOffice API and RPC as optional build dependencies which I have no interest in supporting. It increases the number of #ifdef GOST/#endif conditional code which the project has been working at reducing. The eventual goal is to add user definable borders and title blocks which would eliminate all of the GOST code except the reference designators used in component sub-parts which could probably be replace with some type of user definable string substitution. If this was implemented as script called by the new netlist post processing support I would be more inclined to include it as a good example of how to export a BOM into an OpenOffice file. Adding the title block information to information to the XML netlist probably would be that objectionable and then you would have all of the information you need to generate your OpenOffice file using ptyhon-uno. I recommend that this be kept as a user specific branch.

review: Disapprove

[Alexander Lunev (al-lunev)]

Wayne, you disappointed me once again.
The first time was with pcad2kicad standalone executable.

The situation has repeated. When a hard work is already completed and ready to use by many users around the world, you suggest to throw it away not concerning the users and me of course.

You also said nothing about the component manager:

"implemented component manager (contains only English words and could be used by any KiCad user for general purpose). Features:
   - listing all components and displaying the full component string in the form how it would be printed in the resultant documents
   - adding new circuit variants
   - viewing and working with components in various planes (full list, constant part, variable part for given variant)
   - assigning components to variants
   - possibility to assign a component "not installed" status. This status will be displayed in the component index document and as a result such components will not be printed in the specification document
   - editing component attributes (Title, Value, Type, Precision and so on)
   - components with reference description like "A1C1" are formed into sets and appropriately printed in the resultant documents
   - possibility to edit components as a group by means of multiple selection in the main table of the component manager
   - all changes made in both the eeshema and the component manager are mutually reflected to each other (invisibly to a user)
   - initiating immediate generation of GOST documents from the component manager"

[Wayne Stambaugh (stambaughw)]

On 5/13/2013 6:43 PM, Alexander Lunev wrote:
> Wayne, you disappointed me once again.
> The first time was with pcad2kicad standalone executable.
>
> The situation has repeated. When a hard work is already completed and ready to use by many users around the world, you suggest to throw it away not concerning the users and me of course.
>
> You also said nothing about the component manager:
>
> "implemented component manager (contains only English words and could be used by any KiCad user for general purpose). Features:
> - listing all components and displaying the full component string in the form how it would be printed in the resultant documents
> - adding new circuit variants
> - viewing and working with components in various planes (full list, constant part, variable part for given variant)
> - assigning components to variants
> - possibility to assign a component "not installed" status. This status will be displayed in the component index document and as a result such components will not be printed in the specification document
> - editing component attributes (Title, Value, Type, Precision and so on)
> - components with reference description like "A1C1" are formed into sets and appropriately printed in the resultant documents
> - possibility to edit components as a group by means of multiple selection in the main table of the component manager
> - all changes made in both the eeshema and the component manager are mutually reflected to each other (invisibly to a user)
> - initiating immediate generation of GOST documents from the component manager"
>

Alexander,

Please let me make it clear that this will be my last response to this
merge request. I made my decision based on what I feel is best for the
project. I expect at times my decisions will disappoint but that is not
the goal.

At no point did I ever tell you to throw away any of your code. That
doesn't even sound like something I would say. Regarding pcad2kicad, I
suggested that it be refactored as a plug-in which was accepted in KiCad
so I fail to see any issue there. I also did not tell you to throw away
this merge request. I only suggested that it maintained in a separate
branch. I am not sure how this hurts users as long as your branch is
available to the public. The choice to throw away this code would be yours.

As a lead developer, even I would not have started on a project like
this without consulting the other lead developers at a minimum for
input. The decision to take on this project was yours alone and you
gave no consideration to the fact that it could get rejected.

I looks to me as though your "component manager" is spreadsheet view of
component properties similar to OrCad which is useful. I'm not sure why
you chose to implement it with the OpenOffice SDK and RPC instead of
wxGrid which would have been a better fit for the project. This single
decision alone probably would have made this merge request worth
considering. This most certainly would have been suggest if you would
have let other developers know what your intentions were before you started.

Best Regards,

Wayne

[lp:~kicad-gost-committers/kicad/kicad]

4116. By Konstantin Baranovskiy on 2013-05-14

in GOST part was fixed numbering of parts elements (numbers instead of letters) in library viewer and in message's panels;
small fix in GOST_doc_gen.

4117. By Alexander Lunev on 2013-05-15

temporarily discarded using a floating (independent) window of the component manager because of crashing issues

4118. By Alexander Lunev on 2013-05-18

merge with revision 4153 of lp:kicad branch

4119. By Alexander Lunev on 2013-05-18

supported OpenOffice/LibreOffice installations distributed with Python as a bundle in case of Linux OS

4120. By Alexander Lunev on 2013-05-18

merge with revision 4155 of lp:kicad branch

4121. By Alexander Lunev on 2013-05-18

merge with lp:~kicad-gost-committers/kicad/pcad2kicad branch

4122. By Alexander Lunev on 2013-05-18

added "eeschema->Tools->Run pcad2kicadsch converter" menu item;
added a link to the KiCad about dialog referencing the Internet forum dedicated to KiCad Russian support, including GOST support

4123. By Alexander Lunev on 2013-05-19

fixed compilation warnings

4124. By Alexander Lunev on 2013-05-20

improved odt file loading diagnostics

4125. By Alexander Lunev on 2013-05-21

added optional uno_iface.py logging to a file

4126. By Alexander Lunev on 2013-05-21

merge with revision 4157 of lp:kicad branch

4127. By Alexander Lunev on 2013-05-24

added Info.plist file for pcad2kicadsch Mac OS support;
copied eeschema/eeschema.icns to extra/pcad2kicadsch/pcad2kicadsch.icns;
copied eeschema/eeschema_doc.icns to extra/pcad2kicadsch/pcad2kicadsch_doc.icns

4128. By Alexander Lunev on 2013-05-25

merge with revision 4168 of lp:kicad branch

4129. By Alexander Lunev on 2013-05-25

GOST-doc-gen: generating documents in hidden mode to prevent a user from closing office before the document is formed;
added progress dialog

4130. By Alexander Lunev on 2013-05-26

GOST-doc-gen: supported Company field

4131. By Alexander Lunev on 2013-05-26

merge with revision 4171 of lp:kicad branch

4132. By Alexander Lunev on 2013-05-26

recovered "eeschema->Tools->Generate Bill of Materials" menu item due to user requests to do this

4133. By Alexander Lunev on 2013-05-31

GOST-doc-gen: fixed an issue with long strings w/o tokens;
supported parentheses to make line feeds if necessary;
added workaround for eeschema bug (Value field is assigned to Chip Name field by default on the component adding from a library)

4134. By Alexander Lunev on 2013-05-31

merge with revision 4182 of lp:kicad branch

4135. By Alexander Lunev on 2013-06-01

merge with revision 4184 of lp:kicad branch

4136. By Alexander Lunev on 2013-06-06

merge with revision 4192 of lp:kicad branch

4137. By Alexander Lunev on 2013-06-07

merge with revision 4199 of lp:kicad branch

4138. By Alexander Lunev on 2013-06-08

added CK1202_V1.kicad_pcb file as an output reference to test pcad2kicadpcb converter.
The file was converted from the original CK1202_V1.pcb P-Cad pcb file by pcad2kicadpcb

4139. By Alexander Lunev on 2013-06-08

fixed an issue in s_expr_loader.cpp which resulted in not working of the following features:
1) text fields (graphic elements) of pcad2kicad sch library conversion (supported in rev. 3671 of pcad2kicad branch)
2) stand-alone texts of pcad2kicadpcb (supported in rev. 3658 of pcad2kicad branch)

The bug was introduced in rev. 3681 of pcad2kicad branch (applied S-expressions DSNLEXER to load P-Cad ASCII files)

4140. By Alexander Lunev on 2013-06-08

supported stand-alone text and lines for pcad2kicad schematic conversion;
updated CK1202_V1.kicad_pcb file corresponding to the previous commit

4141. By Alexander Lunev on 2013-06-08

fixed compile error in case of wxWidgets version < 2.9.0

4142. By Alexander Lunev on 2013-06-08

fixed an issue with scaling added in rev. 3677 of pcad2kicad branch (added scaling metric coordinates to fit inch grid for sch pcad2kicad conversion because kicad schematic does not support metric grid).
The scaling was broken in rev. 3696 of pcad2kicad branch (applied BIU conversion).

4143. By Alexander Lunev on 2013-06-09

changed build version postfix from GOST to GOST-COMMITTERS meaning that the build is based on lp:~kicad-gost-committers/kicad/kicad branch

4144. By Alexander Lunev on 2013-06-12

moved all BOM related stuff ("eeschema->Tools->Generate Bill of Materials" menu item) to eeschema/BOM directory

4145. By Alexander Lunev on 2013-06-12

merge with revision 4200 of lp:kicad branch

4146. By Alexander Lunev on 2013-06-12

merge with revision 4209 of lp:kicad branch

4147. By Alexander Lunev on 2013-06-14

started bilingual support in GOST-doc-gen and component manager

4148. By Alexander Lunev on 2013-06-14

supported grammar rule for russian letter after soft consonant in the end of a word

4149. By Alexander Lunev on 2013-06-15

merge with revision 4212 of lp:kicad branch

4150. By Alexander Lunev on 2013-06-15

wrapped all functions of doc_common, doc_component_index and doc_specification c++ modules into classes

4151. By Alexander Lunev on 2013-06-15

merge with revision 4145 of lp:~kicad-gost-committers/kicad/GOST-doc-gen-new-templates branch

4152. By Alexander Lunev on 2013-06-15

GOST-doc-gen: further adaptation to the new templates in order to fit a text into fields

4153. By Alexander Lunev on 2013-06-16

merge with revision 4214 of lp:kicad branch;
recovered sortByValueOnly(), splitRefStr() and engStrToDouble() methods needed by eeschema/BOM/build_BOM.cpp;
from now on there are two Generate BOM items in the eeschema/Tools menu (both the old and new implementations)

4154. By Alexander Lunev on 2013-06-17

merge with revision 4215 of lp:kicad branch

4155. By Alexander Lunev on 2013-06-20

GOST-doc-gen: fixed an issue with Python 3

4156. By Alexander Lunev on 2013-06-20

pcad2kicadpcb: fixed an issue with setting the Reference and Value of a module

4157. By Alexander Lunev on 2013-06-20

merge with revision 4217 of lp:kicad branch

4158. By Alexander Lunev on 2013-06-22

experimental support for ChipName, Value and Type fields in cvpcb compatible with GOST-doc-gen

4159. By Alexander Lunev on 2013-06-22

GOST-doc-gen: supported additional measure units

4160. By Alexander Lunev on 2013-06-23

pcad2kicad: added check for file format

4161. By Alexander Lunev on 2013-06-23

pcad2kicadsch: added space replacement with underscore in Chip Names;
fixed an issue with stand-alone text of pcad2kicad schematic library conversion

4162. By Alexander Lunev on 2013-06-23

GOST component manager: implemented unconditional saving Value and Type attributes even if they contain an empty string

4163. By Alexander Lunev on 2013-06-25

GOST-doc-gen: supported auto-splitting the string of collumn "Name" printed in the component index document;
centered the text of a group name in the component index document

4164. By Alexander Lunev on 2013-06-26

merge with revision 4223 of lp:kicad branch

4165. By Alexander Lunev on 2013-06-26

GOST-doc-gen: fixed an issue with centering/underlining printed text

4166. By Alexander Lunev on 2013-06-27

GOST-doc-gen: supported capacitor values w/o specifying pF unit in them

4167. By Alexander Lunev on 2013-06-29

enhanced support for ChipName, Value and Type fields in cvpcb compatible with GOST-doc-gen

4168. By Alexander Lunev on 2013-06-29

merge with revision 4231 of lp:kicad branch

4169. By Alexander Lunev on 2013-06-29

Component manager: warn once while editing a field of selected components if the components have different parameters

4170. By Alexander Lunev on 2013-06-30

GOST-doc-gen: fixed an issue with sorting component values depending on locale

4171. By Alexander Lunev on 2013-07-02

GOST component manager: added initial setting Type attribute by the content of Chip Name field if the Type attribute contain an empty string

4172. By Alexander Lunev on 2013-07-03

Component manager: corrected NPO to NP0 in Subtype combobox

4173. By Alexander Lunev on 2013-07-03

merge with revision 4236 of lp:kicad branch

4174. By Alexander Lunev on 2013-07-06

Component manager: added exclusion of subcomponents

4175. By Alexander Lunev on 2013-07-06

merge with revision 4237 of lp:kicad branch

4176. By Alexander Lunev on 2013-07-06

decoupled Component manager window from EESchema one.

4177. By Alexander Lunev on 2013-07-07

implemented autopointing the cursor in both EESchema and Pcbnew according to the selected component in Component manager

4178. By Alexander Lunev on 2013-07-07

pcad2kicadsch: supported conversion of attributes

4179. By Alexander Lunev on 2013-07-10

merge with revision 4241 of lp:kicad branch

4180. By Alexander Lunev on 2013-07-15

merge with revision 4242 of lp:kicad branch

4181. By Konstantin Baranovskiy on 2013-07-16

Started porting GOST-doc-gen to the python.
DOC_COMMON::ChangeWordForm(...) and dictionaries was done.

4182. By Alexander Lunev on 2013-07-16

added kicad_uno_iface log files in case of generation of component index and specification documents based on Multivibrator demo circuit. These log files are for unit testing

4183. By Alexander Lunev on 2013-07-20

added USE_PYTHON_GOSTDOCGEN compilation option;
implemented common ImportPyModule() function;
added importing doc_common.py module to start replacement of GOST-doc-gen c++ implementation with Python one

4184. By Alexander Lunev on 2013-07-20

corrected setting a field position by Component Manager

4185. By Alexander Lunev on 2013-07-20

Component Manager: from now on the processing of Value attribute is transparent;
added component attribute validation on Component Manager opening: if it detects that some components have equal Chip Name and Value attributes then it warns that Value attributes will be copied to Type ones including their position, orientation and visibility. After that Value attributes will be cleared. If some of components do not have Type attribute then such attributes will be created.

4186. By Alexander Lunev on 2013-07-20

fixed some issues with Component Manager. Some of the issues took place only under Ubuntu 10.04 (wxWidgets 2.8.10)

4187. By Alexander Lunev on 2013-07-21

merge with revision 4243 of lp:kicad branch

4188. By Alexander Lunev on 2013-07-22

merge with revision 4245 of lp:kicad branch

4189. By Alexander Lunev on 2013-07-23

merge with revision 4248 of lp:kicad branch

4190. By Alexander Lunev on 2013-07-24

merge with revision 4251 of lp:kicad branch

4191. By Alexander Lunev on 2013-07-26

merge with revision 4252 of lp:kicad branch

4192. By Alexander Lunev on 2013-07-26

merge with revision 4254 of lp:kicad branch

4193. By Alexander Lunev on 2013-07-26

merge with revision 4255 of lp:kicad branch

4194. By Alexander Lunev on 2013-07-27

merge with revision 4256 of lp:kicad branch

4195. By Alexander Lunev on 2013-07-29

merge with revision 4261 of lp:kicad branch

4196. By Alexander Lunev on 2013-08-01

merge with revision 4262 of lp:kicad branch

4197. By Alexander Lunev on 2013-08-03

merge with revision 4264 of lp:kicad branch

4198. By Alexander Lunev on 2013-08-04

merge with revision 4267 of lp:kicad branch

4199. By mmcx on 2013-08-04

fixed an issue with Component Manager hang-up on fast or multiple component selection

4200. By Alexander Lunev on 2013-08-05

merge with revision 4268 of lp:kicad branch

4201. By Alexander Lunev on 2013-08-06

merge with revision 4272 of lp:kicad branch

4202. By Alexander Lunev on 2013-08-08

merge with revision 4276 of lp:kicad branch

4203. By Alexander Lunev on 2013-08-09

merge with revision 4279 of lp:kicad branch

4204. By Alexander Lunev on 2013-08-09

merge with revision 4282 of lp:kicad branch

4205. By Alexander Lunev on 2013-08-12

merge with revision 4283 of lp:kicad branch

4206. By Alexander Lunev on 2013-08-14

merge with revision 4285 of lp:kicad branch

4207. By Alexander Lunev on 2013-08-21

merge with revision 4293 of lp:kicad branch

4208. By Alexander Lunev on 2013-09-03

merge with revision 4294 of lp:kicad branch

4209. By Alexander Lunev on 2013-09-03

merge with revision 4309 of lp:kicad branch

4210. By Alexander Lunev on 2013-09-04

merge with revision 4311 of lp:kicad branch

4211. By Alexander Lunev on 2013-09-07

merge with revision 4312 of lp:kicad branch

4212. By Alexander Lunev on 2013-09-10

merge with revision 4313 of lp:kicad branch

4213. By Alexander Lunev on 2013-09-14

merge with revision 4316 of lp:kicad branch

4214. By Konstantin Baranovskiy on 2013-09-19

Porting GOST-doc-gen to python:
doc_common.cpp
  SortStringArray()
  ExtractAbsoluteValue()
done.

4215. By Andrey Fedorushkov on 2013-09-30

add my commit

4216. By Andrey Fedorushkov on 2013-09-30

merge from bzr4357 lp:kicad

4217. By Andrey Fedorushkov on 2013-09-30

merge from bzr4357 lp:kicad :: add picad2kicadpcb bzr version control

4218. By Andrey Fedorushkov on 2013-09-30

fix pcad2kicadpcb: load function

4219. By Andrey Fedorushkov on 2013-10-01

fix build version

4220. By Andrey Fedorushkov on 2013-10-26

fix conflicts

4221. By Andrey Fedorushkov on 2013-10-26

merge to kicad-testing bzr 4415

4222. By Andrey Fedorushkov on 2013-10-26

fix CMakeLists.txt

4223. By Andrey Fedorushkov on 2013-11-04

fix build-version

4224. By Andrey Fedorushkov on 2013-11-04

merge from bzr4431 kicad-testing

4225. By Andrey Fedorushkov on 2013-11-11

merge from bzr4453-testing

4226. By Andrey Fedorushkov on 2013-11-16

merge from bzr4476 testing kicad-committers

4227. By Andrey Fedorushkov on 2013-11-21

merge from bzr4995 kicad-testing

4228. By Andrey Fedorushkov on 2013-11-21

add new template file

4229. By Andrey Fedorushkov on 2013-11-21

fix merge from bzr4495 kicad-testing

4230. By Andrey Fedorushkov on 2013-11-24

merge from bzr4496 kicad-testing, fix typos in template dir

4231. By Andrey Fedorushkov on 2013-11-25

merge from bzr4497 kicad-testing

4232. By Andrey Fedorushkov on 2013-11-25

fix error build autoplace.cpp

4233. By Andrey Fedorushkov on 2013-11-25

merge from bzr4499 kicad-testing

4234. By Andrey Fedorushkov on 2013-11-27

fix parts range

4235. By Andrey Fedorushkov on 2013-11-27

merge from bzr4503 kicad-testing

4236. By Andrey Fedorushkov on 2013-11-27

merge from bzr4505 kicad-testing

4237. By Andrey Fedorushkov on 2013-11-28

merge from bzr4509 kicad-testing

4238. By Andrey Fedorushkov on 2013-11-29

merge from bzr4512 kicad-testing

4239. By Andrey Fedorushkov on 2013-12-02

merge from bzr4513 kicad-testing, rem internal translate in main CMakeLists.txt

4240. By Andrey Fedorushkov on 2013-12-04

merge from bzr4520, pcbnew: libedit - fix create new module

4241. By Andrey Fedorushkov on 2013-12-06

add internat

4242. By Andrey Fedorushkov on 2013-12-06

fix segfault pcbnew

4243. By Andrey Fedorushkov on 2013-12-06

fix bzr rev

4244. By Andrey Fedorushkov on 2013-12-27

merge from bzr4558

4245. By Andrey Fedorushkov on 2013-12-27

merge from bzr4577

4246. By Andrey Fedorushkov on 2014-01-14

merge from bzr4619 kicad-testing

4247. By Alexander Lunev on 2014-04-06

added INTERNAT CMake option to prevent "add_subdirectory given source "internat" which is not an existing" error

4248. By Alexander Lunev on 2014-04-06

merge with revision 4623 of lp:kicad branch

4249. By Alexander Lunev on 2014-04-06

merge with revision 4624 of lp:kicad branch

4250. By Alexander Lunev on 2014-04-06

merge with revision 4628 of lp:kicad branch

4251. By Alexander Lunev on 2014-04-06

merge with revision 4633 of lp:kicad branch

4252. By Alexander Lunev on 2014-04-07

merge with revision 4635 of lp:kicad branch

4253. By Alexander Lunev on 2014-04-07

merge with revision 4655 of lp:kicad branch

4254. By Alexander Lunev on 2014-04-08

merge with revision 4669 of lp:kicad branch

4255. By Alexander Lunev on 2014-04-08

merge with revision 4701 of lp:kicad branch

4256. By Alexander Lunev on 2014-04-08

merge with revision 4708 of lp:kicad branch

4257. By Alexander Lunev on 2014-04-08

merge with revision 4741 of lp:kicad branch

4258. By Alexander Lunev on 2014-04-09

updated CK1202_V1.kicad_pcb file as an output reference to test pcad2kicadpcb converter

4259. By Alexander Lunev on 2014-04-12

temporary workaround for static initialization order fiasco

4260. By Alexander Lunev on 2014-04-13

merge with revision 4742 of lp:kicad branch

4261. By Alexander Lunev on 2014-04-14

merge with revision 4756 of lp:kicad branch

4262. By Alexander Lunev on 2014-04-17

merge with revision 4757 of lp:kicad branch

4263. By Alexander Lunev on 2014-04-17

KICAD_GOST adaptation to KIWAY

4264. By Alexander Lunev on 2014-04-19

added changes missed in my previous commit

4265. By Alexander Lunev on 2014-04-20

merge with revision 4809 of lp:kicad branch and further KICAD_GOST adaptation to KIWAY

4266. By Alexander Lunev on 2014-04-21

removed temporary workaround for static initialization order fiasco due to the issue fixed in revision 4799 of lp:kicad branch

4267. By Alexander Lunev on 2014-04-21

merge with revision 4810 of lp:kicad branch

4268. By Alexander Lunev on 2014-04-21

merge with revision 4813 of lp:kicad branch

4269. By Alexander Lunev on 2014-04-23

merge with revision 4817 of lp:kicad branch

4270. By Alexander Lunev on 2014-04-24

merge with revision 4825 of lp:kicad branch

4271. By Alexander Lunev on 2014-05-11

merge with revision 4841 of lp:kicad branch

4272. By Alexander Lunev on 2014-05-18

merge with revision 4842 of lp:kicad branch

4273. By Alexander Lunev on 2014-05-18

merge with revision 4845 of lp:kicad branch

4274. By Alexander Lunev on 2014-05-18

merge with revision 4859 of lp:kicad branch

4275. By Alexander Lunev on 2014-05-18

merge with revision 4864 of lp:kicad branch

4276. By Alexander Lunev on 2014-05-18

merge with revision 4866 of lp:kicad branch

4277. By Alexander Lunev on 2014-05-20

GOST-doc-gen: support for LibreOffice 4.0 - 4.5 on Windows

4278. By Alexander Lunev on 2014-06-22

merge with revision 4952 of lp:kicad branch

4279. By Alexander Lunev on 2014-06-25

merge with revision 4955 of lp:kicad branch

4280. By Alexander Lunev on 2014-06-26

corrected a typo in FindOOInstallationPath() (MinGW compilation case)

4281. By Alexander Lunev on 2014-06-29

fixed bug #1335547: pcad2kicadsch does not start

4282. By Alexander Lunev on 2014-07-01

merge with revision 4965 of lp:kicad branch

4283. By Alexander Lunev on 2014-07-03

merge with revision 4969 of lp:kicad branch

4284. By Alexander Lunev on 2014-07-04

merge with revision 4973 of lp:kicad branch

4285. By Alexander Lunev on 2014-07-06

merge with revision 4977 of lp:kicad branch

4286. By Alexander Lunev on 2014-07-07

merge with revision 4985 of lp:kicad branch

4287. By Alexander Lunev on 2014-07-11

merge with revision 4989 of lp:kicad branch

4288. By Alexander Lunev on 2014-07-12

fixed bug #1335435: kicad segment fault when use GOST Tools

4289. By Alexander Lunev on 2014-07-12

GOST-doc-gen: added check for unspecified component reference

4290. By Alexander Lunev on 2014-07-16

merge with revision 5005 of lp:kicad branch

4291. By Alexander Lunev on 2014-07-23

merge with revision 5023 of lp:kicad branch

4292. By Alexander Lunev on 2014-08-08

merge with revision 5060 of lp:kicad branch

4293. By Alexander Lunev on 2014-08-13

merge with revision 5070 of lp:kicad branch

4294. By Konstantin Baranovskiy on 2014-09-05

merge with revision 5113 of lp:kicad branch

4295. By Eldar Khayrullin on 2014-09-13

Fix compile error after merging with lp:kicad #5113

4296. By Eldar Khayrullin on 2014-09-14

Improvement in generating GOST documents:
* automatical correction of decimal number (adds letter "П" before "Э3" if present, else adds "ПЭ3");
* removing extra information from name of schematic if present ("Схема электрическая...").

4297. By Konstantin Baranovskiy on 2014-09-16

Fixed automatic correction of the decimal number. Now does nothing if this field is empty.

4298. By Konstantin Baranovskiy on 2014-09-16

For component list to design name appends "Перечень элементов" according to GOST 2.701-2008 page 9 item 5.7.4.

4299. By Konstantin Baranovskiy on 2014-09-17

Changed frame of the sheet of the registration the changes from form 2 to 2a (GOST 2.104).
Improved automatic correction of the suffixes of the decimal numbers in specification.

4300. By Konstantin Baranovskiy on 2014-09-18

Added automatic definition the type of the schematic for specification generation (see GOST 2.701-2008 page 3, table 2).

4301. By Konstantin Baranovskiy on 2014-09-20

Corrected filling the designation's (decimal number) field on second and next pages of the specification and the component list documents.

4302. By Konstantin Baranovskiy on 2014-10-21

merge with revision 5207 of lp:kicad branch

4303. By Konstantin Baranovskiy on 2014-10-21

Fixed compilation without KICAD_GOST option.

4304. By Konstantin Baranovskiy on 2014-10-21

merge with revision 5210 of lp:kicad branch

4305. By Konstantin Baranovskiy on 2014-10-22

merge with revision 5215 of lp:kicad branch

4306. By Konstantin Baranovskiy on 2014-10-26

merge with revision 5223 of lp:kicad branch

4307. By Konstantin Baranovskiy on 2014-10-26

merge with revision 5224 of lp:kicad branch

4308. By Alexander Lunev on 2014-11-29

merge with revision 4309 of lp:~quasiyoke/kicad/kicad branch

4309. By Alexander Lunev on 2014-11-30

merge with revision 5307 of lp:kicad branch

4310. By Alexander Lunev on 2014-11-30

recovered BOM_LABEL class which has been removed in lp:kicad branch (it is necessary for eeschema BOM generation in GOST KiCad branch

4311. By Alexander Lunev on 2014-11-30

adapted pcad2kicadsch to removed old build configuration since kiway is now the only way to build kicad;
eliminated a warning during pcad2kicadsch compilation

4312. By Alexander Lunev on 2014-12-11

merge with revision 5319 of lp:kicad branch

4313. By Eldar Khayrullin on 2015-01-06

default use GOST part id notation ".1" (see GOST 2.702-75 and GOST 2.710-81)

4314. By Eldar Khayrullin on 2015-01-06

default use GOST minimal recomended line width - 0.3 mm (see GOST 2.701-2008 p.5.5) and thickened (see GOST 2.751-73) width for bus - 0.6 mm

4315. By Eldar Khayrullin on 2015-01-07

default use minimal recomended GOST text size 2,5 mm (see GOST 2.304-81) and for library editor pin name/num text size 1,8 mm

4316. By Eldar Khayrullin on 2015-01-08

on some Linux distrs (e.g. Ubuntu) Kicad GOST Tools not find Office embedded Python. If so, use environment var KIGOSTPYTHON path, otherwise use the system Python. Also fix compile warning

4317. By Eldar Khayrullin on 2015-01-08

For plotting used minimal recomended GOST dashed line mark length - 2 mm and space - 1 mm (see GOST 2.303-68). Added plotting dashed lines at SVG format

4318. By Eldar Khayrullin on 2015-01-08

Returned deleted code in rev. 4314, 4315. Instead used check KICAD_GOST definition

4319. By Eldar Khayrullin on 2015-01-09

Used correction radius (proportional line width) for plotting dashed lines

4320. By Eldar Khayrullin on 2015-01-17

Used the separator "-" for group refdes (see published in ИУС №2, 2012 correction to GOST 2.701-2008 ).
Added a transistor in list of component index. Fixed some typos

4321. By Eldar Khayrullin on 2015-02-22

merge with revision 5444 of lp:kicad branch

4322. By Eldar Khayrullin on 2015-03-07

merge with revision 5484 of lp:kicad branch

4323. By Eldar Khayrullin on 2015-03-08

Use in eeschema graphic lines with long dashes instead short for getting more better image lines

4324. By Eldar Khayrullin on 2015-03-14

merge with revision 5511 of lp:kicad branch

4325. By Alexander Lunev on 2015-03-18

merge with revision 5524 of lp:kicad

4326. By Eldar Khayrullin on 2015-03-28

merge with revision 5543 of lp:kicad branch

4327. By Eldar Khayrullin on 2015-03-29

Fix overlapping Quit hotkey in pcbnew

4328. By Alexander Lunev on 2015-04-03

merge with revision 5569 of lp:kicad branch

4329. By Alexander Lunev on 2015-04-03

pcad2kicadsch: supported conversion of wires to bus entries

4330. By Eldar Khayrullin on 2015-04-05

merge with revision 5573 of lp:kicad branch

4331. By Eldar Khayrullin on 2015-04-11

merge with revision 5593 of lp:kicad branch

4332. By Eldar Khayrullin on 2015-04-18

merge with revision 5609 of lp:kicad branch

4333. By Eldar Khayrullin <email address hidden> on 2015-04-25

merge with revision 5622 of lp:kicad branch

4334. By Eldar Khayrullin on 2015-05-01

merge with revision 5635 of lp:kicad branch

4335. By Eldar Khayrullin on 2015-05-09

merge with revision 5648 of lp:kicad branch

4336. By Eldar Khayrullin on 2015-05-16

merge with revision 5654 of lp:kicad branch

4337. By Eldar Khayrullin on 2015-05-16

Fix compile error after merge with branch lp:kicad

4338. By Eldar Khayrullin on 2015-05-23

Merge with revision 5678 of lp:kicad branch

4339. By Eldar Khayrullin on 2015-05-30

Merge with rev. 5690 of lp:kicad

4340. By Eldar Khayrullin on 2015-06-06

Merge with rev. 5717 of lp:kicad

4341. By Eldar Khayrullin on 2015-06-13

Merge with lp:kicad(BZR5743)

4342. By Eldar Khayrullin on 2015-06-13

Make some strings are to translatable for pcad2kicad utility

4343. By Eldar Khayrullin on 2015-06-13

Make some strings are to translatable for GOST tools

4344. By Eldar Khayrullin on 2015-06-16

Make translatable GOST-doc-gen messages

4345. By Eldar Khayrullin on 2015-06-16

Translate pcad2kicad

4346. By Eldar Khayrullin on 2015-06-20

Merge with lp:kicad (BZR5795)

Unmerged revisions

4496. By Eldar Khayrullin on 2020-06-12

PCAD to sch use for metric grid convenient conversion: 0.25mm to 0.254mm

4495. By Eldar Khayrullin on 2017-12-23

pcad2kicadsch: merge import font properties from master branch

4494. By Eldar Khayrullin on 2017-12-02

pcad2kicadsch: import IEEE symbols

4493. By Eldar Khayrullin on 2017-11-26

pcad2kicadsch: replace slashes to '_' in symbols and footprint names

4492. By Eldar Khayrullin on 2017-11-26

pcad2kicadsch: use fp-lib-table (Note: Archive Footprints from imported pcb to {prj_name}.pretty)

4491. By Eldar Khayrullin on 2017-11-26

pcad2kicadsch: use new sym-lib-table

4490. By Eldar Khayrullin on 2017-11-26

pcad2kicadsch: fix not connected Wire Labels

4489. By Eldar Khayrullin on 2017-11-25

pcad2kicadsch: set Footprint field in library

4488. By Eldar Khayrullin on 2017-11-25

pcad2kicadsch: set Footprint field in sch symbols

4487. By Eldar Khayrullin on 2017-11-25

pcad2kicadsch: individual for each pin a visibility name/number

=== modified file '.bzrignore'
--- .bzrignore	2015-04-30 08:46:03 +0000
+++ .bzrignore	2015-06-20 07:42:20 +0000
@@ -48,3 +48,4 @@
 bitmaps_png/tmp
 common/pcb_keywords.cpp
 include/pcb_lexer.h
+include/openoffice
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-11 20:42:48 +0000
+++ CMakeLists.txt	2015-06-20 07:42:20 +0000
@@ -23,6 +23,20 @@
 # reports.
 #
 
+# Russian GOST patch
+option( wxUSE_UNICODE "enable/disable building unicode (default OFF)" )
+option( KICAD_GOST "enable/disable building using GOST notation for multiple gates per package (default OFF)" )
+option( USE_INTERNAT "this option needs to be clarified (default OFF)" )
+option( USE_RPC_DOC_SERVER "enable/disable building GOST document generator using RPC document server (default ON)" ON )
+option( USE_OPENOFFICE_SDK "enable/disable building GOST document generator with use of OpenOffice/LibreOffice SDK (default OFF)" )
+option( USE_PYTHON_GOSTDOCGEN "enable/disable building Python based GOST document generator (default OFF)" )
+# USE_RPC_DOC_SERVER and USE_OPENOFFICE_SDK are suboptions of KICAD_GOST option.
+# These suboptions select an approach how to interact with OpenOffice / LibreOffice.
+# It is recommended to set the suboptions as follows: USE_RPC_DOC_SERVER=ON and USE_OPENOFFICE_SDK=OFF.
+# Other suboption combinations suffer from building and incompatibility issues. They are kept as spare approaches.
+
+option( USE_PCAD2KICAD "PCad to Kicad converter (default ON). Warning, this is experimental" ON )
+
 # The desire is to migrate designs *away from* case independence, and to create designs which use
 # literally (case specific) interpreted component names.  But for backwards compatibility,
 # you may turn OFF this option if you really must.  (Remember that with KiCad using text
@@ -270,6 +284,26 @@
 
 endif( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
 
+if( wxUSE_UNICODE )
+    add_definitions( -DwxUSE_UNICODE )
+endif()
+
+if( KICAD_GOST )
+    add_definitions( -DKICAD_GOST )
+endif()
+
+if( USE_RPC_DOC_SERVER )
+    add_definitions( -DUSE_RPC_DOC_SERVER )
+endif()
+
+if( USE_OPENOFFICE_SDK )
+    add_definitions( -DUSE_OPENOFFICE_SDK )
+endif()
+
+if(USE_PCAD2KICAD)
+    add_definitions(-DUSE_PCAD2KICAD)
+endif(USE_PCAD2KICAD)
+
 if( KICAD_KEEPCASE )
     add_definitions( -DKICAD_KEEPCASE )
 endif()
@@ -398,6 +432,7 @@
     KICAD_PLUGINS
     KICAD_DATA
     KICAD_DOCS
+    KICAD_INTERNAT
     KICAD_DEMOS
     KICAD_TEMPLATE )
 
@@ -596,7 +631,8 @@
 
 
 # Find Python and other scripting resources
-if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
+if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES OR USE_PYTHON_GOSTDOCGEN OR
+   ( KICAD_GOST AND NOT USE_RPC_DOC_SERVER AND NOT USE_OPENOFFICE_SDK ) )
     # force a python version < 3.0
     set( PythonInterp_FIND_VERSION 2.6 )
     set( PythonLibs_FIND_VERSION 2.6 )
@@ -746,6 +782,9 @@
 
 #add_subdirectory( new )
 
+if( KICAD_GOST )
+add_subdirectory( extra/pcad2kicadsch )
+endif( KICAD_GOST )
 
 # Make all libs and executables depend on ExternalProject_Add( boost ),
 # except perhaps bitmap lib.  This allows a multi-threaded build to succeed.
@@ -781,6 +820,10 @@
 #############
 # Resources #
 #############
+if( USE_INTERNAT )
+add_subdirectory( internat )
+endif( USE_INTERNAT )
+
 add_subdirectory( demos )
 add_subdirectory( template )
 
 
=== modified file 'CMakeModules/CreateBzrVersionHeader.cmake'
--- CMakeModules/CreateBzrVersionHeader.cmake	2013-12-28 11:29:20 +0000
+++ CMakeModules/CreateBzrVersionHeader.cmake	2015-06-20 07:42:20 +0000
@@ -63,7 +63,11 @@
     if( Kicad_REPO_LAST_CHANGED_DATE )
         string( REGEX REPLACE "^([0-9]+)\\-([0-9]+)\\-([0-9]+)" "\\1-\\2-\\3"
                 _kicad_bzr_date ${Kicad_REPO_LAST_CHANGED_DATE} )
-      	set( KICAD_BUILD_VERSION "(${_kicad_bzr_date} BZR ${Kicad_REPO_REVISION})" )
+        if( KICAD_GOST )
+        	set( KICAD_BUILD_VERSION "(${_kicad_bzr_date} BZR ${Kicad_REPO_REVISION} GOST-COMMITTERS)" )
+        else( KICAD_GOST )
+        	set( KICAD_BUILD_VERSION "(${_kicad_bzr_date} BZR ${Kicad_REPO_REVISION})" )
+        endif( KICAD_GOST )
 
         # Definition to conditionally use date and revision returned from the
         # Bazaar log command instead of hand coded date and revision in
 
=== added file 'CMakeModules/FindOpenOffice.cmake'
--- CMakeModules/FindOpenOffice.cmake	1970-01-01 00:00:00 +0000
+++ CMakeModules/FindOpenOffice.cmake	2015-06-20 07:42:20 +0000
@@ -0,0 +1,192 @@
+# - Try to find OpenOffice.org SDK, installed from repositories or from "vanilla" distribution
+# Once done this will define
+#
+#  OpenOffice_FOUND - System has OpenOffice.org with SDK
+#  OpenOffice_VERSION - Version of OpenOffice.org with SDK
+#  OOO_PREFIX - Prefix of OpenOffice.org installation
+#  OOO_BASIS_DIR - "basis" directory of OpenOffice.org
+#  OOO_PROGRAM_DIR - "program" directory of OpenOffice.org
+#  OOO_URE_DIR - "ure" directory of OpenOffice.org
+#  OOO_SDK_DIR - "sdk" directory of OpenOffice.org
+#  OOO_INCLUDE_DIR -  include directory of OpenOffice.org
+#  UNOPKG_EXECUTABLE - Absolute path of unopkg tool
+#
+#  Copyright (c) 2010 Konstantin Tokarev <[e-mail]>
+#  Copyright (c) 2013 Alexander Lunev <[e-mail]>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# TODO: Find Go-oo from Novell
+
+unset(OOO_PREFIX CACHE)
+unset(OOO_BASIS_DIR CACHE)
+unset(OOO_SDK_DIR CACHE)
+unset(OOO_PROGRAM_DIR CACHE)
+unset(UNOPKG_EXECUTABLE CACHE)
+unset(OOO_URE_DIR CACHE)
+unset(OOO_INCLUDE_DIR CACHE)
+
+if(UNIX)
+  set(OOO_PATH_HINTS
+    /usr/lib/openoffice/*
+    /usr/lib/ooo/*
+    /usr/lib64/openoffice/*
+    /usr/lib64/ooo/*
+    /usr/local/openoffice/*
+    /opt/openoffice.org3/*
+    /opt/ooo-dev3/*
+    /usr/lib/libreoffice
+    /usr/lib64/libreoffice
+  )
+elseif(WIN32)
+  set(OOO_PATH_HINTS
+    "C:\\Program Files (x86)\\OpenOffice.org 3"
+    "C:\\Program Files\\OpenOffice.org 3"
+    "C:\\Program Files (x86)\\LibreOffice*"
+    "C:\\Program Files\\LibreOffice*"
+  )
+
+  set(OOO_SDK_PATH_HINTS
+    "C:\\Program Files\\OpenOffice*SDK\\sdk"
+    "C:\\Program Files (x86)\\OpenOffice*SDK\\sdk"
+    "C:\\Program Files\\OpenOffice.org 3\\Basis\\sdk"
+    "C:\\Program Files (x86)\\OpenOffice.org 3\\Basis\\sdk"
+    "C:\\Program Files\\LibreOffice*SDK\\sdk"
+    "C:\\Program Files (x86)\\LibreOffice*SDK\\sdk"
+  )
+
+  set(EXE_EXT ".exe")
+endif(UNIX)
+
+if(OOO_PREFIX)
+  set(OOO_PATH_HINTS 
+  "${OOO_PREFIX}/*"
+  ${OOO_PATH_HINTS}
+)
+endif(OOO_PREFIX)
+
+if(WIN32)
+  find_path(OOO_BASIS_DIR
+    NAMES
+      Basis/program/offapi.rdb
+    HINTS
+      ${OOO_PATH_HINTS}  
+)
+else(WIN32)
+  find_path(OOO_BASIS_DIR
+    NAMES
+      sdk/bin/idlc
+    HINTS
+      ${OOO_PATH_HINTS}  
+)
+endif(WIN32)
+mark_as_advanced(OOO_BASIS_DIR)
+
+if(NOT OOO_BASIS_DIR)
+  if(OpenOffice_FIND_REQUIRED)
+    message(FATAL_ERROR "Could not find OpenOffice.org SDK")
+  endif(OpenOffice_FIND_REQUIRED)
+else(NOT OOO_BASIS_DIR)
+  set(OOO_PREFIX "${OOO_BASIS_DIR}" CACHE STRING "OpenOffice.org root directory")
+
+  if(WIN32)
+    find_path(OOO_SDK_DIR
+      NAMES
+        bin/idlc.exe
+      HINTS
+        ${OOO_SDK_PATH_HINTS}  
+    )
+    mark_as_advanced(OOO_SDK_DIR)
+  else(WIN32)
+    set(OOO_SDK_DIR "${OOO_BASIS_DIR}/sdk" CACHE STRING "OpenOffice.org SDK root directory")
+  endif(WIN32)
+
+  message(STATUS "Found OpenOffice.org SDK: ${OOO_SDK_DIR}")
+endif(NOT OOO_BASIS_DIR)
+
+find_path(OOO_PROGRAM_DIR
+  NAMES
+    soffice${EXE_EXT}
+  HINTS
+    "${OOO_PREFIX}/program"
+    "${OOO_PREFIX}/../program"
+)
+mark_as_advanced(OOO_PROGRAM_DIR)
+
+if(NOT OOO_PROGRAM_DIR)
+  if(OpenOffice_FIND_REQUIRED)
+    message(FATAL_ERROR "Could not find OpenOffice.org program directory")
+  endif(OpenOffice_FIND_REQUIRED)
+else(NOT OOO_PROGRAM_DIR)
+  message(STATUS "Found OpenOffice.org program directory: ${OOO_PROGRAM_DIR}")
+endif(NOT OOO_PROGRAM_DIR)
+
+find_file(UNOPKG_EXECUTABLE
+  NAMES
+    unopkg${EXE_EXT}
+  HINTS 
+    "${OOO_PREFIX}/program"
+    "${OOO_PREFIX}/../program"
+  NO_DEFAULT_PATH
+)
+mark_as_advanced(UNOPKG_EXECUTABLE)
+
+if(NOT UNOPKG_EXECUTABLE)
+  if(OpenOffice_FIND_REQUIRED)
+    message(FATAL_ERROR "Could not find unopkg executable")
+  endif(OpenOffice_FIND_REQUIRED)
+else(NOT UNOPKG_EXECUTABLE)
+  message(STATUS "Found unopkg executable: ${UNOPKG_EXECUTABLE}")
+endif(NOT UNOPKG_EXECUTABLE)
+
+
+find_path(OOO_URE_DIR
+  NAMES
+    share/java/java_uno.jar
+    java/java_uno.jar
+  HINTS
+    "${OOO_BASIS_DIR}/*"
+)
+mark_as_advanced(OOO_URE_DIR)
+
+if(NOT OOO_URE_DIR)
+  if(OpenOffice_FIND_REQUIRED)
+    message(FATAL_ERROR "Could not find OpenOffice ure directory")
+  endif(OpenOffice_FIND_REQUIRED)
+else(NOT OOO_URE_DIR)
+  set(OOO_URE_JAVA_DIR "${OOO_URE_DIR}/share/java")
+  message(STATUS "Found URE Java path: ${OOO_URE_JAVA_DIR}")
+endif(NOT OOO_URE_DIR)
+
+find_path(OOO_INCLUDE_DIR 
+  NAMES 
+    com/sun/star/uno/Any.h
+  HINTS
+    "${OOO_SDK_DIR}/include"
+    /usr/include/openoffice
+)
+mark_as_advanced(OOO_INCLUDE_DIR)
+
+if(NOT OOO_INCLUDE_DIR)
+  if(OpenOffice_FIND_REQUIRED)
+    message(FATAL_ERROR "Could not find OpenOffice.org SDK include directory")
+  endif(OpenOffice_FIND_REQUIRED)
+else(NOT OOO_INCLUDE_DIR)
+  message(STATUS "Found OpenOffice.org SDK include directory: ${OOO_INCLUDE_DIR}")
+endif(NOT OOO_INCLUDE_DIR)
+
+if(OOO_PROGRAM_DIR AND OOO_SDK_DIR AND OOO_URE_DIR AND UNOPKG_EXECUTABLE AND OOO_INCLUDE_DIR)
+  set(OpenOffice_FOUND 1)
+
+  if(WIN32)
+    file(READ "${OOO_PROGRAM_DIR}/version.ini" _VERSION_RC_CONTENTS)
+  else(WIN32)
+    file(READ "${OOO_PROGRAM_DIR}/versionrc" _VERSION_RC_CONTENTS)
+  endif(WIN32)
+
+  string(REGEX REPLACE ".*ProductMajor=([0-9]+).*" "\\1" OpenOffice_VERSION "${_VERSION_RC_CONTENTS}")
+else(OOO_PROGRAM_DIR AND OOO_SDK_DIR AND OOO_URE_DIR AND UNOPKG_EXECUTABLE AND OOO_INCLUDE_DIR)
+  set(OpenOffice_FOUND 0)
+endif(OOO_PROGRAM_DIR AND OOO_SDK_DIR AND OOO_URE_DIR AND UNOPKG_EXECUTABLE AND OOO_INCLUDE_DIR)
 
=== modified file 'common/build_version.cpp'
--- common/build_version.cpp	2015-05-26 06:18:50 +0000
+++ common/build_version.cpp	2015-06-20 07:42:20 +0000
@@ -30,8 +30,12 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
+#if defined KICAD_GOST
+#   define KICAD_BUILD_VERSION "(after 2015-may-25 BZR ???? GOST (bzr????-testing))"
+#else
 #   define KICAD_BUILD_VERSION "(after 2015-may-25 BZR unknown)"
 #endif
+#endif
 
 /**
  * Function GetBuildVersion
 
=== modified file 'common/class_plotter.cpp'
--- common/class_plotter.cpp	2015-03-10 20:00:50 +0000
+++ common/class_plotter.cpp	2015-06-20 07:42:20 +0000
@@ -63,8 +63,13 @@
     // Temporary init to avoid not initialized vars, will be set later
     m_IUsPerDecimil = 1;        // will be set later to the actual value
     iuPerDeviceUnit = 1;        // will be set later to the actual value
+#if defined(KICAD_GOST)
+    m_dashMarkLength_mm = 2.0;  // Dashed line parameter in mm: segment
+    m_dashGapLength_mm = 1.0;   // Dashed line parameter in mm: gap
+#else
     m_dashMarkLength_mm = 0.5;  // Dashed line parameter in mm: segment
     m_dashGapLength_mm = 0.25;   // Dashed line parameter in mm: gap
+#endif
 }
 
 PLOTTER::~PLOTTER()
 
=== modified file 'common/dialog_about/AboutDialog_main.cpp'
--- common/dialog_about/AboutDialog_main.cpp	2015-05-11 16:25:33 +0000
+++ common/dialog_about/AboutDialog_main.cpp	2015-06-20 07:42:20 +0000
@@ -155,6 +155,9 @@
     description << wxT( "<li>" ) <<
     HtmlHyperlink( wxT( "http://www.kicadlib.org" ),
                   _( "Repository with additional component libraries" ) ) << wxT( "</li>" );
+    description << wxT( "<li>" ) <<
+    HtmlHyperlink( wxT( "http://electronix.ru/forum/index.php?showforum=210" ),
+                  _( "The Internet forum dedicated to KiCad Russian support, including GOST support" ) ) << wxT( "</li>" );
     description << wxT( "</ul>" );
 
     description << wxT( "</p>" );
 
=== modified file 'common/gr_basic.cpp'
--- common/gr_basic.cpp	2015-03-25 17:27:17 +0000
+++ common/gr_basic.cpp	2015-06-20 07:42:20 +0000
@@ -384,7 +384,11 @@
 void GRDashedLineTo( EDA_RECT* ClipBox, wxDC* DC, int x2, int y2, int width, EDA_COLOR_T Color )
 {
     s_DC_lastcolor = UNSPECIFIED_COLOR;
+#if defined(KICAD_GOST)
+    GRSetColorPen( DC, Color, width, wxPENSTYLE_LONG_DASH );
+#else
     GRSetColorPen( DC, Color, width, wxPENSTYLE_SHORT_DASH );
+#endif
     WinClipAndDrawLine( ClipBox, DC, GRLastMoveToX, GRLastMoveToY, x2, y2, width );
     s_DC_lastcolor = UNSPECIFIED_COLOR;
     GRSetColorPen( DC, Color, width );
@@ -405,7 +409,11 @@
     GRLastMoveToX  = x2;
     GRLastMoveToY  = y2;
     s_DC_lastcolor = UNSPECIFIED_COLOR;
+#if defined(KICAD_GOST)
+    GRSetColorPen( DC, Color, width, wxPENSTYLE_LONG_DASH );
+#else
     GRSetColorPen( DC, Color, width, wxPENSTYLE_SHORT_DASH );
+#endif
     WinClipAndDrawLine( ClipBox, DC, x1, y1, x2, y2, width );
     s_DC_lastcolor = UNSPECIFIED_COLOR;
     GRSetColorPen( DC, Color, width );
 
=== modified file 'common/kiway.cpp'
--- common/kiway.cpp	2015-03-26 17:27:13 +0000
+++ common/kiway.cpp	2015-06-20 07:42:20 +0000
@@ -105,6 +105,9 @@
     case FACE_CVPCB:            name = KIFACE_PREFIX wxT( "cvpcb" );            break;
     case FACE_GERBVIEW:         name = KIFACE_PREFIX wxT( "gerbview" );         break;
     case FACE_PL_EDITOR:        name = KIFACE_PREFIX wxT( "pl_editor" );        break;
+#if defined( KICAD_GOST )
+    case FACE_PCAD2KICADSCH:    name = KIFACE_PREFIX wxT( "pcad2kicadsch" );    break;
+#endif
     case FACE_PCB_CALCULATOR:   name = KIFACE_PREFIX wxT( "pcb_calculator" );   break;
     case FACE_BMP2CMP:          name = KIFACE_PREFIX wxT( "bitmap2component" ); break;
 
@@ -257,6 +260,11 @@
     case FRAME_PL_EDITOR:
         return FACE_PL_EDITOR;
 
+#if defined( KICAD_GOST )
+    case FRAME_PCAD2KICADSCH:
+        return FACE_PCAD2KICADSCH;
+#endif
+
     case FRAME_CALC:
         return FACE_PCB_CALCULATOR;
 
 
=== modified file 'cvpcb/cvframe.cpp'
--- cvpcb/cvframe.cpp	2015-06-07 18:18:45 +0000
+++ cvpcb/cvframe.cpp	2015-06-20 07:42:20 +0000
@@ -835,10 +835,18 @@
     {
         component = m_netlist.GetComponent( i );
 
+#if defined(KICAD_GOST)
+        msg.Printf( CMP_FORMAT, m_compListBox->GetCount() + 1,
+                    GetChars( component->GetReference() ),
+                    GetChars( FormFullString( component ) ),
+                    GetChars( FROM_UTF8( component->GetFPID().Format().c_str() ) ) );
+#else
         msg.Printf( CMP_FORMAT, m_compListBox->GetCount() + 1,
                     GetChars( component->GetReference() ),
                     GetChars( component->GetValue() ),
                     GetChars( FROM_UTF8( component->GetFPID().Format().c_str() ) ) );
+#endif
+
         m_compListBox->m_ComponentList.Add( msg );
     }
 
 
=== modified file 'cvpcb/cvpcb_mainframe.h'
--- cvpcb/cvpcb_mainframe.h	2015-06-07 18:18:45 +0000
+++ cvpcb/cvpcb_mainframe.h	2015-06-20 07:42:20 +0000
@@ -174,6 +174,9 @@
 
     void             OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event );
 
+#if defined(KICAD_GOST)
+    wxString         FormFullString( COMPONENT* aComponent );
+#endif
     /**
      * Function SetNewPkg
      * links the footprint to the current selected component
 
=== modified file 'cvpcb/readwrite_dlgs.cpp'
--- cvpcb/readwrite_dlgs.cpp	2015-06-07 18:18:45 +0000
+++ cvpcb/readwrite_dlgs.cpp	2015-06-20 07:42:20 +0000
@@ -45,6 +45,28 @@
 #include <fp_conflict_assignment_selector.h>
 
 
+#if defined(KICAD_GOST)
+wxString CVPCB_MAINFRAME::FormFullString( COMPONENT* aComponent )
+{
+    wxString   full_str;
+
+    if( aComponent->GetType() == wxEmptyString )
+        full_str = aComponent->GetName();
+    else
+        full_str = aComponent->GetType();
+
+    if( aComponent->GetValue() != wxT( "~" )
+        && aComponent->GetValue() != aComponent->GetName() )
+        // workaround for eeschema bug (Value field is assigned to Chip Name field by default
+        // on the component adding from a library)
+    {
+        full_str += wxT( " " ) + aComponent->GetValue();
+    }
+
+    return full_str;
+}
+#endif
+
 void CVPCB_MAINFRAME::SetNewPkg( const wxString& aFootprintName )
 {
     COMPONENT* component;
@@ -86,10 +108,18 @@
         component->SetFPID( fpid );
 
         // create the new component description
+
+#if defined(KICAD_GOST)
+        wxString   description = wxString::Format( CMP_FORMAT, componentIndex + 1,
+                            GetChars( component->GetReference() ),
+                            GetChars( FormFullString( component ) ),
+                            GetChars( FROM_UTF8( component->GetFPID().Format().c_str() ) ) );
+#else
         wxString   description = wxString::Format( CMP_FORMAT, componentIndex + 1,
                             GetChars( component->GetReference() ),
                             GetChars( component->GetValue() ),
                             GetChars( FROM_UTF8( component->GetFPID().Format().c_str() ) ) );
+#endif
 
         // If the component hasn't had a footprint associated with it
         // it now has, so we decrement the count of components without
@@ -115,7 +145,6 @@
     DisplayStatus();
 }
 
-
 /// Return true if the resultant FPID has a certain nickname.  The guess
 /// is only made if this footprint resides in only one library.
 /// @return int - 0 on success, 1 on not found, 2 on ambiguous i.e. multiple matches
@@ -344,10 +373,17 @@
     {
         COMPONENT* component = m_netlist.GetComponent( i );
 
+#if defined(KICAD_GOST)
+        msg.Printf( CMP_FORMAT, m_compListBox->GetCount() + 1,
+                    GetChars( component->GetReference() ),
+                    GetChars( FormFullString( component ) ),
+                    GetChars( FROM_UTF8( component->GetFPID().Format().c_str() ) ) );
+#else
         msg.Printf( CMP_FORMAT, m_compListBox->GetCount() + 1,
                     GetChars( component->GetReference() ),
                     GetChars( component->GetValue() ),
                     GetChars( FROM_UTF8( component->GetFPID().Format().c_str() ) ) );
+#endif
 
         m_compListBox->AppendLine( msg );
 
 
=== modified file 'demos/CMakeLists.txt'
--- demos/CMakeLists.txt	2015-04-27 18:02:27 +0000
+++ demos/CMakeLists.txt	2015-06-20 07:42:20 +0000
@@ -1,4 +1,5 @@
 install( DIRECTORY
+    GOST
     complex_hierarchy
     ecc83 electric
     flat_hierarchy
 
=== added directory 'demos/GOST'
=== added file 'demos/GOST/multivibrator-comp-idx-kicad_uno_iface.log'
--- demos/GOST/multivibrator-comp-idx-kicad_uno_iface.log	1970-01-01 00:00:00 +0000
+++ demos/GOST/multivibrator-comp-idx-kicad_uno_iface.log	2015-06-20 07:42:20 +0000
@@ -0,0 +1,103 @@
+('Python version:', (2, 6, 6, 'final', 0))
+Connect
+LoadDocument {file:///usr/local/share/kicad/GOST-doc-gen/templates/CompIndexFirstSheet_template.odt}
+SelectTable {0}
+PutCell {3:E4} {Мультивибратор} {0}
+PutCell {3:F1} {АБВГ.000000.001ПЭ3} {0}
+PutCell {0:B1} {АБВГ.000000.001} {0}
+PutCell {3:B4} {Лунев} {0}
+PutCell {3:B5} {Барановский} {0}
+PutCell {3:B8} {Викулов} {0}
+PutCell {3:F6} {ООО "XXXXX"} {0}
+SelectTable {0}
+PutCell {1:A4} {} {0}
+SelectTable {0}
+PutCell {1:A5} {C4} {0}
+PutCell {1:C5} {1} {0}
+PutCell {1:D5} {Не устанавливается} {0}
+SelectTable {0}
+PutCell {1:A6} {} {0}
+SelectTable {0}
+PutCell {1:A7} {} {0}
+PutCell {1:B7} {Резисторы 0805} {2}
+SelectTable {0}
+PutCell {1:A8} {R1} {0}
+PutCell {1:B8} {0805 1 кОм ±5 %} {0}
+PutCell {1:C8} {1} {0}
+PutCell {1:D8} { "Yageo"} {0}
+SelectTable {0}
+PutCell {1:A9} {R2,R3} {0}
+PutCell {1:B9} {0805 100 кОм ±5 %} {0}
+PutCell {1:C9} {2} {0}
+PutCell {1:D9} { "Yageo"} {0}
+SelectTable {0}
+PutCell {1:A10} {R4} {0}
+PutCell {1:B10} {0805 1 кОм ±5 %} {0}
+PutCell {1:C10} {1} {0}
+PutCell {1:D10} { "Yageo"} {0}
+SelectTable {0}
+PutCell {1:A11} {} {0}
+SelectTable {0}
+PutCell {1:A12} {VT1,VT2} {0}
+PutCell {1:B12} {Транзистор PN2222A} {0}
+PutCell {1:C12} {2} {0}
+PutCell {1:D12} {допускается замена} {0}
+PutCell {1:D13} {на MMBT2222A} {0}
+PutCell {1:D14} {"Fairchild"} {0}
+SelectTable {0}
+PutCell {1:A15} {} {0}
+SelectTable {0}
+PutCell {1:A16} {} {0}
+PutCell {1:B16} {Переменные данные для исполнений} {3}
+SelectTable {0}
+PutCell {1:A17} {} {0}
+SelectTable {0}
+PutCell {1:A18} {} {0}
+PutCell {1:B18} {АБВГ.000000.001} {3}
+SelectTable {0}
+PutCell {1:A19} {} {0}
+PutCell {1:B19} {Мультивибратор} {3}
+SelectTable {0}
+PutCell {1:A20} {} {0}
+SelectTable {0}
+PutCell {1:A21} {C1,C2} {0}
+PutCell {1:B21} {Конденсатор 0805-X7R-50 В- 0,1 мкФ ±20 %} {0}
+PutCell {1:C21} {2} {0}
+PutCell {1:D21} { "AVX"} {0}
+SelectTable {0}
+PutCell {1:A22} {} {0}
+SelectTable {0}
+PutCell {1:A23} {} {0}
+PutCell {1:B23} {АБВГ.000000.001-01} {3}
+SelectTable {0}
+PutCell {1:A24} {} {0}
+PutCell {1:B24} {Мультивибратор - 01} {3}
+SelectTable {0}
+PutCell {1:A25} {} {0}
+SelectTable {0}
+PutCell {1:A26} {} {0}
+PutCell {1:B26} {Конденсаторы 0805} {2}
+AppendDocument {file:///usr/local/share/kicad/GOST-doc-gen/templates/CompIndexMiddleSheet_template.odt}
+SelectTable {1}
+PutCell {3:G3} {2} {0}
+PutCell {3:F1} {АБВГ.000000.001ПЭ3} {0}
+SelectTable {1}
+PutCell {1:A2} {} {0}
+PutCell {1:B2} {Конденсаторы танталовые тип B} {2}
+SelectTable {1}
+PutCell {1:A3} {C1,C2} {0}
+PutCell {1:B3} {0805-X7R-50 В- 0,22 мкФ ±20 %} {0}
+PutCell {1:C3} {2} {0}
+PutCell {1:D3} { "AVX"} {0}
+SelectTable {1}
+PutCell {1:A4} {C3} {0}
+PutCell {1:B4} {танталовый тип B-16 В- 10 мкФ ±20 %} {0}
+PutCell {1:C4} {1} {0}
+PutCell {1:D4} { "Panasonic"} {0}
+AppendDocument {file:///usr/local/share/kicad/GOST-doc-gen/templates/CompIndexLastSheet_template.odt}
+SelectTable {2}
+PutCell {3:I5} {3} {0}
+PutCell {3:F1} {АБВГ.000000.001ПЭ3} {0}
+SelectTable {0}
+PutCell {3:J5} {3} {0}
+Exit
 
=== added file 'demos/GOST/multivibrator-spec-kicad_uno_iface.log'
--- demos/GOST/multivibrator-spec-kicad_uno_iface.log	1970-01-01 00:00:00 +0000
+++ demos/GOST/multivibrator-spec-kicad_uno_iface.log	2015-06-20 07:42:20 +0000
@@ -0,0 +1,180 @@
+('Python version:', (2, 6, 6, 'final', 0))
+Connect
+LoadDocument {file:///usr/local/share/kicad/GOST-doc-gen/templates/SpecificationFirstSheet_template.odt}
+SelectTable {0}
+PutCell {3:E4} {Мультивибратор} {0}
+PutCell {3:F1} {АБВГ.000000.001} {0}
+PutCell {0:B1} {} {0}
+PutCell {3:B4} {Лунев} {0}
+PutCell {3:B5} {Барановский} {0}
+PutCell {3:B8} {Викулов} {0}
+PutCell {3:F6} {ООО "XXXXX"} {0}
+SelectTable {0}
+PutCell {1:A4} {} {0}
+PutCell {1:D4} {} {0}
+SelectTable {0}
+PutCell {1:A5} {} {0}
+PutCell {1:D5} {} {0}
+PutCell {1:E5} {Документация} {3}
+SelectTable {0}
+PutCell {1:A6} {} {0}
+PutCell {1:D6} {} {0}
+SelectTable {0}
+PutCell {1:A7} {} {0}
+PutCell {1:D7} {АБВГ.000000.001 СБ} {0}
+PutCell {1:E7} {Сборочный чертеж} {0}
+SelectTable {0}
+PutCell {1:A8} {} {0}
+PutCell {1:D8} {} {0}
+SelectTable {0}
+PutCell {1:A9} {} {0}
+PutCell {1:D9} {АБВГ.000000.001 Э3} {0}
+PutCell {1:E9} {Схема электрическая} {0}
+PutCell {1:E10} {принципиальная} {0}
+SelectTable {0}
+PutCell {1:A11} {} {0}
+PutCell {1:D11} {} {0}
+SelectTable {0}
+PutCell {1:A12} {A4} {0}
+PutCell {1:D12} {АБВГ.000000.001 ПЭ3} {0}
+PutCell {1:E12} {Перечень элементов} {0}
+SelectTable {0}
+PutCell {1:A13} {} {0}
+PutCell {1:D13} {} {0}
+SelectTable {0}
+PutCell {1:A14} {} {0}
+PutCell {1:D14} {} {0}
+PutCell {1:E14} {Детали} {3}
+SelectTable {0}
+PutCell {1:A15} {} {0}
+PutCell {1:D15} {} {0}
+SelectTable {0}
+PutCell {1:A16} {} {0}
+PutCell {1:C16} {1} {0}
+PutCell {1:D16} {} {0}
+PutCell {1:E16} {Плата печатная} {0}
+PutCell {1:F16} {1} {0}
+SelectTable {0}
+PutCell {1:A17} {} {0}
+PutCell {1:D17} {} {0}
+SelectTable {0}
+PutCell {1:A18} {} {0}
+PutCell {1:D18} {} {0}
+SelectTable {0}
+PutCell {1:A19} {} {0}
+PutCell {1:D19} {} {0}
+PutCell {1:E19} {Прочие изделия} {3}
+SelectTable {0}
+PutCell {1:A20} {} {0}
+PutCell {1:D20} {} {0}
+SelectTable {0}
+PutCell {1:A21} {} {0}
+PutCell {1:D21} {} {0}
+PutCell {1:E21} {Резисторы 0805} {0}
+SelectTable {0}
+PutCell {1:A22} {} {0}
+PutCell {1:C22} {5} {0}
+PutCell {1:D22} {} {0}
+PutCell {1:E22} {0805 1 кОм ±5 %} {0}
+PutCell {1:E23} {Фирма "Yageo"} {0}
+PutCell {1:F22} {2} {0}
+PutCell {1:G22} {R1,R4} {0}
+SelectTable {0}
+PutCell {1:A24} {} {0}
+PutCell {1:C24} {6} {0}
+PutCell {1:D24} {} {0}
+PutCell {1:E24} {0805 100 кОм ±5 %} {0}
+PutCell {1:E25} {Фирма "Yageo"} {0}
+PutCell {1:F24} {2} {0}
+PutCell {1:G24} {R2,R3} {0}
+SelectTable {0}
+PutCell {1:A26} {} {0}
+PutCell {1:D26} {} {0}
+AppendDocument {file:///usr/local/share/kicad/GOST-doc-gen/templates/SpecificationMiddleSheet_template.odt}
+SelectTable {1}
+PutCell {3:G3} {2} {0}
+PutCell {3:F1} {АБВГ.000000.001} {0}
+SelectTable {1}
+PutCell {1:A2} {} {0}
+PutCell {1:C2} {7} {0}
+PutCell {1:D2} {} {0}
+PutCell {1:E2} {Транзистор PN2222A} {0}
+PutCell {1:E3} {Фирма "Fairchild"} {0}
+PutCell {1:E4} {допускается замена на} {0}
+PutCell {1:E5} {MMBT2222A} {0}
+PutCell {1:F2} {2} {0}
+PutCell {1:G2} {VT1,VT2} {0}
+SelectTable {1}
+PutCell {1:A6} {} {0}
+PutCell {1:D6} {} {0}
+SelectTable {1}
+PutCell {1:A7} {} {0}
+PutCell {1:D7} {} {0}
+PutCell {1:E7} {Переменные данные} {3}
+PutCell {1:E8} {для исполнений} {3}
+SelectTable {1}
+PutCell {1:A9} {} {0}
+PutCell {1:D9} {} {0}
+SelectTable {1}
+PutCell {1:A10} {} {0}
+PutCell {1:D10} {} {0}
+PutCell {1:E10} {АБВГ.000000.001} {3}
+SelectTable {1}
+PutCell {1:A11} {} {0}
+PutCell {1:D11} {} {0}
+PutCell {1:E11} {Мультивибратор} {3}
+SelectTable {1}
+PutCell {1:A12} {} {0}
+PutCell {1:D12} {} {0}
+SelectTable {1}
+PutCell {1:A13} {} {0}
+PutCell {1:C13} {2} {0}
+PutCell {1:D13} {} {0}
+PutCell {1:E13} {Конденсатор 0805-X7R-50 В-} {0}
+PutCell {1:E14} {0,1 мкФ ±20 %} {0}
+PutCell {1:E15} {Фирма "AVX"} {0}
+PutCell {1:F13} {2} {0}
+PutCell {1:G13} {C1,C2} {0}
+SelectTable {1}
+PutCell {1:A16} {} {0}
+PutCell {1:D16} {} {0}
+SelectTable {1}
+PutCell {1:A17} {} {0}
+PutCell {1:D17} {} {0}
+PutCell {1:E17} {АБВГ.000000.001-01} {3}
+SelectTable {1}
+PutCell {1:A18} {} {0}
+PutCell {1:D18} {} {0}
+PutCell {1:E18} {Мультивибратор - 01} {3}
+SelectTable {1}
+PutCell {1:A19} {} {0}
+PutCell {1:D19} {} {0}
+SelectTable {1}
+PutCell {1:A20} {} {0}
+PutCell {1:C20} {3} {0}
+PutCell {1:D20} {} {0}
+PutCell {1:E20} {Конденсатор 0805-X7R-50 В-} {0}
+PutCell {1:E21} {0,22 мкФ ±20 %} {0}
+PutCell {1:E22} {Фирма "AVX"} {0}
+PutCell {1:F20} {2} {0}
+PutCell {1:G20} {C1,C2} {0}
+SelectTable {1}
+PutCell {1:A23} {} {0}
+PutCell {1:D23} {} {0}
+SelectTable {1}
+PutCell {1:A24} {} {0}
+PutCell {1:C24} {4} {0}
+PutCell {1:D24} {} {0}
+PutCell {1:E24} {Конденсатор} {0}
+PutCell {1:E25} {танталовый тип B-16 В-} {0}
+PutCell {1:E26} {10 мкФ ±20 %} {0}
+PutCell {1:E27} {Фирма "Panasonic"} {0}
+PutCell {1:F24} {1} {0}
+PutCell {1:G24} {C3} {0}
+AppendDocument {file:///usr/local/share/kicad/GOST-doc-gen/templates/CompIndexLastSheet_template.odt}
+SelectTable {2}
+PutCell {3:I5} {3} {0}
+PutCell {3:F1} {АБВГ.000000.001} {0}
+SelectTable {0}
+PutCell {3:J5} {3} {0}
+Exit
 
=== added file 'demos/GOST/multivibrator.sch'
--- demos/GOST/multivibrator.sch	1970-01-01 00:00:00 +0000
+++ demos/GOST/multivibrator.sch	2015-06-20 07:42:20 +0000
@@ -0,0 +1,250 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+EELAYER 24 0
+EELAYER END
+$Descr A4 8268 11693 portrait
+encoding utf-8
+Sheet 1 1
+Title "Мультивибратор"
+Date "21 apr 2013"
+Rev ""
+Comp "ООО \"XXXXX\""
+Comment1 "АБВГ.000000.001"
+Comment2 "Лунев"
+Comment3 "Барановский"
+Comment4 "Викулов"
+$EndDescr
+$Comp
+L PN2222A VT1
+U 1 1 5173A466
+P 3300 5300
+F 0 "VT1" H 3300 5152 40  0000 R CNN
+F 1 "~" H 3300 5450 40  0001 R CNN
+F 2 "TO92" H 3200 5402 29  0001 C CNN
+F 3 "~" H 3300 5300 60  0000 C CNN
+F 4 "Транзистор" H 3300 5300 60  0001 C CNN "Title"
+F 5 "Fairchild" H 3300 5300 60  0001 C CNN "Manufacturer"
+F 6 "допускается замена на MMBT2222A" H 3300 5300 60  0001 C CNN "Note"
+F 7 "PN2222A" H 3300 5300 60  0001 C CNN "Type"
+	1    3300 5300
+	-1   0    0    -1  
+$EndComp
+$Comp
+L C C1
+U 1 1 5173A497
+P 3900 5300
+F 0 "C1" H 3900 5400 40  0000 L CNN
+F 1 "<00>0,1 мкФ</00><01>0,22 мкФ</01>" H 3906 5215 40  0001 L CNN
+F 2 "~" H 3938 5150 30  0000 C CNN
+F 3 "~" H 3900 5300 60  0000 C CNN
+F 4 "0805" H 3900 5300 60  0001 C CNN "Type"
+F 5 "-X7R-50 В-" H 3900 5300 60  0001 C CNN "SType"
+F 6 "20%" H 3900 5300 60  0001 C CNN "Precision"
+F 7 "AVX" H 3900 5300 60  0001 C CNN "Manufacturer"
+F 8 "<00>Конденсатор</00><01>Конденсатор</01>" H 3900 5300 60  0001 C CNN "Title"
+	1    3900 5300
+	0    1    1    0   
+$EndComp
+$Comp
+L R R1
+U 1 1 5173A4D3
+P 3200 4650
+F 0 "R1" V 3280 4650 40  0000 C CNN
+F 1 "1 кОм" V 3207 4651 40  0001 C CNN
+F 2 "~" V 3130 4650 30  0000 C CNN
+F 3 "~" H 3200 4650 30  0000 C CNN
+F 4 "Резистор" V 3200 4650 60  0001 C CNN "Title"
+F 5 "0805" V 3200 4650 60  0001 C CNN "Type"
+F 6 "5%" V 3200 4650 60  0001 C CNN "Precision"
+F 7 "Yageo" V 3200 4650 60  0001 C CNN "Manufacturer"
+	1    3200 4650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3200 5500 3200 5700
+Wire Wire Line
+	3200 5700 5700 5700
+Wire Wire Line
+	5300 5700 5300 5500
+Wire Wire Line
+	3200 4900 3200 5100
+Wire Wire Line
+	3700 4900 3700 5300
+Wire Wire Line
+	3700 5300 3500 5300
+Wire Wire Line
+	4800 5300 5000 5300
+Wire Wire Line
+	4800 4900 4800 5300
+Wire Wire Line
+	5300 4900 5300 5100
+Wire Wire Line
+	3200 4400 3200 4200
+Wire Wire Line
+	3200 4200 5700 4200
+Wire Wire Line
+	5300 4200 5300 4400
+Wire Wire Line
+	4800 4200 4800 4400
+Connection ~ 4800 4200
+Wire Wire Line
+	3700 4200 3700 4400
+Connection ~ 3700 4200
+Wire Wire Line
+	5300 5000 4100 5000
+Wire Wire Line
+	4100 5000 4100 5300
+Connection ~ 5300 5000
+Wire Wire Line
+	4400 5300 4400 5100
+Wire Wire Line
+	4400 5100 3200 5100
+Wire Wire Line
+	5700 5700 5700 4800
+Connection ~ 5300 5700
+Wire Wire Line
+	5700 4200 5700 4400
+Connection ~ 5300 4200
+$Comp
+L R R2
+U 1 1 5173A7AC
+P 3700 4650
+F 0 "R2" V 3780 4650 40  0000 C CNN
+F 1 "100 кОм" V 3707 4651 40  0001 C CNN
+F 2 "~" V 3630 4650 30  0000 C CNN
+F 3 "~" H 3700 4650 30  0000 C CNN
+F 4 "Резистор" V 3700 4650 60  0001 C CNN "Title"
+F 5 "0805" V 3700 4650 60  0001 C CNN "Type"
+F 6 "5%" V 3700 4650 60  0001 C CNN "Precision"
+F 7 "Yageo" V 3700 4650 60  0001 C CNN "Manufacturer"
+	1    3700 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C2
+U 1 1 5173A8F6
+P 4600 5300
+F 0 "C2" H 4600 5400 40  0000 L CNN
+F 1 "<00>0,1 мкФ</00><01>0,22 мкФ</01>" H 4606 5215 40  0001 L CNN
+F 2 "~" H 4638 5150 30  0000 C CNN
+F 3 "~" H 4600 5300 60  0000 C CNN
+F 4 "0805" H 4600 5300 60  0001 C CNN "Type"
+F 5 "-X7R-50 В-" H 4600 5300 60  0001 C CNN "SType"
+F 6 "20%" H 4600 5300 60  0001 C CNN "Precision"
+F 7 "AVX" H 4600 5300 60  0001 C CNN "Manufacturer"
+F 8 "<00>Конденсатор</00><01>Конденсатор</01>" H 4600 5300 60  0001 C CNN "Title"
+	1    4600 5300
+	0    1    1    0   
+$EndComp
+$Comp
+L R R3
+U 1 1 5173A96B
+P 4800 4650
+F 0 "R3" V 4880 4650 40  0000 C CNN
+F 1 "100 кОм" V 4807 4651 40  0001 C CNN
+F 2 "~" V 4730 4650 30  0000 C CNN
+F 3 "~" H 4800 4650 30  0000 C CNN
+F 4 "Резистор" V 4800 4650 60  0001 C CNN "Title"
+F 5 "0805" V 4800 4650 60  0001 C CNN "Type"
+F 6 "5%" V 4800 4650 60  0001 C CNN "Precision"
+F 7 "Yageo" V 4800 4650 60  0001 C CNN "Manufacturer"
+	1    4800 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R4
+U 1 1 5173A975
+P 5300 4650
+F 0 "R4" V 5380 4650 40  0000 C CNN
+F 1 "1 кОм" V 5307 4651 40  0001 C CNN
+F 2 "~" V 5230 4650 30  0000 C CNN
+F 3 "~" H 5300 4650 30  0000 C CNN
+F 4 "Резистор" V 5300 4650 60  0001 C CNN "Title"
+F 5 "0805" V 5300 4650 60  0001 C CNN "Type"
+F 6 "5%" V 5300 4650 60  0001 C CNN "Precision"
+F 7 "Yageo" V 5300 4650 60  0001 C CNN "Manufacturer"
+	1    5300 4650
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C3
+U 1 1 5173A4B5
+P 5700 4600
+F 0 "C3" H 5700 4700 40  0000 L CNN
+F 1 "10 мкФ" H 5706 4515 40  0001 L CNN
+F 2 "~" H 5738 4450 30  0000 C CNN
+F 3 "~" H 5700 4600 60  0000 C CNN
+F 4 "<01>Конденсатор</01>" H 5700 4600 60  0001 C CNN "Title"
+F 5 "танталовый тип B" H 5700 4600 60  0001 C CNN "Type"
+F 6 "-16 В-" H 5700 4600 60  0001 C CNN "SType"
+F 7 "20%" H 5700 4600 60  0001 C CNN "Precision"
+F 8 "Panasonic" H 5700 4600 60  0001 C CNN "Manufacturer"
+	1    5700 4600
+	1    0    0    -1  
+$EndComp
+$Comp
+L PN2222A VT2
+U 1 1 5173AAC5
+P 5200 5300
+F 0 "VT2" H 5200 5152 40  0000 R CNN
+F 1 "~" H 5200 5450 40  0001 R CNN
+F 2 "TO92" H 5100 5402 29  0001 C CNN
+F 3 "~" H 5200 5300 60  0000 C CNN
+F 4 "Транзистор" H 5200 5300 60  0001 C CNN "Title"
+F 5 "Fairchild" H 5200 5300 60  0001 C CNN "Manufacturer"
+F 6 "допускается замена на MMBT2222A" H 5200 5300 60  0001 C CNN "Note"
+F 7 "PN2222A" H 5200 5300 60  0001 C CNN "Type"
+	1    5200 5300
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C4
+U 1 1 5173B0FE
+P 6100 4600
+F 0 "C4" H 6100 4700 40  0000 L CNN
+F 1 "10 мкФ" H 6106 4515 40  0001 L CNN
+F 2 "~" H 6138 4450 30  0000 C CNN
+F 3 "~" H 6100 4600 60  0000 C CNN
+F 4 "Конденсатор" H 6100 4600 60  0001 C CNN "Title"
+F 5 "танталовый тип B" H 6100 4600 60  0001 C CNN "Type"
+F 6 "-16 В-" H 6100 4600 60  0001 C CNN "SType"
+F 7 "20%" H 6100 4600 60  0001 C CNN "Precision"
+F 8 "Panasonic" H 6100 4600 60  0001 C CNN "Manufacturer"
+F 9 "Не устанавливается" H 6100 4600 60  0001 C CNN "Note"
+	1    6100 4600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5700 4800 6100 4800
+Wire Wire Line
+	5700 4400 6100 4400
+$EndSCHEMATC
 
=== added directory 'eeschema/BOM'
=== added file 'eeschema/BOM/BOM_lister.h'
--- eeschema/BOM/BOM_lister.h	1970-01-01 00:00:00 +0000
+++ eeschema/BOM/BOM_lister.h	2015-06-20 07:42:20 +0000
@@ -0,0 +1,190 @@
+/**
+ * @file BOM_lister.h
+ */
+
+/* This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 Jean-Pierre Charras  jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef _BOM_LISTER_H_
+#define _BOM_LISTER_H_
+
+#include <sch_reference_list.h>
+
+
+// A helper class to build item lists for BOM,
+// and write lists on files
+class BOM_LISTER
+{
+private:
+    BOM_LABEL_LIST      m_labelList;            // a list of global and hierarchical labels
+    PART_LIBS*          m_libs;
+    SCH_REFERENCE_LIST  m_cmplist;              // a flat list of components in the full hierarchy
+    FILE*               m_outFile;              // the output file for BOM generation
+    char                m_separatorSymbol;      // the separator used for csv files ( usually \t ; or , )
+    bool                m_outputFmtCsv;         // true to create Csv files, false to create text lists
+    bool                m_includeSubComponents; // true to list each part
+                                                // of a multiple part per package component
+                                                // false to list only once this kind of component
+    bool                m_csvForm;              // true to print less verbose component list
+                                                // false to print more verbose component list
+    bool                m_groupReferences;      // true to group  in list by reference (when possible,
+                                                // i.e. when other fields have the same value
+                                                // false to list one reference per line
+    bool                m_printLocation;        // true to print component location in list by reference
+    std::vector <int>   m_fieldIDactive;        // list of field IDs to print
+
+public:
+    BOM_LISTER( PART_LIBS* aLibs )
+    {
+        m_outFile = NULL;
+        m_separatorSymbol   = '\t';
+        m_outputFmtCsv      = false;
+        m_includeSubComponents = false;
+        m_csvForm = true;
+        m_printLocation     = false;
+        m_groupReferences   = false;
+        m_libs              = aLibs;
+    }
+
+    // Accessors:
+    void SetGroupReferences( bool aGroupRef )
+    {
+        m_groupReferences = aGroupRef;
+    }
+
+    void SetPrintLocation( bool aPrintLoc )
+    {
+        m_printLocation = aPrintLoc;
+    }
+
+    void SetIncludeSubCmp( bool aIncludeSubCmp )
+    {
+        m_includeSubComponents = aIncludeSubCmp;
+    }
+
+    /**
+     * Function SetCvsFormOn
+     * prepare parameters to create a BOM list in comma separated value (cvs)
+     * @param aSeparator = the character used as "csv" separator
+     */
+    void SetCvsFormOn( char aSeparator )
+    {
+        m_csvForm = true;
+        m_separatorSymbol = aSeparator;
+    }
+
+    /**
+     * Function SetCvsFormOff
+     * prepare parameters to create a BOM list in full text readable mode
+     * (not csv format)
+     */
+    void SetCvsFormOff()
+    {
+        m_csvForm = false;
+    }
+
+    void            AddFieldIdToPrintList( int aFieldId );
+
+    void ClearFieldIdPrintList() { m_fieldIDactive.clear(); }
+
+    /**
+     * Function CreateCsvBOMListByValues
+     * print the list of components, grouped by values:
+     * One line by value. The format is something like:
+     *   value;quantity;references;other fields
+     *   18pF;2;"C404 C405";SM0402
+     *   22nF/25V;4;"C128 C168 C228 C268";SM0402
+     * @param aFile = the file to write to (will be closed)
+     */
+    void            CreateCsvBOMListByValues( FILE* aFile );
+
+    /**
+     * Function PrintGlobalAndHierarchicalLabelsList
+     * print the list of global and hierarchical labels by sheet or by name
+     * @param aSortBySheet = true to print by sheet name order
+     *          false to print by label name order
+     * @param aFile = the file to write to (will be NOT closed)
+     */
+    void            PrintGlobalAndHierarchicalLabelsList( FILE* aFile, bool aSortBySheet );
+
+    /**
+     * Function PrintComponentsListByReferenceHumanReadable
+     * print a BOM list in human readable form
+     * @param aFile = the file to write to (will be NOT closed)
+     */
+    bool            PrintComponentsListByReferenceHumanReadable( FILE* aFile );
+
+    /**
+     * Function PrintComponentsListByReferenceCsvForm
+     * print the list of components ordered by references. Generate 2 formats:
+     * - full component list in csv form
+     * - "short" component list in csv form, grouped by common fields values
+     *          (mainly component value)
+     * @param aFile = the file to write to (will be NOT closed)
+     */
+    bool            PrintComponentsListByReferenceCsvForm( FILE* aFile );
+
+    /**
+     * Function PrintComponentsListByValue
+     * print the list of components, sorted by value, one line per component
+     * not useable for csv format (use CreateCsvBOMListByValues instead)
+     * @param aFile = the file to write to (will be NOT closed)
+     */
+    int             PrintComponentsListByValue( FILE* aFile );
+
+private:
+
+    /**
+     * Helper function isFieldPrintable
+     * @return true if the field aFieldId should be printed.
+     * @param aFieldId = the field Id (FOOTPRIN, FIELD4 ...)
+     */
+    bool            isFieldPrintable( int aFieldId );
+
+    /**
+     * Helper function buildGlobalAndHierarchicalLabelsList
+     * Populate m_labelList with global and hierarchical labels
+     * and sheet pins labels
+     */
+    void            buildGlobalAndHierarchicalLabelsList();
+
+    /**
+     * Helper function returnFieldsString
+     * @return a string containing all selected fields texts,
+     * @param aComponent = the schematic component
+     * separated by the csv separator symbol
+     */
+    const wxString  returnFieldsString( SCH_COMPONENT* aComponent );
+
+    /**
+     * Helper function returnURLItemLocation
+     * @param aPathName = the full sheet name of item
+     * @param aPosition = a position (in internal units) to print
+     * @return a formated string to print the full location:
+     * /sheet name/( X Y position)
+     */
+    const wxString  returnURLItemLocation( const wxString&  aPathName,
+                                           wxPoint          aPosition );
+};
+
+#endif    // _BOM_LISTER_H_
 
=== added file 'eeschema/BOM/build_BOM.cpp'
--- eeschema/BOM/build_BOM.cpp	1970-01-01 00:00:00 +0000
+++ eeschema/BOM/build_BOM.cpp	2015-06-20 07:42:20 +0000
@@ -0,0 +1,736 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2012 Wayne Stambaugh <[e-mail]>
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+/**
+ * @file build_BOM.cpp
+ * @brief Code used to generate bill of materials.
+ */
+
+#include <algorithm>    // to use sort vector
+#include <vector>
+
+#include <fctsys.h>
+#include <sch_sheet.h>
+#include <sch_component.h>
+#include <template_fieldnames.h>
+#include <class_library.h>
+#include <base_units.h>
+
+#include <BOM_lister.h>
+
+/* Creates the list of components, grouped by values:
+ * One line by value. The format is something like:
+ *   value;quantity;references;other fields
+ *   18pF;2;"C404 C405";SM0402
+ *   22nF/25V;4;"C128 C168 C228 C268";SM0402
+ * param aFile = the file to write to (will be closed)
+ */
+void BOM_LISTER::CreateCsvBOMListByValues( FILE* aFile )
+{
+    m_outFile = aFile;
+
+    SCH_SHEET_LIST sheetList;
+
+    sheetList.GetComponents( m_libs, m_cmplist, false );
+
+    // sort component list by ref and remove sub components
+    m_cmplist.RemoveSubComponentsFromList();
+
+    // sort component list by value
+    m_cmplist.SortByValueOnly();
+
+    unsigned int index = 0;
+
+    while( index < m_cmplist.GetCount() )
+    {
+        SCH_COMPONENT*  component = m_cmplist[index].GetComp();
+        wxString        referenceListStr;
+        int             qty = 1;
+        referenceListStr.append( m_cmplist[index].GetRef() );
+
+        for( unsigned int ii = index + 1; ii < m_cmplist.GetCount(); )
+        {
+            if( *( m_cmplist[ii].GetComp() ) == *component )
+            {
+                referenceListStr.append( wxT( " " ) + m_cmplist[ii].GetRef() );
+                m_cmplist.RemoveItem( ii );
+                qty++;
+            }
+            else
+                ii++; // Increment index only when current item is not removed from the list
+        }
+
+        // Write value, quantity and list of references
+        fprintf( m_outFile, "%s%c%d%c\"%s\"",
+                 TO_UTF8( component->GetField( VALUE )->GetText() ),
+                 m_separatorSymbol, qty,
+                 m_separatorSymbol, TO_UTF8( referenceListStr ) );
+
+        for( int ii = FOOTPRINT; ii < component->GetFieldCount(); ii++ )
+        {
+            if( isFieldPrintable( ii ) )
+                fprintf( m_outFile, "%c%s", m_separatorSymbol,
+                         TO_UTF8( component->GetField( ii )->GetText() ) );
+        }
+
+        fprintf( m_outFile, "\n" );
+        index++;
+    }
+
+    fclose( m_outFile );
+    m_outFile = NULL;
+}
+
+
+bool BOM_LISTER::isFieldPrintable( int aFieldId )
+{
+    for( unsigned ii = 0; ii < m_fieldIDactive.size(); ii++ )
+        if( m_fieldIDactive[ii] == aFieldId )
+            return true;
+
+
+
+
+    return false;
+}
+
+
+void BOM_LISTER::AddFieldIdToPrintList( int aFieldId )
+{
+    for( unsigned ii = 0; ii < m_fieldIDactive.size(); ii++ )
+        if( m_fieldIDactive[ii] == aFieldId )
+            return;
+
+
+
+
+    m_fieldIDactive.push_back( aFieldId );
+}
+
+
+/* compare function for sorting labels by value, then by sheet
+ */
+static bool SortLabelsByValue( const BOM_LABEL& obj1, const BOM_LABEL& obj2 )
+{
+    int ii = obj1.GetText().CmpNoCase( obj2.GetText() );
+
+    if( ii == 0 )
+        ii = obj1.GetSheetPath().Cmp( obj2.GetSheetPath() );
+
+    return ii < 0;
+}
+
+
+/* compare function for sorting labels by sheet, then by alphabetic order
+ */
+static bool SortLabelsBySheet( const BOM_LABEL& obj1, const BOM_LABEL& obj2 )
+{
+    int ii = obj1.GetSheetPath().Cmp( obj2.GetSheetPath() );
+
+    if( ii == 0 )
+        ii = obj1.GetText().CmpNoCase( obj2.GetText() );
+
+    return ii < 0;
+}
+
+
+// Creates the flat list of global, hierachycal labels and pin sheets
+// and populate m_labelList
+void BOM_LISTER::buildGlobalAndHierarchicalLabelsList()
+{
+    m_labelList.clear();
+
+    // Explore the flat sheet list
+    SCH_SHEET_LIST sheetList;
+
+    for( SCH_SHEET_PATH* path = sheetList.GetFirst(); path; path = sheetList.GetNext() )
+    {
+        SCH_ITEM* schItem = (SCH_ITEM*) path->LastDrawList();
+
+        for( ; schItem; schItem = schItem->Next() )
+        {
+            switch( schItem->Type() )
+            {
+            case SCH_HIERARCHICAL_LABEL_T:
+            case SCH_GLOBAL_LABEL_T:
+                m_labelList.push_back( BOM_LABEL( schItem->Type(), schItem, *path ) );
+                break;
+
+            case SCH_SHEET_T:
+                {
+                    SCH_SHEET* sheet = (SCH_SHEET*) schItem;
+
+                    BOOST_FOREACH( SCH_SHEET_PIN & sheetPin, sheet->GetPins() ) {
+                        m_labelList.push_back( BOM_LABEL( SCH_SHEET_PIN_T,
+                                                          &sheetPin, *path ) );
+                    }
+                }
+                break;
+
+            default:
+                break;
+            }
+        }
+    }
+}
+
+
+// Print the flat list of global, hierachycal labels and pin sheets
+// contained by m_labelList
+void BOM_LISTER::PrintGlobalAndHierarchicalLabelsList( FILE* aFile, bool aSortBySheet )
+{
+    m_outFile = aFile;
+
+    buildGlobalAndHierarchicalLabelsList();
+
+    wxString msg;
+
+    if( aSortBySheet )
+    {
+        sort( m_labelList.begin(), m_labelList.end(), SortLabelsBySheet );
+        msg.Printf( _(
+                        "\n#Global, Hierarchical Labels and PinSheets \
+( order = Sheet Number ) count = %d\n"                                                                         ),
+                    m_labelList.size() );
+    }
+    else
+    {
+        sort( m_labelList.begin(), m_labelList.end(), SortLabelsByValue );
+        msg.Printf( _(
+                        "\n#Global, Hierarchical Labels and PinSheets ( \
+order = Alphab. ) count = %d\n\n"                                                                            ),
+                    m_labelList.size() );
+    }
+
+    fprintf( m_outFile, "%s", TO_UTF8( msg ) );
+
+    SCH_LABEL*      label;
+    SCH_SHEET_PIN*  pinsheet;
+    wxString        sheetpath;
+    wxString        labeltype;
+
+    for( unsigned ii = 0; ii < m_labelList.size(); ii++ )
+    {
+        switch( m_labelList[ii].GetType() )
+        {
+        case SCH_HIERARCHICAL_LABEL_T:
+        case SCH_GLOBAL_LABEL_T:
+            label = (SCH_LABEL*) ( m_labelList[ii].GetLabel() );
+
+            if( m_labelList[ii].GetType() == SCH_HIERARCHICAL_LABEL_T )
+                labeltype = wxT( "Hierarchical" );
+            else
+                labeltype = wxT( "Global      " );
+
+            sheetpath = m_labelList[ii].GetSheetPath().PathHumanReadable();
+            msg.Printf( wxT( "> %-28.28s %s        %s\n" ),
+                        GetChars( label->GetText() ),
+                        GetChars( labeltype ),
+                        GetChars( returnURLItemLocation( sheetpath, label->GetPosition() ) ) );
+
+            fputs( TO_UTF8( msg ), m_outFile );
+            break;
+
+        case SCH_SHEET_PIN_T:
+            pinsheet    = (SCH_SHEET_PIN*) m_labelList[ii].GetLabel();
+            labeltype   = FROM_UTF8( SheetLabelType[pinsheet->GetShape()] );
+
+            msg.Printf( _( "> %-28.28s PinSheet %-7.7s %s\n" ),
+                        GetChars( pinsheet->GetText() ),
+                        GetChars( labeltype ),
+                        GetChars( returnURLItemLocation( m_labelList[ii].GetSheetPath().
+                                                         PathHumanReadable(),
+                                                         pinsheet->GetPosition() ) ) );
+
+            fputs( TO_UTF8( msg ), m_outFile );
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    msg = _( "#End labels\n" );
+    fputs( TO_UTF8( msg ), m_outFile );
+}
+
+
+/*
+ * Helper function
+ * returns a string containing all selected fields texts,
+ * separated by the csv separator symbol (csv form) or a ;
+ */
+const wxString BOM_LISTER::returnFieldsString( SCH_COMPONENT* aComponent )
+{
+    wxString    outStr;
+    wxString    tmpStr;
+    wxString    text;
+
+    for( int ii = FOOTPRINT; ii <= FIELD8; ii++ )
+    {
+        if( !isFieldPrintable( ii ) )
+            continue;
+
+        if( aComponent->GetFieldCount() > ii )
+            text = aComponent->GetField( ii )->GetText();
+        else
+            text = wxEmptyString;
+
+        if( m_csvForm )
+            tmpStr.Printf( wxT( "%c%s" ), m_separatorSymbol, GetChars( text ) );
+        else
+            tmpStr.Printf( wxT( "; %-12s" ), GetChars( text ) );
+
+        outStr += tmpStr;
+    }
+
+    return outStr;
+}
+
+
+/* print the list of components ordered by references,
+ * full component list in human readable form
+ * param aFile = the file to write to (will be NOT closed)
+ */
+
+/* full list in human readable form sample:
+ * #Cmp ( order = Reference )with sub-composants
+ * | C101       47pF        Loc /(X=344,170 mm, Y=116,840 mm); C1          ; field1      ;
+ * | C102       47pF        Loc /(X=364,490 mm, Y=116,840 mm); C1          ;             ;
+ * | C103       47uF        Loc /(X=66,040 mm, Y=231,140 mm); CP6         ;             ;
+ */
+
+bool BOM_LISTER::PrintComponentsListByReferenceHumanReadable( FILE* aFile )
+{
+    m_outFile = aFile;
+    bool addDatasheet = isFieldPrintable( DATASHEET );
+
+    // Print component location if needed, but only when
+    // include sub component option is enabled, because for multiple
+    // parts per package there are more than one location per reference
+    bool        printLocCmp = m_printLocation && m_includeSubComponents;
+
+    wxString    msg;
+
+    if( m_cmplist.GetCount() == 0 )    // Build component list
+    {
+        SCH_SHEET_LIST sheetList;
+        sheetList.GetComponents( m_libs, m_cmplist, false );
+
+        // sort component list
+        m_cmplist.SortByReferenceOnly();
+
+        if( !m_includeSubComponents )
+            m_cmplist.RemoveSubComponentsFromList();
+    }
+    else
+        m_cmplist.SortByReferenceOnly();
+
+    // Print comment line:
+    msg = _( "#Cmp ( order = Reference )" );
+
+    if( m_includeSubComponents )
+        msg << _( " (with SubCmp)" );
+
+    fprintf( m_outFile, "%s\n", TO_UTF8( msg ) );
+
+    wxString    subReference;   // Unit ident, for mutiple parts per package
+    std::string CmpName;
+
+    // Print list of items
+    for( unsigned ii = 0; ii < m_cmplist.GetCount(); ii++ )
+    {
+        EDA_ITEM* item = m_cmplist[ii].GetComp();
+
+        if( item == NULL )
+            continue;
+
+        if( item->Type() != SCH_COMPONENT_T )
+            continue;
+
+        SCH_COMPONENT*  comp = (SCH_COMPONENT*) item;
+
+        bool            isMulti = false;
+
+        LIB_PART*       entry = m_libs->FindLibPart( comp->GetPartName() );
+
+        if( entry )
+            isMulti = entry->IsMulti();
+
+        CmpName = m_cmplist[ii].GetRefStr();
+
+        if( isMulti && m_includeSubComponents )
+        {
+            subReference = LIB_PART::SubReference( m_cmplist[ii].GetUnit() );
+            CmpName += TO_UTF8( subReference );
+        }
+
+        fprintf( m_outFile, "| %-10s %-12s", CmpName.c_str(),
+                 TO_UTF8( comp->GetField( VALUE )->GetText() ) );
+
+        if( addDatasheet )
+            fprintf( m_outFile, "%-20s",
+                     TO_UTF8( comp->GetField( DATASHEET )->GetText() ) );
+
+        if( m_includeSubComponents )
+        {
+            if( printLocCmp )
+            {
+                msg = returnURLItemLocation( m_cmplist[ii].GetSheetPath().PathHumanReadable(),
+                                             comp->GetPosition() );
+                fprintf( m_outFile, "%s", TO_UTF8( msg ) );
+            }
+        }
+
+        wxString tmpStr = returnFieldsString( comp );
+        fprintf( m_outFile, "%s\n", TO_UTF8( tmpStr ) );
+    }
+
+    // Print the last line:
+    fputs(  "#End Cmp\n", m_outFile );
+
+    return true;
+}
+
+
+/* print the list of components ordered by references. Generate 2 formats:
+ * - full component list in csv form
+ * - "short" component list in csv form, grouped by common fields values
+ *          (mainly component value)
+ * param aFile = the file to write to (will be NOT closed)
+ */
+
+/* full csv format sample:
+ *  ref;value;sheet path(location);footprint;field1;field2
+ *  C101;47pF;Loc /(X=57,150 mm, Y=74,930 mm);Loc /(X=344,170 mm, Y=116,840 mm));C1;field1;
+ *  C102;47pF;Loc /(X=344,170 mm, Y=116,840 mm);Loc /(X=364,490 mm, Y=116,840 mm));C1;;
+ *  C103;47uF;Loc /(X=364,490 mm, Y=116,840 mm);Loc /(X=66,040 mm, Y=231,140 mm));CP6;;
+ *  C104;47uF;Loc /(X=66,040 mm, Y=231,140 mm);Loc /(X=82,550 mm, Y=231,140 mm));CP6;;
+ */
+/* short csv format sample:
+ *  ref;value;footprint;Champ1;Champ2
+ *  C101;47pF;C1;field1;;1
+ *  C102;47pF;C1;;;1
+ *  C103..C106;47uF;CP6;;;4
+ */
+
+bool BOM_LISTER::PrintComponentsListByReferenceCsvForm( FILE* aFile )
+{
+    m_outFile = aFile;
+    bool addDatasheet = isFieldPrintable( DATASHEET );
+
+    // Set option group references, for components having same field values
+    // (same value, same footprint ...)
+    // obviously, this is possible only when print location
+    // and include Sub Components are not enabled.
+    bool groupRefs = m_groupReferences;
+    bool includeSubComponents = m_includeSubComponents && !groupRefs;
+
+    // Print component location if needed, but only when
+    // include sub component option is enabled, because for multiple
+    // parts per package there are more than one location per reference
+    bool        printLocCmp = m_printLocation && !groupRefs && m_includeSubComponents;
+
+    wxString    msg;
+
+    if( m_cmplist.GetCount() == 0 )    // Build component list
+    {
+        SCH_SHEET_LIST sheetList;
+        sheetList.GetComponents( m_libs, m_cmplist, false );
+
+        // sort component list
+        m_cmplist.SortByReferenceOnly();
+
+        if( !includeSubComponents )
+            m_cmplist.RemoveSubComponentsFromList();
+    }
+    else
+        m_cmplist.SortByReferenceOnly();
+
+    // Print comment line:
+    msg = wxT( "ref" );
+    msg << (wxChar)m_separatorSymbol << wxT( "value" );
+
+    if( addDatasheet )
+        msg << (wxChar)m_separatorSymbol << wxT( "datasheet" );
+
+    if( printLocCmp )
+        msg << (wxChar)m_separatorSymbol << wxT( "sheet path(location)" );
+
+    if( isFieldPrintable( FOOTPRINT ) )
+        msg << (wxChar)m_separatorSymbol << wxT( "footprint" );
+
+    for( int ii = FIELD1; ii <= FIELD8; ii++ )
+    {
+        if( isFieldPrintable( ii ) )
+            msg << (wxChar)m_separatorSymbol << _( "Field" ) << ii - FIELD1 + 1;
+    }
+
+    if( groupRefs )
+        msg << (wxChar)m_separatorSymbol << _( "Item count" );
+
+    fprintf( m_outFile, "%s\n", TO_UTF8( msg ) );
+
+    // Print BOM list
+    wxString    strCur;
+    wxString    strPred;
+    int         amount = 0;     // number of items, on the same line
+    wxString    cmpName;
+    wxString    cmpNameFirst;
+    wxString    cmpNameLast;
+
+    // Print list of items, by reference
+    for( unsigned ii = 0; ii < m_cmplist.GetCount(); ii++ )
+    {
+        EDA_ITEM* item = m_cmplist[ii].GetComp();
+
+        if( item == NULL )
+            continue;
+
+        if( item->Type() != SCH_COMPONENT_T )
+            continue;
+
+        SCH_COMPONENT*  comp = (SCH_COMPONENT*) item;
+
+        LIB_PART*       entry = m_libs->FindLibPart( comp->GetPartName() );
+
+        bool            isMulti = false;
+
+        if( entry )
+            isMulti = entry->IsMulti();
+
+        cmpName = m_cmplist[ii].GetRef();
+
+        if( isMulti && includeSubComponents )
+            // Add unit ident, for mutiple parts per package
+            cmpName += LIB_PART::SubReference( m_cmplist[ii].GetUnit() );
+
+        if( groupRefs )
+        {
+            // Store value and datasheet (will be printed later)
+            strCur.Empty();
+            strCur << (wxChar)m_separatorSymbol << comp->GetField( VALUE )->GetText();
+
+            if( addDatasheet )
+                strCur << (wxChar)m_separatorSymbol << comp->GetField( DATASHEET )->GetText();
+        }
+        else
+        {
+            // Print the current component reference, value and datasheet
+            msg = cmpName;
+            msg << (wxChar)m_separatorSymbol << comp->GetField( VALUE )->GetText();
+
+            if( addDatasheet )
+                msg << (wxChar)m_separatorSymbol << comp->GetField( DATASHEET )->GetText();
+
+            fprintf( m_outFile, "%s",  TO_UTF8( msg ) );
+        }
+
+        if( printLocCmp )   // Is allowed only for full list (not grouped)
+        {
+            msg = returnURLItemLocation(
+                m_cmplist[ii].GetSheetPath().PathHumanReadable(),
+                comp->GetPosition() );
+
+            fprintf( m_outFile, "%c%s", m_separatorSymbol, TO_UTF8( msg ) );
+        }
+
+        if( groupRefs )
+        {
+            wxString tmpStr = returnFieldsString( comp );
+            strCur += tmpStr;
+
+            if( strPred.Len() == 0 )
+                cmpNameFirst = cmpName;
+            else
+            {
+                // print a BOM line
+                msg.Empty();
+                if( !strCur.IsSameAs( strPred ) )
+                {
+                    switch( amount )
+                    {
+                    case 1:     // One reference to print
+                                // format C103;47uF;CP6;;;1
+                        msg << cmpNameFirst <<strPred << (wxChar)m_separatorSymbol << amount;
+                        break;
+
+                    case 2:     // 2 references to print
+                                // format C103,C104;47uF;CP6;;;2
+                        msg << cmpNameFirst  << wxT(",") << cmpNameLast
+                            << strPred << (wxChar)m_separatorSymbol << amount;
+                        break;
+
+                    default:    // Many references to print :
+                                // format: C103..C106;47uF;CP6;;;4
+                        msg << cmpNameFirst << wxT("..") << cmpNameLast
+                            << strPred << (wxChar)m_separatorSymbol << amount;
+                        break;
+                    }
+                    fprintf( m_outFile, "%s\n", TO_UTF8( msg ) );
+
+                    cmpNameFirst = cmpName;
+                    amount = 0;
+                }
+            }
+
+            strPred     = strCur;
+            cmpNameLast = cmpName;
+            amount++;
+        }
+        else
+        {
+            msg = returnFieldsString( comp );
+            fprintf( m_outFile, "%s\n", TO_UTF8( msg ) );
+        }
+    }
+
+    // Print the last line:
+    if( groupRefs )
+    {
+        msg.Empty();
+        switch( amount )
+        {
+        case 1:
+            msg << cmpNameFirst << strPred << (wxChar)m_separatorSymbol << amount;
+            break;
+
+        case 2:
+            msg << cmpNameFirst  << wxT(",") << cmpNameLast
+                << strPred << (wxChar)m_separatorSymbol << amount;
+            break;
+
+        default:
+           msg << cmpNameFirst << wxT("..") << cmpNameFirst << cmpNameLast
+               << strPred << (wxChar)m_separatorSymbol << amount;
+            break;
+        }
+        fprintf( m_outFile, "%s\n", TO_UTF8( msg ) );
+    }
+
+    return true;
+}
+
+
+/* PrintComponentsListByValue
+ * print the list of components, sorted by value, one line per component
+ * param aFile = the file to write to (will be NOT closed)
+ * not useable for csv format (use CreateCsvBOMListByValues instead)
+ * format:
+ *   | 10pF         C15       Loc /controle/(X=48,260 mm, Y=83,820 mm); <fields>
+ *   | 10pF         C16       Loc /controle/(X=68,580 mm, Y=83,820 mm); <fields>
+ */
+int BOM_LISTER::PrintComponentsListByValue( FILE* aFile )
+{
+    m_outFile = aFile;
+
+    if( m_cmplist.GetCount() == 0 )    // Build component list
+    {
+        SCH_SHEET_LIST sheetList;
+        sheetList.GetComponents( m_libs, m_cmplist, false );
+
+        if( !m_includeSubComponents )
+        {
+            // sort component list
+            m_cmplist.SortByReferenceOnly();
+            m_cmplist.RemoveSubComponentsFromList();
+        }
+    }
+
+    m_cmplist.SortByValueOnly();
+
+    wxString    msg;
+
+    msg = _( "\n#Cmp ( order = Value )" );
+
+    if( m_includeSubComponents )
+        msg << _( " (with SubCmp)" );
+
+    msg << wxT( "\n" );
+
+    fputs( TO_UTF8( msg ), m_outFile );
+
+    std::string cmpName;
+    for( unsigned ii = 0; ii < m_cmplist.GetCount(); ii++ )
+    {
+        EDA_ITEM* schItem = m_cmplist[ii].GetComp();
+
+        if( schItem == NULL )
+            continue;
+
+        if( schItem->Type() != SCH_COMPONENT_T )
+            continue;
+
+        SCH_COMPONENT*  drawLibItem = (SCH_COMPONENT*) schItem;
+
+        bool            isMulti = false;
+        LIB_PART*       entry   = m_libs->FindLibPart( drawLibItem->GetPartName() );
+
+        if( entry )
+            isMulti = entry->IsMulti();
+
+        cmpName = m_cmplist[ii].GetRefStr();
+
+        if( isMulti && m_includeSubComponents )
+            // Add unit ident, for mutiple parts per package
+            cmpName += TO_UTF8( LIB_PART::SubReference( m_cmplist[ii].GetUnit() ) );
+
+        fprintf( m_outFile, "| %-12s %-10s",
+                 TO_UTF8( drawLibItem->GetField( VALUE )->GetText() ),
+                 cmpName.c_str() );
+
+        // print the sheet path and location
+        if( m_includeSubComponents )
+        {
+            msg = returnURLItemLocation( m_cmplist[ii].GetSheetPath().PathHumanReadable(),
+                                         drawLibItem->GetPosition() );
+            fprintf( m_outFile, "%s", TO_UTF8( msg ) );
+        }
+
+        fprintf( m_outFile, "%s\n", TO_UTF8( returnFieldsString( drawLibItem ) ) );
+    }
+
+    msg = _( "#End Cmp\n" );
+    fputs( TO_UTF8( msg ), m_outFile );
+    return 0;
+}
+
+
+/* returnURLItemLocation
+ * return a formated string to print the full location:
+ * <sheet name>/( X Y position)
+ * param aPathName = the full sheet name of item
+ * param aPosition = a position (in internal units) to print
+ */
+const wxString BOM_LISTER::returnURLItemLocation( const wxString&   aPathName,
+                                                  wxPoint           aPosition )
+{
+    wxString text;
+
+    text.Printf( wxT( "Loc %s(X=%s, Y=%s)" ), GetChars( aPathName ),
+                 GetChars( StringFromValue( g_UserUnit, aPosition.x, true ) ),
+                 GetChars( StringFromValue( g_UserUnit, aPosition.y, true ) ) );
+    return text;
+}
 
=== added directory 'eeschema/BOM/dialogs'
=== added file 'eeschema/BOM/dialogs/dialog_build_BOM.cpp'
--- eeschema/BOM/dialogs/dialog_build_BOM.cpp	1970-01-01 00:00:00 +0000
+++ eeschema/BOM/dialogs/dialog_build_BOM.cpp	2015-06-20 07:42:20 +0000
@@ -0,0 +1,592 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+/**
+ * @file dialog_build_BOM.cpp
+ */
+
+#include <fctsys.h>
+#include <kiface_i.h>
+#include <pgm_base.h>
+#include <confirm.h>
+#include <gestfich.h>
+#include <kicad_string.h>
+#include <class_sch_screen.h>
+#include <wxstruct.h>
+#include <build_version.h>
+
+#include <netlist.h>
+#include <template_fieldnames.h>
+#include <sch_component.h>
+#include <sch_sheet.h>
+#include <class_library.h>
+
+#include <wx/valgen.h>
+
+#include <dialog_build_BOM.h>
+#include <BOM_lister.h>
+
+
+/* Local variables */
+static bool     s_ListByRef    = true;
+static bool     s_ListByValue  = true;
+static bool     s_ListWithSubCmponents;
+static bool     s_ListHierarchicalPinByName;
+static bool     s_ListHierarchicalPinBySheet;
+static bool     s_BrowseCreatedList;
+static int      s_OutputFormOpt;
+static int      s_OutputSeparatorOpt;
+static bool     s_Add_Location = false;
+static bool     s_Add_FpField_state = true;
+static bool     s_Add_DatasheetField_state;
+static bool     s_Add_F1_state;
+static bool     s_Add_F2_state;
+static bool     s_Add_F3_state;
+static bool     s_Add_F4_state;
+static bool     s_Add_F5_state;
+static bool     s_Add_F6_state;
+static bool     s_Add_F7_state;
+static bool     s_Add_F8_state;
+static bool     s_Add_Alls_state;
+static char     s_ExportSeparatorSymbol;
+
+
+static bool*    s_AddFieldList[] =
+{
+    &s_Add_FpField_state,
+    &s_Add_F1_state,
+    &s_Add_F2_state,
+    &s_Add_F3_state,
+    &s_Add_F4_state,
+    &s_Add_F5_state,
+    &s_Add_F6_state,
+    &s_Add_F7_state,
+    &s_Add_F8_state,
+    &s_Add_Alls_state,
+    &s_Add_DatasheetField_state,
+    NULL
+};
+
+
+const wxString OPTION_BOM_LIST_REF( wxT("BomListPerRef") );
+const wxString OPTION_BOM_LIST_VALUE( wxT("BomListPerValue") );
+const wxString OPTION_BOM_LIST_HPINS( wxT("BomListPerHPins") );
+const wxString OPTION_BOM_LIST_HPINS_BY_SHEET( wxT("BomListHPinsPerSheet") );
+const wxString OPTION_BOM_LIST_HPINS_BY_NAME_( wxT("BomListHPinsPerName") );
+const wxString OPTION_BOM_LIST_SUB_CMP( wxT("BomListSubCmps") );
+
+const wxString OPTION_BOM_FORMAT( wxT("BomFormat") );
+const wxString OPTION_BOM_LAUNCH_BROWSER( wxT("BomLaunchBrowser") );
+const wxString OPTION_BOM_SEPARATOR( wxT("BomExportSeparator") );
+const wxString OPTION_BOM_ADD_FIELD ( wxT("BomAddField") );
+const wxString OPTION_BOM_ADD_LOCATION ( wxT("BomAddLocation") );
+
+/* list of separators used in bom export to spreadsheet
+ * (selected by s_OutputSeparatorOpt, and s_OutputSeparatorOpt radiobox)
+ */
+static char s_ExportSeparator[] = ("\t;,.");
+
+/*!
+ * DIALOG_BUILD_BOM dialog type definition
+ */
+
+
+DIALOG_BUILD_BOM::DIALOG_BUILD_BOM( SCH_EDIT_FRAME* parent ) :
+    DIALOG_BUILD_BOM_BASE( parent )
+{
+    m_config = Kiface().KifaceSettings();
+    wxASSERT( m_config != NULL );
+
+    m_parent = parent;
+
+    Init();
+
+    if( GetSizer() )
+    {
+        GetSizer()->SetSizeHints( this );
+    }
+    Centre();
+}
+
+
+/*!
+ * Init Controls for DIALOG_BUILD_BOM
+ */
+
+void DIALOG_BUILD_BOM::Init()
+{
+    SetFocus();
+
+    /* Get options */
+    m_config->Read( OPTION_BOM_LIST_REF, &s_ListByRef );
+    m_config->Read( OPTION_BOM_LIST_VALUE , &s_ListByValue );
+    m_config->Read( OPTION_BOM_LIST_HPINS, &s_ListHierarchicalPinByName );
+    m_config->Read( OPTION_BOM_LIST_HPINS_BY_SHEET, &s_ListWithSubCmponents );
+    m_config->Read( OPTION_BOM_LIST_HPINS_BY_NAME_, &s_ListWithSubCmponents );
+    m_config->Read( OPTION_BOM_LIST_SUB_CMP, &s_ListWithSubCmponents );
+    m_config->Read( OPTION_BOM_LIST_HPINS_BY_SHEET, &s_ListHierarchicalPinBySheet );
+    m_config->Read( OPTION_BOM_LIST_HPINS_BY_NAME_, &s_ListHierarchicalPinByName );
+    s_OutputFormOpt = m_config->Read( OPTION_BOM_FORMAT, 0l );
+    m_config->Read( OPTION_BOM_LAUNCH_BROWSER, &s_BrowseCreatedList );
+    s_OutputSeparatorOpt   = m_config->Read( OPTION_BOM_SEPARATOR, 0l );
+    m_config->Read( OPTION_BOM_ADD_LOCATION, &s_Add_Location );
+
+    long addfields = m_config->Read( OPTION_BOM_ADD_FIELD, 0l );
+    for( int ii = 0, bitmask = 1; s_AddFieldList[ii] != NULL; ii++ )
+    {
+        if( (addfields & bitmask) )
+            *s_AddFieldList[ii] = true;
+        else
+            *s_AddFieldList[ii] = false;
+
+        bitmask <<= 1;
+    }
+
+    // Set validators
+    m_ListCmpbyRefItems->SetValidator( wxGenericValidator( &s_ListByRef ) );
+    m_ListSubCmpItems->SetValidator( wxGenericValidator( &s_ListWithSubCmponents ) );
+    m_ListCmpbyValItems->SetValidator( wxGenericValidator( &s_ListByValue ) );
+    m_GenListLabelsbyVal->SetValidator( wxGenericValidator( &s_ListHierarchicalPinByName ) );
+    m_GenListLabelsbySheet->SetValidator( wxGenericValidator( &s_ListHierarchicalPinBySheet ) );
+    m_OutputFormCtrl->SetValidator( wxGenericValidator( &s_OutputFormOpt ) );
+    m_OutputSeparatorCtrl->SetValidator( wxGenericValidator( &s_OutputSeparatorOpt ) );
+    m_GetListBrowser->SetValidator( wxGenericValidator( &s_BrowseCreatedList ) );
+
+    m_AddLocationField->SetValidator( wxGenericValidator( &s_Add_Location ) );
+    m_AddFootprintField->SetValidator( wxGenericValidator( &s_Add_FpField_state ) );
+    m_AddDatasheetField->SetValidator( wxGenericValidator( &s_Add_DatasheetField_state ) );
+    m_AddField1->SetValidator( wxGenericValidator( &s_Add_F1_state ) );
+    m_AddField2->SetValidator( wxGenericValidator( &s_Add_F2_state ) );
+    m_AddField3->SetValidator( wxGenericValidator( &s_Add_F3_state ) );
+    m_AddField4->SetValidator( wxGenericValidator( &s_Add_F4_state ) );
+    m_AddField5->SetValidator( wxGenericValidator( &s_Add_F5_state ) );
+    m_AddField6->SetValidator( wxGenericValidator( &s_Add_F6_state ) );
+    m_AddField7->SetValidator( wxGenericValidator( &s_Add_F7_state ) );
+    m_AddField8->SetValidator( wxGenericValidator( &s_Add_F8_state ) );
+    m_AddAllFields->SetValidator( wxGenericValidator( &s_Add_Alls_state ) );
+
+    m_OutputFormCtrl->SetSelection( s_OutputFormOpt );
+    m_OutputSeparatorCtrl->SetSelection( s_OutputSeparatorOpt );
+
+    // Enable/disable options:
+    wxCommandEvent dummy;
+    OnRadioboxSelectFormatSelected( dummy );
+}
+
+
+/*
+ * Called on BOM format selection:
+ * Enable/disable options in dialog
+ */
+void DIALOG_BUILD_BOM::OnRadioboxSelectFormatSelected( wxCommandEvent& event )
+{
+    switch( m_OutputFormCtrl->GetSelection() )
+    {
+        case 0:     // Human readable text full report
+            m_OutputSeparatorCtrl->Enable( false );
+            m_ListCmpbyRefItems->Enable( true );
+            m_ListCmpbyValItems->Enable( true );
+            m_GenListLabelsbyVal->Enable( true );
+            m_GenListLabelsbySheet->Enable( true );
+            m_ListSubCmpItems->Enable( true );
+            m_AddLocationField->Enable( true );
+            break;
+
+        case 1:     // Csv format, full list by reference
+            m_OutputSeparatorCtrl->Enable( true );
+            m_ListCmpbyRefItems->Enable( false );
+            m_ListCmpbyValItems->Enable( false );
+            m_GenListLabelsbyVal->Enable( false );
+            m_GenListLabelsbySheet->Enable( false );
+            m_ListSubCmpItems->Enable( true );
+            m_AddLocationField->Enable( true );
+            break;
+
+        case 2:     // Csv format, grouped list by reference
+            m_OutputSeparatorCtrl->Enable( true );
+            m_ListCmpbyRefItems->Enable( false );
+            m_ListCmpbyValItems->Enable( false );
+            m_GenListLabelsbyVal->Enable( false );
+            m_GenListLabelsbySheet->Enable( false );
+            m_ListSubCmpItems->Enable( false );
+            m_AddLocationField->Enable( false );
+            break;
+
+        case 3:     // Csv format, short list by values
+            m_OutputSeparatorCtrl->Enable( true );
+            m_ListCmpbyRefItems->Enable( false );
+            m_ListCmpbyValItems->Enable( false );
+            m_GenListLabelsbyVal->Enable( false );
+            m_GenListLabelsbySheet->Enable( false );
+            m_ListSubCmpItems->Enable( false );
+            m_AddLocationField->Enable( false );
+            break;
+    }
+}
+
+
+/*!
+ * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
+ */
+
+void DIALOG_BUILD_BOM::OnOkClick( wxCommandEvent& event )
+{
+    char ExportSeparatorSymbol = s_ExportSeparator[0];
+
+    if( m_OutputSeparatorCtrl->GetSelection() > 0 )
+        ExportSeparatorSymbol = s_ExportSeparator[m_OutputSeparatorCtrl->GetSelection()];
+
+    int ExportFileType = m_OutputFormCtrl->GetSelection();
+
+    SavePreferences();
+
+    Create_BOM_Lists( ExportFileType, m_ListSubCmpItems->GetValue(),
+                      ExportSeparatorSymbol, m_GetListBrowser->GetValue() );
+}
+
+
+/*!
+ * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
+ */
+
+void DIALOG_BUILD_BOM::OnCancelClick( wxCommandEvent& event )
+{
+    EndModal( -1 );
+}
+
+
+void DIALOG_BUILD_BOM::SavePreferences()
+{
+    // Determine current settings of "List items" and "Options" checkboxes
+    s_ListByRef = m_ListCmpbyRefItems->GetValue();
+    s_ListWithSubCmponents = m_ListSubCmpItems->GetValue();
+    s_ListByValue = m_ListCmpbyValItems->GetValue();
+    s_ListHierarchicalPinByName = m_GenListLabelsbyVal->GetValue();
+    s_ListHierarchicalPinBySheet = m_GenListLabelsbySheet->GetValue();
+    s_BrowseCreatedList = m_GetListBrowser->GetValue();
+
+    // (saved in config ):
+
+    // Determine current settings of both radiobutton groups
+    s_OutputFormOpt = m_OutputFormCtrl->GetSelection();
+    s_OutputSeparatorOpt = m_OutputSeparatorCtrl->GetSelection();
+
+    if( s_OutputSeparatorOpt < 0 )
+        s_OutputSeparatorOpt = 0;
+
+    // Determine current settings of all "Fields to add" checkboxes
+    s_Add_Location = m_AddLocationField->GetValue();
+    s_Add_FpField_state = m_AddFootprintField->GetValue();
+    s_Add_DatasheetField_state = m_AddDatasheetField->GetValue();
+    s_Add_F1_state     = m_AddField1->GetValue();
+    s_Add_F2_state     = m_AddField2->GetValue();
+    s_Add_F3_state     = m_AddField3->GetValue();
+    s_Add_F4_state     = m_AddField4->GetValue();
+    s_Add_F5_state     = m_AddField5->GetValue();
+    s_Add_F6_state     = m_AddField6->GetValue();
+    s_Add_F7_state     = m_AddField7->GetValue();
+    s_Add_F8_state     = m_AddField8->GetValue();
+    s_Add_Alls_state   = m_AddAllFields->GetValue();
+
+    // Now save current settings of both radiobutton groups
+    m_config->Write( OPTION_BOM_LIST_REF, s_ListByRef );
+    m_config->Write( OPTION_BOM_LIST_VALUE , s_ListByValue );
+    m_config->Write( OPTION_BOM_LIST_HPINS, s_ListHierarchicalPinByName );
+    m_config->Write( OPTION_BOM_LIST_HPINS_BY_SHEET, s_ListHierarchicalPinBySheet );
+    m_config->Write( OPTION_BOM_LIST_HPINS_BY_NAME_, s_ListHierarchicalPinByName );
+    m_config->Write( OPTION_BOM_LIST_SUB_CMP, s_ListWithSubCmponents );
+
+    m_config->Write( OPTION_BOM_FORMAT, (long) s_OutputFormOpt );
+    m_config->Write( OPTION_BOM_SEPARATOR, (long) s_OutputSeparatorOpt );
+    m_config->Write( OPTION_BOM_LAUNCH_BROWSER, (long) s_BrowseCreatedList );
+
+    // Now save current settings of all "Fields to add" checkboxes
+    m_config->Write( OPTION_BOM_ADD_LOCATION, s_Add_Location );
+
+    long addfields = 0;
+    for( int ii = 0, bitmask = 1; s_AddFieldList[ii] != NULL; ii++ )
+    {
+        if( *s_AddFieldList[ii] )
+            addfields |= bitmask;
+
+        bitmask <<= 1;
+    }
+
+    m_config->Write( OPTION_BOM_ADD_FIELD, addfields );
+}
+
+
+void DIALOG_BUILD_BOM::Create_BOM_Lists( int  aTypeFile,
+                                         bool aIncludeSubComponents,
+                                         char aExportSeparatorSymbol,
+                                         bool aRunBrowser )
+{
+    wxString    wildcard;
+
+    static wxFileName fn;
+
+    wxFileName  current = g_RootSheet->GetScreen()->GetFileName();
+
+    s_ExportSeparatorSymbol = aExportSeparatorSymbol;
+
+    if( !fn.HasName() || fn.GetName()==NAMELESS_PROJECT )
+    {
+        fn.SetName( current.GetName() );
+    }
+    // else use a previous run's name, because fn was set before and user
+    // is probably just iteratively refining the BOM.
+
+    if( fn.GetPath().IsEmpty() )
+    {
+        fn.SetPath( current.GetPath() );
+    }
+    // else use a previous run's path, because fn was set before and user
+    // is probably just iteratively refining the BOM.
+
+    wxString bomDesc = _( "Bill of Materials" );    // translate once, use twice.
+
+    if( aTypeFile == 0 )
+    {
+        fn.SetExt( wxT( "lst" ) );
+        wildcard = bomDesc + wxT( " (*.lst)|*.lst" );
+    }
+    else
+    {
+        fn.SetExt( wxT( "csv" ) );
+        wildcard = bomDesc + wxT( " (*.csv)|*.csv" );
+    }
+
+    wxFileDialog dlg( this, bomDesc, fn.GetPath(),
+                      fn.GetFullName(), wildcard, wxFD_SAVE );
+
+    if( dlg.ShowModal() == wxID_CANCEL )
+        return;
+
+    fn = dlg.GetPath();        // remember path+filename+ext for subsequent runs.
+
+    m_listFileName = dlg.GetPath();
+
+    // Close dialog, then show the list (if so requested)
+
+    switch( aTypeFile )
+    {
+    case 0: // list
+        CreatePartsAndLabelsFullList( aIncludeSubComponents );
+        break;
+
+    case 1: // spreadsheet, Single Part per line
+        CreateSpreadSheetPartsFullList( aIncludeSubComponents, s_Add_Location, false );
+        break;
+
+    case 2: // spreadsheet, group Part with same fields per line
+        CreateSpreadSheetPartsFullList( aIncludeSubComponents, s_Add_Location, true );
+        break;
+
+    case 3: // spreadsheet, one value per line and no sub-component
+        CreateSpreadSheetPartsShortList();
+        break;
+    }
+
+    EndModal( 1 );
+
+    if( aRunBrowser )
+    {
+        wxString editorname = Pgm().GetEditorName();
+        wxString filename   = m_listFileName;
+        AddDelimiterString( filename );
+        ExecuteFile( this, editorname, filename );
+    }
+}
+
+/** Helper function IsFieldChecked
+ * return the state of the wxCheckbox corresponding to the
+ * field aFieldId (FOOTPRINT, DATASHEET and FIELD1 to FIELD8
+ * if the option "All user fields" is checked, return always true
+ * for fileds ids >= FIELD1
+ * @param aFieldId = the field id : FOOTPRINT to FIELD8
+ */
+bool DIALOG_BUILD_BOM::IsFieldChecked(int aFieldId)
+{
+    if( m_AddAllFields->IsChecked() && (aFieldId>= FIELD1) )
+        return true;
+
+    switch ( aFieldId )
+    {
+        case FIELD1:
+            return m_AddField1->IsChecked();
+        case FIELD2:
+            return m_AddField2->IsChecked();
+        case FIELD3:
+            return m_AddField3->IsChecked();
+        case FIELD4:
+            return m_AddField4->IsChecked();
+        case FIELD5:
+            return m_AddField5->IsChecked();
+        case FIELD6:
+            return m_AddField6->IsChecked();
+        case FIELD7:
+            return m_AddField7->IsChecked();
+        case FIELD8:
+            return m_AddField8->IsChecked();
+        case FOOTPRINT:
+            return m_AddFootprintField->IsChecked();
+        case DATASHEET:
+            return m_AddDatasheetField->IsChecked();
+    }
+
+    return false;
+}
+
+
+/* Prints a list of components, in a form which can be imported by a spreadsheet.
+ * components having the same value and the same footprint
+ * are grouped on the same line
+ * Form is:
+ *  value; number of components; list of references; <footprint>; <field1>; ...;
+ * list is sorted by values
+ */
+void DIALOG_BUILD_BOM::CreateSpreadSheetPartsShortList( )
+{
+    FILE* f;
+
+    if( ( f = wxFopen( m_listFileName, wxT( "wt" ) ) ) == NULL )
+    {
+        wxString msg;
+        msg.Printf( _( "Failed to open file <%s>" ), GetChars(m_listFileName) );
+        DisplayError( this, msg );
+        return;
+    }
+
+    BOM_LISTER bom_lister( Prj().SchLibs() );
+    bom_lister.SetCvsFormOn( s_ExportSeparatorSymbol );
+
+    // Set the list of fields to add to list
+    for( int ii = FOOTPRINT; ii <= FIELD8; ii++ )
+        if( IsFieldChecked( ii ) )
+            bom_lister.AddFieldIdToPrintList( ii );
+    // Write the list of components grouped by values:
+    bom_lister.CreateCsvBOMListByValues( f );
+}
+
+
+/*
+ * Print a list of components, in a form which can be imported by a spreadsheet
+ * form is:
+ * cmp ref; cmp val; fields;
+ * Components are sorted by reference
+ * param aIncludeSubComponents = true to print sub components
+ * param aPrintLocation = true to print components location
+ *        (only possible when aIncludeSubComponents == true)
+ * param aGroupRefs = true to group components references, when other fieds
+ *          have the same value
+ */
+void DIALOG_BUILD_BOM::CreateSpreadSheetPartsFullList( bool aIncludeSubComponents,
+                                                       bool aPrintLocation,
+                                                       bool aGroupRefs )
+{
+    FILE*    f;
+    wxString msg;
+
+    if( ( f = wxFopen( m_listFileName, wxT( "wt" ) ) ) == NULL )
+    {
+        msg.Printf( _( "Failed to open file <%s>" ), GetChars( m_listFileName ) );
+        DisplayError( this, msg );
+        return;
+    }
+
+    BOM_LISTER bom_lister( Prj().SchLibs() );
+    bom_lister.SetCvsFormOn( s_ExportSeparatorSymbol );
+
+    // Set group refs option (hight priority):
+    // Obvioulsy only useful when not including sub-components
+    bom_lister.SetGroupReferences( aGroupRefs );
+    bom_lister.SetIncludeSubCmp( aIncludeSubComponents && !aGroupRefs );
+
+    // Set print location option:
+    // Obvioulsy only possible when including sub components
+    // and not grouping references
+    bom_lister.SetPrintLocation( aPrintLocation && !aGroupRefs &&
+                                 aIncludeSubComponents );
+
+    // Set the list of fields to add to list
+    for( int ii = FOOTPRINT; ii <= FIELD8; ii++ )
+        if( IsFieldChecked( ii ) )
+            bom_lister.AddFieldIdToPrintList( ii );
+
+    // create the file
+    bom_lister.PrintComponentsListByReferenceCsvForm( f );
+
+    fclose( f );
+}
+
+
+/*
+ * CreatePartsAndLabelsFullList()
+ * Main function to create the list of components and/or labels
+ * (global labels, hierarchical labels and pin sheets )
+ */
+void DIALOG_BUILD_BOM::CreatePartsAndLabelsFullList( bool aIncludeSubComponents )
+{
+    FILE*    f;
+    wxString msg;
+
+    if( ( f = wxFopen( m_listFileName, wxT( "wt" ) ) ) == NULL )
+    {
+        msg.Printf( _( "Failed to open file <%s>" ), GetChars( m_listFileName ) );
+        DisplayError( this, msg );
+        return;
+    }
+
+    BOM_LISTER bom_lister( Prj().SchLibs() );
+    bom_lister.SetIncludeSubCmp( aIncludeSubComponents );
+    bom_lister.SetCvsFormOff();
+    bom_lister.SetPrintLocation( s_Add_Location );
+    // Set the list of fields to add to list
+    for( int ii = FOOTPRINT; ii <= FIELD8; ii++ )
+        if( IsFieldChecked( ii ) )
+            bom_lister.AddFieldIdToPrintList( ii );
+
+    // creates the list file
+    wxString Title = Pgm().App().GetAppName() + wxT( " " ) + GetBuildVersion();
+
+    fprintf( f, "%s  >> Creation date: %s\n", TO_UTF8( Title ), TO_UTF8( DateAndTime() ) );
+
+    if( m_ListCmpbyRefItems->GetValue() )
+        bom_lister.PrintComponentsListByReferenceHumanReadable( f );
+
+    if( m_ListCmpbyValItems->GetValue() )
+        bom_lister.PrintComponentsListByValue( f );
+
+    // Create list of global labels, hierachical labels and pins sheets
+
+    if( m_GenListLabelsbySheet->GetValue() )
+        bom_lister.PrintGlobalAndHierarchicalLabelsList( f, true );
+
+    if( m_GenListLabelsbyVal->GetValue() )
+        bom_lister.PrintGlobalAndHierarchicalLabelsList( f, false );
+
+    msg = _( "\n#End List\n" );
+    fprintf( f, "%s", TO_UTF8( msg ) );
+    fclose( f );
+}
 
=== added file 'eeschema/BOM/dialogs/dialog_build_BOM.h'
--- eeschema/BOM/dialogs/dialog_build_BOM.h	1970-01-01 00:00:00 +0000
+++ eeschema/BOM/dialogs/dialog_build_BOM.h	2015-06-20 07:42:20 +0000
@@ -0,0 +1,93 @@
+/**
+ * @file dialog_build_BOM.h
+ */
+
+/* This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+
+#ifndef _DIALOG_BUILD_BOM_H_
+#define _DIALOG_BUILD_BOM_H_
+
+#include <dialog_build_BOM_base.h>
+#include <schframe.h>
+
+class SCH_COMPONENT;
+class wxConfig;
+
+class DIALOG_BUILD_BOM : public DIALOG_BUILD_BOM_BASE
+{
+private:
+    SCH_EDIT_FRAME* m_parent;
+    wxConfigBase*   m_config;
+    wxString        m_listFileName;     // The full filename of the file report.
+
+private:
+    void    OnRadioboxSelectFormatSelected( wxCommandEvent& event );
+    void    OnOkClick( wxCommandEvent& event );
+    void    OnCancelClick( wxCommandEvent& event );
+
+    void    SavePreferences();
+    void    Init();
+    void    Create_BOM_Lists( int   aTypeFile,
+                              bool  aIncludeSubComponents,
+                              char  aExportSeparatorSymbol,
+                              bool  aRunBrowser );
+
+    void    CreatePartsAndLabelsFullList( bool aIncludeSubComponents );
+
+    /**
+     * Function CreateSpreadSheetPartsFullList
+     * prints a list of components, in a form which can be imported by a
+     * spreadsheet.  Form is:
+     *  reference; cmp value; \<footprint\>; \<field1\>; ...;
+     * Components are sorted by reference
+     * @param aIncludeSubComponents = true to print sub components
+     * @param aPrintLocation = true to print components location
+     *        (only possible when aIncludeSubComponents == true)
+     * @param aGroupRefs = true to group components references, when other fieds
+     *          have the same value
+     */
+    void    CreateSpreadSheetPartsFullList( bool aIncludeSubComponents,
+                                            bool aPrintLocation,
+                                            bool aGroupRefs );
+
+    /**
+     * Function CreateSpreadSheetPartsShortList
+     * prints a list of components, in a form which can be imported by a spreadsheet.
+     * components having the same value and the same footprint
+     * are grouped on the same line
+     * Form is:
+     *  value; number of components; list of references; \<footprint\>; \<field1\>; ...;
+     * list is sorted by values
+     */
+    void    CreateSpreadSheetPartsShortList();
+
+    bool    IsFieldChecked( int aFieldId );
+
+public:
+    DIALOG_BUILD_BOM( SCH_EDIT_FRAME* parent );
+
+    // ~DIALOG_BUILD_BOM() {};
+};
+
+#endif  // _DIALOG_BUILD_BOM_H_
 
=== added file 'eeschema/BOM/dialogs/dialog_build_BOM_base.cpp'
--- eeschema/BOM/dialogs/dialog_build_BOM_base.cpp	1970-01-01 00:00:00 +0000
+++ eeschema/BOM/dialogs/dialog_build_BOM_base.cpp	2015-06-20 07:42:20 +0000
@@ -0,0 +1,157 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_build_BOM_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bMainSizer;
+	bMainSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizerUpper;
+	bSizerUpper = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxStaticBoxSizer* sbOptionsSizer;
+	sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
+	
+	wxStaticBoxSizer* sbListOptionsSizer;
+	sbListOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("List items:") ), wxVERTICAL );
+	
+	m_ListCmpbyRefItems = new wxCheckBox( this, wxID_ANY, _("Components by reference"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbListOptionsSizer->Add( m_ListCmpbyRefItems, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_ListSubCmpItems = new wxCheckBox( this, wxID_ANY, _("Sub components (i.e. U2A, U2B ...)"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbListOptionsSizer->Add( m_ListSubCmpItems, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_ListCmpbyValItems = new wxCheckBox( this, wxID_ANY, _("Components by value"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbListOptionsSizer->Add( m_ListCmpbyValItems, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_GenListLabelsbyVal = new wxCheckBox( this, wxID_ANY, _("Hierarchical pins by name"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbListOptionsSizer->Add( m_GenListLabelsbyVal, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_GenListLabelsbySheet = new wxCheckBox( this, wxID_ANY, _("Hierarchical pins by sheet"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbListOptionsSizer->Add( m_GenListLabelsbySheet, 0, wxALL, 5 );
+	
+	
+	sbOptionsSizer->Add( sbListOptionsSizer, 0, wxEXPAND, 5 );
+	
+	wxString m_OutputFormCtrlChoices[] = { _("List"), _("List for spreadsheet import (by ref)"), _("List for spreadsheet import (by grouped ref)"), _("List for spreadsheet import (by value)") };
+	int m_OutputFormCtrlNChoices = sizeof( m_OutputFormCtrlChoices ) / sizeof( wxString );
+	m_OutputFormCtrl = new wxRadioBox( this, ID_RADIOBOX_SELECT_FORMAT, _("Output format:"), wxDefaultPosition, wxDefaultSize, m_OutputFormCtrlNChoices, m_OutputFormCtrlChoices, 1, wxRA_SPECIFY_COLS );
+	m_OutputFormCtrl->SetSelection( 1 );
+	sbOptionsSizer->Add( m_OutputFormCtrl, 0, wxEXPAND|wxTOP, 5 );
+	
+	wxString m_OutputSeparatorCtrlChoices[] = { _("Tab"), _(";"), _(",") };
+	int m_OutputSeparatorCtrlNChoices = sizeof( m_OutputSeparatorCtrlChoices ) / sizeof( wxString );
+	m_OutputSeparatorCtrl = new wxRadioBox( this, wxID_ANY, _("Field separator for spreadsheet import:"), wxDefaultPosition, wxDefaultSize, m_OutputSeparatorCtrlNChoices, m_OutputSeparatorCtrlChoices, 1, wxRA_SPECIFY_ROWS );
+	m_OutputSeparatorCtrl->SetSelection( 0 );
+	sbOptionsSizer->Add( m_OutputSeparatorCtrl, 0, wxEXPAND|wxTOP, 5 );
+	
+	m_GetListBrowser = new wxCheckBox( this, wxID_ANY, _("Launch list browser"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbOptionsSizer->Add( m_GetListBrowser, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bSizerUpper->Add( sbOptionsSizer, 3, wxALL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bRightSizer;
+	bRightSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbAddToListSelectionSizer;
+	sbAddToListSelectionSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Add to list:") ), wxVERTICAL );
+	
+	m_AddLocationField = new wxCheckBox( this, wxID_ANY, _("Component location"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbAddToListSelectionSizer->Add( m_AddLocationField, 0, wxALL, 5 );
+	
+	wxStaticBoxSizer* sbFixedFieldsSizer;
+	sbFixedFieldsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("System Fields:") ), wxVERTICAL );
+	
+	m_AddDatasheetField = new wxCheckBox( this, wxID_ANY, _("Datasheet"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbFixedFieldsSizer->Add( m_AddDatasheetField, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_AddFootprintField = new wxCheckBox( this, wxID_ANY, _("Footprint"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbFixedFieldsSizer->Add( m_AddFootprintField, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	sbAddToListSelectionSizer->Add( sbFixedFieldsSizer, 0, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbUsersFiledsSizer;
+	sbUsersFiledsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Users fields:") ), wxVERTICAL );
+	
+	m_AddField1 = new wxCheckBox( this, wxID_ANY, _("Field 1"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbUsersFiledsSizer->Add( m_AddField1, 0, wxEXPAND|wxALL, 5 );
+	
+	m_AddField2 = new wxCheckBox( this, wxID_ANY, _("Field 2"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbUsersFiledsSizer->Add( m_AddField2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_AddField3 = new wxCheckBox( this, wxID_ANY, _("Field 3"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbUsersFiledsSizer->Add( m_AddField3, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_AddField4 = new wxCheckBox( this, wxID_ANY, _("Field 4"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbUsersFiledsSizer->Add( m_AddField4, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_AddField5 = new wxCheckBox( this, wxID_ANY, _("Field 5"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbUsersFiledsSizer->Add( m_AddField5, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_AddField6 = new wxCheckBox( this, wxID_ANY, _("Field 6"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbUsersFiledsSizer->Add( m_AddField6, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_AddField7 = new wxCheckBox( this, wxID_ANY, _("Field 7"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbUsersFiledsSizer->Add( m_AddField7, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_AddField8 = new wxCheckBox( this, wxID_ANY, _("Field 8"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbUsersFiledsSizer->Add( m_AddField8, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	sbAddToListSelectionSizer->Add( sbUsersFiledsSizer, 0, wxEXPAND|wxTOP, 5 );
+	
+	m_AddAllFields = new wxCheckBox( this, wxID_ANY, _("All existing user fields"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbAddToListSelectionSizer->Add( m_AddAllFields, 0, wxALL, 5 );
+	
+	
+	bRightSizer->Add( sbAddToListSelectionSizer, 1, wxEXPAND, 5 );
+	
+	
+	bSizerUpper->Add( bRightSizer, 2, wxALL|wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( bSizerUpper, 1, wxEXPAND, 5 );
+	
+	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	
+	m_sdbSizer = new wxStdDialogButtonSizer();
+	m_sdbSizerOK = new wxButton( this, wxID_OK );
+	m_sdbSizer->AddButton( m_sdbSizerOK );
+	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizer->AddButton( m_sdbSizerCancel );
+	m_sdbSizer->Realize();
+	
+	bMainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	bMainSizer->Fit( this );
+	
+	// Connect Events
+	m_OutputFormCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnRadioboxSelectFormatSelected ), NULL, this );
+	m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnCancelClick ), NULL, this );
+	m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnOkClick ), NULL, this );
+}
+
+DIALOG_BUILD_BOM_BASE::~DIALOG_BUILD_BOM_BASE()
+{
+	// Disconnect Events
+	m_OutputFormCtrl->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnRadioboxSelectFormatSelected ), NULL, this );
+	m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnCancelClick ), NULL, this );
+	m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnOkClick ), NULL, this );
+	
+}
 
=== added file 'eeschema/BOM/dialogs/dialog_build_BOM_base.fbp'
--- eeschema/BOM/dialogs/dialog_build_BOM_base.fbp	1970-01-01 00:00:00 +0000
+++ eeschema/BOM/dialogs/dialog_build_BOM_base.fbp	2015-06-20 07:42:20 +0000
@@ -0,0 +1,2060 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="11" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">res</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">dialog_build_BOM_base</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">1</property>
+        <property name="name">dialog_build_BOM_base</property>
+        <property name="namespace"></property>
+        <property name="path">.</property>
+        <property name="precompiled_header"></property>
+        <property name="relative_path">1</property>
+        <property name="skip_php_events">1</property>
+        <property name="skip_python_events">1</property>
+        <property name="use_enum">1</property>
+        <property name="use_microsoft_bom">0</property>
+        <object class="Dialog" expanded="1">
+            <property name="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="center"></property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">DIALOG_BUILD_BOM_BASE</property>
+            <property name="pos"></property>
+            <property name="size">-1,-1</property>
+            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
+            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
+            <property name="title">List of Materials</property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style"></property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bMainSizer</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">1</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">bSizerUpper</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">3</property>
+                            <object class="wxStaticBoxSizer" expanded="1">
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Options:</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">sbOptionsSizer</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <event name="OnUpdateUI"></event>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxStaticBoxSizer" expanded="0">
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">List items:</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">sbListOptionsSizer</property>
+                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="permission">none</property>
+                                        <event name="OnUpdateUI"></event>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxCheckBox" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="checked">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Components by reference</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_ListCmpbyRefItems</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCheckBox"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxCheckBox" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="checked">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Sub components (i.e. U2A, U2B ...)</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_ListSubCmpItems</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCheckBox"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxCheckBox" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="checked">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Components by value</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_ListCmpbyValItems</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCheckBox"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxCheckBox" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="checked">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Hierarchical pins by name</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_GenListLabelsbyVal</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCheckBox"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxCheckBox" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="checked">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Hierarchical pins by sheet</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_GenListLabelsbySheet</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCheckBox"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND|wxTOP</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxRadioBox" expanded="1">
+                                        <property name="BottomDockable">1</property>
+                                        <property name="LeftDockable">1</property>
+                                        <property name="RightDockable">1</property>
+                                        <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="choices">&quot;List&quot; &quot;List for spreadsheet import (by ref)&quot; &quot;List for spreadsheet import (by grouped ref)&quot; &quot;List for spreadsheet import (by value)&quot;</property>
+                                        <property name="close_button">1</property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default_pane">0</property>
+                                        <property name="dock">Dock</property>
+                                        <property name="dock_fixed">0</property>
+                                        <property name="docking">Left</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font"></property>
+                                        <property name="gripper">0</property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">ID_RADIOBOX_SELECT_FORMAT</property>
+                                        <property name="label">Output format:</property>
+                                        <property name="majorDimension">1</property>
+                                        <property name="max_size"></property>
+                                        <property name="maximize_button">0</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_OutputFormCtrl</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="selection">1</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxRA_SPECIFY_COLS</property>
+                                        <property name="subclass"></property>
+                                        <property name="toolbar_pane">0</property>
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
+                                        <property name="validator_style">wxFILTER_NONE</property>
+                                        <property name="validator_type">wxDefaultValidator</property>
+                                        <property name="validator_variable"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRadioBox">OnRadioboxSelectFormatSelected</event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND|wxTOP</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxRadioBox" expanded="1">
+                                        <property name="BottomDockable">1</property>
+                                        <property name="LeftDockable">1</property>
+                                        <property name="RightDockable">1</property>
+                                        <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="choices">&quot;Tab&quot; &quot;;&quot; &quot;,&quot;</property>
+                                        <property name="close_button">1</property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default_pane">0</property>
+                                        <property name="dock">Dock</property>
+                                        <property name="dock_fixed">0</property>
+                                        <property name="docking">Left</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font"></property>
+                                        <property name="gripper">0</property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Field separator for spreadsheet import:</property>
+                                        <property name="majorDimension">1</property>
+                                        <property name="max_size"></property>
+                                        <property name="maximize_button">0</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_OutputSeparatorCtrl</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="selection">0</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxRA_SPECIFY_ROWS</property>
+                                        <property name="subclass"></property>
+                                        <property name="toolbar_pane">0</property>
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
+                                        <property name="validator_style">wxFILTER_NONE</property>
+                                        <property name="validator_type">wxDefaultValidator</property>
+                                        <property name="validator_variable"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRadioBox"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxCheckBox" expanded="1">
+                                        <property name="BottomDockable">1</property>
+                                        <property name="LeftDockable">1</property>
+                                        <property name="RightDockable">1</property>
+                                        <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="checked">0</property>
+                                        <property name="close_button">1</property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default_pane">0</property>
+                                        <property name="dock">Dock</property>
+                                        <property name="dock_fixed">0</property>
+                                        <property name="docking">Left</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font"></property>
+                                        <property name="gripper">0</property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Launch list browser</property>
+                                        <property name="max_size"></property>
+                                        <property name="maximize_button">0</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_GetListBrowser</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="toolbar_pane">0</property>
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
+                                        <property name="validator_style">wxFILTER_NONE</property>
+                                        <property name="validator_type">wxDefaultValidator</property>
+                                        <property name="validator_variable"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCheckBox"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="proportion">2</property>
+                            <object class="wxBoxSizer" expanded="1">
+                                <property name="minimum_size"></property>
+                                <property name="name">bRightSizer</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="wxStaticBoxSizer" expanded="1">
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Add to list:</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">sbAddToListSelectionSizer</property>
+                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="permission">none</property>
+                                        <event name="OnUpdateUI"></event>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxCheckBox" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="checked">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Component location</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_AddLocationField</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCheckBox"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxEXPAND</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticBoxSizer" expanded="1">
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">System Fields:</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">sbFixedFieldsSizer</property>
+                                                <property name="orient">wxVERTICAL</property>
+                                                <property name="permission">none</property>
+                                                <event name="OnUpdateUI"></event>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Datasheet</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddDatasheetField</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Footprint</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddFootprintField</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxEXPAND|wxTOP</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticBoxSizer" expanded="1">
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">Users fields:</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">sbUsersFiledsSizer</property>
+                                                <property name="orient">wxVERTICAL</property>
+                                                <property name="permission">none</property>
+                                                <event name="OnUpdateUI"></event>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxEXPAND|wxALL</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Field 1</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddField1</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Field 2</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddField2</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Field 3</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddField3</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Field 4</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddField4</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Field 5</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddField5</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Field 6</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddField6</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Field 7</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddField7</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxCheckBox" expanded="1">
+                                                        <property name="BottomDockable">1</property>
+                                                        <property name="LeftDockable">1</property>
+                                                        <property name="RightDockable">1</property>
+                                                        <property name="TopDockable">1</property>
+                                                        <property name="aui_layer"></property>
+                                                        <property name="aui_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</property>
+                                                        <property name="center_pane">0</property>
+                                                        <property name="checked">0</property>
+                                                        <property name="close_button">1</property>
+                                                        <property name="context_help"></property>
+                                                        <property name="context_menu">1</property>
+                                                        <property name="default_pane">0</property>
+                                                        <property name="dock">Dock</property>
+                                                        <property name="dock_fixed">0</property>
+                                                        <property name="docking">Left</property>
+                                                        <property name="enabled">1</property>
+                                                        <property name="fg"></property>
+                                                        <property name="floatable">1</property>
+                                                        <property name="font"></property>
+                                                        <property name="gripper">0</property>
+                                                        <property name="hidden">0</property>
+                                                        <property name="id">wxID_ANY</property>
+                                                        <property name="label">Field 8</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_AddField8</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip"></property>
+                                                        <property name="validator_data_type"></property>
+                                                        <property name="validator_style">wxFILTER_NONE</property>
+                                                        <property name="validator_type">wxDefaultValidator</property>
+                                                        <property name="validator_variable"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnCheckBox"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxCheckBox" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="checked">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">All existing user fields</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_AddAllFields</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCheckBox"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStaticLine" expanded="1">
+                        <property name="BottomDockable">1</property>
+                        <property name="LeftDockable">1</property>
+                        <property name="RightDockable">1</property>
+                        <property name="TopDockable">1</property>
+                        <property name="aui_layer"></property>
+                        <property name="aui_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="close_button">1</property>
+                        <property name="context_help"></property>
+                        <property name="context_menu">1</property>
+                        <property name="default_pane">0</property>
+                        <property name="dock">Dock</property>
+                        <property name="dock_fixed">0</property>
+                        <property name="docking">Left</property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="floatable">1</property>
+                        <property name="font"></property>
+                        <property name="gripper">0</property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="max_size"></property>
+                        <property name="maximize_button">0</property>
+                        <property name="maximum_size"></property>
+                        <property name="min_size"></property>
+                        <property name="minimize_button">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="moveable">1</property>
+                        <property name="name">m_staticline1</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style">wxLI_HORIZONTAL</property>
+                        <property name="subclass"></property>
+                        <property name="toolbar_pane">0</property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStdDialogButtonSizer" expanded="1">
+                        <property name="Apply">0</property>
+                        <property name="Cancel">1</property>
+                        <property name="ContextHelp">0</property>
+                        <property name="Help">0</property>
+                        <property name="No">0</property>
+                        <property name="OK">1</property>
+                        <property name="Save">0</property>
+                        <property name="Yes">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_sdbSizer</property>
+                        <property name="permission">protected</property>
+                        <event name="OnApplyButtonClick"></event>
+                        <event name="OnCancelButtonClick">OnCancelClick</event>
+                        <event name="OnContextHelpButtonClick"></event>
+                        <event name="OnHelpButtonClick"></event>
+                        <event name="OnNoButtonClick"></event>
+                        <event name="OnOKButtonClick">OnOkClick</event>
+                        <event name="OnSaveButtonClick"></event>
+                        <event name="OnYesButtonClick"></event>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>
 
=== added file 'eeschema/BOM/dialogs/dialog_build_BOM_base.h'
--- eeschema/BOM/dialogs/dialog_build_BOM_base.h	1970-01-01 00:00:00 +0000
+++ eeschema/BOM/dialogs/dialog_build_BOM_base.h	2015-06-20 07:42:20 +0000
@@ -0,0 +1,83 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_BUILD_BOM_BASE_H__
+#define __DIALOG_BUILD_BOM_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+class DIALOG_SHIM;
+
+#include "dialog_shim.h"
+#include <wx/string.h>
+#include <wx/checkbox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/radiobox.h>
+#include <wx/statline.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_BUILD_BOM_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_BUILD_BOM_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		enum
+		{
+			ID_RADIOBOX_SELECT_FORMAT = 1000
+		};
+		
+		wxCheckBox* m_ListCmpbyRefItems;