Merge pull request #862 from ZoomTen/icons-new

Filetype icons (light palette, Windows & Linux)

CMakeLists.txt

@@ -476,5 +476,12 @@ if(UNIX AND NOT APPLE)
   install(FILES packaging/linux/icons/128x128/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/128x128/apps)
   install(FILES packaging/linux/icons/256x256/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/256x256/apps)
   install(FILES packaging/linux/icons/512x512/org.olivevideoeditor.Olive.png DESTINATION share/icons/hicolor/512x512/apps)
+  install(FILES packaging/linux/icons/16x16/application-vnd.olive-project.png DESTINATION share/icons/hicolor/16x16/mimetypes)
+  install(FILES packaging/linux/icons/32x32/application-vnd.olive-project.png DESTINATION share/icons/hicolor/32x32/mimetypes)
+  install(FILES packaging/linux/icons/48x48/application-vnd.olive-project.png DESTINATION share/icons/hicolor/48x48/mimetypes)
+  install(FILES packaging/linux/icons/64x64/application-vnd.olive-project.png DESTINATION share/icons/hicolor/64x64/mimetypes)
+  install(FILES packaging/linux/icons/128x128/application-vnd.olive-project.png DESTINATION share/icons/hicolor/128x128/mimetypes)
+  install(FILES packaging/linux/icons/256x256/application-vnd.olive-project.png DESTINATION share/icons/hicolor/256x256/mimetypes)
+  install(FILES packaging/linux/icons/512x512/application-vnd.olive-project.png DESTINATION share/icons/hicolor/512x512/mimetypes)
   install(FILES ${OLIVE_QM_FILES} DESTINATION share/olive-editor/ts)
 endif()

olive.pro

@@ -380,5 +380,19 @@ unix:!mac {
     icon256.path = $$PREFIX/share/icons/hicolor/256x256/apps
     icon512.files = $$PWD/packaging/linux/icons/512x512/org.olivevideoeditor.Olive.png
     icon512.path = $$PREFIX/share/icons/hicolor/512x512/apps
-    INSTALLS += target effects translations metainfo desktop mime icon16 icon32 icon48 icon64 icon128 icon256 icon512
+    mime16.files = $$PWD/packaging/linux/icons/16x16/application-vnd.olive-project.png
+    mime16.path = $$PREFIX/share/icons/hicolor/16x16/mimetypes
+    mime32.files = $$PWD/packaging/linux/icons/32x32/application-vnd.olive-project.png
+    mime32.path = $$PREFIX/share/icons/hicolor/32x32/mimetypes
+    mime48.files = $$PWD/packaging/linux/icons/48x48/application-vnd.olive-project.png
+    mime48.path = $$PREFIX/share/icons/hicolor/48x48/mimetypes
+    mime64.files = $$PWD/packaging/linux/icons/64x64/application-vnd.olive-project.png
+    mime64.path = $$PREFIX/share/icons/hicolor/64x64/mimetypes
+    mime128.files = $$PWD/packaging/linux/icons/128x128/application-vnd.olive-project.png
+    mime128.path = $$PREFIX/share/icons/hicolor/128x128/mimetypes
+    mime256.files = $$PWD/packaging/linux/icons/256x256/application-vnd.olive-project.png
+    mime256.path = $$PREFIX/share/icons/hicolor/256x256/mimetypes
+    mime512.files = $$PWD/packaging/linux/icons/512x512/application-vnd.olive-project.png
+    mime512.path = $$PREFIX/share/icons/hicolor/512x512/mimetypes
+    INSTALLS += target effects translations metainfo desktop mime icon16 icon32 icon48 icon64 icon128 icon256 icon512 mime16 mime32 mime48 mime64 mime128 mime256 mime512
 }

packaging/linux/org.olivevideoeditor.Olive.xml

@@ -3,6 +3,5 @@
   <mime-type type="application/vnd.olive-project">
     <comment>Olive project</comment>
     <glob pattern="*.ove"/>
-    <icon name="org.olivevideoeditor.Olive"/>
   </mime-type>
 </mime-info>

packaging/windows/nsis/olive.nsi

@@ -54,6 +54,15 @@ Section "Create Start Menu shortcut"
 	CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
 SectionEnd
 
+Section "Associate *.ove files with Olive"
+	WriteRegStr HKCR ".ove" "" "OliveEditor.OVEFile"
+	WriteRegStr HKCR ".ove" "Content Type" "application/vnd.olive-project"
+	WriteRegStr HKCR "OliveEditor.OVEFile" "" "Olive project file"
+	WriteRegStr HKCR "OliveEditor.OVEFile\DefaultIcon" "" "$INSTDIR\olive-editor.exe,1"
+	WriteRegStr HKCR "OliveEditor.OVEFile\shell\open\command" "" "$\"$INSTDIR\olive-editor.exe$\" $\"%1$\""
+	System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
+SectionEnd
+
 UninstPage uninstConfirm
 UninstPage instfiles
 
@@ -63,7 +72,12 @@ Section "uninstall"
 
 	Delete "$DESKTOP\${APP_NAME}.lnk"
 	rmdir /r "$SMPROGRAMS\${APP_NAME}"
-
+	
+	DeleteRegKey HKCR ".ove"
+	DeleteRegKey HKCR "OliveEditor.OVEFile"
+	DeleteRegKey HKCR "OliveEditor.OVEFile\DefaultIcon" ""
+	DeleteRegKey HKCR "OliveEditor.OVEFile\shell\open\command" ""
+	System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 SectionEnd
 
 Function LaunchOlive

packaging/windows/resources.rc

@@ -1,4 +1,5 @@
 IDI_ICON1   ICON    DISCARDABLE "olive.ico"
+IDI_ICON2   ICON    DISCARDABLE "olive_ove.ico"
 
 #include <windows.h>
 #include "version.h"