diff --git a/.gitmodules b/.gitmodules index e3303f75..c9e033b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,5 +2,5 @@ path = submodules/KiCost url = https://github.com/hildogjr/KiCost.git [submodule "kibot/PcbDraw/resources/footprints"] - path = kibot/PcbDraw/resources/footprints + path = kibot/resources/pcbdraw/footprints url = https://github.com/yaqwsx/PcbDraw-Lib.git diff --git a/MANIFEST.in b/MANIFEST.in index db253c4f..e54d7912 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,10 +1,12 @@ include MANIFEST.in include LICENSE include README.md -include kibot/report_templates/*.txt -include kibot/kicad_colors/*.json -include kibot/kicad_layouts/*.kicad_wks -include kibot/config_templates/gerber/*.yaml -include kibot/config_templates/bom/*.yaml -include kibot/images/*.svg -include kibot/images/*.ico +include kibot/resources/report_templates/*.txt +include kibot/resources/kicad_colors/*.json +include kibot/resources/kicad_layouts/*.kicad_wks +include kibot/resources/config_templates/gerber/*.yaml +include kibot/resources/config_templates/bom/*.yaml +include kibot/resources/images/*.svg +include kibot/resources/images/*.ico +include kibot/resources/pcbdraw/styles/*.json +recursive-include kibot/resources/pcbdraw/footprints/ *.svg LICENCE *.md *.py *.pl *.png diff --git a/debian/install b/debian/install new file mode 100644 index 00000000..5f35b709 --- /dev/null +++ b/debian/install @@ -0,0 +1,6 @@ +kibot/resources/config_templates/ /usr/share/kibot/ +kibot/resources/images/ /usr/share/kibot/ +kibot/resources/kicad_colors/ /usr/share/kibot/ +kibot/resources/kicad_layouts/ /usr/share/kibot/ +kibot/resources/pcbdraw/ /usr/share/kibot/ +kibot/resources/report_templates/ /usr/share/kibot/ diff --git a/debian/patches/001-Separate_data_files b/debian/patches/001-Separate_data_files new file mode 100644 index 00000000..b235403d --- /dev/null +++ b/debian/patches/001-Separate_data_files @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -21,7 +21,7 @@ + scripts=['src/kibot-check'], + entry_points={'console_scripts': ['kibot=kibot.__main__:main', 'kiplot=kibot.__main__:main']}, + install_requires=__pypi_deps__, +- include_package_data=True, ++ include_package_data=False, + classifiers=['Development Status :: 5 - Production/Stable', + 'Environment :: Console', + 'Intended Audience :: Developers', diff --git a/debian/patches/series b/debian/patches/series index 4a97dfa7..d99b0389 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ # You must remove unused comment lines for the released package. +001-Separate_data_files diff --git a/docs/Makefile b/docs/Makefile index 8b73e37d..4f7ff402 100755 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,13 +1,13 @@ #!/usr/bin/make -all: ../README.md samples/generic_plot.kibot.yaml ../kibot/report_templates/report_full_svg.txt ../kibot/config_templates/bom/MacroFab_XYRS.kibot.yaml \ - ../kibot/config_templates/gerber/Elecrow.kibot.yaml ../kibot/config_templates/gerber/FusionPCB.kibot.yaml \ - ../kibot/config_templates/gerber/JLCPCB.kibot.yaml ../kibot/config_templates/gerber/PCBWay.kibot.yaml ../src/kibot-check +all: ../README.md samples/generic_plot.kibot.yaml ../kibot/resources/report_templates/report_full_svg.txt ../kibot/resources/config_templates/bom/MacroFab_XYRS.kibot.yaml \ + ../kibot/resources/config_templates/gerber/Elecrow.kibot.yaml ../kibot/resources/config_templates/gerber/FusionPCB.kibot.yaml \ + ../kibot/resources/config_templates/gerber/JLCPCB.kibot.yaml ../kibot/resources/config_templates/gerber/PCBWay.kibot.yaml ../src/kibot-check -../kibot/config_templates/gerber/%.kibot.yaml: samples/%.kibot.yaml +../kibot/resources/config_templates/gerber/%.kibot.yaml: samples/%.kibot.yaml cp $< $@ -../kibot/config_templates/bom/%.kibot.yaml: samples/%.kibot.yaml +../kibot/resources/config_templates/bom/%.kibot.yaml: samples/%.kibot.yaml cp $< $@ ../README.md: README.in replace_tags.pl ../kibot/out_*.py ../kibot/pre_*.py ../kibot/var_*.py ../kibot/fil_*.py ../kibot/__main__.py ../kibot/config_reader.py ../kibot/globals.py ../kibot/dep_downloader.py @@ -21,5 +21,5 @@ samples/generic_plot.kibot.yaml: ../kibot/out_*.py ../kibot/pre_*.py ../kibot/co ../src/kibot -v --example mv example_template.kibot.yaml $@ -../kibot/report_templates/report_full_svg.txt: ../kibot/report_templates/report_full.txt +../kibot/resources/report_templates/report_full_svg.txt: ../kibot/resources/report_templates/report_full.txt sed -e 's/layer_pdfs/layer_svgs/' $< > $@ diff --git a/kibot/PcbDraw/__init__.py b/kibot/PcbDraw/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/kibot/gs.py b/kibot/gs.py index 13783cd8..93224778 100644 --- a/kibot/gs.py +++ b/kibot/gs.py @@ -15,7 +15,7 @@ except ImportError: from datetime import datetime, date from sys import exit from shutil import copy2 -from .misc import EXIT_BAD_ARGS, W_DATEFORMAT, W_UNKVAR +from .misc import EXIT_BAD_ARGS, W_DATEFORMAT, W_UNKVAR, WRONG_INSTALL from .log import get_logger logger = get_logger(__name__) @@ -408,3 +408,16 @@ class GS(object): def check_tool(context, name): """ Looks for a dependency """ return GS.check_tool_dep(context, name, fatal=False) + + @staticmethod + def get_resource_path(name): + # Try relative to the script + dir_name = os.path.join(os.path.dirname(__file__), 'resources', name) + if os.path.isdir(dir_name): + return dir_name + # Try using the system level path + dir_name = os.path.join('usr', 'share', 'kibot', name) + if os.path.isdir(dir_name): + return dir_name + logger.error('Missing resource directory `{}`'.format(name)) + exit(WRONG_INSTALL) diff --git a/kibot/kicad/color_theme.py b/kibot/kicad/color_theme.py index ca7b64df..3fdc3699 100644 --- a/kibot/kicad/color_theme.py +++ b/kibot/kicad/color_theme.py @@ -63,7 +63,7 @@ def load_color_theme(name): logger.warning(W_COLORTHEME, "KiCad 5 doesn't support color themes ({})".format(name)) return None if is_built_in: - fn = os.path.join(os.path.dirname(__file__), '..', 'kicad_colors', name+'.json') + fn = os.path.join(GS.get_resource_path('kicad_colors'), name+'.json') else: KiConf.init(GS.pcb_file) fn = os.path.join(KiConf.config_dir, 'colors', name+'.json') diff --git a/kibot/kiplot.py b/kibot/kiplot.py index f4198eff..8c9bef31 100644 --- a/kibot/kiplot.py +++ b/kibot/kiplot.py @@ -873,7 +873,7 @@ def generate_one_example(dest_dir, types): logger.debug('- {}, skipped (PCB: {} SCH: {})'.format(n, o.is_pcb(), o.is_sch())) continue # Look for templates - tpls = glob(os.path.join(os.path.dirname(__file__), 'config_templates', n, '*.kibot.yaml')) + tpls = glob(os.path.join(GS.get_resource_path('config_templates'), n, '*.kibot.yaml')) if tpls: # Load the templates tpl_names = tpls diff --git a/kibot/out_navigate_results.py b/kibot/out_navigate_results.py index 6ee71043..37c69594 100644 --- a/kibot/out_navigate_results.py +++ b/kibot/out_navigate_results.py @@ -189,7 +189,7 @@ class Navigate_ResultsOptions(BaseOptions): if img_w in self.copied_images: # Already copied, just return its name return self.copied_images[img_w] - src = os.path.join(self.img_src_dir, 'images', img+'.svg') + src = os.path.join(self.img_src_dir, img+'.svg') dst = os.path.join(self.out_dir, 'images', img_w) id = img_w if self.rsvg_command is not None and self.svg_to_png(src, dst+'.png', width): @@ -428,7 +428,7 @@ class Navigate_ResultsOptions(BaseOptions): def run(self, name): self.out_dir = os.path.dirname(name) - self.img_src_dir = os.path.dirname(__file__) + self.img_src_dir = GS.get_resource_path('images') self.img_dst_dir = os.path.join(self.out_dir, 'images') os.makedirs(self.img_dst_dir, exist_ok=True) self.copied_images = {} @@ -454,7 +454,7 @@ class Navigate_ResultsOptions(BaseOptions): self.home = name self.back_img = self.copy('back', MID_ICON) self.home_img = self.copy('home', MID_ICON) - copy2(os.path.join(self.img_src_dir, 'images', 'favicon.ico'), os.path.join(self.out_dir, 'favicon.ico')) + copy2(os.path.join(self.img_src_dir, 'favicon.ico'), os.path.join(self.out_dir, 'favicon.ico')) self.generate_page_for(o_tree, name) # Link it? if self.link_from_root: diff --git a/kibot/out_pcb_print.py b/kibot/out_pcb_print.py index eb511830..dcbc2402 100644 --- a/kibot/out_pcb_print.py +++ b/kibot/out_pcb_print.py @@ -770,22 +770,10 @@ class PCB_PrintOptions(VariantOptions): # Run PcbDraw to make the heavy work (find the Edge.Cuts path and create masks) try: plotter = PcbPlotter(GS.board) - # TODO: Review the paths, most probably add the system KiBot dir - # Read libs from current dir - # plotter.setup_arbitrary_data_path(".") - # Libs indicated by PCBDRAW_LIB_PATH - plotter.setup_env_data_path() - # Libs from resources relative to the script - plotter.setup_builtin_data_path() - # Libs from the user HOME and the system - plotter.setup_global_data_path() plotter.yield_warning = pcbdraw_warnings plotter.render_back = back plotter.plot_plan = [PlotSubstrate(only_mask=True)] image = plotter.plot() - # Most errors are reported as RuntimeError - # When the PCB can't be loaded we get IOError - # When the SVG contains errors we get SyntaxError except (RuntimeError, SyntaxError, IOError) as e: logger.error('PcbDraw error: '+str(e)) exit(PCBDRAW_ERR) @@ -975,7 +963,7 @@ class PCB_PrintOptions(VariantOptions): # Find the layout file layout = KiConf.fix_page_layout(GS.pro_file, dry=True)[1] if not layout or not os.path.isfile(layout): - layout = os.path.abspath(os.path.join(os.path.dirname(__file__), 'kicad_layouts', 'default.kicad_wks')) + layout = os.path.abspath(os.path.join(GS.get_resource_path('kicad_layouts'), 'default.kicad_wks')) logger.debug('- Using layout: '+layout) self.layout = layout # Plot options diff --git a/kibot/out_pcbdraw.py b/kibot/out_pcbdraw.py index d1c41fb5..bee7bacb 100644 --- a/kibot/out_pcbdraw.py +++ b/kibot/out_pcbdraw.py @@ -3,7 +3,6 @@ # Copyright (c) 2020-2022 Instituto Nacional de Tecnología Industrial # License: GPL-3.0 # Project: KiBot (formerly KiPlot) -# TODO: Package resources """ Dependencies: - from: RSVG @@ -411,14 +410,11 @@ class PcbDrawOptions(VariantOptions): try: plotter = PcbPlotter(GS.board) - # TODO: Review the paths, most probably add the system KiBot dir - # Read libs from current dir - # plotter.setup_arbitrary_data_path(".") + # Read libs from KiBot resources + plotter.setup_arbitrary_data_path(GS.get_resource_path('pcbdraw')) # Libs indicated by PCBDRAW_LIB_PATH plotter.setup_env_data_path() - # Libs from resources relative to the script - plotter.setup_builtin_data_path() - # Libs from the user HOME and the system + # Libs from the user HOME and the system (for pcbdraw) plotter.setup_global_data_path() plotter.yield_warning = pcbdraw_warnings plotter.libs = self.libs diff --git a/kibot/out_report.py b/kibot/out_report.py index ab03a3db..bafe2bf3 100644 --- a/kibot/out_report.py +++ b/kibot/out_report.py @@ -222,7 +222,7 @@ class ReportOptions(BaseOptions): self.template = self.template[:-6] self.to_ascii = True if self.template.lower() in ('full', 'simple', 'full_svg'): - self.template = os.path.abspath(os.path.join(os.path.dirname(__file__), 'report_templates', + self.template = os.path.abspath(os.path.join(GS.get_resource_path('report_templates'), 'report_'+self.template.lower()+'.txt')) if not os.path.isabs(self.template): self.template = os.path.expandvars(os.path.expanduser(self.template)) diff --git a/kibot/config_templates/bom/MacroFab_XYRS.kibot.yaml b/kibot/resources/config_templates/bom/MacroFab_XYRS.kibot.yaml similarity index 100% rename from kibot/config_templates/bom/MacroFab_XYRS.kibot.yaml rename to kibot/resources/config_templates/bom/MacroFab_XYRS.kibot.yaml diff --git a/kibot/config_templates/gerber/Elecrow.kibot.yaml b/kibot/resources/config_templates/gerber/Elecrow.kibot.yaml similarity index 100% rename from kibot/config_templates/gerber/Elecrow.kibot.yaml rename to kibot/resources/config_templates/gerber/Elecrow.kibot.yaml diff --git a/kibot/config_templates/gerber/FusionPCB.kibot.yaml b/kibot/resources/config_templates/gerber/FusionPCB.kibot.yaml similarity index 100% rename from kibot/config_templates/gerber/FusionPCB.kibot.yaml rename to kibot/resources/config_templates/gerber/FusionPCB.kibot.yaml diff --git a/kibot/config_templates/gerber/JLCPCB.kibot.yaml b/kibot/resources/config_templates/gerber/JLCPCB.kibot.yaml similarity index 100% rename from kibot/config_templates/gerber/JLCPCB.kibot.yaml rename to kibot/resources/config_templates/gerber/JLCPCB.kibot.yaml diff --git a/kibot/config_templates/gerber/PCBWay.kibot.yaml b/kibot/resources/config_templates/gerber/PCBWay.kibot.yaml similarity index 100% rename from kibot/config_templates/gerber/PCBWay.kibot.yaml rename to kibot/resources/config_templates/gerber/PCBWay.kibot.yaml diff --git a/kibot/images/3d.svg b/kibot/resources/images/3d.svg similarity index 100% rename from kibot/images/3d.svg rename to kibot/resources/images/3d.svg diff --git a/kibot/images/assembly_simple.svg b/kibot/resources/images/assembly_simple.svg similarity index 100% rename from kibot/images/assembly_simple.svg rename to kibot/resources/images/assembly_simple.svg diff --git a/kibot/images/back.svg b/kibot/resources/images/back.svg similarity index 100% rename from kibot/images/back.svg rename to kibot/resources/images/back.svg diff --git a/kibot/images/bom.svg b/kibot/resources/images/bom.svg similarity index 100% rename from kibot/images/bom.svg rename to kibot/resources/images/bom.svg diff --git a/kibot/images/eeschema.svg b/kibot/resources/images/eeschema.svg similarity index 100% rename from kibot/images/eeschema.svg rename to kibot/resources/images/eeschema.svg diff --git a/kibot/images/export.svg b/kibot/resources/images/export.svg similarity index 100% rename from kibot/images/export.svg rename to kibot/resources/images/export.svg diff --git a/kibot/images/fabrication.svg b/kibot/resources/images/fabrication.svg similarity index 100% rename from kibot/images/fabrication.svg rename to kibot/resources/images/fabrication.svg diff --git a/kibot/images/favicon.ico b/kibot/resources/images/favicon.ico similarity index 100% rename from kibot/images/favicon.ico rename to kibot/resources/images/favicon.ico diff --git a/kibot/images/file_brd.svg b/kibot/resources/images/file_brd.svg similarity index 100% rename from kibot/images/file_brd.svg rename to kibot/resources/images/file_brd.svg diff --git a/kibot/images/file_bz2.svg b/kibot/resources/images/file_bz2.svg similarity index 100% rename from kibot/images/file_bz2.svg rename to kibot/resources/images/file_bz2.svg diff --git a/kibot/images/file_cad.svg b/kibot/resources/images/file_cad.svg similarity index 100% rename from kibot/images/file_cad.svg rename to kibot/resources/images/file_cad.svg diff --git a/kibot/images/file_csv.svg b/kibot/resources/images/file_csv.svg similarity index 100% rename from kibot/images/file_csv.svg rename to kibot/resources/images/file_csv.svg diff --git a/kibot/images/file_drl.svg b/kibot/resources/images/file_drl.svg similarity index 100% rename from kibot/images/file_drl.svg rename to kibot/resources/images/file_drl.svg diff --git a/kibot/images/file_dxf.svg b/kibot/resources/images/file_dxf.svg similarity index 100% rename from kibot/images/file_dxf.svg rename to kibot/resources/images/file_dxf.svg diff --git a/kibot/images/file_eps.svg b/kibot/resources/images/file_eps.svg similarity index 100% rename from kibot/images/file_eps.svg rename to kibot/resources/images/file_eps.svg diff --git a/kibot/images/file_gbr.svg b/kibot/resources/images/file_gbr.svg similarity index 100% rename from kibot/images/file_gbr.svg rename to kibot/resources/images/file_gbr.svg diff --git a/kibot/images/file_gerber_job.svg b/kibot/resources/images/file_gerber_job.svg similarity index 100% rename from kibot/images/file_gerber_job.svg rename to kibot/resources/images/file_gerber_job.svg diff --git a/kibot/images/file_gz.svg b/kibot/resources/images/file_gz.svg similarity index 100% rename from kibot/images/file_gz.svg rename to kibot/resources/images/file_gz.svg diff --git a/kibot/images/file_html.svg b/kibot/resources/images/file_html.svg similarity index 100% rename from kibot/images/file_html.svg rename to kibot/resources/images/file_html.svg diff --git a/kibot/images/file_jpg.svg b/kibot/resources/images/file_jpg.svg similarity index 100% rename from kibot/images/file_jpg.svg rename to kibot/resources/images/file_jpg.svg diff --git a/kibot/images/file_pdf.svg b/kibot/resources/images/file_pdf.svg similarity index 100% rename from kibot/images/file_pdf.svg rename to kibot/resources/images/file_pdf.svg diff --git a/kibot/images/file_plt.svg b/kibot/resources/images/file_plt.svg similarity index 100% rename from kibot/images/file_plt.svg rename to kibot/resources/images/file_plt.svg diff --git a/kibot/images/file_png.svg b/kibot/resources/images/file_png.svg similarity index 100% rename from kibot/images/file_png.svg rename to kibot/resources/images/file_png.svg diff --git a/kibot/images/file_pos.svg b/kibot/resources/images/file_pos.svg similarity index 100% rename from kibot/images/file_pos.svg rename to kibot/resources/images/file_pos.svg diff --git a/kibot/images/file_ps.svg b/kibot/resources/images/file_ps.svg similarity index 100% rename from kibot/images/file_ps.svg rename to kibot/resources/images/file_ps.svg diff --git a/kibot/images/file_rar.svg b/kibot/resources/images/file_rar.svg similarity index 100% rename from kibot/images/file_rar.svg rename to kibot/resources/images/file_rar.svg diff --git a/kibot/images/file_stp.svg b/kibot/resources/images/file_stp.svg similarity index 100% rename from kibot/images/file_stp.svg rename to kibot/resources/images/file_stp.svg diff --git a/kibot/images/file_svg.svg b/kibot/resources/images/file_svg.svg similarity index 100% rename from kibot/images/file_svg.svg rename to kibot/resources/images/file_svg.svg diff --git a/kibot/images/file_tar.svg b/kibot/resources/images/file_tar.svg similarity index 100% rename from kibot/images/file_tar.svg rename to kibot/resources/images/file_tar.svg diff --git a/kibot/images/file_tsv.svg b/kibot/resources/images/file_tsv.svg similarity index 100% rename from kibot/images/file_tsv.svg rename to kibot/resources/images/file_tsv.svg diff --git a/kibot/images/file_txt.svg b/kibot/resources/images/file_txt.svg similarity index 100% rename from kibot/images/file_txt.svg rename to kibot/resources/images/file_txt.svg diff --git a/kibot/images/file_xlsx.svg b/kibot/resources/images/file_xlsx.svg similarity index 100% rename from kibot/images/file_xlsx.svg rename to kibot/resources/images/file_xlsx.svg diff --git a/kibot/images/file_xml.svg b/kibot/resources/images/file_xml.svg similarity index 100% rename from kibot/images/file_xml.svg rename to kibot/resources/images/file_xml.svg diff --git a/kibot/images/file_xyrs.svg b/kibot/resources/images/file_xyrs.svg similarity index 100% rename from kibot/images/file_xyrs.svg rename to kibot/resources/images/file_xyrs.svg diff --git a/kibot/images/file_xz.svg b/kibot/resources/images/file_xz.svg similarity index 100% rename from kibot/images/file_xz.svg rename to kibot/resources/images/file_xz.svg diff --git a/kibot/images/file_zip.svg b/kibot/resources/images/file_zip.svg similarity index 100% rename from kibot/images/file_zip.svg rename to kibot/resources/images/file_zip.svg diff --git a/kibot/images/gerber.svg b/kibot/resources/images/gerber.svg similarity index 100% rename from kibot/images/gerber.svg rename to kibot/resources/images/gerber.svg diff --git a/kibot/images/home.svg b/kibot/resources/images/home.svg similarity index 100% rename from kibot/images/home.svg rename to kibot/resources/images/home.svg diff --git a/kibot/images/load_drill.svg b/kibot/resources/images/load_drill.svg similarity index 100% rename from kibot/images/load_drill.svg rename to kibot/resources/images/load_drill.svg diff --git a/kibot/images/pcbnew.svg b/kibot/resources/images/pcbnew.svg similarity index 100% rename from kibot/images/pcbnew.svg rename to kibot/resources/images/pcbnew.svg diff --git a/kibot/images/project.svg b/kibot/resources/images/project.svg similarity index 100% rename from kibot/images/project.svg rename to kibot/resources/images/project.svg diff --git a/kibot/images/repair.svg b/kibot/resources/images/repair.svg similarity index 100% rename from kibot/images/repair.svg rename to kibot/resources/images/repair.svg diff --git a/kibot/images/unknown.svg b/kibot/resources/images/unknown.svg similarity index 100% rename from kibot/images/unknown.svg rename to kibot/resources/images/unknown.svg diff --git a/kibot/images/zip.svg b/kibot/resources/images/zip.svg similarity index 100% rename from kibot/images/zip.svg rename to kibot/resources/images/zip.svg diff --git a/kibot/kicad_colors/_builtin_classic.json b/kibot/resources/kicad_colors/_builtin_classic.json similarity index 100% rename from kibot/kicad_colors/_builtin_classic.json rename to kibot/resources/kicad_colors/_builtin_classic.json diff --git a/kibot/kicad_colors/_builtin_default.json b/kibot/resources/kicad_colors/_builtin_default.json similarity index 100% rename from kibot/kicad_colors/_builtin_default.json rename to kibot/resources/kicad_colors/_builtin_default.json diff --git a/kibot/kicad_layouts/default.kicad_wks b/kibot/resources/kicad_layouts/default.kicad_wks similarity index 100% rename from kibot/kicad_layouts/default.kicad_wks rename to kibot/resources/kicad_layouts/default.kicad_wks diff --git a/kibot/PcbDraw/resources/footprints b/kibot/resources/pcbdraw/footprints similarity index 100% rename from kibot/PcbDraw/resources/footprints rename to kibot/resources/pcbdraw/footprints diff --git a/kibot/PcbDraw/resources/styles/gatema-green.json b/kibot/resources/pcbdraw/styles/gatema-green.json similarity index 100% rename from kibot/PcbDraw/resources/styles/gatema-green.json rename to kibot/resources/pcbdraw/styles/gatema-green.json diff --git a/kibot/PcbDraw/resources/styles/jlcpcb-green-enig.json b/kibot/resources/pcbdraw/styles/jlcpcb-green-enig.json similarity index 100% rename from kibot/PcbDraw/resources/styles/jlcpcb-green-enig.json rename to kibot/resources/pcbdraw/styles/jlcpcb-green-enig.json diff --git a/kibot/PcbDraw/resources/styles/jlcpcb-green-hasl.json b/kibot/resources/pcbdraw/styles/jlcpcb-green-hasl.json similarity index 100% rename from kibot/PcbDraw/resources/styles/jlcpcb-green-hasl.json rename to kibot/resources/pcbdraw/styles/jlcpcb-green-hasl.json diff --git a/kibot/PcbDraw/resources/styles/mayer-yellow-hasl.json b/kibot/resources/pcbdraw/styles/mayer-yellow-hasl.json similarity index 100% rename from kibot/PcbDraw/resources/styles/mayer-yellow-hasl.json rename to kibot/resources/pcbdraw/styles/mayer-yellow-hasl.json diff --git a/kibot/PcbDraw/resources/styles/oshpark-afterdark.json b/kibot/resources/pcbdraw/styles/oshpark-afterdark.json similarity index 100% rename from kibot/PcbDraw/resources/styles/oshpark-afterdark.json rename to kibot/resources/pcbdraw/styles/oshpark-afterdark.json diff --git a/kibot/PcbDraw/resources/styles/oshpark-purple.json b/kibot/resources/pcbdraw/styles/oshpark-purple.json similarity index 100% rename from kibot/PcbDraw/resources/styles/oshpark-purple.json rename to kibot/resources/pcbdraw/styles/oshpark-purple.json diff --git a/kibot/PcbDraw/resources/styles/set-black-cu.json b/kibot/resources/pcbdraw/styles/set-black-cu.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-black-cu.json rename to kibot/resources/pcbdraw/styles/set-black-cu.json diff --git a/kibot/PcbDraw/resources/styles/set-black-enig.json b/kibot/resources/pcbdraw/styles/set-black-enig.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-black-enig.json rename to kibot/resources/pcbdraw/styles/set-black-enig.json diff --git a/kibot/PcbDraw/resources/styles/set-black-hasl.json b/kibot/resources/pcbdraw/styles/set-black-hasl.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-black-hasl.json rename to kibot/resources/pcbdraw/styles/set-black-hasl.json diff --git a/kibot/PcbDraw/resources/styles/set-blue-cu.json b/kibot/resources/pcbdraw/styles/set-blue-cu.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-blue-cu.json rename to kibot/resources/pcbdraw/styles/set-blue-cu.json diff --git a/kibot/PcbDraw/resources/styles/set-blue-enig.json b/kibot/resources/pcbdraw/styles/set-blue-enig.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-blue-enig.json rename to kibot/resources/pcbdraw/styles/set-blue-enig.json diff --git a/kibot/PcbDraw/resources/styles/set-blue-hasl.json b/kibot/resources/pcbdraw/styles/set-blue-hasl.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-blue-hasl.json rename to kibot/resources/pcbdraw/styles/set-blue-hasl.json diff --git a/kibot/PcbDraw/resources/styles/set-red-cu.json b/kibot/resources/pcbdraw/styles/set-red-cu.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-red-cu.json rename to kibot/resources/pcbdraw/styles/set-red-cu.json diff --git a/kibot/PcbDraw/resources/styles/set-red-enig.json b/kibot/resources/pcbdraw/styles/set-red-enig.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-red-enig.json rename to kibot/resources/pcbdraw/styles/set-red-enig.json diff --git a/kibot/PcbDraw/resources/styles/set-red-hasl.json b/kibot/resources/pcbdraw/styles/set-red-hasl.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-red-hasl.json rename to kibot/resources/pcbdraw/styles/set-red-hasl.json diff --git a/kibot/PcbDraw/resources/styles/set-white-cu.json b/kibot/resources/pcbdraw/styles/set-white-cu.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-white-cu.json rename to kibot/resources/pcbdraw/styles/set-white-cu.json diff --git a/kibot/PcbDraw/resources/styles/set-white-enig.json b/kibot/resources/pcbdraw/styles/set-white-enig.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-white-enig.json rename to kibot/resources/pcbdraw/styles/set-white-enig.json diff --git a/kibot/PcbDraw/resources/styles/set-white-hasl.json b/kibot/resources/pcbdraw/styles/set-white-hasl.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-white-hasl.json rename to kibot/resources/pcbdraw/styles/set-white-hasl.json diff --git a/kibot/PcbDraw/resources/styles/set-yellow-cu.json b/kibot/resources/pcbdraw/styles/set-yellow-cu.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-yellow-cu.json rename to kibot/resources/pcbdraw/styles/set-yellow-cu.json diff --git a/kibot/PcbDraw/resources/styles/set-yellow-enig.json b/kibot/resources/pcbdraw/styles/set-yellow-enig.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-yellow-enig.json rename to kibot/resources/pcbdraw/styles/set-yellow-enig.json diff --git a/kibot/PcbDraw/resources/styles/set-yellow-hasl.json b/kibot/resources/pcbdraw/styles/set-yellow-hasl.json similarity index 100% rename from kibot/PcbDraw/resources/styles/set-yellow-hasl.json rename to kibot/resources/pcbdraw/styles/set-yellow-hasl.json diff --git a/kibot/report_templates/report_full.txt b/kibot/resources/report_templates/report_full.txt similarity index 100% rename from kibot/report_templates/report_full.txt rename to kibot/resources/report_templates/report_full.txt diff --git a/kibot/report_templates/report_full_svg.txt b/kibot/resources/report_templates/report_full_svg.txt similarity index 100% rename from kibot/report_templates/report_full_svg.txt rename to kibot/resources/report_templates/report_full_svg.txt diff --git a/kibot/report_templates/report_simple.txt b/kibot/resources/report_templates/report_simple.txt similarity index 100% rename from kibot/report_templates/report_simple.txt rename to kibot/resources/report_templates/report_simple.txt