From 8c7d1a9be9582362eb86aeffaa082f13e7ac76bc Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Sat, 8 Dec 2007 08:35:18 +0000 Subject: * MEDIALIB: Add image if no actor image present * MEDIALIB: Align image at middle * STATUS: avoid some filter warning (is'nt numeric) * RECORDS: don't use inotify as global object * RECORDS: delayed preview image generation --- skins/blue/images/noactor.gif | 1 + skins/blue/images/noactor.png | 1 + skins/blue/style.css | 11 +- skins/blue_flat/style.css | 30 ++-- skins/lcars/images/noactor.gif | 1 + skins/lcars/images/noactor.png | 1 + skins/lcars/style.css | 11 +- skins/lcars_flat/style.css | 29 ++-- skins/snow/images/noactor.gif | 1 + skins/snow/images/noactor.png | 1 + skins/snow/style.css | 11 +- skins/snow_flat/style.css | 29 ++-- skins/stone/images/artwork/Makefile | 2 +- skins/stone/images/artwork/noactor.svg | 284 +++++++++++++++++++++++++++++++++ skins/stone/images/noactor.gif | Bin 0 -> 2702 bytes skins/stone/images/noactor.png | Bin 0 -> 4320 bytes skins/stone/memory.tmpl | 11 +- skins/stone/mldisplay.tmpl | 8 +- skins/stone/style.css | 12 +- skins/stone_flat/memory.tmpl | 12 +- skins/stone_flat/mldisplay.tmpl | 10 +- skins/stone_flat/style.css | 30 ++-- skins/xstyle/memory.tmpl | 14 +- 23 files changed, 439 insertions(+), 71 deletions(-) create mode 120000 skins/blue/images/noactor.gif create mode 120000 skins/blue/images/noactor.png create mode 120000 skins/lcars/images/noactor.gif create mode 120000 skins/lcars/images/noactor.png create mode 120000 skins/snow/images/noactor.gif create mode 120000 skins/snow/images/noactor.png create mode 100644 skins/stone/images/artwork/noactor.svg create mode 100644 skins/stone/images/noactor.gif create mode 100644 skins/stone/images/noactor.png diff --git a/skins/blue/images/noactor.gif b/skins/blue/images/noactor.gif new file mode 120000 index 0000000..199ac10 --- /dev/null +++ b/skins/blue/images/noactor.gif @@ -0,0 +1 @@ +../../stone/images/noactor.gif \ No newline at end of file diff --git a/skins/blue/images/noactor.png b/skins/blue/images/noactor.png new file mode 120000 index 0000000..2a4b1bf --- /dev/null +++ b/skins/blue/images/noactor.png @@ -0,0 +1 @@ +../../stone/images/noactor.png \ No newline at end of file diff --git a/skins/blue/style.css b/skins/blue/style.css index f256350..8fd2045 100644 --- a/skins/blue/style.css +++ b/skins/blue/style.css @@ -101,14 +101,14 @@ width:120px; } img.media { -width:130px; +height:180px; } div.media { -height:180px; +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } img.actor { @@ -116,7 +116,10 @@ height:90px; } div.actor { -width:60px; +width:190px; +vertical-align:middle; +text-align:center; +display: table-cell; } a img { diff --git a/skins/blue_flat/style.css b/skins/blue_flat/style.css index b91a415..3cce6ed 100644 --- a/skins/blue_flat/style.css +++ b/skins/blue_flat/style.css @@ -99,35 +99,43 @@ img.cover { width:120px; } -img.media { -width:130px; +img.medialist { +width:60px; } -div.media { -height:180px; +div.medialist { +height:80px; vertical-align:middle; text-align:center; overflow:hidden; } -img.medialist { -width:60px; + +img.media { +height:180px; } -div.medialist { -height:80px; +div.media { +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } - img.actor { height:90px; } div.actor { -width:130px; +width:110px; +vertical-align:middle; +text-align:center; +display: table-cell; +} + +div.actortext { +height:2em; +width:100px; vertical-align:middle; text-align:center; } diff --git a/skins/lcars/images/noactor.gif b/skins/lcars/images/noactor.gif new file mode 120000 index 0000000..199ac10 --- /dev/null +++ b/skins/lcars/images/noactor.gif @@ -0,0 +1 @@ +../../stone/images/noactor.gif \ No newline at end of file diff --git a/skins/lcars/images/noactor.png b/skins/lcars/images/noactor.png new file mode 120000 index 0000000..2a4b1bf --- /dev/null +++ b/skins/lcars/images/noactor.png @@ -0,0 +1 @@ +../../stone/images/noactor.png \ No newline at end of file diff --git a/skins/lcars/style.css b/skins/lcars/style.css index dd957e0..16aabd3 100644 --- a/skins/lcars/style.css +++ b/skins/lcars/style.css @@ -109,14 +109,14 @@ width:120px; } img.media { -width:130px; +height:180px; } div.media { -height:180px; +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } img.actor { @@ -124,7 +124,10 @@ height:90px; } div.actor { -width:60px; +width:190px; +vertical-align:middle; +text-align:center; +display: table-cell; } a img { diff --git a/skins/lcars_flat/style.css b/skins/lcars_flat/style.css index d99743b..b353084 100644 --- a/skins/lcars_flat/style.css +++ b/skins/lcars_flat/style.css @@ -106,35 +106,42 @@ img.cover { width:120px; } -img.media { -width:130px; +img.medialist { +width:60px; } -div.media { -height:180px; +div.medialist { +height:80px; vertical-align:middle; text-align:center; overflow:hidden; } -img.medialist { -width:60px; +img.media { +height:180px; } -div.medialist { -height:80px; +div.media { +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } - img.actor { height:90px; } div.actor { -width:130px; +width:110px; +vertical-align:middle; +text-align:center; +display: table-cell; +} + +div.actortext { +height:2em; +width:100px; vertical-align:middle; text-align:center; } diff --git a/skins/snow/images/noactor.gif b/skins/snow/images/noactor.gif new file mode 120000 index 0000000..199ac10 --- /dev/null +++ b/skins/snow/images/noactor.gif @@ -0,0 +1 @@ +../../stone/images/noactor.gif \ No newline at end of file diff --git a/skins/snow/images/noactor.png b/skins/snow/images/noactor.png new file mode 120000 index 0000000..2a4b1bf --- /dev/null +++ b/skins/snow/images/noactor.png @@ -0,0 +1 @@ +../../stone/images/noactor.png \ No newline at end of file diff --git a/skins/snow/style.css b/skins/snow/style.css index 179590e..5818bfc 100644 --- a/skins/snow/style.css +++ b/skins/snow/style.css @@ -101,14 +101,14 @@ width:130px; } img.media { -width:130px; +height:180px; } div.media { -height:180px; +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } img.actor { @@ -116,7 +116,10 @@ height:90px; } div.actor { -width:60px; +width:190px; +vertical-align:middle; +text-align:center; +display: table-cell; } a img { diff --git a/skins/snow_flat/style.css b/skins/snow_flat/style.css index 0721842..b70989c 100644 --- a/skins/snow_flat/style.css +++ b/skins/snow_flat/style.css @@ -98,35 +98,42 @@ img.cover { width:110px; } -img.media { -width:130px; +img.medialist { +width:60px; } -div.media { -height:180px; +div.medialist { +height:80px; vertical-align:middle; text-align:center; overflow:hidden; } -img.medialist { -width:60px; +img.media { +height:180px; } -div.medialist { -height:80px; +div.media { +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } - img.actor { height:90px; } div.actor { -width:130px; +width:110px; +vertical-align:middle; +text-align:center; +display: table-cell; +} + +div.actortext { +height:2em; +width:100px; vertical-align:middle; text-align:center; } diff --git a/skins/stone/images/artwork/Makefile b/skins/stone/images/artwork/Makefile index f48ae09..ba944cb 100644 --- a/skins/stone/images/artwork/Makefile +++ b/skins/stone/images/artwork/Makefile @@ -8,7 +8,7 @@ IMAGES = ../on.gif ../delete.gif ../record.gif ../off.gif ../edit.gif \ ../home.gif ../refresh.gif ../onoff.gif ../movie.gif ../play.gif ../folder.gif \ ../select.gif ../deselect.gif ../invers.gif ../newfolder.gif \ ../cut.gif ../file.gif ../audio.gif ../topten.gif ../warning.gif \ -../imdb.gif ../ofdb.gif ../info.gif ../tvm.gif ../nocover.gif +../imdb.gif ../ofdb.gif ../info.gif ../tvm.gif ../nocover.gif ../noactor.gif ### Targets: diff --git a/skins/stone/images/artwork/noactor.svg b/skins/stone/images/artwork/noactor.svg new file mode 100644 index 0000000..a0b164b --- /dev/null +++ b/skins/stone/images/artwork/noactor.svg @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/skins/stone/images/noactor.gif b/skins/stone/images/noactor.gif new file mode 100644 index 0000000..79c3946 Binary files /dev/null and b/skins/stone/images/noactor.gif differ diff --git a/skins/stone/images/noactor.png b/skins/stone/images/noactor.png new file mode 100644 index 0000000..3dea6c3 Binary files /dev/null and b/skins/stone/images/noactor.png differ diff --git a/skins/stone/memory.tmpl b/skins/stone/memory.tmpl index c37bfd8..042dfb0 100644 --- a/skins/stone/memory.tmpl +++ b/skins/stone/memory.tmpl @@ -73,13 +73,20 @@ # ------------------- Piegraph für Speicher FILTER null; name = 'memory_now'; + MemTotal = data.MemTotal div 1024; + Active = data.Active div 1024; + Cached = data.Cached div 1024; + Inactive = data.Inactive div 1024; + MemFree = data.MemFree div 1024; + Buffers = data.Buffers div 1024; + d2 = [ - ["Active ${data.Active}","Cached ${data.Cached}","Inactive ${data.Inactive}","MemFree ${data.MemFree}","Buffers ${data.Buffers}"], + ["Active ${Active} MB","Cached ${Cached} MB","Inactive ${Inactive} MB","MemFree ${MemFree} MB","Buffers ${Buffers} MB"], [ data.Active, data.Cached, data.Inactive, data.MemFree, data.Buffers] ]; USE my_graph = GD.Graph.pie(375, 375); label = gettext('Total Memory'); - label = "${label} ${data.MemTotal}"; + label = "${label} ${MemTotal} MB"; my_graph.set( axislabelclr => 'black', pie_height => 20, diff --git a/skins/stone/mldisplay.tmpl b/skins/stone/mldisplay.tmpl index 8cae113..acc6ddf 100644 --- a/skins/stone/mldisplay.tmpl +++ b/skins/stone/mldisplay.tmpl @@ -137,7 +137,13 @@ seen = f.25;
- <?% actor %?> + + + <?% actor %?> + + <?% actor %?> + +
diff --git a/skins/stone/style.css b/skins/stone/style.css index 6ec7e5a..a0fcea5 100644 --- a/skins/stone/style.css +++ b/skins/stone/style.css @@ -103,14 +103,14 @@ width:110px; } img.media { -width:130px; +height:180px; } div.media { -height:180px; +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } img.actor { @@ -118,9 +118,13 @@ height:90px; } div.actor { -width:60px; +width:190px; +vertical-align:middle; +text-align:center; +display: table-cell; } + a img { border:0; } diff --git a/skins/stone_flat/memory.tmpl b/skins/stone_flat/memory.tmpl index f0b15e0..2fc2f1d 100644 --- a/skins/stone_flat/memory.tmpl +++ b/skins/stone_flat/memory.tmpl @@ -72,13 +72,21 @@ # ------------------- Piegraph für Speicher FILTER null; name = 'memory_now'; + MemTotal = data.MemTotal div 1024; + Active = data.Active div 1024; + Cached = data.Cached div 1024; + Inactive = data.Inactive div 1024; + MemFree = data.MemFree div 1024; + Buffers = data.Buffers div 1024; + d2 = [ - ["Active ${data.Active}","Cached ${data.Cached}","Inactive ${data.Inactive}","MemFree ${data.MemFree}","Buffers ${data.Buffers}"], + ["Active ${Active} MB","Cached ${Cached} MB","Inactive ${Inactive} MB","MemFree ${MemFree} MB","Buffers ${Buffers} MB"], [ data.Active, data.Cached, data.Inactive, data.MemFree, data.Buffers] ]; + USE my_graph = GD.Graph.pie(500, 300); label = gettext('Total Memory'); - label = "${label} ${data.MemTotal}"; + label = "${label} ${MemTotal} MB"; my_graph.set( axislabelclr => 'black', pie_height => 20, diff --git a/skins/stone_flat/mldisplay.tmpl b/skins/stone_flat/mldisplay.tmpl index 04d311b..d05f9ff 100644 --- a/skins/stone_flat/mldisplay.tmpl +++ b/skins/stone_flat/mldisplay.tmpl @@ -136,9 +136,15 @@ seen = f.25; ";END %?> -
+
- <?% actor %?> + + + <?% actor %?> + + <?% actor %?> + +
diff --git a/skins/stone_flat/style.css b/skins/stone_flat/style.css index 175a24a..703292c 100644 --- a/skins/stone_flat/style.css +++ b/skins/stone_flat/style.css @@ -100,38 +100,46 @@ img.cover { width:100px; } -img.media { -width:130px; +img.medialist { +width:60px; } -div.media { -height:180px; +div.medialist { +height:80px; vertical-align:middle; text-align:center; overflow:hidden; } -img.medialist { -width:60px; +img.media { +height:180px; } -div.medialist { -height:80px; +div.media { +width:190px; vertical-align:middle; text-align:center; -overflow:hidden; +display: table-cell; } - img.actor { height:90px; } div.actor { -width:130px; +width:110px; vertical-align:middle; text-align:center; +display: table-cell; } + +div.actortext { +height:2em; +width:100px; +vertical-align:middle; +text-align:center; +} + a img { border:0; } diff --git a/skins/xstyle/memory.tmpl b/skins/xstyle/memory.tmpl index f0e7774..7c455d9 100644 --- a/skins/xstyle/memory.tmpl +++ b/skins/xstyle/memory.tmpl @@ -33,7 +33,7 @@ USE my_graph = GD.Graph.lines(500,300); # Xsteps - steps = param.stack.size / 5 | format('%d'); + steps = param.stack.size div 5; label = gettext('Memory usage since'); label = "${label} ${d.first.first}"; @@ -64,13 +64,21 @@ # ------------------- Piegraph für Speicher FILTER null; name = 'memory_now'; + MemTotal = data.MemTotal div 1024; + Active = data.Active div 1024; + Cached = data.Cached div 1024; + Inactive = data.Inactive div 1024; + MemFree = data.MemFree div 1024; + Buffers = data.Buffers div 1024; + d2 = [ - ["Active ${data.Active}","Cached ${data.Cached}","Inactive ${data.Inactive}","MemFree ${data.MemFree}","Buffers ${data.Buffers}"], + ["Active ${Active} MB","Cached ${Cached} MB","Inactive ${Inactive} MB","MemFree ${MemFree} MB","Buffers ${Buffers} MB"], [ data.Active, data.Cached, data.Inactive, data.MemFree, data.Buffers] ]; + USE my_graph = GD.Graph.pie(400, 300); label = gettext('Total Memory'); - label = "${label} ${data.MemTotal}"; + label = "${label} ${MemTotal} MB"; my_graph.set( title => label, axislabelclr => 'black', -- cgit v1.2.3