Pushed all but number 3, I'm working on cleaning that up a bit. Thank you. :)
On Sun, May 29, 2016 at 06:30:37PM -0500, José Ignacio Romero wrote: > This series fixes bug #1583569[1] where it was reported that pcbnew > files have the wrong extension in the mime package. When I looked > deeper into it I found out that there were many other things wrong > with the desktop integration files for Linux, from wrong mimetype > names, inconsistent desktop files and missing icons. This is my > attempt to fix most of those issues, patch 1, 2, 4, and 5 are fairly > straightforward and probably not too controversial. Patch 3 could use > some TLC from translators to add more strings to the .desktop files. > > This patch series looks scary big because there's some churn caused by > binary files that needed to be regenerated/moved around in the icons > directory. > > [1](https://bugs.launchpad.net/kicad/+bug/1583569) > > José Ignacio Romero (5): > Fix pcbnew extension and mimetype in MIME XML package file > Remove mimelnk files > Clean up the applications/*.destop files. > Fix hicolor icons. > Add script for generating icons under resources/linux/mime/icons > > CMakeLists.txt | 7 - > .../mime/applications/bitmap2component.desktop | 12 +- > resources/linux/mime/applications/eeschema.desktop | 16 +- > resources/linux/mime/applications/gerbview.desktop | 13 +- > resources/linux/mime/applications/kicad.desktop | 14 +- > .../linux/mime/applications/pcbcalculator.desktop | 14 +- > resources/linux/mime/applications/pcbnew.desktop | 15 +- > .../linux/mime/icons/hicolor/128x128/apps/3d.png | Bin 10917 -> 0 bytes > .../hicolor/128x128/apps/bitmap2component.png | Bin 13176 -> 7066 bytes > .../mime/icons/hicolor/128x128/apps/eeschema.png | Bin 11777 -> 12051 > bytes > .../mime/icons/hicolor/128x128/apps/gerbview.png | Bin 21775 -> 21831 > bytes > .../mime/icons/hicolor/128x128/apps/kicad.png | Bin 5144 -> 5337 bytes > .../icons/hicolor/128x128/apps/pcbcalculator.png | Bin 9585 -> 9464 bytes > .../mime/icons/hicolor/128x128/apps/pcbnew.png | Bin 12292 -> 12324 > bytes > .../128x128/mimetypes/application-x-3d-project.png | Bin 10917 -> 0 bytes > .../application-x-bitmap2component-project.png | Bin 13176 -> 0 bytes > .../mimetypes/application-x-eeschema-project.png | Bin 11777 -> 0 bytes > .../mimetypes/application-x-gerbview-project.png | Bin 21775 -> 0 bytes > .../128x128/mimetypes/application-x-kicad-pcb.png | Bin 0 -> 12324 bytes > .../mimetypes/application-x-kicad-project.png | Bin 5144 -> 5337 bytes > .../mimetypes/application-x-kicad-schematic.png | Bin 0 -> 12051 bytes > .../application-x-pcbcalculator-project.png | Bin 9585 -> 0 bytes > .../mimetypes/application-x-pcbnew-project.png | Bin 12292 -> 0 bytes > .../icons/hicolor/16x16/apps/bitmap2component.png | Bin 0 -> 740 bytes > .../mime/icons/hicolor/16x16/apps/eeschema.png | Bin 0 -> 840 bytes > .../mime/icons/hicolor/16x16/apps/gerbview.png | Bin 0 -> 997 bytes > .../linux/mime/icons/hicolor/16x16/apps/kicad.png | Bin 0 -> 776 bytes > .../icons/hicolor/16x16/apps/pcbcalculator.png | Bin 0 -> 742 bytes > .../linux/mime/icons/hicolor/16x16/apps/pcbnew.png | Bin 0 -> 815 bytes > .../16x16/mimetypes/application-x-kicad-pcb.png | Bin 0 -> 815 bytes > .../mimetypes/application-x-kicad-project.png | Bin 679 -> 776 bytes > .../mimetypes/application-x-kicad-schematic.png | Bin 0 -> 840 bytes > .../icons/hicolor/22x22/apps/bitmap2component.png | Bin 0 -> 1230 bytes > .../mime/icons/hicolor/22x22/apps/eeschema.png | Bin 0 -> 1322 bytes > .../mime/icons/hicolor/22x22/apps/gerbview.png | Bin 0 -> 1510 bytes > .../linux/mime/icons/hicolor/22x22/apps/kicad.png | Bin 1083 -> 1158 bytes > .../icons/hicolor/22x22/apps/pcbcalculator.png | Bin 0 -> 1061 bytes > .../linux/mime/icons/hicolor/22x22/apps/pcbnew.png | Bin 0 -> 1314 bytes > .../22x22/mimetypes/application-x-kicad-pcb.png | Bin 0 -> 1314 bytes > .../mimetypes/application-x-kicad-project.png | Bin 1083 -> 1158 bytes > .../mimetypes/application-x-kicad-schematic.png | Bin 0 -> 1322 bytes > .../icons/hicolor/24x24/apps/bitmap2component.png | Bin 0 -> 1222 bytes > .../mime/icons/hicolor/24x24/apps/eeschema.png | Bin 0 -> 1462 bytes > .../mime/icons/hicolor/24x24/apps/gerbview.png | Bin 0 -> 1776 bytes > .../linux/mime/icons/hicolor/24x24/apps/kicad.png | Bin 1160 -> 1228 bytes > .../icons/hicolor/24x24/apps/pcbcalculator.png | Bin 0 -> 1233 bytes > .../linux/mime/icons/hicolor/24x24/apps/pcbnew.png | Bin 0 -> 1410 bytes > .../24x24/mimetypes/application-x-kicad-pcb.png | Bin 0 -> 1410 bytes > .../mimetypes/application-x-kicad-project.png | Bin 1160 -> 1228 bytes > .../mimetypes/application-x-kicad-schematic.png | Bin 0 -> 1462 bytes > .../icons/hicolor/32x32/apps/bitmap2component.png | Bin 0 -> 2082 bytes > .../mime/icons/hicolor/32x32/apps/eeschema.png | Bin 0 -> 2140 bytes > .../mime/icons/hicolor/32x32/apps/gerbview.png | Bin 0 -> 2746 bytes > .../linux/mime/icons/hicolor/32x32/apps/kicad.png | Bin 1448 -> 1655 bytes > .../icons/hicolor/32x32/apps/pcbcalculator.png | Bin 0 -> 1816 bytes > .../linux/mime/icons/hicolor/32x32/apps/pcbnew.png | Bin 0 -> 2124 bytes > .../32x32/mimetypes/application-x-kicad-pcb.png | Bin 0 -> 2124 bytes > .../mimetypes/application-x-kicad-project.png | Bin 1448 -> 1655 bytes > .../mimetypes/application-x-kicad-schematic.png | Bin 0 -> 2140 bytes > .../icons/hicolor/48x48/apps/bitmap2component.png | Bin 3598 -> 2349 bytes > .../linux/mime/icons/hicolor/48x48/apps/cvpcb.png | Bin 2435 -> 0 bytes > .../mime/icons/hicolor/48x48/apps/eeschema.png | Bin 3347 -> 3549 bytes > .../mime/icons/hicolor/48x48/apps/gerbview.png | Bin 5333 -> 5174 bytes > .../linux/mime/icons/hicolor/48x48/apps/kicad.png | Bin 2178 -> 2383 bytes > .../icons/hicolor/48x48/apps/pcbcalculator.png | Bin 3256 -> 3032 bytes > .../linux/mime/icons/hicolor/48x48/apps/pcbnew.png | Bin 3366 -> 3523 bytes > .../application-x-bitmap2component-project.png | Bin 3598 -> 0 bytes > .../mimetypes/application-x-eeschema-project.png | Bin 3347 -> 0 bytes > .../mimetypes/application-x-gerbview-project.png | Bin 5333 -> 0 bytes > .../48x48/mimetypes/application-x-kicad-pcb.png | Bin 0 -> 3523 bytes > .../mimetypes/application-x-kicad-project.png | Bin 2178 -> 2383 bytes > .../mimetypes/application-x-kicad-schematic.png | Bin 0 -> 3549 bytes > .../application-x-pcbcalculator-project.png | Bin 3256 -> 0 bytes > .../mimetypes/application-x-pcbnew-project.png | Bin 3366 -> 0 bytes > .../icons/hicolor/64x64/apps/bitmap2component.png | Bin 0 -> 4122 bytes > .../mime/icons/hicolor/64x64/apps/eeschema.png | Bin 0 -> 5134 bytes > .../mime/icons/hicolor/64x64/apps/gerbview.png | Bin 0 -> 8118 bytes > .../linux/mime/icons/hicolor/64x64/apps/kicad.png | Bin 0 -> 3059 bytes > .../icons/hicolor/64x64/apps/pcbcalculator.png | Bin 0 -> 4442 bytes > .../linux/mime/icons/hicolor/64x64/apps/pcbnew.png | Bin 0 -> 5178 bytes > .../64x64/mimetypes/application-x-kicad-pcb.png | Bin 0 -> 5178 bytes > .../mimetypes/application-x-kicad-project.png | Bin 0 -> 3059 bytes > .../mimetypes/application-x-kicad-schematic.png | Bin 0 -> 5134 bytes > .../linux/mime/icons/hicolor/scalable/apps/3d.svg | 32 - > .../hicolor/scalable/apps/bitmap2component.svg | 1292 ++---------- > .../mime/icons/hicolor/scalable/apps/eeschema.svg | 2202 > ++++++++++++++++---- > .../mime/icons/hicolor/scalable/apps/gerbview.svg | 871 +++++++- > .../mime/icons/hicolor/scalable/apps/kicad.svg | 226 +- > .../icons/hicolor/scalable/apps/pcbcalculator.svg | 6 +- > .../mime/icons/hicolor/scalable/apps/pcbnew.svg | 4 +- > .../mimetypes/application-x-3d-project.svg | 32 - > .../application-x-bitmap2component-project.svg | 1125 ---------- > .../mimetypes/application-x-eeschema-project.svg | 394 ---- > .../mimetypes/application-x-gerbview-project.svg | 109 - > .../scalable/mimetypes/application-x-kicad-pcb.svg | 1554 ++++++++++++++ > .../mimetypes/application-x-kicad-project.svg | 226 +- > .../mimetypes/application-x-kicad-schematic.svg | 1816 ++++++++++++++++ > .../application-x-pcbcalculator-project.svg | 1100 ---------- > .../mimetypes/application-x-pcbnew-project.svg | 1554 -------------- > resources/linux/mime/mime/packages/kicad-kicad.xml | 21 + > resources/linux/mime/mime/packages/kicad.xml | 21 - > .../mime/mimelnk/application/x-kicad-pcb.desktop | 8 - > .../mimelnk/application/x-kicad-project.desktop | 7 - > .../mimelnk/application/x-kicad-schematic.desktop | 7 - > scripts/mk_mime_icons.py | 81 + > 105 files changed, 6542 insertions(+), 6237 deletions(-) > delete mode 100644 resources/linux/mime/icons/hicolor/128x128/apps/3d.png > delete mode 100644 > resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-3d-project.png > delete mode 100644 > resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-bitmap2component-project.png > delete mode 100644 > resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-eeschema-project.png > delete mode 100644 > resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-gerbview-project.png > create mode 100644 > resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-kicad-pcb.png > create mode 100644 > resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-kicad-schematic.png > delete mode 100644 > resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-pcbcalculator-project.png > delete mode 100644 > resources/linux/mime/icons/hicolor/128x128/mimetypes/application-x-pcbnew-project.png > create mode 100644 > resources/linux/mime/icons/hicolor/16x16/apps/bitmap2component.png > create mode 100644 resources/linux/mime/icons/hicolor/16x16/apps/eeschema.png > create mode 100644 resources/linux/mime/icons/hicolor/16x16/apps/gerbview.png > create mode 100644 resources/linux/mime/icons/hicolor/16x16/apps/kicad.png > create mode 100644 > resources/linux/mime/icons/hicolor/16x16/apps/pcbcalculator.png > create mode 100644 resources/linux/mime/icons/hicolor/16x16/apps/pcbnew.png > create mode 100644 > resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-pcb.png > create mode 100644 > resources/linux/mime/icons/hicolor/16x16/mimetypes/application-x-kicad-schematic.png > create mode 100644 > resources/linux/mime/icons/hicolor/22x22/apps/bitmap2component.png > create mode 100644 resources/linux/mime/icons/hicolor/22x22/apps/eeschema.png > create mode 100644 resources/linux/mime/icons/hicolor/22x22/apps/gerbview.png > create mode 100644 > resources/linux/mime/icons/hicolor/22x22/apps/pcbcalculator.png > create mode 100644 resources/linux/mime/icons/hicolor/22x22/apps/pcbnew.png > create mode 100644 > resources/linux/mime/icons/hicolor/22x22/mimetypes/application-x-kicad-pcb.png > create mode 100644 > resources/linux/mime/icons/hicolor/22x22/mimetypes/application-x-kicad-schematic.png > create mode 100644 > resources/linux/mime/icons/hicolor/24x24/apps/bitmap2component.png > create mode 100644 resources/linux/mime/icons/hicolor/24x24/apps/eeschema.png > create mode 100644 resources/linux/mime/icons/hicolor/24x24/apps/gerbview.png > create mode 100644 > resources/linux/mime/icons/hicolor/24x24/apps/pcbcalculator.png > create mode 100644 resources/linux/mime/icons/hicolor/24x24/apps/pcbnew.png > create mode 100644 > resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-pcb.png > create mode 100644 > resources/linux/mime/icons/hicolor/24x24/mimetypes/application-x-kicad-schematic.png > create mode 100644 > resources/linux/mime/icons/hicolor/32x32/apps/bitmap2component.png > create mode 100644 resources/linux/mime/icons/hicolor/32x32/apps/eeschema.png > create mode 100644 resources/linux/mime/icons/hicolor/32x32/apps/gerbview.png > create mode 100644 > resources/linux/mime/icons/hicolor/32x32/apps/pcbcalculator.png > create mode 100644 resources/linux/mime/icons/hicolor/32x32/apps/pcbnew.png > create mode 100644 > resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-pcb.png > create mode 100644 > resources/linux/mime/icons/hicolor/32x32/mimetypes/application-x-kicad-schematic.png > delete mode 100644 resources/linux/mime/icons/hicolor/48x48/apps/cvpcb.png > delete mode 100644 > resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-bitmap2component-project.png > delete mode 100644 > resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-eeschema-project.png > delete mode 100644 > resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-gerbview-project.png > create mode 100644 > resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-kicad-pcb.png > create mode 100644 > resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-kicad-schematic.png > delete mode 100644 > resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-pcbcalculator-project.png > delete mode 100644 > resources/linux/mime/icons/hicolor/48x48/mimetypes/application-x-pcbnew-project.png > create mode 100644 > resources/linux/mime/icons/hicolor/64x64/apps/bitmap2component.png > create mode 100644 resources/linux/mime/icons/hicolor/64x64/apps/eeschema.png > create mode 100644 resources/linux/mime/icons/hicolor/64x64/apps/gerbview.png > create mode 100644 resources/linux/mime/icons/hicolor/64x64/apps/kicad.png > create mode 100644 > resources/linux/mime/icons/hicolor/64x64/apps/pcbcalculator.png > create mode 100644 resources/linux/mime/icons/hicolor/64x64/apps/pcbnew.png > create mode 100644 > resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-pcb.png > create mode 100644 > resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-project.png > create mode 100644 > resources/linux/mime/icons/hicolor/64x64/mimetypes/application-x-kicad-schematic.png > delete mode 100644 resources/linux/mime/icons/hicolor/scalable/apps/3d.svg > delete mode 100644 > resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-3d-project.svg > delete mode 100644 > resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-bitmap2component-project.svg > delete mode 100644 > resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-eeschema-project.svg > delete mode 100644 > resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-gerbview-project.svg > create mode 100644 > resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg > create mode 100644 > resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg > delete mode 100644 > resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-pcbcalculator-project.svg > delete mode 100644 > resources/linux/mime/icons/hicolor/scalable/mimetypes/application-x-pcbnew-project.svg > create mode 100644 resources/linux/mime/mime/packages/kicad-kicad.xml > delete mode 100644 resources/linux/mime/mime/packages/kicad.xml > delete mode 100644 > resources/linux/mime/mimelnk/application/x-kicad-pcb.desktop > delete mode 100644 > resources/linux/mime/mimelnk/application/x-kicad-project.desktop > delete mode 100644 > resources/linux/mime/mimelnk/application/x-kicad-schematic.desktop > create mode 100755 scripts/mk_mime_icons.py > > -- > 2.8.1 > _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
