Merge branch 'linux-mime-types'

fritzing.desktop

@@ -4,11 +4,11 @@ Name=Fritzing
 GenericName=Fritzing
 Comment=Electronic Design Automation software
 Exec=Fritzing
-Icon=fritzing
+Icon=icons/fritzing_icon.png
 Terminal=false
 Type=Application
-Categories=Development;IDE;Electronics;
+Categories=Development;IDE;Electronics;EDA;
 X-SuSE-translate=false
 StartupNotify=true
 Categories=PCB;
-MimeType=application/fritzing;
+MimeType=application/x-fritzing-fz;application/x-fritzing-fzz;application/x-fritzing-fzp;application/x-fritzing-fzpz;application/x-fritzing-fzb;application/x-fritzing-fzbz;application/x-fritzing-fzm;

fritzing.rc

@@ -1,4 +1,4 @@
-IDI_ICON1               ICON    DISCARDABLE     "resources/images/fritzing_icon.ico"
+IDI_ICON1               ICON    DISCARDABLE     "resources/system_icons/win/fritzing_icon.ico"
 
 #include <windows.h>
 

install_fritzing.sh

@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# this is a rough beginning of a linux install script for fritzing
+# sets up document icons and file associations using mime types
+
+APPDIR=$(dirname "$0")
+
+# check if user .mime.types file exists, otherwise create it
+if [ ! -f ~/.mime.types ]
+then
+	echo "creating user mime.types file"
+	touch ~/.mime.types
+fi
+
+# add mime types for fritzing file formats
+grep -q application/x-fritzing ~/.mime.types
+if [ $? -eq 0 ]
+then
+	echo "fritzing mime types already registered"
+else
+	echo "application/x-fritzing-fz 	fritzing" >> ~/.mime.types
+	echo "application/x-fritzing-fzz 	fritzing" >> ~/.mime.types
+	echo "application/x-fritzing-fzp 	fritzing" >> ~/.mime.types
+	echo "application/x-fritzing-fzpz 	fritzing" >> ~/.mime.types
+	echo "application/x-fritzing-fzb 	fritzing" >> ~/.mime.types
+	echo "application/x-fritzing-fzbz 	fritzing" >> ~/.mime.types
+	echo "application/x-fritzing-fzm 	fritzing" >> ~/.mime.types
+fi
+
+cd $APPDIR
+
+# install fritzing into mime user directory
+xdg-mime install --mode user 'icons/x-fritzing-fz.xml'
+xdg-mime install --mode user 'icons/x-fritzing-fzz.xml'
+xdg-mime install --mode user 'icons/x-fritzing-fzp.xml'
+xdg-mime install --mode user 'icons/x-fritzing-fzpz.xml'
+xdg-mime install --mode user 'icons/x-fritzing-fzb.xml'
+xdg-mime install --mode user 'icons/x-fritzing-fzbz.xml'
+xdg-mime install --mode user 'icons/x-fritzing-fzm.xml'
+
+# set the default application to fritzing.desktop
+xdg-mime default 'fritzing.desktop' application/x-fritzing-fz
+xdg-mime default 'fritzing.desktop' application/x-fritzing-fzz
+xdg-mime default 'fritzing.desktop' application/x-fritzing-fzp
+xdg-mime default 'fritzing.desktop' application/x-fritzing-fzpz
+xdg-mime default 'fritzing.desktop' application/x-fritzing-fzb
+xdg-mime default 'fritzing.desktop' application/x-fritzing-fzbz
+xdg-mime default 'fritzing.desktop' application/x-fritzing-fzm
+
+# install image-files into user mime system with specified size
+# ~/.local/share/icons/hicolor/*size*
+xdg-icon-resource install --mode user --context mimetypes --size 128 'icons/fz_icon128.png' application-x-fritzing-fz
+xdg-icon-resource install --mode user --context mimetypes --size 256 'icons/fz_icon256.png' application-x-fritzing-fz
+xdg-icon-resource install --mode user --context mimetypes --size 128 'icons/fzz_icon128.png' application-x-fritzing-fzz
+xdg-icon-resource install --mode user --context mimetypes --size 256 'icons/fzz_icon256.png' application-x-fritzing-fzz
+xdg-icon-resource install --mode user --context mimetypes --size 128 'icons/fzp_icon128.png' application-x-fritzing-fzp
+xdg-icon-resource install --mode user --context mimetypes --size 256 'icons/fzp_icon256.png' application-x-fritzing-fzp
+xdg-icon-resource install --mode user --context mimetypes --size 128 'icons/fzpz_icon128.png' application-x-fritzing-fzpz
+xdg-icon-resource install --mode user --context mimetypes --size 256 'icons/fzpz_icon256.png' application-x-fritzing-fzpz
+xdg-icon-resource install --mode user --context mimetypes --size 128 'icons/fzb_icon128.png' application-x-fritzing-fzb
+xdg-icon-resource install --mode user --context mimetypes --size 256 'icons/fzb_icon256.png' application-x-fritzing-fzb
+xdg-icon-resource install --mode user --context mimetypes --size 128 'icons/fzbz_icon128.png' application-x-fritzing-fzbz
+xdg-icon-resource install --mode user --context mimetypes --size 256 'icons/fzbz_icon256.png' application-x-fritzing-fzbz
+xdg-icon-resource install --mode user --context mimetypes --size 128 'icons/fzm_icon128.png' application-x-fritzing-fzm
+xdg-icon-resource install --mode user --context mimetypes --size 256 'icons/fzm_icon256.png' application-x-fritzing-fzm
+
+# update user databases
+update-desktop-database ~/.local/share/applications
+update-mime-database ~/.local/share/mime
+
+echo "installed fritzing system icons"

phoenix.pro

