sys-boot/plymouth-calculate-plugin: добавлены шаблоны для 0.9.5

profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth

@@ -1,33 +1,51 @@
-# Calculate format=kde path=/usr/share/plymouth/themes/calculate
+# Calculate format=kde path=/usr/share/plymouth/themes/calculate pkg(sys-boot/plymouth-calculate-plugin)>=0.9.5
 [Plymouth Theme]
 Name=Calculate
-Description=Simple theme that shows progressbar, image and text for shutdown
+Description=Calculate spinner theme
 ModuleName=calculate
 
 [calculate]
 ImageDir=/usr/share/plymouth/themes/calculate
-BootBackgroundStartColor=0x#-ini(theme.splash-silent-background-color-begin)-#
-BootBackgroundEndColor=0x#-ini(theme.splash-silent-background-color-end)-#
-ShutdownBackgroundStartColor=0x#-ini(theme.splash-shutdown-background-color-begin)-#
-ShutdownBackgroundEndColor=0x#-ini(theme.splash-shutdown-background-color-end)-#
-!ShutdownProgressbarColor=
-!BootProgressbarColor=
+
+[boot-up]
+BackgroundStartColor=0x#-ini(theme.splash-silent-background-color-begin)-#
+BackgroundEndColor=0x#-ini(theme.splash-silent-background-color-end)-#
 #?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==background#
-BootImage=/usr/share/plymouth/themes/calculate/boot
+WatermarkImage=/usr/share/plymouth/themes/calculate/boot
 #ini#
 #?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==logo#
-BootImage=/usr/share/plymouth/themes/calculate/boot.png
+WatermarkImage=/usr/share/plymouth/themes/calculate/boot.png
 #ini#
 #?ini(theme.splash-silent-picture)==||exists(#-ini(theme.splash-silent-picture)-#)==#
-!BootImage=
+!WatermarkImage
 #ini#
+
+[shutdown]
+BackgroundStartColor=0x#-ini(theme.splash-shutdown-background-color-begin)-#
+BackgroundEndColor=0x#-ini(theme.splash-shutdown-background-color-end)-#
+#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==background#
+WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown
+#ini#
+#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==logo#
+WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown.png
+#ini#
+#?ini(theme.splash-shutdown-picture)==||exists(#-ini(theme.splash-shutdown-picture)-#)==#
+!WatermarkImage=
+#ini#
+TitleColor=0x#-ini(theme.splash-shutdown-text-color)-#
+Title=S h u t t i n g   d o w n
+
+[reboot]
+BackgroundStartColor=0x#-ini(theme.splash-shutdown-background-color-begin)-#
+BackgroundEndColor=0x#-ini(theme.splash-shutdown-background-color-end)-#
 #?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==background#
-ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown
+WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown
 #ini#
 #?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==logo#
-ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown.png
+WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown.png
 #ini#
 #?ini(theme.splash-shutdown-picture)==||exists(#-ini(theme.splash-shutdown-picture)-#)==#
-!ShutdownImage=
+!WatermarkImage=
 #ini#
-ShutdownTextColor=0x#-ini(theme.splash-shutdown-text-color)-#
+TitleColor=0x#-ini(theme.splash-shutdown-text-color)-#
+Title=S h u t t i n g   d o w n

profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth-0.9.4

@@ -0,0 +1,33 @@
+# Calculate format=kde path=/usr/share/plymouth/themes/calculate pkg(sys-boot/plymouth-calculate-plugin)<0.9.5 name=calculate.plymouth
+[Plymouth Theme]
+Name=Calculate
+Description=Simple theme that shows progressbar, image and text for shutdown
+ModuleName=calculate
+
+[calculate]
+ImageDir=/usr/share/plymouth/themes/calculate
+BootBackgroundStartColor=0x#-ini(theme.splash-silent-background-color-begin)-#
+BootBackgroundEndColor=0x#-ini(theme.splash-silent-background-color-end)-#
+ShutdownBackgroundStartColor=0x#-ini(theme.splash-shutdown-background-color-begin)-#
+ShutdownBackgroundEndColor=0x#-ini(theme.splash-shutdown-background-color-end)-#
+!ShutdownProgressbarColor=
+!BootProgressbarColor=
+#?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==background#
+BootImage=/usr/share/plymouth/themes/calculate/boot
+#ini#
+#?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==logo#
+BootImage=/usr/share/plymouth/themes/calculate/boot.png
+#ini#
+#?ini(theme.splash-silent-picture)==||exists(#-ini(theme.splash-silent-picture)-#)==#
+!BootImage=
+#ini#
+#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==background#
+ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown
+#ini#
+#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==logo#
+ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown.png
+#ini#
+#?ini(theme.splash-shutdown-picture)==||exists(#-ini(theme.splash-shutdown-picture)-#)==#
+!ShutdownImage=
+#ini#
+ShutdownTextColor=0x#-ini(theme.splash-shutdown-text-color)-#

profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth

@@ -1,12 +1,26 @@
-# Calculate format=kde path=/usr/share/plymouth/themes/calculate
+# Calculate format=kde path=/usr/share/plymouth/themes/calculate pkg(sys-boot/plymouth-calculate-plugin)>=0.9.5 name=calculate.plymouth
 [calculate]
+Font=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,yres*16/1080,km)-#
+TitleFont=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,yres*20/1080,km)-#
+
+[shutdown]
 #?os_install_locale_lang==ru_RU#
-ShutdownText=З а в е р ш е н и е   р а б о т ы
+Title=З а в е р ш е н и е   р а б о т ы
 #os_install_locale_lang#
 #?os_install_locale_lang==fr_FR#
-ShutdownText=A r r ê t   e n   c o u r s
+Title=A r r ê t   e n   c o u r s
 #os_install_locale_lang#
 #?os_install_locale_lang!=ru_RU&&os_install_locale_lang!=fr_FR#
-ShutdownText=S h u t t i n g   d o w n
+Title=S h u t t i n g   d o w n
+#os_install_locale_lang#
+
+[reboot]
+#?os_install_locale_lang==ru_RU#
+Title=З а в е р ш е н и е   р а б о т ы
+#os_install_locale_lang#
+#?os_install_locale_lang==fr_FR#
+Title=A r r ê t   e n   c o u r s
+#os_install_locale_lang#
+#?os_install_locale_lang!=ru_RU&&os_install_locale_lang!=fr_FR#
+Title=S h u t t i n g   d o w n
 #os_install_locale_lang#
-ShutdownFont=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,yres*20/1080,km)-#

profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth-0.9.4

@@ -0,0 +1,12 @@
+# Calculate format=kde path=/usr/share/plymouth/themes/calculate pkg(sys-boot/plymouth-calculate-plugin)<0.9.5 name=calculate.plymouth
+[calculate]
+#?os_install_locale_lang==ru_RU#
+ShutdownText=З а в е р ш е н и е   р а б о т ы
+#os_install_locale_lang#
+#?os_install_locale_lang==fr_FR#
+ShutdownText=A r r ê t   e n   c o u r s
+#os_install_locale_lang#
+#?os_install_locale_lang!=ru_RU&&os_install_locale_lang!=fr_FR#
+ShutdownText=S h u t t i n g   d o w n
+#os_install_locale_lang#
+ShutdownFont=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,yres*20/1080,km)-#