icon + theme fix

nitramr · Nov 11, 2016 · 571247b · 571247b
1 parent 3b67c5f
commit 571247b
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/resources/iconsets/1_5_1_light/1_5_1.xml → ...rces/iconsets/1_5_1_light/1_5_1_light.xml b/resources/iconsets/1_5_1_light/1_5_1.xml → ...rces/iconsets/1_5_1_light/1_5_1_light.xml
@@ -5,6 +5,6 @@
 	<path>1_5_1_light</path>
 	<activeversion>1.5.1</activeversion>
 	<nametext lang="en_US">Scribus 1.5.1 light</nametext>
-	<nametext lang="fr">Scribus 1.5.1 light</nametext>
+	<nametext lang="fr">Scribus 1.5.1 brillant</nametext>
 	<nametext lang="de_DE">Scribus 1.5.1 hell</nametext>
 </iconset>
diff --git a/resources/iconsets/CMakeLists.txt b/resources/iconsets/CMakeLists.txt
@@ -27,6 +27,10 @@ INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_22} DESTINATION ${ICONDIR}/1_5_0/22)
 FILE( GLOB SCRIBUS_ICONS_1_5_0_32 1_5_0/32/*.jpg 1_5_0/32/*.png 1_5_0/32/*.xpm )
 INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_32} DESTINATION ${ICONDIR}/1_5_0/32)
 
+#Install our 64x64 icons
+FILE( GLOB SCRIBUS_ICONS_1_5_0_64 1_5_0/64/*.jpg 1_5_0/64/*.png 1_5_0/64/*.xpm )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_64} DESTINATION ${ICONDIR}/1_5_0/64)
+
 #Install our stylesheet icons
 FILE( GLOB SCRIBUS_ICONS_1_5_0_STYLE 1_5_0/stylesheet/*.png )
 INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_STYLE} DESTINATION ${ICONDIR}/1_5_0/stylesheet)
@@ -59,6 +63,10 @@ INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_22} DESTINATION ${ICONDIR}/1_5_1/22)
 FILE( GLOB SCRIBUS_ICONS_1_5_1_32 1_5_1/32/*.jpg 1_5_1/32/*.png 1_5_1/32/*.xpm )
 INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_32} DESTINATION ${ICONDIR}/1_5_1/32)
 
+#Install our 64x64 icons
+FILE( GLOB SCRIBUS_ICONS_1_5_1_64 1_5_1/64/*.jpg 1_5_1/64/*.png 1_5_1/64/*.xpm )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_64} DESTINATION ${ICONDIR}/1_5_1/64)
+
 #Install our stylesheet icons
 FILE( GLOB SCRIBUS_ICONS_1_5_1_STYLE 1_5_1/stylesheet/*.png )
 INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_STYLE} DESTINATION ${ICONDIR}/1_5_1/stylesheet)
@@ -68,4 +76,40 @@ FILE( GLOB SCRIBUS_XML_1_5_1 1_5_1/*.xml )
 INSTALL(FILES ${SCRIBUS_XML_1_5_1} DESTINATION ${ICONDIR})
 
 
+##################
+
+
+#Install our 1.5.1_light icons
+FILE( GLOB SCRIBUS_ICONS_1_5_1_LIGHT_UNSORTED 1_5_1_light/*.jpg 1_5_1_light/*.png 1_5_1_light/*.xpm )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_LIGHT_UNSORTED} DESTINATION ${ICONDIR}/1_5_1_light/)
+
+#Install our 16x16 icons
+FILE( GLOB SCRIBUS_ICONS_1_5_1_LIGHT_10 1_5_1_light/10/*.jpg 1_5_1_light/10/*.png 1_5_1_light/10/*.xpm )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_LIGHT_10} DESTINATION ${ICONDIR}/1_5_1_light/10)
+
+#Install our 16x16 icons
+FILE( GLOB SCRIBUS_ICONS_1_5_1_LIGHT_16 1_5_1_light/16/*.jpg 1_5_1_light/16/*.png 1_5_1_light/16/*.xpm )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_LIGHT_16} DESTINATION ${ICONDIR}/1_5_1_light/16)
+
+#Install our 22x22 icons
+FILE( GLOB SCRIBUS_ICONS_1_5_1_LIGHT_22 1_5_1_light/22/*.jpg 1_5_1_light/22/*.png 1_5_1_light/22/*.xpm )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_LIGHT_22} DESTINATION ${ICONDIR}/1_5_1_light/22)
+
+#Install our 32x32 icons
+FILE( GLOB SCRIBUS_ICONS_1_5_1_LIGHT_32 1_5_1_light/32/*.jpg 1_5_1_light/32/*.png 1_5_1_light/32/*.xpm )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_LIGHT_32} DESTINATION ${ICONDIR}/1_5_1_light/32)
+
+#Install our 64x64 icons
+FILE( GLOB SCRIBUS_ICONS_1_5_1_LIGHT_64 1_5_1_light/64/*.jpg 1_5_1_light/64/*.png 1_5_1_light/64/*.xpm )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_LIGHT_64} DESTINATION ${ICONDIR}/1_5_1_light/64)
+
+#Install our stylesheet icons
+FILE( GLOB SCRIBUS_ICONS_1_5_1_LIGHT_STYLE 1_5_1_light/stylesheet/*.png )
+INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_LIGHT_STYLE} DESTINATION ${ICONDIR}/1_5_1_light/stylesheet)
+
+#Install our XML
+FILE( GLOB SCRIBUS_XML_1_5_1_LIGHT 1_5_1_light/*.xml )
+INSTALL(FILES ${SCRIBUS_XML_1_5_1_LIGHT} DESTINATION ${ICONDIR})
+
+
 ##################