@@ -40,7 +40,7 @@ win32 {
         INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
         DEFINES += _CRT_SECURE_NO_DEPRECATE
         DEFINES += _WINDOWS
-	RELEASE_SCRIPT = $$(RELEASE_SCRIPT)			# environment variable set from release script	
+	RELEASE_SCRIPT = $$(RELEASE_SCRIPT)			# environment variable set from release script
 
         message("target arch: $${QMAKE_TARGET.arch}")
         contains(QMAKE_TARGET.arch, x86_64) {
@@ -52,7 +52,7 @@ win32 {
                 RELDIR = ../release32
                 DEBDIR = ../debug32
         }
-	
+
 	Release:DESTDIR = $${RELDIR}
 	Release:OBJECTS_DIR = $${RELDIR}
 	Release:MOC_DIR = $${RELDIR}
@@ -142,10 +142,10 @@ unix {
         INSTALLS += target desktop manpage icon parts sketches bins translations syntax help
 }
 
-ICON = resources/images/fritzing_icon.icns
+ICON = resources/system_icons/macosx/fritzing_icon.icns
 
 macx {
-    FILE_ICONS.files = resources/images/mac_fz_icon.icns resources/images/mac_fzz_icon.icns resources/images/mac_fzb_icon.icns resources/images/mac_fzp_icon.icns resources/images/mac_fzm_icon.icns resources/images/mac_fzpz_icon.icns
+    FILE_ICONS.files = resources/system_icons/macosx/mac_fz_icon.icns resources/system_icons/macosx/mac_fzz_icon.icns resources/system_icons/macosx/mac_fzb_icon.icns resources/system_icons/macosx/mac_fzp_icon.icns resources/system_icons/macosx/mac_fzm_icon.icns resources/system_icons/macosx/mac_fzpz_icon.icns
     FILE_ICONS.path = Contents/Resources
     QMAKE_BUNDLE_DATA += FILE_ICONS
 }
@@ -250,5 +250,3 @@ TEMPLATE = app
 
 
 message("libs $$LIBS")
-
-

resources/images/x-fritzing-fzz.xml → resources/system_icons/linux/x-fritzing-fz.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-<mime-type type="mimetypes/x-fritzing-fzz">  
+<mime-type type="application/x-fritzing-fz">  
 <comment>Fritzing Sketch</comment>
-<generic-icon name="x-fritzing-fzz"/>
-<glob pattern="*.fzz"/>
+<generic-icon name="application-x-fritzing-fz"/>
+<glob pattern="*.fz"/>
 </mime-type>
 </mime-info>

resources/system_icons/linux/x-fritzing-fzb.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+<mime-type type="application/x-fritzing-fzb">  
+<comment>Fritzing Parts Bin</comment>
+<generic-icon name="application-x-fritzing-fzb"/>
+<glob pattern="*.fzb"/>
+</mime-type>
+</mime-info>

resources/system_icons/linux/x-fritzing-fzbz.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+<mime-type type="application/x-fritzing-fzbz">
+<comment>Fritzing Parts Bin Bundle</comment>
+<generic-icon name="application-x-fritzing-fzbz"/>
+<glob pattern="*.fzbz"/>
+</mime-type>
+</mime-info>

resources/system_icons/linux/x-fritzing-fzm.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+<mime-type type="application/x-fritzing-fzm">
+<comment>Fritzing Module</comment>
+<generic-icon name="application-x-fritzing-fzm"/>
+<glob pattern="*.fzm"/>
+</mime-type>
+</mime-info>

resources/system_icons/linux/x-fritzing-fzp.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+<mime-type type="application/x-fritzing-fzp">
+<comment>Fritzing Part Definition</comment>
+<generic-icon name="application-x-fritzing-fzp"/>
+<glob pattern="*.fzp"/>
+</mime-type>
+</mime-info>

resources/system_icons/linux/x-fritzing-fzpz.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+<mime-type type="application/x-fritzing-fzpz">
+<comment>Fritzing Part Bundle</comment>
+<generic-icon name="application-x-fritzing-fzpz"/>
+<glob pattern="*.fzpz"/>
+</mime-type>
+</mime-info>

resources/system_icons/linux/x-fritzing-fzz.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+<mime-type type="application/x-fritzing-fzz">
+<comment>Fritzing Sketch Bundle</comment>
+<generic-icon name="application-x-fritzing-fzz"/>
+<glob pattern="*.fzz"/>
+</mime-type>
+</mime-info>

tools/linux_release_script/release.sh

@@ -59,14 +59,19 @@ echo "making release folder: $release_folder"
 mkdir $release_folder
 
 echo "copying release files"
-cp -rf  sketches/ help/ translations/ Fritzing.sh Fritzing.1 fritzing.desktop fritzing.rc fritzing.appdata.xml readme.md LICENSE.CC-BY-SA LICENSE.GPL2 LICENSE.GPL3 $release_folder/
+cp -rf sketches/ help/ translations/ Fritzing.sh Fritzing.1 fritzing.desktop fritzing.rc fritzing.appdata.xml install_fritzing.sh readme.md LICENSE.CC-BY-SA LICENSE.GPL2 LICENSE.GPL3 $release_folder/
+mkdir $release_folder/icons
+cp resources/system_icons/linux/* $release_folder/icons/
 mv Fritzing $release_folder/
+chmod +x $release_folder/install_fritzing.sh
+
 cd $release_folder
-echo "cleaning translations"
 
+echo "cleaning translations"
 rm ./translations/*.ts  			# remove translation xml files, since we only need the binaries in the release
 find ./translations -name "*.qm" -size -128c -delete   # delete empty translation binaries
 
+echo "cloning fritzing-parts"
 git clone https://github.com/fritzing/fritzing-parts.git
 
 echo "making library folders"