Install app icon into oxygen folder for mac and windows builds

2014-06-14 19:26:54 +00:00
parent b081594527
commit adddc75991
6 changed files with 33 additions and 203 deletions
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -2,7 +2,13 @@
 #    kde4_install_icons( ${DATA_INSTALL_DIR}/cantata/icons)
 #else (ENABLE_KDE_SUPPORT)
    if (WIN32 OR APPLE)
-        install(FILES cantata.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
+        install(FILES cantata.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/scalable/apps)
+        install(FILES cantata16.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/16x16/apps RENAME cantata.png)
+        install(FILES cantata22.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/22x22/apps RENAME cantata.png)
+        install(FILES cantata24.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/24x24/apps RENAME cantata.png)
+        install(FILES cantata32.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/32x32/apps RENAME cantata.png)
+        install(FILES cantata48.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/48x48/apps RENAME cantata.png)
+        install(FILES cantata64.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/64x64/apps RENAME cantata.png)
    else (WIN32 OR APPLE)
        macro (update_iconcache ICON_THEME)
            # Update mtime of hicolor icon theme dir.
--- a/mac/icons/README
+++ b/mac/icons/README
@@ -1,6 +1,6 @@
-The icons included here are taken from the Oxygen icon project
-(http://www.oxygen-icons.org/). Only the minimum set of icons needed for Cantata
-are included.
+The icons included here are (apart from the cantata icon) are taken from the 
+Oxygen icon project (http://www.oxygen-icons.org/). Only the minimum set of 
+icons needed for Cantata are included.

-Oxygen icon theme is dual licensed. To facilitate this, a copy of each license
+Oxygen icon theme is dual licensed. To facilitate this, a copy of each license 
 is included.
--- a/mac/icons/index.theme
+++ b/mac/icons/index.theme
@@ -1,103 +1,9 @@
 [Icon Theme]
 Name=Oxygen
-Name[ar]=أكسجين
-Name[bn]=অক্সিজেন
-Name[csb]=Krziseń
-Name[es]=Oxígeno
-Name[gu]=ઓક્સિજન
-Name[hi]=आक्सीजन
-Name[hne]=आक्सीजन
-Name[kk]=Оттегі
-Name[km]=អុកស៊ីហ្សែន
-Name[kn]=ಆಕ್ಸಿಜನ್
-Name[mai]=आक्सीजन
-Name[mk]=Оксиген
-Name[ml]=ഓക്സിജന്‍
-Name[mr]=आक्सीजन
-Name[ne]=अक्सिजन
-Name[nn]=Oksygen
-Name[or]=ଅକ୍ସିଜେନ
-Name[pa]=ਆਕਸੀਜਨ
-Name[se]=Oksygena
-Name[sr]=Кисеоник
-Name[sr@latin]=Kiseonik
-Name[ta]=ஆக்ஸிஜன்
-Name[th]=รูปแบบ Oxygen
-Name[wa]=Ocsidjinne
-Name[x-test]=xxOxygenxx
-
 Comment=Oxygen Team
-Comment[af]=Oxygen span
-Comment[ar]=ثيمة أكسجين
-Comment[be@latin]=Supołka „Oxygen”
-Comment[bg]=Екипът на Oxygen
-Comment[bn]=অক্সিজেন টীম
-Comment[bn_IN]=Oxygen দল
-Comment[cs]=Tým Oxygen
-Comment[csb]=Oxygen-Team
-Comment[da]=Oxygen-holdet
-Comment[de]=Oxygen-Team
-Comment[el]=Η ομάδα του Oxygen
-Comment[eo]=Oxygen Teamo
-Comment[es]=Equipo Oxygen
-Comment[et]=Oxygeni meeskond
-Comment[eu]=Oxygen taldea
-Comment[fi]=Oxygen-tiimi
-Comment[fr]=L'équipe Oxygen
-Comment[ga]=Foireann Oxygen
-Comment[gl]=A equipa de Oxygen
-Comment[gu]=ઓક્સિજન ટીમ
-Comment[he]=צוות Oxygen
-Comment[hi]=ऑक्सीजन टोली
-Comment[hne]=आक्सीजन टीम
-Comment[hr]=Tim Oxygen-a
-Comment[is]=Oxygen teymið
-Comment[it]=La squadra di Oxygen
-Comment[kk]=Oxygen тобы
-Comment[km]=ក្រុមអុកស៊ីសែន
-Comment[kn]=ಆಕ್ಸಿಜನ್ ತಂಡ
-Comment[ko]=Oxygen 팀
-Comment[ku]=Koma Oxygen
-Comment[lt]=Oxygen komanda
-Comment[lv]=Oxygen komanda
-Comment[mk]=Тимот на Оксиген
-Comment[ml]=ഓക്സിജന്‍ സംഘം
-Comment[mr]=ऑक्सीजन समूह
-Comment[nds]=Oxygen-Koppel
-Comment[nl]=Oxygen-team
-Comment[nn]=Oksygen-gruppa
-Comment[or]=Oxygen ଦଳ
-Comment[pa]=ਆਕਸੀਜਨ ਟੀਮ
-Comment[pl]=Zespół Oxygena
-Comment[pt]=Equipa do Oxygen
-Comment[pt_BR]=Equipe do Oxygen
-Comment[ro]=Echipa Oxygen
-Comment[ru]=Команда Oxygen
-Comment[si]=Oxygen කණ්ඩායම
-Comment[sk]=Tím Oxygen
-Comment[sl]=Ekipa Oxygena
-Comment[sr]=Тим Кисеоника
-Comment[sr@latin]=Tim Kiseonika
-Comment[sv]=Oxygen-gruppen
-Comment[ta]=Oxygen அணி
-Comment[te]=Oxygen టీము
-Comment[tg]=Командаи Oxygen
-Comment[th]=กลุ่มผู้พัฒนา Oxygen
-Comment[tr]=Oxygen Ekibi
-Comment[uk]=Команда Oxygen
-Comment[uz]=Oxygen jamoasi
-Comment[uz@cyrillic]=Oxygen жамоаси
-Comment[wa]=Ekipe Ocsidjinne
-Comment[x-test]=xxOxygen Teamxx
-Comment[zh_CN]=Oxygen 团队
-Comment[zh_TW]=Oxygen 開發團隊
-
 DisplayDepth=32
-
 Inherits=hicolor
-
 Example=folder
-
 DesktopDefault=48
 DesktopSizes=16,22,32,48,64,128,256
 ToolbarDefault=22
@@ -111,7 +17,7 @@ PanelSizes=16,22,32,48,64,128,256
 DialogDefault=32
 DialogSizes=16,22,32,48,64,128,256

-Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/mimetypes,16x16/places,16x16/status,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/mimetypes,22x22/places,22x22/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/mimetypes,32x32/places,32x32/status,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/status,64x64/apps,64x64/categories,64x64/devices,64x64/status,128x128/categories,128x128/devices,256x256/categories,256x256/devices
+Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/mimetypes,16x16/places,16x16/status,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/mimetypes,22x22/places,22x22/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/mimetypes,32x32/places,32x32/status,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/status,64x64/apps,64x64/categories,64x64/devices,64x64/status,128x128/categories,128x128/devices,256x256/categories,256x256/devices,scalable/apps

 [16x16/actions]
 Size=16
@@ -287,3 +193,11 @@ Type=Threshold
 Size=256
 Context=Devices
 Type=Threshold
+
+[scalable/apps]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Applications
+Type=Scalable
+
--- a/widgets/icons.cpp
+++ b/widgets/icons.cpp
@@ -425,11 +425,7 @@ Icons::Icons()
    lastFmIcon.addFile(":lastfm.svg");
    #ifndef ENABLE_KDE_SUPPORT
    #ifndef ENABLE_UBUNTU
-    #if defined Q_OS_WIN || defined Q_OS_MAC
-    appIcon.addFile(CANTATA_SYS_ICONS_DIR+"cantata.svg");
-    #else // defined Q_OS_WIN || defined Q_OS_MAC
    appIcon=Icon("cantata");
-    #endif // defined Q_OS_WIN || defined Q_OS_MAC
    #endif // ENABLE_UBUNTU
    shortcutsIcon=Icon("preferences-desktop-keyboard");
    #if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined ENABLE_UBUNTU
--- a/windows/icons/README
+++ b/windows/icons/README
@@ -1,6 +1,6 @@
-The icons included here are taken from the Oxygen icon project
-(http://www.oxygen-icons.org/). Only the minimum set of icons needed for Cantata
-are included.
+The icons included here are (apart from the cantata icon) are taken from the 
+Oxygen icon project (http://www.oxygen-icons.org/). Only the minimum set of 
+icons needed for Cantata are included.

-Oxygen icon theme is dual licensed. To facilitate this, a copy of each license
+Oxygen icon theme is dual licensed. To facilitate this, a copy of each license 
 is included.
--- a/windows/icons/index.theme
+++ b/windows/icons/index.theme
@@ -1,103 +1,9 @@
 [Icon Theme]
 Name=Oxygen
-Name[ar]=أكسجين
-Name[bn]=অক্সিজেন
-Name[csb]=Krziseń
-Name[es]=Oxígeno
-Name[gu]=ઓક્સિજન
-Name[hi]=आक्सीजन
-Name[hne]=आक्सीजन
-Name[kk]=Оттегі
-Name[km]=អុកស៊ីហ្សែន
-Name[kn]=ಆಕ್ಸಿಜನ್
-Name[mai]=आक्सीजन
-Name[mk]=Оксиген
-Name[ml]=ഓക്സിജന്‍
-Name[mr]=आक्सीजन
-Name[ne]=अक्सिजन
-Name[nn]=Oksygen
-Name[or]=ଅକ୍ସିଜେନ
-Name[pa]=ਆਕਸੀਜਨ
-Name[se]=Oksygena
-Name[sr]=Кисеоник
-Name[sr@latin]=Kiseonik
-Name[ta]=ஆக்ஸிஜன்
-Name[th]=รูปแบบ Oxygen
-Name[wa]=Ocsidjinne
-Name[x-test]=xxOxygenxx
-
 Comment=Oxygen Team
-Comment[af]=Oxygen span
-Comment[ar]=ثيمة أكسجين
-Comment[be@latin]=Supołka „Oxygen”
-Comment[bg]=Екипът на Oxygen
-Comment[bn]=অক্সিজেন টীম
-Comment[bn_IN]=Oxygen দল
-Comment[cs]=Tým Oxygen
-Comment[csb]=Oxygen-Team
-Comment[da]=Oxygen-holdet
-Comment[de]=Oxygen-Team
-Comment[el]=Η ομάδα του Oxygen
-Comment[eo]=Oxygen Teamo
-Comment[es]=Equipo Oxygen
-Comment[et]=Oxygeni meeskond
-Comment[eu]=Oxygen taldea
-Comment[fi]=Oxygen-tiimi
-Comment[fr]=L'équipe Oxygen
-Comment[ga]=Foireann Oxygen
-Comment[gl]=A equipa de Oxygen
-Comment[gu]=ઓક્સિજન ટીમ
-Comment[he]=צוות Oxygen
-Comment[hi]=ऑक्सीजन टोली
-Comment[hne]=आक्सीजन टीम
-Comment[hr]=Tim Oxygen-a
-Comment[is]=Oxygen teymið
-Comment[it]=La squadra di Oxygen
-Comment[kk]=Oxygen тобы
-Comment[km]=ក្រុមអុកស៊ីសែន
-Comment[kn]=ಆಕ್ಸಿಜನ್ ತಂಡ
-Comment[ko]=Oxygen 팀
-Comment[ku]=Koma Oxygen
-Comment[lt]=Oxygen komanda
-Comment[lv]=Oxygen komanda
-Comment[mk]=Тимот на Оксиген
-Comment[ml]=ഓക്സിജന്‍ സംഘം
-Comment[mr]=ऑक्सीजन समूह
-Comment[nds]=Oxygen-Koppel
-Comment[nl]=Oxygen-team
-Comment[nn]=Oksygen-gruppa
-Comment[or]=Oxygen ଦଳ
-Comment[pa]=ਆਕਸੀਜਨ ਟੀਮ
-Comment[pl]=Zespół Oxygena
-Comment[pt]=Equipa do Oxygen
-Comment[pt_BR]=Equipe do Oxygen
-Comment[ro]=Echipa Oxygen
-Comment[ru]=Команда Oxygen
-Comment[si]=Oxygen කණ්ඩායම
-Comment[sk]=Tím Oxygen
-Comment[sl]=Ekipa Oxygena
-Comment[sr]=Тим Кисеоника
-Comment[sr@latin]=Tim Kiseonika
-Comment[sv]=Oxygen-gruppen
-Comment[ta]=Oxygen அணி
-Comment[te]=Oxygen టీము
-Comment[tg]=Командаи Oxygen
-Comment[th]=กลุ่มผู้พัฒนา Oxygen
-Comment[tr]=Oxygen Ekibi
-Comment[uk]=Команда Oxygen
-Comment[uz]=Oxygen jamoasi
-Comment[uz@cyrillic]=Oxygen жамоаси
-Comment[wa]=Ekipe Ocsidjinne
-Comment[x-test]=xxOxygen Teamxx
-Comment[zh_CN]=Oxygen 团队
-Comment[zh_TW]=Oxygen 開發團隊
-
 DisplayDepth=32
-
 Inherits=hicolor
-
 Example=folder
-
 DesktopDefault=48
 DesktopSizes=16,22,32,48,64,128,256
 ToolbarDefault=22
@@ -111,7 +17,7 @@ PanelSizes=16,22,32,48,64,128,256
 DialogDefault=32
 DialogSizes=16,22,32,48,64,128,256

-Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/mimetypes,16x16/places,16x16/status,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/mimetypes,22x22/places,22x22/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/mimetypes,32x32/places,32x32/status,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/status,64x64/apps,64x64/categories,64x64/devices,64x64/status,128x128/categories,128x128/devices,256x256/categories,256x256/devices
+Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/mimetypes,16x16/places,16x16/status,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/mimetypes,22x22/places,22x22/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/mimetypes,32x32/places,32x32/status,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/status,64x64/apps,64x64/categories,64x64/devices,64x64/status,128x128/categories,128x128/devices,256x256/categories,256x256/devices,scalable/apps

 [16x16/actions]
 Size=16
@@ -287,3 +193,11 @@ Type=Threshold
 Size=256
 Context=Devices
 Type=Threshold
+
+[scalable/apps]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Applications
+Type=Scalable
+