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 <hdegoede@redhat.com>

diff --git a/themes/spinfinity/Makefile.am b/themes/spinfinity/Makefile.am
index cc07f45b03c236b7d11e3e978b81f4896d7a8662..98fcfb87da10ba94f497899a9446323493e6e563 100644 (file)
--- 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 (file)
index 0000000..b89d578
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 d4a94690232ac5e96c1e8c7d37fa8a167b56bae1..55d1e711e4a7c6ed3470d27fc97934950307b782 100644 (file)
--- 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 5ca6441323f2e8ab85859db967228ed8b19dd8f7..678d3a3baf8a3bc1ece6d0218a855b5baf8651f8 100644 (file)
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 dac708bebbe0da5b65d8e325fdf2804102a27736..d08482dbf7cf7b3932e9532e281388acb3f2a5f0 100644 (file)
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 68aa2d219aea62b47f4dbd514afb032d2d0f0d03..ffd316cdd30f9a4c7a1296074fef1f98344c4995 100644 (file)
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 ec63a382466d8f156c499de44c9c97ee196c822f..3802ee8afd07c8c5da69599b93afe09a86857189 100644 (file)
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 876bf3736e3afc9273d029eaa23679ff32fea581..a913bfbb0b4d6f7e07f3539a433db1e9325bb9b7 100644 (file)
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 fa909b972bbb5c7fc6aa8aed9d107196748bafbb..4c3e72dbce07c1f11d2523d2a2e1296e593f87f4 100644 (file)
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 3d44635425a07334d841a22e215b2d2fb3d6971a..d8a70846649833b2c7f321e951c4e190c4e06641 100644 (file)
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 b932c68ba8187e005a7603a878f8aadab6d7751d..286a6266d2b9d8c945dd164b559444c34256699a 100644 (file)
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 920c8dbd88d36cabdadb095be88e4d61d8e79869..2a97e5e9f90ab6c6f553a3a9d090065b330fa90b 100644 (file)
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 b4526956bb4b67f31cff2548be1b2142b125694d..74795332a582bcf454af8411838caa43e0ebd44d 100644 (file)
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 99377a905b51f58d1bddac04ad39600dc8a91e0d..26ba138ed8f801251e53668f135d073a96c78c23 100644 (file)
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 3bd36a9e81cee3463ac006c6bf0fcc34d0f52d8e..54031e418c50eb8d870f6fcaff0d08a82e0be115 100644 (file)
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 da6ce5846f60e36ed8ef7e5596fcfeaaaea594bd..2a443d01d83863cf78529ef74c795f2d750cee22 100644 (file)
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 58cd02f9de9c1dda2092dfdb8334e82091a47ba3..a1dffeaf77bb2353b317f8770abb4bacf2078784 100644 (file)
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 b43aef1ac8f4913ef08b5a7a27141e1e5f16fd5c..99fb29191174b2e5afa704b1da0e2543f868c024 100644 (file)
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 8eb06d8f3368fe7288ce1eedc47a480ec7fc35bc..a4cb22ed88468bcf4587f6f8ce0149eb6392af9f 100644 (file)
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 0689f51051bc1229f8bc61ac552cf59ee41fbc6b..b89d578d1efa5dad7d9ff195e92cb481103daa5d 100644 (file)
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 db78d6b6a9f9550ac1bf9807d9819c2843e7a1f0..876830f10cb2eb13b29b5d86cafeedbea216adae 100644 (file)
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 2996754367de8ffaf0af4ddf8f295408f4f78550..9f4adbdf03fa00fc0770e16d0c5b98226568276a 100644 (file)
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 66b17fe033beae2bddb3c14c00077987fadddfba..ef8676e0b57c68abcbe6dd7a7e98fd8175f7e414 100644 (file)
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 1af7efcfa0a6ed215e1846abe0b3de4f1b0e5d33..60fca079ef1cf09a08bfc38182c3400e46df980e 100644 (file)
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 661c0a32a5de5a3ddf34d1357d1861710a38bbe5..97511186bf7dc6042b8fafb5bf0b7a01b68f8e2d 100644 (file)
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 fbd0379ec8499a96f94a179d0607411390996630..060bfe94b8b5c3346a9fbdc3254fe1a7a7b82ea6 100644 (file)
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 4fda936d84db97b653c8bb4c874f6e03776cf617..434e3dbe2f8728ae8100bcc0f572f34c84a1a8ec 100644 (file)
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 8be2bc0a56bbd8cda7fe07e1229bc993b637da1a..2ed48aa3ecc1653e44508ffe04e638811266808a 100644 (file)
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 2009b4bd46b2e8ab381a0a08a0e7edd5473e30ba..b68510b7a348274366c6f0db3752a7c3e1319b62 100644 (file)
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 531a39d0a1342495f273221b10cfbbaa9e757c40..a5aac2fca68c1ee99c60bb9d1259535805514ef0 100644 (file)
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 51a9b6881457fa45e714b17bc741d440e1920ada..ad4a3142306133e0e0e8d9c894d47f1b67c4db06 100644 (file)
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 1f5985869ffab2f8dcd39b931ed9d10cbfba21fb..d907220f195e6e706e2941a321da8fd5ac1bd825 100644 (file)
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 101435674d776e8627842702585c15cee89c6c05..9674a07da1c05ac86c398e2ae9db541aae251161 100644 (file)
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 652bdef469ff61bc3acc64cfb24691f3acc50a85..c1a51ad08173a6dd7b68128196bdf7e83e1ab9dd 100644 (file)
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 6792bc8f550611c1ecbb7a266e70f931cbd03481..fdeca4ad22aaafc714786b72ebec957865586f18 100644 (file)
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 232c05bf351c45c285740f730f972c8d5bb424e1..af0269182879f4968e9f5485e84fa5fffd10e4fd 100644 (file)
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 b9836fef85d465254901540b0b92701a440fa058..b89d578d1efa5dad7d9ff195e92cb481103daa5d 100644 (file)
Binary files a/themes/spinfinity/throbber-33.png and b/themes/spinfinity/throbber-33.png differ