[DW-Changelog] s2: http://bugs.dwscoalition.org/show_bug.cgi?id=1852

[Dreamwidth Changelog]

        Show the name of the layer in the title of the page for the layout 
source viewer.

        Patch by exor674. 

diffs (70 lines):

diff -r e110eaddbdf3 -r a9c9878eb60c S2/BackendHTML.pm
--- a/S2/BackendHTML.pm Mon Nov 09 06:05:13 2009 +0000
+++ b/S2/BackendHTML.pm Sun May 02 07:29:14 2010 +0000
@@ -30,7 +30,7 @@ sub output {
 sub output {
     my ($this, $o) = @_;
 
-    $o->write("<html><head><title>Layer Source</title>\n");
+    $o->write("<html><head>\n");
     $o->write("<meta http-equiv=\"Content-Type\" content=\"text/html; 
charset=utf-8\">\n");
     $o->write("<style type=\"text/css\">\n");
     $o->write("body { background: #ffffff none; color: #000000; }\n");
@@ -43,7 +43,10 @@ sub output {
     $o->write(".t { background: #ffffff none; color: " . $TypeColor . "; }\n");
     $o->write(".v { background: #ffffff none; color: " . $VarColor . "; }\n");
     $o->write(".n { background: #ffffff none; color: " . $IntegerColor . "; 
}\n");
-    $o->write("</style></head>\n<body>\n<pre>");
+    $o->write("</style>\n");
+    my $name = $this->{'layer'}->getLayerInfo('name');
+    $o->write("<title>" . ( $name ? "$name - " : "" ) . "Layer 
Source</title>");
+    $o->write("</head>\n<body>\n<pre>");
     my $nodes = $this->{'layer'}->getNodes();
     foreach my $n (@$nodes) {
         my $dbg = "Doing node: " . ref($n);
diff -r e110eaddbdf3 -r a9c9878eb60c S2/Layer.pm
--- a/S2/Layer.pm       Mon Nov 09 06:05:13 2009 +0000
+++ b/S2/Layer.pm       Sun May 02 07:29:14 2010 +0000
@@ -14,12 +14,12 @@ sub new
 sub new
 {
     my ($class, $toker, $type) = @_;
-    my $this = {
-        'type' => $type,
-        'declaredType' => undef,
-        'nodes' => [],
-        'layerinfo' => {},
-    };
+    my $this = bless {
+        type => $type,
+        declaredType => undef,
+        nodes => [],
+        layerinfo => {},
+    }, $class;
 
     my $nodes = $this->{'nodes'};
 
@@ -33,9 +33,10 @@ sub new
         if (S2::NodeLayerInfo->canStart($toker)) {
             my $nli = S2::NodeLayerInfo->parse($toker);
             push @$nodes, $nli;
-            if ($nli->getKey() eq "type") {
-                $this->{'declaredType'} = $nli->getValue();
+            if ( $nli->getKey eq "type" ) {
+                $this->{declaredType} = $nli->getValue;
             }
+            $this->setLayerInfo($nli->getKey, $nli->getValue);
             next;
         }
 
@@ -67,8 +68,8 @@ sub new
         S2::error($t, "Unknown token encountered while parsing layer: " .
                   $t->toString());
     }
-
-    bless $this, $class;
+    
+    return $this;
 }
 
 sub setLayerInfo {
_______________________________________________
dw-changelog mailing list
dw-changelog@lists.dwscoalition.org
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog