summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stewart <schultz@mageia.org>2019-05-04 23:11:39 +0100
committerDonald Stewart <schultz@mageia.org>2019-05-04 23:11:39 +0100
commit9647a3930a808963e22ce721aadeab5ae0edeb97 (patch)
treeee3fa6ca3c6598ad40d502358600f06395b9aa90
parent2579bb9c60706352fa9a655b41946ddc3b656e0a (diff)
downloadtheme-9647a3930a808963e22ce721aadeab5ae0edeb97.tar
theme-9647a3930a808963e22ce721aadeab5ae0edeb97.tar.gz
theme-9647a3930a808963e22ce721aadeab5ae0edeb97.tar.bz2
theme-9647a3930a808963e22ce721aadeab5ae0edeb97.tar.xz
theme-9647a3930a808963e22ce721aadeab5ae0edeb97.zip
7.0
- New artwork for MGA7 - Backgrounds: support for 3440x1440 added - mga-bg-res: support added for ultrawide - Extra-Backgrounds: MGA6 Background added
-rwxr-xr-x[-rw-r--r--]Mageia-Default/background/Mageia-Default-1024x600.pngbin92367 -> 220708 bytes
-rwxr-xr-x[-rw-r--r--]Mageia-Default/background/Mageia-Default-1280x1024.pngbin135306 -> 418057 bytes
-rwxr-xr-x[-rw-r--r--]Mageia-Default/background/Mageia-Default-1280x768.pngbin127176 -> 308143 bytes
-rwxr-xr-x[-rw-r--r--]Mageia-Default/background/Mageia-Default-1600x1200.pngbin178033 -> 533202 bytes
-rwxr-xr-x[-rw-r--r--]Mageia-Default/background/Mageia-Default-1920x1200.pngbin224953 -> 566621 bytes
-rwxr-xr-xMageia-Default/background/Mageia-Default-3440x1440.pngbin0 -> 820067 bytes
-rwxr-xr-x[-rw-r--r--]Mageia-Default/background/Mageia-Default-3840x2160.pngbin557705 -> 1260056 bytes
-rwxr-xr-x[-rw-r--r--]Mageia-Default/gfxboot/back.jpgbin32287 -> 42019 bytes
-rwxr-xr-x[-rw-r--r--]Mageia-Default/gfxboot/welcome.jpgbin20954 -> 42019 bytes
-rw-r--r--Makefile4
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-01.jpgbin478619 -> 641810 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-02.jpgbin417536 -> 416840 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-03.jpgbin799545 -> 283634 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-04.jpgbin483200 -> 365938 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-05.jpgbin423301 -> 398063 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-06.jpgbin495883 -> 277696 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-07.jpgbin316374 -> 413216 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-08.jpgbin442174 -> 181227 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-09.jpgbin266236 -> 230972 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-10.jpgbin423914 -> 481428 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-11.jpgbin396991 -> 550912 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-12.jpgbin357771 -> 354477 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-13.jpgbin459246 -> 524605 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-14.jpgbin397286 -> 482012 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-15.jpgbin484015 -> 494657 bytes
-rwxr-xr-x[-rw-r--r--]common/screensaver/Screensaver-16.jpgbin287928 -> 396936 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-17.jpgbin0 -> 713763 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-18.jpgbin0 -> 672288 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-19.jpgbin0 -> 356298 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-20.jpgbin0 -> 649075 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-21.jpgbin0 -> 463125 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-22.jpgbin0 -> 477609 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-23.jpgbin0 -> 164540 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-24.jpgbin0 -> 196004 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-25.jpgbin0 -> 142400 bytes
-rwxr-xr-xcommon/screensaver/Screensaver-26.jpgbin0 -> 325956 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-01.jpgbin122496 -> 280894 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-02.jpgbin124971 -> 230882 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-03.jpgbin122258 -> 249515 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-04.jpgbin679926 -> 215852 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-05.jpgbin287435 -> 240200 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-06.jpgbin116882 -> 272145 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-07.jpgbin141650 -> 263939 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-08.jpgbin155512 -> 267550 bytes
-rwxr-xr-x[-rw-r--r--]extra-backgrounds/Extra-Background-09.jpgbin125336 -> 268809 bytes
-rwxr-xr-xextra-backgrounds/Extra-Background-10.jpgbin0 -> 272458 bytes
-rw-r--r--extra-backgrounds/Mageia-Default-6.jpgbin0 -> 190421 bytes
-rw-r--r--mga-bg-res/NEWS4
-rwxr-xr-xmga-bg-res/mga-bg-res.sh2
49 files changed, 7 insertions, 3 deletions
diff --git a/Mageia-Default/background/Mageia-Default-1024x600.png b/Mageia-Default/background/Mageia-Default-1024x600.png
index 8e087e8..2681c59 100644..100755
--- a/Mageia-Default/background/Mageia-Default-1024x600.png
+++ b/Mageia-Default/background/Mageia-Default-1024x600.png
Binary files differ
diff --git a/Mageia-Default/background/Mageia-Default-1280x1024.png b/Mageia-Default/background/Mageia-Default-1280x1024.png
index 23701c8..56551b6 100644..100755
--- a/Mageia-Default/background/Mageia-Default-1280x1024.png
+++ b/Mageia-Default/background/Mageia-Default-1280x1024.png
Binary files differ
diff --git a/Mageia-Default/background/Mageia-Default-1280x768.png b/Mageia-Default/background/Mageia-Default-1280x768.png
index 256c750..8057c63 100644..100755
--- a/Mageia-Default/background/Mageia-Default-1280x768.png
+++ b/Mageia-Default/background/Mageia-Default-1280x768.png
Binary files differ
diff --git a/Mageia-Default/background/Mageia-Default-1600x1200.png b/Mageia-Default/background/Mageia-Default-1600x1200.png
index df9c862..9bb86f4 100644..100755
--- a/Mageia-Default/background/Mageia-Default-1600x1200.png
+++ b/Mageia-Default/background/Mageia-Default-1600x1200.png
Binary files differ
diff --git a/Mageia-Default/background/Mageia-Default-1920x1200.png b/Mageia-Default/background/Mageia-Default-1920x1200.png
index 55ca2b5..b79cc96 100644..100755
--- a/Mageia-Default/background/Mageia-Default-1920x1200.png
+++ b/Mageia-Default/background/Mageia-Default-1920x1200.png
Binary files 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
--- /dev/null
+++ b/Mageia-Default/background/Mageia-Default-3440x1440.png
Binary files differ
diff --git a/Mageia-Default/background/Mageia-Default-3840x2160.png b/Mageia-Default/background/Mageia-Default-3840x2160.png
index 524af7c..427129d 100644..100755
--- a/Mageia-Default/background/Mageia-Default-3840x2160.png
+++ b/Mageia-Default/background/Mageia-Default-3840x2160.png
Binary files differ
diff --git a/Mageia-Default/gfxboot/back.jpg b/Mageia-Default/gfxboot/back.jpg
index 80d0007..58f12d3 100644..100755
--- a/Mageia-Default/gfxboot/back.jpg
+++ b/Mageia-Default/gfxboot/back.jpg
Binary files differ
diff --git a/Mageia-Default/gfxboot/welcome.jpg b/Mageia-Default/gfxboot/welcome.jpg
index 05b847c..58f12d3 100644..100755
--- a/Mageia-Default/gfxboot/welcome.jpg
+++ b/Mageia-Default/gfxboot/welcome.jpg
Binary files 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
index e5779bb..3e6f212 100644..100755
--- a/common/screensaver/Screensaver-01.jpg
+++ b/common/screensaver/Screensaver-01.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-02.jpg b/common/screensaver/Screensaver-02.jpg
index ada3df6..f447a10 100644..100755
--- a/common/screensaver/Screensaver-02.jpg
+++ b/common/screensaver/Screensaver-02.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-03.jpg b/common/screensaver/Screensaver-03.jpg
index da10151..4e7548e 100644..100755
--- a/common/screensaver/Screensaver-03.jpg
+++ b/common/screensaver/Screensaver-03.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-04.jpg b/common/screensaver/Screensaver-04.jpg
index d65a590..7ea9e6f 100644..100755
--- a/common/screensaver/Screensaver-04.jpg
+++ b/common/screensaver/Screensaver-04.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-05.jpg b/common/screensaver/Screensaver-05.jpg
index e27d9f8..ae4ec4d 100644..100755
--- a/common/screensaver/Screensaver-05.jpg
+++ b/common/screensaver/Screensaver-05.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-06.jpg b/common/screensaver/Screensaver-06.jpg
index 18d5a9a..2742f65 100644..100755
--- a/common/screensaver/Screensaver-06.jpg
+++ b/common/screensaver/Screensaver-06.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-07.jpg b/common/screensaver/Screensaver-07.jpg
index ded6904..a878ac2 100644..100755
--- a/common/screensaver/Screensaver-07.jpg
+++ b/common/screensaver/Screensaver-07.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-08.jpg b/common/screensaver/Screensaver-08.jpg
index 0d5cd72..fe21648 100644..100755
--- a/common/screensaver/Screensaver-08.jpg
+++ b/common/screensaver/Screensaver-08.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-09.jpg b/common/screensaver/Screensaver-09.jpg
index 3d869c1..653e43e 100644..100755
--- a/common/screensaver/Screensaver-09.jpg
+++ b/common/screensaver/Screensaver-09.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-10.jpg b/common/screensaver/Screensaver-10.jpg
index 82d59c2..9fc46a7 100644..100755
--- a/common/screensaver/Screensaver-10.jpg
+++ b/common/screensaver/Screensaver-10.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-11.jpg b/common/screensaver/Screensaver-11.jpg
index b466f3d..2ca369d 100644..100755
--- a/common/screensaver/Screensaver-11.jpg
+++ b/common/screensaver/Screensaver-11.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-12.jpg b/common/screensaver/Screensaver-12.jpg
index e8dd358..f35f99f 100644..100755
--- a/common/screensaver/Screensaver-12.jpg
+++ b/common/screensaver/Screensaver-12.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-13.jpg b/common/screensaver/Screensaver-13.jpg
index 439a435..c7a635c 100644..100755
--- a/common/screensaver/Screensaver-13.jpg
+++ b/common/screensaver/Screensaver-13.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-14.jpg b/common/screensaver/Screensaver-14.jpg
index 38c3c65..67b62d7 100644..100755
--- a/common/screensaver/Screensaver-14.jpg
+++ b/common/screensaver/Screensaver-14.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-15.jpg b/common/screensaver/Screensaver-15.jpg
index a052ef3..7908da0 100644..100755
--- a/common/screensaver/Screensaver-15.jpg
+++ b/common/screensaver/Screensaver-15.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-16.jpg b/common/screensaver/Screensaver-16.jpg
index 0d10ccd..137b623 100644..100755
--- a/common/screensaver/Screensaver-16.jpg
+++ b/common/screensaver/Screensaver-16.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-17.jpg b/common/screensaver/Screensaver-17.jpg
new file mode 100755
index 0000000..b0c185e
--- /dev/null
+++ b/common/screensaver/Screensaver-17.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-18.jpg b/common/screensaver/Screensaver-18.jpg
new file mode 100755
index 0000000..e5b696d
--- /dev/null
+++ b/common/screensaver/Screensaver-18.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-19.jpg b/common/screensaver/Screensaver-19.jpg
new file mode 100755
index 0000000..c67ef47
--- /dev/null
+++ b/common/screensaver/Screensaver-19.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-20.jpg b/common/screensaver/Screensaver-20.jpg
new file mode 100755
index 0000000..256bc34
--- /dev/null
+++ b/common/screensaver/Screensaver-20.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-21.jpg b/common/screensaver/Screensaver-21.jpg
new file mode 100755
index 0000000..ea2885d
--- /dev/null
+++ b/common/screensaver/Screensaver-21.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-22.jpg b/common/screensaver/Screensaver-22.jpg
new file mode 100755
index 0000000..58fa3ae
--- /dev/null
+++ b/common/screensaver/Screensaver-22.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-23.jpg b/common/screensaver/Screensaver-23.jpg
new file mode 100755
index 0000000..266e420
--- /dev/null
+++ b/common/screensaver/Screensaver-23.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-24.jpg b/common/screensaver/Screensaver-24.jpg
new file mode 100755
index 0000000..b7441a2
--- /dev/null
+++ b/common/screensaver/Screensaver-24.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-25.jpg b/common/screensaver/Screensaver-25.jpg
new file mode 100755
index 0000000..a8ed4cd
--- /dev/null
+++ b/common/screensaver/Screensaver-25.jpg
Binary files differ
diff --git a/common/screensaver/Screensaver-26.jpg b/common/screensaver/Screensaver-26.jpg
new file mode 100755
index 0000000..67dcc76
--- /dev/null
+++ b/common/screensaver/Screensaver-26.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-01.jpg b/extra-backgrounds/Extra-Background-01.jpg
index 02f1052..9a05574 100644..100755
--- a/extra-backgrounds/Extra-Background-01.jpg
+++ b/extra-backgrounds/Extra-Background-01.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-02.jpg b/extra-backgrounds/Extra-Background-02.jpg
index c145154..c6d660e 100644..100755
--- a/extra-backgrounds/Extra-Background-02.jpg
+++ b/extra-backgrounds/Extra-Background-02.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-03.jpg b/extra-backgrounds/Extra-Background-03.jpg
index 67124c4..2783695 100644..100755
--- a/extra-backgrounds/Extra-Background-03.jpg
+++ b/extra-backgrounds/Extra-Background-03.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-04.jpg b/extra-backgrounds/Extra-Background-04.jpg
index f9846d9..424a574 100644..100755
--- a/extra-backgrounds/Extra-Background-04.jpg
+++ b/extra-backgrounds/Extra-Background-04.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-05.jpg b/extra-backgrounds/Extra-Background-05.jpg
index a1c16ba..db592c4 100644..100755
--- a/extra-backgrounds/Extra-Background-05.jpg
+++ b/extra-backgrounds/Extra-Background-05.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-06.jpg b/extra-backgrounds/Extra-Background-06.jpg
index 8a699cc..e3d444a 100644..100755
--- a/extra-backgrounds/Extra-Background-06.jpg
+++ b/extra-backgrounds/Extra-Background-06.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-07.jpg b/extra-backgrounds/Extra-Background-07.jpg
index 35467e0..3846d56 100644..100755
--- a/extra-backgrounds/Extra-Background-07.jpg
+++ b/extra-backgrounds/Extra-Background-07.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-08.jpg b/extra-backgrounds/Extra-Background-08.jpg
index 251c0bf..f296a4d 100644..100755
--- a/extra-backgrounds/Extra-Background-08.jpg
+++ b/extra-backgrounds/Extra-Background-08.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-09.jpg b/extra-backgrounds/Extra-Background-09.jpg
index aa76dbc..6fcd3ef 100644..100755
--- a/extra-backgrounds/Extra-Background-09.jpg
+++ b/extra-backgrounds/Extra-Background-09.jpg
Binary files differ
diff --git a/extra-backgrounds/Extra-Background-10.jpg b/extra-backgrounds/Extra-Background-10.jpg
new file mode 100755
index 0000000..e409219
--- /dev/null
+++ b/extra-backgrounds/Extra-Background-10.jpg
Binary files differ
diff --git a/extra-backgrounds/Mageia-Default-6.jpg b/extra-backgrounds/Mageia-Default-6.jpg
new file mode 100644
index 0000000..7e82a5e
--- /dev/null
+++ b/extra-backgrounds/Mageia-Default-6.jpg
Binary files 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]}