From 2aff8822d6954b3dd7fc43dceaec13ac69cf6148 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Sat, 16 Jan 2021 19:15:12 +0000 Subject: [PATCH] Rearrange linux resources and translate MIME files --- .gitignore | 3 +++ CMakeModules/Functions.cmake | 4 +-- resources/CMakeLists.txt | 23 ++++++++++++------ .../hicolor/128x128/apps/bitmap2component.png | Bin .../icons/hicolor/128x128/apps/eeschema.png | Bin .../icons/hicolor/128x128/apps/gerbview.png | Bin .../icons/hicolor/128x128/apps/kicad.png | Bin .../hicolor/128x128/apps/pcbcalculator.png | Bin .../icons/hicolor/128x128/apps/pcbnew.png | Bin .../mimetypes/application-x-kicad-pcb.png | Bin .../mimetypes/application-x-kicad-project.png | Bin .../application-x-kicad-schematic.png | Bin .../hicolor/16x16/apps/bitmap2component.png | Bin .../icons/hicolor/16x16/apps/eeschema.png | Bin .../icons/hicolor/16x16/apps/gerbview.png | Bin .../icons/hicolor/16x16/apps/kicad.png | Bin .../hicolor/16x16/apps/pcbcalculator.png | Bin .../icons/hicolor/16x16/apps/pcbnew.png | Bin .../mimetypes/application-x-kicad-pcb.png | Bin .../mimetypes/application-x-kicad-project.png | Bin .../application-x-kicad-schematic.png | Bin .../hicolor/24x24/apps/bitmap2component.png | Bin .../icons/hicolor/24x24/apps/eeschema.png | Bin .../icons/hicolor/24x24/apps/gerbview.png | Bin .../icons/hicolor/24x24/apps/kicad.png | Bin .../hicolor/24x24/apps/pcbcalculator.png | Bin .../icons/hicolor/24x24/apps/pcbnew.png | Bin .../mimetypes/application-x-kicad-pcb.png | Bin .../mimetypes/application-x-kicad-project.png | Bin .../application-x-kicad-schematic.png | Bin .../hicolor/32x32/apps/bitmap2component.png | Bin .../icons/hicolor/32x32/apps/eeschema.png | Bin .../icons/hicolor/32x32/apps/gerbview.png | Bin .../icons/hicolor/32x32/apps/kicad.png | Bin .../hicolor/32x32/apps/pcbcalculator.png | Bin .../icons/hicolor/32x32/apps/pcbnew.png | Bin .../mimetypes/application-x-kicad-pcb.png | Bin .../mimetypes/application-x-kicad-project.png | Bin .../application-x-kicad-schematic.png | Bin .../hicolor/48x48/apps/bitmap2component.png | Bin .../icons/hicolor/48x48/apps/eeschema.png | Bin .../icons/hicolor/48x48/apps/gerbview.png | Bin .../icons/hicolor/48x48/apps/kicad.png | Bin .../hicolor/48x48/apps/pcbcalculator.png | Bin .../icons/hicolor/48x48/apps/pcbnew.png | Bin .../mimetypes/application-x-kicad-pcb.png | Bin .../mimetypes/application-x-kicad-project.png | Bin .../application-x-kicad-schematic.png | Bin .../hicolor/64x64/apps/bitmap2component.png | Bin .../icons/hicolor/64x64/apps/eeschema.png | Bin .../icons/hicolor/64x64/apps/gerbview.png | Bin .../icons/hicolor/64x64/apps/kicad.png | Bin .../hicolor/64x64/apps/pcbcalculator.png | Bin .../icons/hicolor/64x64/apps/pcbnew.png | Bin .../mimetypes/application-x-kicad-pcb.png | Bin .../mimetypes/application-x-kicad-project.png | Bin .../application-x-kicad-schematic.png | Bin .../scalable/apps/bitmap2component.svg | 0 .../icons/hicolor/scalable/apps/eeschema.svg | 0 .../icons/hicolor/scalable/apps/gerbview.svg | 0 .../icons/hicolor/scalable/apps/kicad.svg | 0 .../hicolor/scalable/apps/pcbcalculator.svg | 0 .../icons/hicolor/scalable/apps/pcbnew.svg | 0 .../mimetypes/application-x-kicad-pcb.svg | 0 .../mimetypes/application-x-kicad-project.svg | 0 .../application-x-kicad-schematic.svg | 0 ...kicad-gerbers.xml => kicad-gerbers.xml.in} | 0 .../kicad-kicad.xml => kicad-kicad.xml.in} | 3 --- 68 files changed, 20 insertions(+), 13 deletions(-) rename resources/linux/{mime => }/icons/hicolor/128x128/apps/bitmap2component.png (100%) rename resources/linux/{mime => }/icons/hicolor/128x128/apps/eeschema.png (100%) rename resources/linux/{mime => }/icons/hicolor/128x128/apps/gerbview.png (100%) rename resources/linux/{mime => }/icons/hicolor/128x128/apps/kicad.png (100%) rename resources/linux/{mime => }/icons/hicolor/128x128/apps/pcbcalculator.png (100%) rename resources/linux/{mime => }/icons/hicolor/128x128/apps/pcbnew.png (100%) rename resources/linux/{mime => }/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png (100%) rename resources/linux/{mime => }/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png (100%) rename resources/linux/{mime => }/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/apps/bitmap2component.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/apps/eeschema.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/apps/gerbview.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/apps/kicad.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/apps/pcbcalculator.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/apps/pcbnew.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png (100%) rename resources/linux/{mime => }/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/apps/bitmap2component.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/apps/eeschema.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/apps/gerbview.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/apps/kicad.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/apps/pcbcalculator.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/apps/pcbnew.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png (100%) rename resources/linux/{mime => }/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/apps/bitmap2component.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/apps/eeschema.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/apps/gerbview.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/apps/kicad.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/apps/pcbcalculator.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/apps/pcbnew.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png (100%) rename resources/linux/{mime => }/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/apps/bitmap2component.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/apps/eeschema.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/apps/gerbview.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/apps/kicad.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/apps/pcbcalculator.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/apps/pcbnew.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png (100%) rename resources/linux/{mime => }/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/apps/bitmap2component.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/apps/eeschema.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/apps/gerbview.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/apps/kicad.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/apps/pcbcalculator.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/apps/pcbnew.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png (100%) rename resources/linux/{mime => }/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/apps/bitmap2component.svg (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/apps/eeschema.svg (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/apps/gerbview.svg (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/apps/kicad.svg (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/apps/pcbcalculator.svg (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/apps/pcbnew.svg (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg (100%) rename resources/linux/{mime => }/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg (100%) rename resources/linux/mime/{mime/packages/kicad-gerbers.xml => kicad-gerbers.xml.in} (100%) rename resources/linux/mime/{mime/packages/kicad-kicad.xml => kicad-kicad.xml.in} (80%) diff --git a/.gitignore b/.gitignore index 7969e77860..1323ef01be 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,6 @@ CMakeSettings.json *.mo i18n_status.svg i18n_status.csv + +# Don't actually ignore any of these files, since we need them in the tree +!resources/linux/icons/hicolor/**/**/* diff --git a/CMakeModules/Functions.cmake b/CMakeModules/Functions.cmake index be9ee8c6d8..f5149bc829 100644 --- a/CMakeModules/Functions.cmake +++ b/CMakeModules/Functions.cmake @@ -185,14 +185,14 @@ macro( linux_metadata_translation SRC_FILE OUT_FILE PO_DIR ) ${OPT_TYPE} --template=${SRC_FILE} -d ${PO_DIR} -o ${OUT_FILE} - COMMENT "Translating ${OUT_FNAME}" + COMMENT "Translating file ${OUT_FNAME}" ) else() add_custom_command( OUTPUT ${OUT_FILE} DEPENDS ${SRC_FILE} COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SRC_FILE}" "${OUT_FILE}" - COMMENT "Copying ${OUT_FNAME}" + COMMENT "Copying file ${OUT_FNAME}" ) endif() endmacro() diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 556aa6c5f0..6d99aa437b 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -47,6 +47,15 @@ elseif( UNIX ) ${PROJECT_BINARY_DIR}/resources/linux/launchers/pcbnew.desktop ${PROJECT_SOURCE_DIR}/translation/pofiles ) + # Translate the MIME info, which are read from the source directory + linux_metadata_translation( ${PROJECT_SOURCE_DIR}/resources/linux/mime/kicad-gerbers.xml.in + ${PROJECT_BINARY_DIR}/resources/linux/mime/kicad-gerbers.xml + ${PROJECT_SOURCE_DIR}/translation/pofiles ) + + linux_metadata_translation( ${PROJECT_SOURCE_DIR}/resources/linux/mime/kicad-kicad.xml.in + ${PROJECT_BINARY_DIR}/resources/linux/mime/kicad-kicad.xml + ${PROJECT_SOURCE_DIR}/translation/pofiles ) + add_custom_target( metadata ALL DEPENDS ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml ${PROJECT_BINARY_DIR}/resources/linux/launchers/bitmap2component.desktop @@ -55,21 +64,19 @@ elseif( UNIX ) ${PROJECT_BINARY_DIR}/resources/linux/launchers/kicad.desktop ${PROJECT_BINARY_DIR}/resources/linux/launchers/pcbcalculator.desktop ${PROJECT_BINARY_DIR}/resources/linux/launchers/pcbnew.desktop + ${PROJECT_BINARY_DIR}/resources/linux/mime/kicad-gerbers.xml + ${PROJECT_BINARY_DIR}/resources/linux/mime/kicad-kicad.xml ) - # Set paths - set( UNIX_MIME_DIR linux/mime ) - set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime ) - set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons ) - # Install Mime directory - install( DIRECTORY ${UNIX_ICON_FILES} + # Install icons + install( DIRECTORY ${PROJECT_SOURCE_DIR}/resources/linux/icons TYPE DATA COMPONENT resources ) - # Install Icons - install( DIRECTORY ${UNIX_MIME_FILES}/ + # Install MIME type files + install( DIRECTORY ${PROJECT_BINARY_DIR}/resources/linux/mime/ DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages COMPONENT resources ) diff --git a/resources/linux/mime/icons/hicolor/128x128/apps/bitmap2component.png b/resources/linux/icons/hicolor/128x128/apps/bitmap2component.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/apps/bitmap2component.png rename to resources/linux/icons/hicolor/128x128/apps/bitmap2component.png diff --git a/resources/linux/mime/icons/hicolor/128x128/apps/eeschema.png b/resources/linux/icons/hicolor/128x128/apps/eeschema.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/apps/eeschema.png rename to resources/linux/icons/hicolor/128x128/apps/eeschema.png diff --git a/resources/linux/mime/icons/hicolor/128x128/apps/gerbview.png b/resources/linux/icons/hicolor/128x128/apps/gerbview.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/apps/gerbview.png rename to resources/linux/icons/hicolor/128x128/apps/gerbview.png diff --git a/resources/linux/mime/icons/hicolor/128x128/apps/kicad.png b/resources/linux/icons/hicolor/128x128/apps/kicad.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/apps/kicad.png rename to resources/linux/icons/hicolor/128x128/apps/kicad.png diff --git a/resources/linux/mime/icons/hicolor/128x128/apps/pcbcalculator.png b/resources/linux/icons/hicolor/128x128/apps/pcbcalculator.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/apps/pcbcalculator.png rename to resources/linux/icons/hicolor/128x128/apps/pcbcalculator.png diff --git a/resources/linux/mime/icons/hicolor/128x128/apps/pcbnew.png b/resources/linux/icons/hicolor/128x128/apps/pcbnew.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/apps/pcbnew.png rename to resources/linux/icons/hicolor/128x128/apps/pcbnew.png diff --git a/resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png b/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png rename to resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png diff --git a/resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png b/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png rename to resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-project.png diff --git a/resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png b/resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png similarity index 100% rename from resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png rename to resources/linux/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png diff --git a/resources/linux/mime/icons/hicolor/16x16/apps/bitmap2component.png b/resources/linux/icons/hicolor/16x16/apps/bitmap2component.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/apps/bitmap2component.png rename to resources/linux/icons/hicolor/16x16/apps/bitmap2component.png diff --git a/resources/linux/mime/icons/hicolor/16x16/apps/eeschema.png b/resources/linux/icons/hicolor/16x16/apps/eeschema.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/apps/eeschema.png rename to resources/linux/icons/hicolor/16x16/apps/eeschema.png diff --git a/resources/linux/mime/icons/hicolor/16x16/apps/gerbview.png b/resources/linux/icons/hicolor/16x16/apps/gerbview.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/apps/gerbview.png rename to resources/linux/icons/hicolor/16x16/apps/gerbview.png diff --git a/resources/linux/mime/icons/hicolor/16x16/apps/kicad.png b/resources/linux/icons/hicolor/16x16/apps/kicad.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/apps/kicad.png rename to resources/linux/icons/hicolor/16x16/apps/kicad.png diff --git a/resources/linux/mime/icons/hicolor/16x16/apps/pcbcalculator.png b/resources/linux/icons/hicolor/16x16/apps/pcbcalculator.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/apps/pcbcalculator.png rename to resources/linux/icons/hicolor/16x16/apps/pcbcalculator.png diff --git a/resources/linux/mime/icons/hicolor/16x16/apps/pcbnew.png b/resources/linux/icons/hicolor/16x16/apps/pcbnew.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/apps/pcbnew.png rename to resources/linux/icons/hicolor/16x16/apps/pcbnew.png diff --git a/resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png b/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png rename to resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png diff --git a/resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png b/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png rename to resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png diff --git a/resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png b/resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png similarity index 100% rename from resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png rename to resources/linux/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png diff --git a/resources/linux/mime/icons/hicolor/24x24/apps/bitmap2component.png b/resources/linux/icons/hicolor/24x24/apps/bitmap2component.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/apps/bitmap2component.png rename to resources/linux/icons/hicolor/24x24/apps/bitmap2component.png diff --git a/resources/linux/mime/icons/hicolor/24x24/apps/eeschema.png b/resources/linux/icons/hicolor/24x24/apps/eeschema.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/apps/eeschema.png rename to resources/linux/icons/hicolor/24x24/apps/eeschema.png diff --git a/resources/linux/mime/icons/hicolor/24x24/apps/gerbview.png b/resources/linux/icons/hicolor/24x24/apps/gerbview.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/apps/gerbview.png rename to resources/linux/icons/hicolor/24x24/apps/gerbview.png diff --git a/resources/linux/mime/icons/hicolor/24x24/apps/kicad.png b/resources/linux/icons/hicolor/24x24/apps/kicad.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/apps/kicad.png rename to resources/linux/icons/hicolor/24x24/apps/kicad.png diff --git a/resources/linux/mime/icons/hicolor/24x24/apps/pcbcalculator.png b/resources/linux/icons/hicolor/24x24/apps/pcbcalculator.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/apps/pcbcalculator.png rename to resources/linux/icons/hicolor/24x24/apps/pcbcalculator.png diff --git a/resources/linux/mime/icons/hicolor/24x24/apps/pcbnew.png b/resources/linux/icons/hicolor/24x24/apps/pcbnew.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/apps/pcbnew.png rename to resources/linux/icons/hicolor/24x24/apps/pcbnew.png diff --git a/resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png b/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png rename to resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png diff --git a/resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png b/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png rename to resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png diff --git a/resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png b/resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png similarity index 100% rename from resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png rename to resources/linux/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png diff --git a/resources/linux/mime/icons/hicolor/32x32/apps/bitmap2component.png b/resources/linux/icons/hicolor/32x32/apps/bitmap2component.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/apps/bitmap2component.png rename to resources/linux/icons/hicolor/32x32/apps/bitmap2component.png diff --git a/resources/linux/mime/icons/hicolor/32x32/apps/eeschema.png b/resources/linux/icons/hicolor/32x32/apps/eeschema.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/apps/eeschema.png rename to resources/linux/icons/hicolor/32x32/apps/eeschema.png diff --git a/resources/linux/mime/icons/hicolor/32x32/apps/gerbview.png b/resources/linux/icons/hicolor/32x32/apps/gerbview.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/apps/gerbview.png rename to resources/linux/icons/hicolor/32x32/apps/gerbview.png diff --git a/resources/linux/mime/icons/hicolor/32x32/apps/kicad.png b/resources/linux/icons/hicolor/32x32/apps/kicad.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/apps/kicad.png rename to resources/linux/icons/hicolor/32x32/apps/kicad.png diff --git a/resources/linux/mime/icons/hicolor/32x32/apps/pcbcalculator.png b/resources/linux/icons/hicolor/32x32/apps/pcbcalculator.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/apps/pcbcalculator.png rename to resources/linux/icons/hicolor/32x32/apps/pcbcalculator.png diff --git a/resources/linux/mime/icons/hicolor/32x32/apps/pcbnew.png b/resources/linux/icons/hicolor/32x32/apps/pcbnew.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/apps/pcbnew.png rename to resources/linux/icons/hicolor/32x32/apps/pcbnew.png diff --git a/resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png b/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png rename to resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png diff --git a/resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png b/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png rename to resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png diff --git a/resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png b/resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png similarity index 100% rename from resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png rename to resources/linux/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png diff --git a/resources/linux/mime/icons/hicolor/48x48/apps/bitmap2component.png b/resources/linux/icons/hicolor/48x48/apps/bitmap2component.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/apps/bitmap2component.png rename to resources/linux/icons/hicolor/48x48/apps/bitmap2component.png diff --git a/resources/linux/mime/icons/hicolor/48x48/apps/eeschema.png b/resources/linux/icons/hicolor/48x48/apps/eeschema.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/apps/eeschema.png rename to resources/linux/icons/hicolor/48x48/apps/eeschema.png diff --git a/resources/linux/mime/icons/hicolor/48x48/apps/gerbview.png b/resources/linux/icons/hicolor/48x48/apps/gerbview.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/apps/gerbview.png rename to resources/linux/icons/hicolor/48x48/apps/gerbview.png diff --git a/resources/linux/mime/icons/hicolor/48x48/apps/kicad.png b/resources/linux/icons/hicolor/48x48/apps/kicad.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/apps/kicad.png rename to resources/linux/icons/hicolor/48x48/apps/kicad.png diff --git a/resources/linux/mime/icons/hicolor/48x48/apps/pcbcalculator.png b/resources/linux/icons/hicolor/48x48/apps/pcbcalculator.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/apps/pcbcalculator.png rename to resources/linux/icons/hicolor/48x48/apps/pcbcalculator.png diff --git a/resources/linux/mime/icons/hicolor/48x48/apps/pcbnew.png b/resources/linux/icons/hicolor/48x48/apps/pcbnew.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/apps/pcbnew.png rename to resources/linux/icons/hicolor/48x48/apps/pcbnew.png diff --git a/resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png rename to resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png diff --git a/resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png rename to resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png diff --git a/resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png similarity index 100% rename from resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png rename to resources/linux/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png diff --git a/resources/linux/mime/icons/hicolor/64x64/apps/bitmap2component.png b/resources/linux/icons/hicolor/64x64/apps/bitmap2component.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/apps/bitmap2component.png rename to resources/linux/icons/hicolor/64x64/apps/bitmap2component.png diff --git a/resources/linux/mime/icons/hicolor/64x64/apps/eeschema.png b/resources/linux/icons/hicolor/64x64/apps/eeschema.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/apps/eeschema.png rename to resources/linux/icons/hicolor/64x64/apps/eeschema.png diff --git a/resources/linux/mime/icons/hicolor/64x64/apps/gerbview.png b/resources/linux/icons/hicolor/64x64/apps/gerbview.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/apps/gerbview.png rename to resources/linux/icons/hicolor/64x64/apps/gerbview.png diff --git a/resources/linux/mime/icons/hicolor/64x64/apps/kicad.png b/resources/linux/icons/hicolor/64x64/apps/kicad.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/apps/kicad.png rename to resources/linux/icons/hicolor/64x64/apps/kicad.png diff --git a/resources/linux/mime/icons/hicolor/64x64/apps/pcbcalculator.png b/resources/linux/icons/hicolor/64x64/apps/pcbcalculator.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/apps/pcbcalculator.png rename to resources/linux/icons/hicolor/64x64/apps/pcbcalculator.png diff --git a/resources/linux/mime/icons/hicolor/64x64/apps/pcbnew.png b/resources/linux/icons/hicolor/64x64/apps/pcbnew.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/apps/pcbnew.png rename to resources/linux/icons/hicolor/64x64/apps/pcbnew.png diff --git a/resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png b/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png rename to resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png diff --git a/resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png b/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png rename to resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png diff --git a/resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png b/resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png similarity index 100% rename from resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png rename to resources/linux/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png diff --git a/resources/linux/mime/icons/hicolor/scalable/apps/bitmap2component.svg b/resources/linux/icons/hicolor/scalable/apps/bitmap2component.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/apps/bitmap2component.svg rename to resources/linux/icons/hicolor/scalable/apps/bitmap2component.svg diff --git a/resources/linux/mime/icons/hicolor/scalable/apps/eeschema.svg b/resources/linux/icons/hicolor/scalable/apps/eeschema.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/apps/eeschema.svg rename to resources/linux/icons/hicolor/scalable/apps/eeschema.svg diff --git a/resources/linux/mime/icons/hicolor/scalable/apps/gerbview.svg b/resources/linux/icons/hicolor/scalable/apps/gerbview.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/apps/gerbview.svg rename to resources/linux/icons/hicolor/scalable/apps/gerbview.svg diff --git a/resources/linux/mime/icons/hicolor/scalable/apps/kicad.svg b/resources/linux/icons/hicolor/scalable/apps/kicad.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/apps/kicad.svg rename to resources/linux/icons/hicolor/scalable/apps/kicad.svg diff --git a/resources/linux/mime/icons/hicolor/scalable/apps/pcbcalculator.svg b/resources/linux/icons/hicolor/scalable/apps/pcbcalculator.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/apps/pcbcalculator.svg rename to resources/linux/icons/hicolor/scalable/apps/pcbcalculator.svg diff --git a/resources/linux/mime/icons/hicolor/scalable/apps/pcbnew.svg b/resources/linux/icons/hicolor/scalable/apps/pcbnew.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/apps/pcbnew.svg rename to resources/linux/icons/hicolor/scalable/apps/pcbnew.svg diff --git a/resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg rename to resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg diff --git a/resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg rename to resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg diff --git a/resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg similarity index 100% rename from resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg rename to resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg diff --git a/resources/linux/mime/mime/packages/kicad-gerbers.xml b/resources/linux/mime/kicad-gerbers.xml.in similarity index 100% rename from resources/linux/mime/mime/packages/kicad-gerbers.xml rename to resources/linux/mime/kicad-gerbers.xml.in diff --git a/resources/linux/mime/mime/packages/kicad-kicad.xml b/resources/linux/mime/kicad-kicad.xml.in similarity index 80% rename from resources/linux/mime/mime/packages/kicad-kicad.xml rename to resources/linux/mime/kicad-kicad.xml.in index 168ec788e6..35243865db 100644 --- a/resources/linux/mime/mime/packages/kicad-kicad.xml +++ b/resources/linux/mime/kicad-kicad.xml.in @@ -3,21 +3,18 @@ KiCad Project - Projet KiCad KiCad Schematic - Schéma électronique KiCad KiCad Printed Circuit Board - Circuit imprimé KiCad