From: Hans de Goede Date: Thu, 26 Sep 2019 13:59:38 +0000 (+0200) Subject: themes: Move spinifity from the throbgress splash to the two-step splash X-Git-Tag: 0.9.5~37^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08490fed8a7e99cd8db7d09a326981945218f5c8;p=thirdparty%2Fplymouth.git themes: Move spinifity from the throbgress splash to the two-step splash At one point in time the two-step splash plugin was forked from the throbgress splash. Since then the two-step plugin has grown to be more flexible / configurable. The two-step plugin is now flexible enough that with the right config it can mimick the throbgress plugin. Moving the spinifity theme to use the two-step plugin allows us to remove the throbgress plugin, removing the code duplication between the 2 plugins. An added advantage of this is that the two-step plugin has more functionality, such as capslock indicator support for the password dialog. Note the throbber-??.png images were modified to add 24 transparant rows at the top, to get the extra hardcoded throbber-height / 2 space which the throbgress plugin added between the throbber and the header-image, this was done automatically using the following command: convert old.png -background transparent -gravity northwest -splice 0x24 new.png Signed-off-by: Hans de Goede --- diff --git a/themes/spinfinity/Makefile.am b/themes/spinfinity/Makefile.am index cc07f45b..98fcfb87 100644 --- a/themes/spinfinity/Makefile.am +++ b/themes/spinfinity/Makefile.am @@ -5,6 +5,7 @@ dist_theme_DATA = \ bullet.png \ entry.png \ lock.png \ + animation-0001.png \ throbber-00.png \ throbber-01.png \ throbber-02.png \ @@ -49,3 +50,5 @@ spinfinity.plymouth: $(srcdir)/spinfinity.plymouth.in EXTRA_DIST = spinfinity.plymouth.in +install-data-hook: + ln -sf /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(themedir)/header-image.png diff --git a/themes/spinfinity/animation-0001.png b/themes/spinfinity/animation-0001.png new file mode 100644 index 00000000..b89d578d Binary files /dev/null and b/themes/spinfinity/animation-0001.png differ diff --git a/themes/spinfinity/spinfinity.plymouth.in b/themes/spinfinity/spinfinity.plymouth.in index d4a94690..55d1e711 100644 --- a/themes/spinfinity/spinfinity.plymouth.in +++ b/themes/spinfinity/spinfinity.plymouth.in @@ -1,7 +1,43 @@ [Plymouth Theme] Name=Spinfinity Description=Simple theme that shows a rotating infinity sign in the center of the screen -ModuleName=throbgress +ModuleName=two-step -[throbgress] +[two-step] ImageDir=@PLYMOUTH_THEME_PATH@/spinfinity +BackgroundStartColor=0x0073b3 +BackgroundEndColor=0x00457e +WatermarkHorizontalAlignment=0.5 +WatermarkVerticalAlignment=0.5 +HorizontalAlignment=0.5 +VerticalAlignment=0.55 +ProgressBarHorizontalAlignment=0.5 +ProgressBarVerticalAlignment=1.0 +ProgressBarWidth=1920 +ProgressBarHeight=16 +ProgressBarBackgroundColor=0x01000000 +ProgressBarForegroundColor=0xffffffff + +[boot-up] +UseProgressBar=true +UseAnimation=true + +[shutdown] +UseProgressBar=false +UseAnimation=false + +[reboot] +UseProgressBar=false +UseAnimation=false + +[updates] +UseProgressBar=true +UseAnimation=true + +[system-upgrade] +UseProgressBar=true +UseAnimation=true + +[firmware-upgrade] +UseProgressBar=true +UseAnimation=true diff --git a/themes/spinfinity/throbber-00.png b/themes/spinfinity/throbber-00.png index 5ca64413..678d3a3b 100644 Binary files a/themes/spinfinity/throbber-00.png and b/themes/spinfinity/throbber-00.png differ diff --git a/themes/spinfinity/throbber-01.png b/themes/spinfinity/throbber-01.png index dac708be..d08482db 100644 Binary files a/themes/spinfinity/throbber-01.png and b/themes/spinfinity/throbber-01.png differ diff --git a/themes/spinfinity/throbber-02.png b/themes/spinfinity/throbber-02.png index 68aa2d21..ffd316cd 100644 Binary files a/themes/spinfinity/throbber-02.png and b/themes/spinfinity/throbber-02.png differ diff --git a/themes/spinfinity/throbber-03.png b/themes/spinfinity/throbber-03.png index ec63a382..3802ee8a 100644 Binary files a/themes/spinfinity/throbber-03.png and b/themes/spinfinity/throbber-03.png differ diff --git a/themes/spinfinity/throbber-04.png b/themes/spinfinity/throbber-04.png index 876bf373..a913bfbb 100644 Binary files a/themes/spinfinity/throbber-04.png and b/themes/spinfinity/throbber-04.png differ diff --git a/themes/spinfinity/throbber-05.png b/themes/spinfinity/throbber-05.png index fa909b97..4c3e72db 100644 Binary files a/themes/spinfinity/throbber-05.png and b/themes/spinfinity/throbber-05.png differ diff --git a/themes/spinfinity/throbber-06.png b/themes/spinfinity/throbber-06.png index 3d446354..d8a70846 100644 Binary files a/themes/spinfinity/throbber-06.png and b/themes/spinfinity/throbber-06.png differ diff --git a/themes/spinfinity/throbber-07.png b/themes/spinfinity/throbber-07.png index b932c68b..286a6266 100644 Binary files a/themes/spinfinity/throbber-07.png and b/themes/spinfinity/throbber-07.png differ diff --git a/themes/spinfinity/throbber-08.png b/themes/spinfinity/throbber-08.png index 920c8dbd..2a97e5e9 100644 Binary files a/themes/spinfinity/throbber-08.png and b/themes/spinfinity/throbber-08.png differ diff --git a/themes/spinfinity/throbber-09.png b/themes/spinfinity/throbber-09.png index b4526956..74795332 100644 Binary files a/themes/spinfinity/throbber-09.png and b/themes/spinfinity/throbber-09.png differ diff --git a/themes/spinfinity/throbber-10.png b/themes/spinfinity/throbber-10.png index 99377a90..26ba138e 100644 Binary files a/themes/spinfinity/throbber-10.png and b/themes/spinfinity/throbber-10.png differ diff --git a/themes/spinfinity/throbber-11.png b/themes/spinfinity/throbber-11.png index 3bd36a9e..54031e41 100644 Binary files a/themes/spinfinity/throbber-11.png and b/themes/spinfinity/throbber-11.png differ diff --git a/themes/spinfinity/throbber-12.png b/themes/spinfinity/throbber-12.png index da6ce584..2a443d01 100644 Binary files a/themes/spinfinity/throbber-12.png and b/themes/spinfinity/throbber-12.png differ diff --git a/themes/spinfinity/throbber-13.png b/themes/spinfinity/throbber-13.png index 58cd02f9..a1dffeaf 100644 Binary files a/themes/spinfinity/throbber-13.png and b/themes/spinfinity/throbber-13.png differ diff --git a/themes/spinfinity/throbber-14.png b/themes/spinfinity/throbber-14.png index b43aef1a..99fb2919 100644 Binary files a/themes/spinfinity/throbber-14.png and b/themes/spinfinity/throbber-14.png differ diff --git a/themes/spinfinity/throbber-15.png b/themes/spinfinity/throbber-15.png index 8eb06d8f..a4cb22ed 100644 Binary files a/themes/spinfinity/throbber-15.png and b/themes/spinfinity/throbber-15.png differ diff --git a/themes/spinfinity/throbber-16.png b/themes/spinfinity/throbber-16.png index 0689f510..b89d578d 100644 Binary files a/themes/spinfinity/throbber-16.png and b/themes/spinfinity/throbber-16.png differ diff --git a/themes/spinfinity/throbber-17.png b/themes/spinfinity/throbber-17.png index db78d6b6..876830f1 100644 Binary files a/themes/spinfinity/throbber-17.png and b/themes/spinfinity/throbber-17.png differ diff --git a/themes/spinfinity/throbber-18.png b/themes/spinfinity/throbber-18.png index 29967543..9f4adbdf 100644 Binary files a/themes/spinfinity/throbber-18.png and b/themes/spinfinity/throbber-18.png differ diff --git a/themes/spinfinity/throbber-19.png b/themes/spinfinity/throbber-19.png index 66b17fe0..ef8676e0 100644 Binary files a/themes/spinfinity/throbber-19.png and b/themes/spinfinity/throbber-19.png differ diff --git a/themes/spinfinity/throbber-20.png b/themes/spinfinity/throbber-20.png index 1af7efcf..60fca079 100644 Binary files a/themes/spinfinity/throbber-20.png and b/themes/spinfinity/throbber-20.png differ diff --git a/themes/spinfinity/throbber-21.png b/themes/spinfinity/throbber-21.png index 661c0a32..97511186 100644 Binary files a/themes/spinfinity/throbber-21.png and b/themes/spinfinity/throbber-21.png differ diff --git a/themes/spinfinity/throbber-22.png b/themes/spinfinity/throbber-22.png index fbd0379e..060bfe94 100644 Binary files a/themes/spinfinity/throbber-22.png and b/themes/spinfinity/throbber-22.png differ diff --git a/themes/spinfinity/throbber-23.png b/themes/spinfinity/throbber-23.png index 4fda936d..434e3dbe 100644 Binary files a/themes/spinfinity/throbber-23.png and b/themes/spinfinity/throbber-23.png differ diff --git a/themes/spinfinity/throbber-24.png b/themes/spinfinity/throbber-24.png index 8be2bc0a..2ed48aa3 100644 Binary files a/themes/spinfinity/throbber-24.png and b/themes/spinfinity/throbber-24.png differ diff --git a/themes/spinfinity/throbber-25.png b/themes/spinfinity/throbber-25.png index 2009b4bd..b68510b7 100644 Binary files a/themes/spinfinity/throbber-25.png and b/themes/spinfinity/throbber-25.png differ diff --git a/themes/spinfinity/throbber-26.png b/themes/spinfinity/throbber-26.png index 531a39d0..a5aac2fc 100644 Binary files a/themes/spinfinity/throbber-26.png and b/themes/spinfinity/throbber-26.png differ diff --git a/themes/spinfinity/throbber-27.png b/themes/spinfinity/throbber-27.png index 51a9b688..ad4a3142 100644 Binary files a/themes/spinfinity/throbber-27.png and b/themes/spinfinity/throbber-27.png differ diff --git a/themes/spinfinity/throbber-28.png b/themes/spinfinity/throbber-28.png index 1f598586..d907220f 100644 Binary files a/themes/spinfinity/throbber-28.png and b/themes/spinfinity/throbber-28.png differ diff --git a/themes/spinfinity/throbber-29.png b/themes/spinfinity/throbber-29.png index 10143567..9674a07d 100644 Binary files a/themes/spinfinity/throbber-29.png and b/themes/spinfinity/throbber-29.png differ diff --git a/themes/spinfinity/throbber-30.png b/themes/spinfinity/throbber-30.png index 652bdef4..c1a51ad0 100644 Binary files a/themes/spinfinity/throbber-30.png and b/themes/spinfinity/throbber-30.png differ diff --git a/themes/spinfinity/throbber-31.png b/themes/spinfinity/throbber-31.png index 6792bc8f..fdeca4ad 100644 Binary files a/themes/spinfinity/throbber-31.png and b/themes/spinfinity/throbber-31.png differ diff --git a/themes/spinfinity/throbber-32.png b/themes/spinfinity/throbber-32.png index 232c05bf..af026918 100644 Binary files a/themes/spinfinity/throbber-32.png and b/themes/spinfinity/throbber-32.png differ diff --git a/themes/spinfinity/throbber-33.png b/themes/spinfinity/throbber-33.png index b9836fef..b89d578d 100644 Binary files a/themes/spinfinity/throbber-33.png and b/themes/spinfinity/throbber-33.png differ