1.1 --- a/l3-frontend	Mon Feb 20 17:52:40 2006 +0200
     1.2 +++ b/l3-frontend	Fri Feb 24 08:49:31 2006 +0200
     1.3 @@ -231,7 +231,7 @@
     1.4      my $datafile = $_[0];
     1.5  
     1.6      open (CLASS, $datafile)
     1.7 -        or die "Can't open file of the class ",$datafile,"\n";
     1.8 +        or die "Can't open file with xml lablog ",$datafile,"\n";
     1.9      local $/;
    1.10      $data = <CLASS>;
    1.11      close(CLASS);
    1.12 @@ -250,7 +250,7 @@
    1.13      my $datafile = $_[0];
    1.14  
    1.15      open (CLASS, $datafile)
    1.16 -        or die "Can't open file of the class ",$datafile,"\n";
    1.17 +        or die "Can't open file with xml lablog ",$datafile,"\n";
    1.18      local $/;
    1.19      my $data = <CLASS>;
    1.20      close(CLASS);
    1.21 @@ -323,6 +323,12 @@
    1.22  #  Если несколько пометок (notes) идут подряд, 
    1.23  #  они все объединяются
    1.24  
    1.25 +        if ($$cl->{cline} =~ /l3shot/) {
    1.26 +                if ($$cl->{output} =~ m@Screenshot is written to.*/(.*)\.xwd@) {
    1.27 +                    $$cl->{screenshot}="$1";
    1.28 +                }
    1.29 +        }
    1.30 +
    1.31          if ($$cl->{cline}=~ m@cat[^#]*#([\^=v])\s*(.*)@) {
    1.32  
    1.33              my $note_operator = $1;
    1.34 @@ -598,7 +604,7 @@
    1.35          }
    1.36          elsif ($seconds_since_last_command > 7200) {
    1.37              my $hours_passed =  int($seconds_since_last_command/3600);
    1.38 -            my $passed_word  = $minutes_passed % 10 == 1 ? "прошла"
    1.39 +            my $passed_word  = $hours_passed % 10 == 1 ? "прошла"
    1.40                                                           : "прошло";
    1.41              my $hours_word   = $hours_passed % 10 == 1 ?   "часа":
    1.42                                                             "часов";
    1.43 @@ -639,7 +645,7 @@
    1.44                          
    1.45  
    1.46  # CONSOLE CHANGE
    1.47 -        if ( $last_tty ne $cl->{"tty"} && 0) {
    1.48 +        if ($cl->{"tty"} && $last_tty ne $cl->{"tty"} && 0) {
    1.49              my $tty = $cl->{"tty"};
    1.50              $this_day_result .= "<div class='ttychange'>"
    1.51                                  . $tty
    1.52 @@ -682,7 +688,8 @@
    1.53          my $hint = make_comment($cl->{"cline"});
    1.54  
    1.55          my $cline;
    1.56 -        $cline = $cl->{"prompt"}.$cl->{"cline"};
    1.57 +        $prompt_hint = join ("&#10;", map("$_=$cl->{$_}", grep (!/^output$/, sort(keys(%{$cl})))));
    1.58 +        $cline = "<span title='$prompt_hint'>".$cl->{"prompt"}."</prompt>".$cl->{"cline"};
    1.59          $cline =~ s/\n//;
    1.60  
    1.61          $cline = "<span title='$hint' class='with_hint'>$cline</span>" if $hint;
    1.62 @@ -708,6 +715,14 @@
    1.63  # DIFF
    1.64          $this_day_result .= "<pre class='diff'>".$cl->{"diff"}."</pre>"
    1.65              if ( $Config{"show_diffs"} =~ /^y/i && $cl->{"diff"});
    1.66 +# SHOT
    1.67 +        $this_day_result .= "<img src='"
    1.68 +                .$Config{l3shot_path}
    1.69 +                .$cl->{"screenshot"}
    1.70 +                .$Config{l3shot_suffix}
    1.71 +                ."' alt ='screenshot id ".$cl->{"screenshot"}
    1.72 +                ."'/>"
    1.73 +            if ( $Config{"show_screenshots"} =~ /^y/i && $cl->{"screenshot"});
    1.74  
    1.75  #NOTES
    1.76          if ( $Config{"show_notes"} =~ /^y/i && $cl->{"note"}) {