From 9647a3930a808963e22ce721aadeab5ae0edeb97 Mon Sep 17 00:00:00 2001 From: Donald Stewart Date: Sat, 4 May 2019 23:11:39 +0100 Subject: 7.0 - New artwork for MGA7 - Backgrounds: support for 3440x1440 added - mga-bg-res: support added for ultrawide - Extra-Backgrounds: MGA6 Background added --- .../background/Mageia-Default-1024x600.png | Bin 92367 -> 220708 bytes .../background/Mageia-Default-1280x1024.png | Bin 135306 -> 418057 bytes .../background/Mageia-Default-1280x768.png | Bin 127176 -> 308143 bytes .../background/Mageia-Default-1600x1200.png | Bin 178033 -> 533202 bytes .../background/Mageia-Default-1920x1200.png | Bin 224953 -> 566621 bytes .../background/Mageia-Default-3440x1440.png | Bin 0 -> 820067 bytes .../background/Mageia-Default-3840x2160.png | Bin 557705 -> 1260056 bytes Mageia-Default/gfxboot/back.jpg | Bin 32287 -> 42019 bytes Mageia-Default/gfxboot/welcome.jpg | Bin 20954 -> 42019 bytes Makefile | 4 ++-- common/screensaver/Screensaver-01.jpg | Bin 478619 -> 641810 bytes common/screensaver/Screensaver-02.jpg | Bin 417536 -> 416840 bytes common/screensaver/Screensaver-03.jpg | Bin 799545 -> 283634 bytes common/screensaver/Screensaver-04.jpg | Bin 483200 -> 365938 bytes common/screensaver/Screensaver-05.jpg | Bin 423301 -> 398063 bytes common/screensaver/Screensaver-06.jpg | Bin 495883 -> 277696 bytes common/screensaver/Screensaver-07.jpg | Bin 316374 -> 413216 bytes common/screensaver/Screensaver-08.jpg | Bin 442174 -> 181227 bytes common/screensaver/Screensaver-09.jpg | Bin 266236 -> 230972 bytes common/screensaver/Screensaver-10.jpg | Bin 423914 -> 481428 bytes common/screensaver/Screensaver-11.jpg | Bin 396991 -> 550912 bytes common/screensaver/Screensaver-12.jpg | Bin 357771 -> 354477 bytes common/screensaver/Screensaver-13.jpg | Bin 459246 -> 524605 bytes common/screensaver/Screensaver-14.jpg | Bin 397286 -> 482012 bytes common/screensaver/Screensaver-15.jpg | Bin 484015 -> 494657 bytes common/screensaver/Screensaver-16.jpg | Bin 287928 -> 396936 bytes common/screensaver/Screensaver-17.jpg | Bin 0 -> 713763 bytes common/screensaver/Screensaver-18.jpg | Bin 0 -> 672288 bytes common/screensaver/Screensaver-19.jpg | Bin 0 -> 356298 bytes common/screensaver/Screensaver-20.jpg | Bin 0 -> 649075 bytes common/screensaver/Screensaver-21.jpg | Bin 0 -> 463125 bytes common/screensaver/Screensaver-22.jpg | Bin 0 -> 477609 bytes common/screensaver/Screensaver-23.jpg | Bin 0 -> 164540 bytes common/screensaver/Screensaver-24.jpg | Bin 0 -> 196004 bytes common/screensaver/Screensaver-25.jpg | Bin 0 -> 142400 bytes common/screensaver/Screensaver-26.jpg | Bin 0 -> 325956 bytes extra-backgrounds/Extra-Background-01.jpg | Bin 122496 -> 280894 bytes extra-backgrounds/Extra-Background-02.jpg | Bin 124971 -> 230882 bytes extra-backgrounds/Extra-Background-03.jpg | Bin 122258 -> 249515 bytes extra-backgrounds/Extra-Background-04.jpg | Bin 679926 -> 215852 bytes extra-backgrounds/Extra-Background-05.jpg | Bin 287435 -> 240200 bytes extra-backgrounds/Extra-Background-06.jpg | Bin 116882 -> 272145 bytes extra-backgrounds/Extra-Background-07.jpg | Bin 141650 -> 263939 bytes extra-backgrounds/Extra-Background-08.jpg | Bin 155512 -> 267550 bytes extra-backgrounds/Extra-Background-09.jpg | Bin 125336 -> 268809 bytes extra-backgrounds/Extra-Background-10.jpg | Bin 0 -> 272458 bytes extra-backgrounds/Mageia-Default-6.jpg | Bin 0 -> 190421 bytes mga-bg-res/NEWS | 4 ++++ mga-bg-res/mga-bg-res.sh | 2 +- 49 files changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 Mageia-Default/background/Mageia-Default-1024x600.png mode change 100644 => 100755 Mageia-Default/background/Mageia-Default-1280x1024.png mode change 100644 => 100755 Mageia-Default/background/Mageia-Default-1280x768.png mode change 100644 => 100755 Mageia-Default/background/Mageia-Default-1600x1200.png mode change 100644 => 100755 Mageia-Default/background/Mageia-Default-1920x1200.png create mode 100755 Mageia-Default/background/Mageia-Default-3440x1440.png mode change 100644 => 100755 Mageia-Default/background/Mageia-Default-3840x2160.png mode change 100644 => 100755 Mageia-Default/gfxboot/back.jpg mode change 100644 => 100755 Mageia-Default/gfxboot/welcome.jpg mode change 100644 => 100755 common/screensaver/Screensaver-01.jpg mode change 100644 => 100755 common/screensaver/Screensaver-02.jpg mode change 100644 => 100755 common/screensaver/Screensaver-03.jpg mode change 100644 => 100755 common/screensaver/Screensaver-04.jpg mode change 100644 => 100755 common/screensaver/Screensaver-05.jpg mode change 100644 => 100755 common/screensaver/Screensaver-06.jpg mode change 100644 => 100755 common/screensaver/Screensaver-07.jpg mode change 100644 => 100755 common/screensaver/Screensaver-08.jpg mode change 100644 => 100755 common/screensaver/Screensaver-09.jpg mode change 100644 => 100755 common/screensaver/Screensaver-10.jpg mode change 100644 => 100755 common/screensaver/Screensaver-11.jpg mode change 100644 => 100755 common/screensaver/Screensaver-12.jpg mode change 100644 => 100755 common/screensaver/Screensaver-13.jpg mode change 100644 => 100755 common/screensaver/Screensaver-14.jpg mode change 100644 => 100755 common/screensaver/Screensaver-15.jpg mode change 100644 => 100755 common/screensaver/Screensaver-16.jpg create mode 100755 common/screensaver/Screensaver-17.jpg create mode 100755 common/screensaver/Screensaver-18.jpg create mode 100755 common/screensaver/Screensaver-19.jpg create mode 100755 common/screensaver/Screensaver-20.jpg create mode 100755 common/screensaver/Screensaver-21.jpg create mode 100755 common/screensaver/Screensaver-22.jpg create mode 100755 common/screensaver/Screensaver-23.jpg create mode 100755 common/screensaver/Screensaver-24.jpg create mode 100755 common/screensaver/Screensaver-25.jpg create mode 100755 common/screensaver/Screensaver-26.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-01.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-02.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-03.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-04.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-05.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-06.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-07.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-08.jpg mode change 100644 => 100755 extra-backgrounds/Extra-Background-09.jpg create mode 100755 extra-backgrounds/Extra-Background-10.jpg create mode 100644 extra-backgrounds/Mageia-Default-6.jpg diff --git a/Mageia-Default/background/Mageia-Default-1024x600.png b/Mageia-Default/background/Mageia-Default-1024x600.png old mode 100644 new mode 100755 index 8e087e8..2681c59 Binary files a/Mageia-Default/background/Mageia-Default-1024x600.png and b/Mageia-Default/background/Mageia-Default-1024x600.png differ diff --git a/Mageia-Default/background/Mageia-Default-1280x1024.png b/Mageia-Default/background/Mageia-Default-1280x1024.png old mode 100644 new mode 100755 index 23701c8..56551b6 Binary files a/Mageia-Default/background/Mageia-Default-1280x1024.png and b/Mageia-Default/background/Mageia-Default-1280x1024.png differ diff --git a/Mageia-Default/background/Mageia-Default-1280x768.png b/Mageia-Default/background/Mageia-Default-1280x768.png old mode 100644 new mode 100755 index 256c750..8057c63 Binary files a/Mageia-Default/background/Mageia-Default-1280x768.png and b/Mageia-Default/background/Mageia-Default-1280x768.png differ diff --git a/Mageia-Default/background/Mageia-Default-1600x1200.png b/Mageia-Default/background/Mageia-Default-1600x1200.png old mode 100644 new mode 100755 index df9c862..9bb86f4 Binary files a/Mageia-Default/background/Mageia-Default-1600x1200.png and b/Mageia-Default/background/Mageia-Default-1600x1200.png differ diff --git a/Mageia-Default/background/Mageia-Default-1920x1200.png b/Mageia-Default/background/Mageia-Default-1920x1200.png old mode 100644 new mode 100755 index 55ca2b5..b79cc96 Binary files a/Mageia-Default/background/Mageia-Default-1920x1200.png and b/Mageia-Default/background/Mageia-Default-1920x1200.png differ diff --git a/Mageia-Default/background/Mageia-Default-3440x1440.png b/Mageia-Default/background/Mageia-Default-3440x1440.png new file mode 100755 index 0000000..39448c7 Binary files /dev/null and b/Mageia-Default/background/Mageia-Default-3440x1440.png differ diff --git a/Mageia-Default/background/Mageia-Default-3840x2160.png b/Mageia-Default/background/Mageia-Default-3840x2160.png old mode 100644 new mode 100755 index 524af7c..427129d Binary files a/Mageia-Default/background/Mageia-Default-3840x2160.png and b/Mageia-Default/background/Mageia-Default-3840x2160.png differ diff --git a/Mageia-Default/gfxboot/back.jpg b/Mageia-Default/gfxboot/back.jpg old mode 100644 new mode 100755 index 80d0007..58f12d3 Binary files a/Mageia-Default/gfxboot/back.jpg and b/Mageia-Default/gfxboot/back.jpg differ diff --git a/Mageia-Default/gfxboot/welcome.jpg b/Mageia-Default/gfxboot/welcome.jpg old mode 100644 new mode 100755 index 05b847c..58f12d3 Binary files a/Mageia-Default/gfxboot/welcome.jpg and b/Mageia-Default/gfxboot/welcome.jpg differ diff --git a/Makefile b/Makefile index c02a120..cdd8507 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ NAME=theme # Bump RELEASE for new Mageia release # Bump THEMEVER for new theme version in same release -RELEASE=6 -THEMEVER=5 +RELEASE=7 +THEMEVER=0 VERSION=$(RELEASE).$(THEMEVER) THEMES=Mageia-Default diff --git a/common/screensaver/Screensaver-01.jpg b/common/screensaver/Screensaver-01.jpg old mode 100644 new mode 100755 index e5779bb..3e6f212 Binary files a/common/screensaver/Screensaver-01.jpg and b/common/screensaver/Screensaver-01.jpg differ diff --git a/common/screensaver/Screensaver-02.jpg b/common/screensaver/Screensaver-02.jpg old mode 100644 new mode 100755 index ada3df6..f447a10 Binary files a/common/screensaver/Screensaver-02.jpg and b/common/screensaver/Screensaver-02.jpg differ diff --git a/common/screensaver/Screensaver-03.jpg b/common/screensaver/Screensaver-03.jpg old mode 100644 new mode 100755 index da10151..4e7548e Binary files a/common/screensaver/Screensaver-03.jpg and b/common/screensaver/Screensaver-03.jpg differ diff --git a/common/screensaver/Screensaver-04.jpg b/common/screensaver/Screensaver-04.jpg old mode 100644 new mode 100755 index d65a590..7ea9e6f Binary files a/common/screensaver/Screensaver-04.jpg and b/common/screensaver/Screensaver-04.jpg differ diff --git a/common/screensaver/Screensaver-05.jpg b/common/screensaver/Screensaver-05.jpg old mode 100644 new mode 100755 index e27d9f8..ae4ec4d Binary files a/common/screensaver/Screensaver-05.jpg and b/common/screensaver/Screensaver-05.jpg differ diff --git a/common/screensaver/Screensaver-06.jpg b/common/screensaver/Screensaver-06.jpg old mode 100644 new mode 100755 index 18d5a9a..2742f65 Binary files a/common/screensaver/Screensaver-06.jpg and b/common/screensaver/Screensaver-06.jpg differ diff --git a/common/screensaver/Screensaver-07.jpg b/common/screensaver/Screensaver-07.jpg old mode 100644 new mode 100755 index ded6904..a878ac2 Binary files a/common/screensaver/Screensaver-07.jpg and b/common/screensaver/Screensaver-07.jpg differ diff --git a/common/screensaver/Screensaver-08.jpg b/common/screensaver/Screensaver-08.jpg old mode 100644 new mode 100755 index 0d5cd72..fe21648 Binary files a/common/screensaver/Screensaver-08.jpg and b/common/screensaver/Screensaver-08.jpg differ diff --git a/common/screensaver/Screensaver-09.jpg b/common/screensaver/Screensaver-09.jpg old mode 100644 new mode 100755 index 3d869c1..653e43e Binary files a/common/screensaver/Screensaver-09.jpg and b/common/screensaver/Screensaver-09.jpg differ diff --git a/common/screensaver/Screensaver-10.jpg b/common/screensaver/Screensaver-10.jpg old mode 100644 new mode 100755 index 82d59c2..9fc46a7 Binary files a/common/screensaver/Screensaver-10.jpg and b/common/screensaver/Screensaver-10.jpg differ diff --git a/common/screensaver/Screensaver-11.jpg b/common/screensaver/Screensaver-11.jpg old mode 100644 new mode 100755 index b466f3d..2ca369d Binary files a/common/screensaver/Screensaver-11.jpg and b/common/screensaver/Screensaver-11.jpg differ diff --git a/common/screensaver/Screensaver-12.jpg b/common/screensaver/Screensaver-12.jpg old mode 100644 new mode 100755 index e8dd358..f35f99f Binary files a/common/screensaver/Screensaver-12.jpg and b/common/screensaver/Screensaver-12.jpg differ diff --git a/common/screensaver/Screensaver-13.jpg b/common/screensaver/Screensaver-13.jpg old mode 100644 new mode 100755 index 439a435..c7a635c Binary files a/common/screensaver/Screensaver-13.jpg and b/common/screensaver/Screensaver-13.jpg differ diff --git a/common/screensaver/Screensaver-14.jpg b/common/screensaver/Screensaver-14.jpg old mode 100644 new mode 100755 index 38c3c65..67b62d7 Binary files a/common/screensaver/Screensaver-14.jpg and b/common/screensaver/Screensaver-14.jpg differ diff --git a/common/screensaver/Screensaver-15.jpg b/common/screensaver/Screensaver-15.jpg old mode 100644 new mode 100755 index a052ef3..7908da0 Binary files a/common/screensaver/Screensaver-15.jpg and b/common/screensaver/Screensaver-15.jpg differ diff --git a/common/screensaver/Screensaver-16.jpg b/common/screensaver/Screensaver-16.jpg old mode 100644 new mode 100755 index 0d10ccd..137b623 Binary files a/common/screensaver/Screensaver-16.jpg and b/common/screensaver/Screensaver-16.jpg differ diff --git a/common/screensaver/Screensaver-17.jpg b/common/screensaver/Screensaver-17.jpg new file mode 100755 index 0000000..b0c185e Binary files /dev/null and b/common/screensaver/Screensaver-17.jpg differ diff --git a/common/screensaver/Screensaver-18.jpg b/common/screensaver/Screensaver-18.jpg new file mode 100755 index 0000000..e5b696d Binary files /dev/null and b/common/screensaver/Screensaver-18.jpg differ diff --git a/common/screensaver/Screensaver-19.jpg b/common/screensaver/Screensaver-19.jpg new file mode 100755 index 0000000..c67ef47 Binary files /dev/null and b/common/screensaver/Screensaver-19.jpg differ diff --git a/common/screensaver/Screensaver-20.jpg b/common/screensaver/Screensaver-20.jpg new file mode 100755 index 0000000..256bc34 Binary files /dev/null and b/common/screensaver/Screensaver-20.jpg differ diff --git a/common/screensaver/Screensaver-21.jpg b/common/screensaver/Screensaver-21.jpg new file mode 100755 index 0000000..ea2885d Binary files /dev/null and b/common/screensaver/Screensaver-21.jpg differ diff --git a/common/screensaver/Screensaver-22.jpg b/common/screensaver/Screensaver-22.jpg new file mode 100755 index 0000000..58fa3ae Binary files /dev/null and b/common/screensaver/Screensaver-22.jpg differ diff --git a/common/screensaver/Screensaver-23.jpg b/common/screensaver/Screensaver-23.jpg new file mode 100755 index 0000000..266e420 Binary files /dev/null and b/common/screensaver/Screensaver-23.jpg differ diff --git a/common/screensaver/Screensaver-24.jpg b/common/screensaver/Screensaver-24.jpg new file mode 100755 index 0000000..b7441a2 Binary files /dev/null and b/common/screensaver/Screensaver-24.jpg differ diff --git a/common/screensaver/Screensaver-25.jpg b/common/screensaver/Screensaver-25.jpg new file mode 100755 index 0000000..a8ed4cd Binary files /dev/null and b/common/screensaver/Screensaver-25.jpg differ diff --git a/common/screensaver/Screensaver-26.jpg b/common/screensaver/Screensaver-26.jpg new file mode 100755 index 0000000..67dcc76 Binary files /dev/null and b/common/screensaver/Screensaver-26.jpg differ diff --git a/extra-backgrounds/Extra-Background-01.jpg b/extra-backgrounds/Extra-Background-01.jpg old mode 100644 new mode 100755 index 02f1052..9a05574 Binary files a/extra-backgrounds/Extra-Background-01.jpg and b/extra-backgrounds/Extra-Background-01.jpg differ diff --git a/extra-backgrounds/Extra-Background-02.jpg b/extra-backgrounds/Extra-Background-02.jpg old mode 100644 new mode 100755 index c145154..c6d660e Binary files a/extra-backgrounds/Extra-Background-02.jpg and b/extra-backgrounds/Extra-Background-02.jpg differ diff --git a/extra-backgrounds/Extra-Background-03.jpg b/extra-backgrounds/Extra-Background-03.jpg old mode 100644 new mode 100755 index 67124c4..2783695 Binary files a/extra-backgrounds/Extra-Background-03.jpg and b/extra-backgrounds/Extra-Background-03.jpg differ diff --git a/extra-backgrounds/Extra-Background-04.jpg b/extra-backgrounds/Extra-Background-04.jpg old mode 100644 new mode 100755 index f9846d9..424a574 Binary files a/extra-backgrounds/Extra-Background-04.jpg and b/extra-backgrounds/Extra-Background-04.jpg differ diff --git a/extra-backgrounds/Extra-Background-05.jpg b/extra-backgrounds/Extra-Background-05.jpg old mode 100644 new mode 100755 index a1c16ba..db592c4 Binary files a/extra-backgrounds/Extra-Background-05.jpg and b/extra-backgrounds/Extra-Background-05.jpg differ diff --git a/extra-backgrounds/Extra-Background-06.jpg b/extra-backgrounds/Extra-Background-06.jpg old mode 100644 new mode 100755 index 8a699cc..e3d444a Binary files a/extra-backgrounds/Extra-Background-06.jpg and b/extra-backgrounds/Extra-Background-06.jpg differ diff --git a/extra-backgrounds/Extra-Background-07.jpg b/extra-backgrounds/Extra-Background-07.jpg old mode 100644 new mode 100755 index 35467e0..3846d56 Binary files a/extra-backgrounds/Extra-Background-07.jpg and b/extra-backgrounds/Extra-Background-07.jpg differ diff --git a/extra-backgrounds/Extra-Background-08.jpg b/extra-backgrounds/Extra-Background-08.jpg old mode 100644 new mode 100755 index 251c0bf..f296a4d Binary files a/extra-backgrounds/Extra-Background-08.jpg and b/extra-backgrounds/Extra-Background-08.jpg differ diff --git a/extra-backgrounds/Extra-Background-09.jpg b/extra-backgrounds/Extra-Background-09.jpg old mode 100644 new mode 100755 index aa76dbc..6fcd3ef Binary files a/extra-backgrounds/Extra-Background-09.jpg and b/extra-backgrounds/Extra-Background-09.jpg differ diff --git a/extra-backgrounds/Extra-Background-10.jpg b/extra-backgrounds/Extra-Background-10.jpg new file mode 100755 index 0000000..e409219 Binary files /dev/null and b/extra-backgrounds/Extra-Background-10.jpg differ diff --git a/extra-backgrounds/Mageia-Default-6.jpg b/extra-backgrounds/Mageia-Default-6.jpg new file mode 100644 index 0000000..7e82a5e Binary files /dev/null and b/extra-backgrounds/Mageia-Default-6.jpg differ diff --git a/mga-bg-res/NEWS b/mga-bg-res/NEWS index a815ce6..d875e1e 100644 --- a/mga-bg-res/NEWS +++ b/mga-bg-res/NEWS @@ -1,4 +1,8 @@ git version (follows mageia-theme versioning and releases): +Version 7.0 +- Add support for 3400x1440 ultrawide + +Version 6.5 - Merge versioning back into that of mageia-theme - Fix 16:9 reference resolution for Mageia 6 artwork (3840x2160) - Use monitor-edid directly instead of monitor-probe, as the latter falls diff --git a/mga-bg-res/mga-bg-res.sh b/mga-bg-res/mga-bg-res.sh index 888db1a..74a6371 100755 --- a/mga-bg-res/mga-bg-res.sh +++ b/mga-bg-res/mga-bg-res.sh @@ -29,7 +29,7 @@ if [ ! -e "$bgpath/$theme-$res.png" ]; then # Bash only does integer arithmetic, we multiply everything by 1000 to workaround this ratio=$((1000*$width/$height)) declare -A refRatios=( ["1250"]="1280x1024" ["1333"]="1600x1200" ["1600"]="1920x1200" - ["1667"]="1280x768" ["1707"]="1024x600" ["1778"]="3840x2160" ) + ["1667"]="1280x768" ["1707"]="1024x600" ["1778"]="3840x2160" ["2389"]="3440x1440" ) for key in "${!refRatios[@]}"; do if [ $(($ratio % $key)) -lt 25 -o $(($key % $ratio)) -lt 25 ]; then res=${refRatios[$key]} -- cgit v1.2.1