From d48ecc172b633d81b71debfaca97199073d41ee7 Mon Sep 17 00:00:00 2001 From: Donald Stewart Date: Tue, 7 Jan 2014 14:22:22 +0000 Subject: add git support in makefile Ksplash 4.0 - add MGA4 artwork - add support for 2560x1920 --- Makefile | 3 ++ .../Themes/Default/1920x1440/background.png | Bin 3103539 -> 0 bytes .../ksplash/Themes/Default/1920x1440/bubble1.png | Bin 600 -> 0 bytes .../ksplash/Themes/Default/1920x1440/bubble2.png | Bin 592 -> 0 bytes .../ksplash/Themes/Default/1920x1440/bubble3.png | Bin 527 -> 0 bytes .../ksplash/Themes/Default/1920x1440/bubble4.png | Bin 494 -> 0 bytes .../ksplash/Themes/Default/1920x1440/bubble5.png | Bin 442 -> 0 bytes .../Themes/Default/1920x1440/description.txt | 49 --------------------- .../ksplash/Themes/Default/1920x1440/icon1.png | Bin 4748 -> 0 bytes .../Themes/Default/1920x1440/icon1_anim.png | Bin 172105 -> 0 bytes .../ksplash/Themes/Default/1920x1440/icon2.png | Bin 8531 -> 0 bytes .../Themes/Default/1920x1440/icon2_anim.png | Bin 246882 -> 0 bytes .../ksplash/Themes/Default/1920x1440/icon3.png | Bin 9428 -> 0 bytes .../Themes/Default/1920x1440/icon3_anim.png | Bin 293532 -> 0 bytes .../ksplash/Themes/Default/1920x1440/icon4.png | Bin 5468 -> 0 bytes .../Themes/Default/1920x1440/icon4_anim.png | Bin 232671 -> 0 bytes .../ksplash/Themes/Default/1920x1440/icon5.png | Bin 20953 -> 0 bytes .../Themes/Default/1920x1440/icon5_anim.png | Bin 589217 -> 0 bytes .../apps/ksplash/Themes/Default/1920x1440/logo.png | Bin 11545 -> 0 bytes .../Themes/Default/2560x1920/background.png | Bin 0 -> 1910289 bytes .../ksplash/Themes/Default/2560x1920/bubble1.png | Bin 0 -> 600 bytes .../ksplash/Themes/Default/2560x1920/bubble2.png | Bin 0 -> 592 bytes .../ksplash/Themes/Default/2560x1920/bubble3.png | Bin 0 -> 527 bytes .../ksplash/Themes/Default/2560x1920/bubble4.png | Bin 0 -> 494 bytes .../ksplash/Themes/Default/2560x1920/bubble5.png | Bin 0 -> 442 bytes .../Themes/Default/2560x1920/description.txt | 28 ++++++++++++ .../apps/ksplash/Themes/Default/2560x1920/logo.png | Bin 0 -> 11545 bytes .../share/apps/ksplash/Themes/Default/Preview.png | Bin 90638 -> 21537 bytes .../share/apps/ksplash/Themes/Default/Theme.rc | 2 +- 29 files changed, 32 insertions(+), 50 deletions(-) delete mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/background.png delete mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble1.png delete mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble2.png delete mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble3.png delete mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble4.png delete mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble5.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/description.txt delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1_anim.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2_anim.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3_anim.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4_anim.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5.png delete mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5_anim.png delete mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/logo.png create mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/background.png create mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble1.png create mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble2.png create mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble3.png create mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble4.png create mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble5.png create mode 100644 kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt create mode 100755 kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/logo.png diff --git a/Makefile b/Makefile index 23f7b7a..66865d5 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,6 @@ localdist: tar tar: localcopy tar cfa $(PACKAGE)-$(PKGVERSION).$(DATE).tar.xz $(PACKAGE)-$(PKGVERSION) rm -rf $(PACKAGE)-$(PKGVERSION) + +export: + git archive --prefix $(PACKAGE)-$(PKGVERSION)/ HEAD | xz -9 > $(PACKAGE)-$(PKGVERSION).$(DATE).tar.xz diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/background.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/background.png deleted file mode 100755 index 53525f9..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/background.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble1.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble1.png deleted file mode 100755 index 84c6888..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble1.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble2.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble2.png deleted file mode 100755 index 4a661ab..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble2.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble3.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble3.png deleted file mode 100755 index d34a20a..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble3.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble4.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble4.png deleted file mode 100755 index f93046d..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble4.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble5.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble5.png deleted file mode 100755 index 1549e65..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/bubble5.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/description.txt b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/description.txt deleted file mode 100644 index e5667f3..0000000 --- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/description.txt +++ /dev/null @@ -1,49 +0,0 @@ -# rev. 3.2 - -SCALE ON -BACKGROUND_IMAGE 0 0 background.png -SCALE OFF - -#logo is centered - -IMAGE_REL CC -100 130 CC logo.png - - -#ANIM_REL 1 CB -300 0 LB 30 icon1_anim.png 85 1 -#WAIT_STATE kded -IMAGE_REL CC -347 35 CC bubble1.png -WAIT_STATE kded - -#ANIM_REL 2 CB -215 0 LB 30 icon2_anim.png 85 1 -#WAIT_STATE kcminit -IMAGE_REL CC -347 35 CC bubble2.png -WAIT_STATE kcminit - -#ANIM_REL 3 CB -130 0 LB 30 icon3_anim.png 85 1 -#WAIT_STATE ksmserver -IMAGE_REL CC -347 35 CC bubble3.png -WAIT_STATE ksmserver - -#ANIM_REL 4 CB -45 0 LB 30 icon4_anim.png 85 1 -#WAIT_STATE wm -IMAGE_REL CC -347 35 CC bubble4.png -WAIT_STATE wm - -#ANIM_REL 5 CB 60 0 LB 30 icon5_anim.png 85 1 -#WAIT_STATE desktop -IMAGE_REL CC -347 35 CC bubble5.png -WAIT_STATE desktop - -WAIT_STATE ready - -# show the icons fully right before the splash goes away -#STOP_ANIM 1 -#IMAGE_REL CB -300 0 LB icon1.png -#STOP_ANIM 2 -#IMAGE_REL CB -215 0 LB icon2.png -#STOP_ANIM 3 -#IMAGE_REL CB -130 0 LB icon3.png -#STOP_ANIM 4 -#IMAGE_REL CB -45 0 LB icon4.png -#STOP_ANIM 5 -#IMAGE_REL CB 60 0 LB icon5.png diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1.png deleted file mode 100644 index 93daa84..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1_anim.png deleted file mode 100644 index 3b065f5..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon1_anim.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2.png deleted file mode 100644 index 2078ad1..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2_anim.png deleted file mode 100644 index 36f1afc..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon2_anim.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3.png deleted file mode 100644 index 48b2ffe..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3_anim.png deleted file mode 100644 index 28bb493..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon3_anim.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4.png deleted file mode 100644 index 15699e2..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4_anim.png deleted file mode 100644 index 9309db5..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon4_anim.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5.png deleted file mode 100644 index 4540cb3..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5_anim.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5_anim.png deleted file mode 100644 index de690c1..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/icon5_anim.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/logo.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/logo.png deleted file mode 100755 index dce2b6a..0000000 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/1920x1440/logo.png and /dev/null differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/background.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/background.png new file mode 100755 index 0000000..dec22f6 Binary files /dev/null and b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/background.png differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble1.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble1.png new file mode 100755 index 0000000..84c6888 Binary files /dev/null and b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble1.png differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble2.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble2.png new file mode 100755 index 0000000..4a661ab Binary files /dev/null and b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble2.png differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble3.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble3.png new file mode 100755 index 0000000..d34a20a Binary files /dev/null and b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble3.png differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble4.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble4.png new file mode 100755 index 0000000..f93046d Binary files /dev/null and b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble4.png differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble5.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble5.png new file mode 100755 index 0000000..1549e65 Binary files /dev/null and b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/bubble5.png differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt new file mode 100644 index 0000000..d07d896 --- /dev/null +++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt @@ -0,0 +1,28 @@ +# rev. 4.0 + +SCALE ON +BACKGROUND_IMAGE 0 0 background.png +SCALE OFF + +#logo is centered + +IMAGE_REL CC -300 130 CC logo.png + + + +IMAGE_REL CC -547 35 CC bubble1.png +WAIT_STATE kded + +IMAGE_REL CC -547 35 CC bubble2.png +WAIT_STATE kcminit + +IMAGE_REL CC -547 35 CC bubble3.png +WAIT_STATE ksmserver + +IMAGE_REL CC -547 35 CC bubble4.png +WAIT_STATE wm + +IMAGE_REL CC -547 35 CC bubble5.png +WAIT_STATE desktop + +WAIT_STATE ready diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/logo.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/logo.png new file mode 100755 index 0000000..dce2b6a Binary files /dev/null and b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/logo.png differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Preview.png b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Preview.png index b1104f9..b932b69 100755 Binary files a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Preview.png and b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Preview.png differ diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc index d2d6f9f..9e076a2 100644 --- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc +++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc @@ -1,7 +1,7 @@ [KSplash Theme: Default] Name = Mageia Splash Screen Description = Mageia Splash Screen using KSplashX -Version = 3.2 +Version = 4.0 Author = Mageia Atelier Team Homepage = http://www.mageia.org -- cgit v1.2.1 From e263e3f0e83c4ccac85a17524aee13c0d90ccb74 Mon Sep 17 00:00:00 2001 From: Donald Stewart Date: Sun, 12 Jan 2014 14:33:28 +0000 Subject: move ksplash animation --- .../apps/ksplash/Themes/Default/2560x1920/description.txt | 14 +++++++------- .../common/share/apps/ksplash/Themes/Default/Theme.rc | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt index d07d896..a00ad04 100644 --- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt +++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt @@ -1,4 +1,4 @@ -# rev. 4.0 +# rev. 4.1 SCALE ON BACKGROUND_IMAGE 0 0 background.png @@ -6,23 +6,23 @@ SCALE OFF #logo is centered -IMAGE_REL CC -300 130 CC logo.png +IMAGE_REL CC -400 130 CC logo.png -IMAGE_REL CC -547 35 CC bubble1.png +IMAGE_REL CC -647 35 CC bubble1.png WAIT_STATE kded -IMAGE_REL CC -547 35 CC bubble2.png +IMAGE_REL CC -647 35 CC bubble2.png WAIT_STATE kcminit -IMAGE_REL CC -547 35 CC bubble3.png +IMAGE_REL CC -647 35 CC bubble3.png WAIT_STATE ksmserver -IMAGE_REL CC -547 35 CC bubble4.png +IMAGE_REL CC -647 35 CC bubble4.png WAIT_STATE wm -IMAGE_REL CC -547 35 CC bubble5.png +IMAGE_REL CC -647 35 CC bubble5.png WAIT_STATE desktop WAIT_STATE ready diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc index 9e076a2..fd9ab88 100644 --- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc +++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/Theme.rc @@ -1,7 +1,7 @@ [KSplash Theme: Default] Name = Mageia Splash Screen Description = Mageia Splash Screen using KSplashX -Version = 4.0 +Version = 4.1 Author = Mageia Atelier Team Homepage = http://www.mageia.org -- cgit v1.2.1 From ef8ea523d51e279224e4916fdc1379135df51ba8 Mon Sep 17 00:00:00 2001 From: Donald Stewart Date: Sun, 19 Jan 2014 19:24:31 +0000 Subject: ksplash 4.2 - fix animation display on small screens --- .../apps/ksplash/Themes/Default/2560x1920/description.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt index a00ad04..2d72e3f 100644 --- a/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt +++ b/kde4-profiles/common/share/apps/ksplash/Themes/Default/2560x1920/description.txt @@ -1,4 +1,4 @@ -# rev. 4.1 +# rev. 4.2 SCALE ON BACKGROUND_IMAGE 0 0 background.png @@ -6,23 +6,23 @@ SCALE OFF #logo is centered -IMAGE_REL CC -400 130 CC logo.png +IMAGE_REL CC -100 10 CC logo.png -IMAGE_REL CC -647 35 CC bubble1.png +IMAGE_REL CC -347 -85 CC bubble1.png WAIT_STATE kded -IMAGE_REL CC -647 35 CC bubble2.png +IMAGE_REL CC -347 -85 CC bubble2.png WAIT_STATE kcminit -IMAGE_REL CC -647 35 CC bubble3.png +IMAGE_REL CC -347 -85 CC bubble3.png WAIT_STATE ksmserver -IMAGE_REL CC -647 35 CC bubble4.png +IMAGE_REL CC -347 -85 CC bubble4.png WAIT_STATE wm -IMAGE_REL CC -647 35 CC bubble5.png +IMAGE_REL CC -347 -85 CC bubble5.png WAIT_STATE desktop WAIT_STATE ready -- cgit v1.2.1