diff --git a/.gitignore b/.gitignore index c99872f9c1..0ad1c733b9 100644 --- a/.gitignore +++ b/.gitignore @@ -122,6 +122,7 @@ i18n_status.csv # Don't actually ignore any of these files, since we need them in the tree !resources/linux/icons/hicolor/**/**/* +!resources/linux/icons-nightly/hicolor/**/**/* !CMakeModules/**/* !bitmaps_png/png/**/* diff --git a/bitmaps_png/mk_icn_res.sh b/bitmaps_png/mk_icn_res.sh old mode 100644 new mode 100755 index 089b8708f5..af7fbeef22 --- a/bitmaps_png/mk_icn_res.sh +++ b/bitmaps_png/mk_icn_res.sh @@ -2,55 +2,71 @@ # # make icons using Inkscape +ICON="kicad + pcbnew + eeschema + gerbview + bitmap2component + pcbcalculator" + +SIZE="16x16 + 24x24 + 32x32 + 48x48 + 64x64 + 128x128" + # create output directories -rm -r ../resources/linux/mime/icons/hicolor/* -mkdir -p ../resources/linux/mime/icons/hicolor/scalable -cd ../resources/linux/mime/icons/hicolor +rm -r ../resources/linux/icons/hicolor/* +rm -r ../resources/linux/icons-nightly/hicolor/* + +mkdir -p ../resources/linux/icons/hicolor/scalable/mimetypes ../resources/linux/icons/hicolor/scalable/apps +mkdir -p ../resources/linux/icons-nightly/hicolor/scalable/apps + echo -e '\E[0;34m'"Directory \"scalable\" for .svg icons was created." +tput sgr0 # copy sources to the scalable dir -cd ../../../../../bitmaps_png/sources -cp icon_kicad.svg ../../resources/linux/mime/icons/hicolor/scalable/kicad.svg -cp icon_pcbnew.svg ../../resources/linux/mime/icons/hicolor/scalable/pcbnew.svg -cp icon_eeschema.svg ../../resources/linux/mime/icons/hicolor/scalable/eeschema.svg -echo -e '\E[0;34m'"Sources of icons was copied." +cp ./sources/light/icon_kicad.svg ../resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg +cp ./sources/light/icon_pcbnew.svg ../resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-pcb.svg +cp ./sources/light/icon_eeschema.svg ../resources/linux/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg -# convert .svg files into .png files -cd ../../resources/linux/mime/icons/hicolor/scalable - -SIZES="16x16 - 22x22 - 24x24 - 32x32 - 48x48" - -for size in $SIZES +for icon in $ICON do - sz=${size%x*} - echo -e '\E[0;32m'"\nMaking the mimetypes icons with size $size." - mkdir ../$size - echo -e '\E[0;34m'"Directory $size was created." - mkdir ../$size/mimetypes - echo -e '\E[0;34m'"Subdirectory \"mimetypes\" was created." - tput sgr0 - - inkscape -f kicad.svg -e ../$size/mimetypes/application-x-kicad-project.png -w $sz -h $sz --export-area-snap - inkscape -f eeschema.svg -e ../$size/mimetypes/application-x-kicad-eeschema.png -w $sz -h $sz --export-area-snap - inkscape -f pcbnew.svg -e ../$size/mimetypes/application-x-kicad-pcbnew.png -w $sz -h $sz --export-area-snap - echo -e '\E[0;34m'"Icons with size $size was created." - - if [ $sz -eq 48 ] - then - echo -e '\E[0;32m'"\nMaking the applications icons with size $size." - mkdir ../$size/apps - echo -e '\E[0;34m'"Subdirectory \"apps\" was created." - tput sgr0 - - inkscape -f kicad.svg -e ../$size/apps/kicad.png -w $sz -h $sz --export-area-snap - inkscape -f eeschema.svg -e ../$size/apps/eeschema.png -w $sz -h $sz --export-area-snap - inkscape -f pcbnew.svg -e ../$size/apps/pcbnew.png -w $sz -h $sz --export-area-snap - echo -e '\E[0;34m'"Icons with size $size was created." - tput sgr0 - fi + cp ./sources/light/icon_$icon.svg ../resources/linux/icons/hicolor/scalable/apps/$icon.svg done +cp ./sources/light/icon_kicad_nightly.svg ../resources/linux/icons-nightly/hicolor/scalable/apps/kicad.svg + +echo -e '\E[0;34m'"Sources of icons were copied." +tput sgr0 + +# convert .svg files into .png files +for size in $SIZE +do + sz=${size%x*} + + source_sz="" + + if [ $sz -le 32 ] + then + source_sz="_$sz" + fi + + echo -e '\E[0;32m'"\nMaking icons with size $size from \"source$source_sz\"." + tput sgr0 + + mkdir -p ../resources/linux/icons/hicolor/$size/mimetypes ../resources/linux/icons/hicolor/$size/apps + mkdir -p ../resources/linux/icons-nightly/hicolor/$size/apps + + inkscape -o ../resources/linux/icons/hicolor/$size/mimetypes/application-x-kicad-project.png -w $sz -h $sz --export-area-snap ./sources/light/icon_kicad${source_sz}.svg + inkscape -o ../resources/linux/icons/hicolor/$size/mimetypes/application-x-kicad-pcb.png -w $sz -h $sz --export-area-snap ./sources/light/icon_pcbnew${source_sz}.svg + inkscape -o ../resources/linux/icons/hicolor/$size/mimetypes/application-x-kicad-schematic.png -w $sz -h $sz --export-area-snap ./sources/light/icon_eeschema${source_sz}.svg + + for icon in $ICON + do + inkscape -o ../resources/linux/icons/hicolor/$size/apps/$icon.png -w $sz -h $sz --export-area-snap ./sources/light/icon_${icon}${source_sz}.svg + done + inkscape -o ../resources/linux/icons-nightly/hicolor/$size/apps/kicad.png -w $sz -h $sz --export-area-snap ./sources/light/icon_kicad_nightly${source_sz}.svg + +done diff --git a/bitmaps_png/sources/CREDITS b/bitmaps_png/sources/CREDITS index c0ac8728a9..fe1f104208 100644 --- a/bitmaps_png/sources/CREDITS +++ b/bitmaps_png/sources/CREDITS @@ -4,4 +4,6 @@ Original KiCad Icon work by Inigo Zuluaga and Fabrizio Tappero among others KiCad icons were redesigned in 2020 by Aleksandr Zyrianov +KiCad nightly icon reworked by Rafael Silva based on the 2020 redesign + License: CC-BY-SA 4.0 \ No newline at end of file diff --git a/bitmaps_png/sources/dark/icon_kicad_24.svg b/bitmaps_png/sources/dark/icon_kicad_24.svg new file mode 100644 index 0000000000..ef6cd87134 --- /dev/null +++ b/bitmaps_png/sources/dark/icon_kicad_24.svg @@ -0,0 +1,213 @@ + + + + + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + diff --git a/bitmaps_png/sources/dark/icon_kicad_nightly.svg b/bitmaps_png/sources/dark/icon_kicad_nightly.svg new file mode 100755 index 0000000000..a4e8a18d42 --- /dev/null +++ b/bitmaps_png/sources/dark/icon_kicad_nightly.svg @@ -0,0 +1,234 @@ + + + + + + image/svg+xml + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + + diff --git a/bitmaps_png/sources/dark/icon_kicad_nightly_16.svg b/bitmaps_png/sources/dark/icon_kicad_nightly_16.svg new file mode 100644 index 0000000000..78b96958de --- /dev/null +++ b/bitmaps_png/sources/dark/icon_kicad_nightly_16.svg @@ -0,0 +1,232 @@ + + + + + + image/svg+xml + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + diff --git a/bitmaps_png/sources/dark/icon_kicad_nightly_24.svg b/bitmaps_png/sources/dark/icon_kicad_nightly_24.svg new file mode 100644 index 0000000000..a6f7799733 --- /dev/null +++ b/bitmaps_png/sources/dark/icon_kicad_nightly_24.svg @@ -0,0 +1,217 @@ + + + + + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + diff --git a/bitmaps_png/sources/dark/icon_kicad_nightly_32.svg b/bitmaps_png/sources/dark/icon_kicad_nightly_32.svg new file mode 100644 index 0000000000..970ceae546 --- /dev/null +++ b/bitmaps_png/sources/dark/icon_kicad_nightly_32.svg @@ -0,0 +1,234 @@ + + + + + + image/svg+xml + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + diff --git a/bitmaps_png/sources/light/icon_kicad_24.svg b/bitmaps_png/sources/light/icon_kicad_24.svg new file mode 100644 index 0000000000..ef6cd87134 --- /dev/null +++ b/bitmaps_png/sources/light/icon_kicad_24.svg @@ -0,0 +1,213 @@ + + + + + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + diff --git a/bitmaps_png/sources/light/icon_kicad_nightly.svg b/bitmaps_png/sources/light/icon_kicad_nightly.svg new file mode 100755 index 0000000000..a4e8a18d42 --- /dev/null +++ b/bitmaps_png/sources/light/icon_kicad_nightly.svg @@ -0,0 +1,234 @@ + + + + + + image/svg+xml + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + + diff --git a/bitmaps_png/sources/light/icon_kicad_nightly_16.svg b/bitmaps_png/sources/light/icon_kicad_nightly_16.svg new file mode 100644 index 0000000000..78b96958de --- /dev/null +++ b/bitmaps_png/sources/light/icon_kicad_nightly_16.svg @@ -0,0 +1,232 @@ + + + + + + image/svg+xml + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + diff --git a/bitmaps_png/sources/light/icon_kicad_nightly_24.svg b/bitmaps_png/sources/light/icon_kicad_nightly_24.svg new file mode 100644 index 0000000000..a6f7799733 --- /dev/null +++ b/bitmaps_png/sources/light/icon_kicad_nightly_24.svg @@ -0,0 +1,217 @@ + + + + + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + diff --git a/bitmaps_png/sources/light/icon_kicad_nightly_32.svg b/bitmaps_png/sources/light/icon_kicad_nightly_32.svg new file mode 100644 index 0000000000..970ceae546 --- /dev/null +++ b/bitmaps_png/sources/light/icon_kicad_nightly_32.svg @@ -0,0 +1,234 @@ + + + + + + image/svg+xml + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + diff --git a/resources/linux/icons-nightly/hicolor/128x128/apps/kicad.png b/resources/linux/icons-nightly/hicolor/128x128/apps/kicad.png new file mode 100644 index 0000000000..239c7fa92a Binary files /dev/null and b/resources/linux/icons-nightly/hicolor/128x128/apps/kicad.png differ diff --git a/resources/linux/icons-nightly/hicolor/16x16/apps/kicad.png b/resources/linux/icons-nightly/hicolor/16x16/apps/kicad.png new file mode 100644 index 0000000000..daaef8a08b Binary files /dev/null and b/resources/linux/icons-nightly/hicolor/16x16/apps/kicad.png differ diff --git a/resources/linux/icons-nightly/hicolor/24x24/apps/kicad.png b/resources/linux/icons-nightly/hicolor/24x24/apps/kicad.png new file mode 100644 index 0000000000..ef773808ee Binary files /dev/null and b/resources/linux/icons-nightly/hicolor/24x24/apps/kicad.png differ diff --git a/resources/linux/icons-nightly/hicolor/32x32/apps/kicad.png b/resources/linux/icons-nightly/hicolor/32x32/apps/kicad.png new file mode 100644 index 0000000000..e1d48d0cec Binary files /dev/null and b/resources/linux/icons-nightly/hicolor/32x32/apps/kicad.png differ diff --git a/resources/linux/icons-nightly/hicolor/48x48/apps/kicad.png b/resources/linux/icons-nightly/hicolor/48x48/apps/kicad.png new file mode 100644 index 0000000000..25726fb728 Binary files /dev/null and b/resources/linux/icons-nightly/hicolor/48x48/apps/kicad.png differ diff --git a/resources/linux/icons-nightly/hicolor/64x64/apps/kicad.png b/resources/linux/icons-nightly/hicolor/64x64/apps/kicad.png new file mode 100644 index 0000000000..9e12e3a140 Binary files /dev/null and b/resources/linux/icons-nightly/hicolor/64x64/apps/kicad.png differ diff --git a/resources/linux/icons-nightly/hicolor/scalable/apps/kicad.svg b/resources/linux/icons-nightly/hicolor/scalable/apps/kicad.svg new file mode 100755 index 0000000000..a4e8a18d42 --- /dev/null +++ b/resources/linux/icons-nightly/hicolor/scalable/apps/kicad.svg @@ -0,0 +1,234 @@ + + + + + + image/svg+xml + + app_icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app_icon + + + + + + + + + + + +