From 0f7a1055a2bed65de06179176d6f0cc09d2b9485 Mon Sep 17 00:00:00 2001 From: betateilchen Date: Fri, 6 Feb 2015 18:45:02 +0000 Subject: [PATCH] 55_InfoPanel: updated added: - attr bgopacity - attr bgcolor none - add link to textbox git-svn-id: https://svn.fhem.de/fhem/trunk@7894 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/55_InfoPanel.pm | 86 ++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 50 deletions(-) diff --git a/fhem/FHEM/55_InfoPanel.pm b/fhem/FHEM/55_InfoPanel.pm index 4db371bd4..fdef66bcb 100644 --- a/fhem/FHEM/55_InfoPanel.pm +++ b/fhem/FHEM/55_InfoPanel.pm @@ -84,7 +84,7 @@ sub InfoPanel_Initialize($) { $hash->{DefFn} = "btIP_Define"; $hash->{UndefFn} = "btIP_Undef"; #$hash->{AttrFn} = "btIP_Attr"; - $hash->{AttrList} = "autoreread:1,0 bgcenter:1,0 bgcolor bgdir refresh size title tmin"; + $hash->{AttrList} = "autoreread:1,0 bgcenter:1,0 bgcolor bgdir bgopacity refresh size title tmin"; $hash->{SetFn} = "btIP_Set"; $hash->{NotifyFn} = "btIP_Notify"; return undef; @@ -446,10 +446,11 @@ sub btIP_itemText { } sub btIP_itemTextBox { - my ($id,$x,$y,$boxwidth,$boxheight,$text,%params)= @_; + my ($id,$x,$y,$boxwidth,$boxheight,$text,$link,%params)= @_; return unless(defined($text)); $id = ($id eq '-') ? createUniqueId() : $id; my $color = substr($params{rgb},0,6); + $link =~ s/"//g; my ($d,$output); if(defined($params{boxcolor})) { @@ -465,13 +466,16 @@ sub btIP_itemTextBox { $output = ""; } - $d = "
\n". - "

\n$text\n

\n". - "
\n"; + $d = "
\n". + "\n"; + $d .= "\n" if($link && length($link)); + $d .= "

\n$text\n

\n"; + $d .= "" if($link && length($link)); + $d .= "
\n"; $defs{$params{name}}{fhem}{div} .= $d; @@ -605,22 +609,23 @@ sub btIP_returnSVG($) { } my ($width,$height)= split(/x/, AttrVal($name,"size","800x600")); - my $bgcolor = AttrVal($name,'bgcolor','000000'); + my $bgcolor = AttrVal($name,'bgcolor','000000'); my $output = ""; our $svg = ""; eval { - $svg = "\n/g; - $svg .= btIP_itemTextBox($id,$x,$y,$boxwidth,$boxheight,$txt,%params); + $svg .= btIP_itemTextBox($id,$x,$y,$boxwidth,$boxheight,$txt,$link,%params); $params{xx} = $x; $params{yy} = $y + $boxheight; } @@ -1045,28 +1052,6 @@ sub btIP_splitRequest($) { # HTML Stuff # -sub btIP_returnPNG($) { - my ($name) = @_; - my ($svgdata, $rsvg, $pngImg); - - $svgdata = btIP_returnSVG($name); - - eval { - require Image::LibRSVG; - $rsvg = new Image::LibRSVG(); - $rsvg->loadImageFromString($svgdata); - $pngImg = $rsvg->getImageBitmap(); - }; - Log3($FW_wname,1,"InfoPanel: Cannot create png image") if($@ or !defined($pngImg) or ($pngImg eq "")); - return $pngImg if $pngImg; - return undef; -} - -#################### -# -# HTML Stuff -# - sub btIP_returnHTML($) { my ($name) = @_; @@ -1219,8 +1204,9 @@ Please read Layout definition