[ViewVC] Diff of: cvs/kgsueme/kgsueme/game.pl

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.88 by pcg, Fri May 21 16:13:41 2004 UTC vs.
Revision 1.93 by pcg, Tue May 25 18:36:36 2004 UTC

    $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1);
    # board box (aspect/canvas)
-   $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
+   #$self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
+   # RIGHT PANE
+   $hpane->pack2 ((my $vbox = new Gtk2::VBox), 1, 1);
+   $hpane->set (position_set => 1);
+   $vbox->pack_start ((my $frame = new Gtk2::Frame), 0, 1, 0);
    {
       $frame->add (my $vbox = new Gtk2::VBox);
       $vbox->add ($self->{title} = new Gtk2::Label $title);
       $scale->set_draw_value (0);
       $scale->set_digits (0);
       $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
    }
-   $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
-   # RIGHT PANE
-   $hpane->pack2 (($self->{vpane} = new Gtk2::VPaned), 1, 1);
-   $hpane->set (position_set => 1);
-   gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
-#   $self->{vpane}->add (my $sw = new Gtk2::ScrolledWindow);
-#   $sw->set_policy ("automatic", "always");
-#   $sw->add ($self->{userlist} = new userlist);
-   $self->{vpane}->add (my $vbox = new Gtk2::VBox);
    $vbox->pack_start ((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
    $hbox->add ($self->{userpanel}[$_] = new game::userpanel colour => $_)
       for COLOUR_WHITE, COLOUR_BLACK;
    $self->{user}[COLOUR_BLACK] = $self->{user1};
    $self->{user}[COLOUR_WHITE] = $self->{user2};
    # show board
    if ($self->is_inprogress) {
-      $self->{left}->add ($self->{boardbox}) unless $self->{boardbox}->parent;
+      if (!$self->{boardbox}->parent) {
+         $self->{boardbox}->add ($self->{board} = new Gtk2::GoBoard size => $self->{size});
+         $self->{left}->add ($self->{boardbox});
+      }
       if (my $ch = delete $self->{challenge}) {
          (delete $_->{inlay})->clear for values %$ch;
       }
    }
    # view text
    eval { #d#
    my @ga;
-   $ga[0] = "\nType: " . (util::toxml $gametype{$self->type})
+   $ga[0] = "\nType: " . util::toxml $self->type_char;
-            . " (" . (util::toxml $gameopt{$self->option}) . ")";
    $ga[1] = "\nFlags:";
    $ga[1] .= " started"   if $self->is_inprogress;
    $ga[1] .= " adjourned" if $self->is_adjourned;
    $ga[1] .= " scored"    if $self->is_scored;
    $ga[1] .= " saved"     if $self->is_saved;
          for COLOUR_BLACK, COLOUR_WHITE;
    }
    sound::play 3, "gamestart";
-   $self->draw_rules ($self->{rules_inlay});
+   $self->{rules_inlay}->refresh;
 }
 sub inject_resign_game {
    my ($self, $msg) = @_;
 sub draw_users {
    my ($self, $inlay) = @_;
    for (sort keys %{$self->{users}}) {
-      $inlay->append_text (" <user>" . $self->{users}{$_}->as_string . "</user>");
+      $inlay->append_text ("  <user>" . $self->{users}{$_}->as_string . "</user>");
    }
 }
 sub event_challenge {
    my ($self, $challenge) = @_;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing kgsueme/kgsueme/game.pl (file contents): Revision 1.88 by pcg, Fri May 21 16:13:41 2004 UTC vs. Revision 1.93 by pcg, Tue May 25 18:36:36 2004 UTC

Diff Legend

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.88 by pcg, Fri May 21 16:13:41 2004 UTC vs.
Revision 1.93 by pcg, Tue May 25 18:36:36 2004 UTC