From 96b12d85dcf668807d321cbb1300c95f229afea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 21 Feb 2019 13:41:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B3=D1=80=D0=B5=D1=81=D1=81=D0=B1=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D0=BC=D1=8B=20plymou?= =?UTF-8?q?th?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/default/ini.env | 2 ++ profiles/ini.env | 2 -- .../calculate.plymouth | 10 ------- .../ini.example/2-example.theme | 26 ------------------- 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/profiles/default/ini.env b/profiles/default/ini.env index fb7c71bff..6b720d17b 100644 --- a/profiles/default/ini.env +++ b/profiles/default/ini.env @@ -9,3 +9,5 @@ splash-silent-progress-color-begin = cdc481 splash-silent-progress-color-end = 5a1d08 splash-silent-progress-type = fade splash-verbose-background = /usr/share/themes/Calculate/splash-verbose.jpg +splash-silent-progress-color = cdc481 +splash-shutdown-progress-color = off diff --git a/profiles/ini.env b/profiles/ini.env index b8e748ac6..62f27e7d0 100644 --- a/profiles/ini.env +++ b/profiles/ini.env @@ -49,10 +49,8 @@ splash-silent-picture = /usr/share/themes/Calculate/splash-silent.png splash-silent-type = logo splash-silent-background-color-begin = 090500 splash-silent-background-color-end = 090500 -splash-silent-progress-color = cdc481 splash-shutdown-picture = /usr/share/themes/Calculate/splash-shutdown.jpg splash-shutdown-type = background splash-shutdown-background-color-begin = 000000 splash-shutdown-background-color-end = 000000 -splash-shutdown-progress-color = off splash-shutdown-text-color = ffff9c diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth index 7f7233f6a..0c93df4db 100644 --- a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth +++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth @@ -10,16 +10,6 @@ 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)-# -#?ini(theme.splash-silent-progress-color)!=off# -BootProgressbarColor=0x#-ini(theme.splash-silent-progress-color)-# -#!ini# -BootProgressbarColor=off -#ini# -#?ini(theme.splash-shutdown-progress-color)!=off# -ShutdownProgressbarColor=0x#-ini(theme.splash-shutdown-progress-color)-# -#!ini# -ShutdownProgressbarColor=off -#ini# #?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==background# BootImage=/usr/share/plymouth/themes/calculate/boot #ini# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme index e9cb98679..4ecf1fbed 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/calculate-utils/ini.example/2-example.theme @@ -251,19 +251,6 @@ #os_install_locale_language# ; splash-shutdown-picture = /usr/share/themes/Calculate/splash-shutdown.jpg -#in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CCDX)!=# -#?os_install_locale_language!=ru&&os_install_locale_language!=fr# -# Color of the shutdown indicator ('off' for disable) -#os_install_locale_language# -#?os_install_locale_language==ru# -# Цвет индикатора прогресса завершения работы компьютера (off - не отображать) -#os_install_locale_language# -#?os_install_locale_language==fr# -# Couleur de l’indicateur d’arrêt -#os_install_locale_language# -; splash-shutdown-progress-color = off - #in# #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CCDX)!=# #?os_install_locale_language!=ru# @@ -322,19 +309,6 @@ #os_install_locale_language# ; splash-silent-picture = /usr/share/themes/Calculate/splash-silent.png -#in# -#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CCDX)!=# -#?os_install_locale_language!=ru&&os_install_locale_language!=fr# -# Color of the boot indicator ('off' for disable) -#os_install_locale_language# -#?os_install_locale_language==ru# -# Цвет индикатора прогресса загрузки компьютера (off - не отображать) -#os_install_locale_language# -#?os_install_locale_language==fr# -# Couleur de l’indicateur d’arrêt -#os_install_locale_language# -; splash-silent-progress-color = cdc481 - #in# #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CCDX)!=# #?os_install_locale_language!=ru#