[ViewVC] Diff of: cvs/deliantra/gde/GCE/MapEditor.pm

Comparing deliantra/gde/GCE/MapEditor.pm (file contents):
Revision 1.46 by root, Thu Dec 7 20:30:25 2006 UTC vs.
Revision 1.57 by elmex, Fri Aug 10 12:20:51 2007 UTC

 use GCE::AttrEdit;
 use GCE::Util;
 use GCE::HashDialog;
+use POSIX qw/strftime/;
 use Glib::Object::Subclass
     Gtk2::Window;
 use Storable qw/dclone/;
    my ($self) = @_;
    $self->{attach_editor}->save_layout  if $self->{attach_editor};
    $self->{map_properties}->save_layout if $self->{map_properties};
    $self->{meta_info_win}->save_layout  if $self->{meta_info_win};
+   $main::CFG->{map_info} = main::get_pos_and_size ($self->{map_info})
+      if $self->{map_info};
 }
 sub close_windows {
    my ($self) = @_;
       $menu->append ($item);
       $item->show;
       $item->signal_connect (activate => $cm->[1]);
    }
-   my $inv_item = Gtk2::MenuItem->new ("Add inventory");
+   $menu->append (my $sep = new Gtk2::SeparatorMenuItem);
-   $inv_item->set_submenu (my $smenu = new Gtk2::Menu);
+   $sep->show;
-   $menu->append ($inv_item);
    for my $sr (reverse $self->get_stack_refs ($map, $x, $y)) {
       my $item = Gtk2::MenuItem->new ($sr->longname);
-      $smenu->append ($item);
+      $menu->append ($item);
+      $item->set_submenu (my $smenu = new Gtk2::Menu);
+      for my $act (
+         [ 'Add inventory'  => sub { $_[0]->add_inv ($::MAINWIN->get_pick) } ],
+         [ 'Find in picker' => sub { $::MAINWIN->open_pick_window ({ selection => $sr->picker_folder }) } ],
+      ) {
+         my $sitem = Gtk2::MenuItem->new ($act->[0]);
+         $smenu->append ($sitem);
+         $sitem->signal_connect (activate => sub { $act->[1]->($sr) });
+         $sitem->show;
+      }
       $item->show;
-      $item->signal_connect (activate => sub {
-         $sr->add_inv ($::MAINWIN->get_pick);
-      });
    }
-   $inv_item->show;
    $menu->popup (undef, undef, undef, undef, $event->button, $event->time);
 }
 sub build_menu {
    my ($self) = @_;
                callback => sub { $self->save_map },
                accelerator => '<ctrl>S'
             },
             "Save As" => {
                callback => sub { $self->save_map_as },
+            },
+            "Map _Info" => {
+               callback => sub { $self->open_map_info },
+               accelerator => "<ctrl>I",
             },
             "Map _Properties" => {
                callback => sub { $self->open_map_prop },
                accelerator => "<ctrl>P"
             },
       }
       push @refs,
          GCE::ArchRef->new (
             arch => $arch,
+            source => 'map',
             cb => sub {
                $map->change_begin ('attredit');
                $map->change_stack ($ox, $oy, $cstack);
                if (my $changeset = $map->change_end) {
 sub open_map {
    my ($self, $path, $key) = @_;
    $self->{mapkey} = $key;
    if (ref $path) {
       $self->{map}->set_map ($path);
       delete $self->{meta_info};
       $self->set_title ('<ram>');
    } else {
+      my $ok = 0;
+      if (-e $path && -f $path) {
+         $ok = 1;
+      } else {
+         unless ($path =~ m/\.map$/) { # yuck
+            my $p = $path . '.map';
+            if ($ok = -e $p && -f $p) {
+               $path = $p;
+            }
+         }
+      }
+      unless ($ok) {
+         die "Couldn't open '$path' or find '$path.map': No such file or it is not a file.\n";
+      }
       $self->{path} = $path;
       $self->{map}->set_map (my $m = new_from_file Crossfire::Map $path);
       $self->{meta_info} = load_meta_info ($path);
       $self->set_title ("gce - map editor - $self->{path}");
    }
       ref_hash    => $self->{map}{map}{info},
       dialog      => [
          [width      => 'Width'    => 'string'],
          [height     => 'Height'   => 'string'],
       ],
+      close_on_save => 1,
       save_cb => sub {
          my ($info) = @_;
          $self->{map}{map}->resize ($info->{width}, $info->{height});
          $self->{map}->invalidate_all;
-         $w->destroy;
       }
    );
    $w->signal_connect (destroy => sub { delete $self->{meta_info_win} });
          [undef      => x                   => 'sep'   ],
          [cf_login   => 'Server login name' => 'string'],
          [cf_password=> 'Password'          => 'password'],
          [path       => 'Map path'          => 'string'],
       ],
+      close_on_save => 1,
       save_cb => sub {
          my ($meta) = @_;
          warn "UPLOAD[".Crossfire::to_json ($meta)."]\n";
       }
    );
    $w->signal_connect (destroy => sub { delete $self->{meta_info_win} });
    $w->show_all;
 }
+sub open_map_info {
+   my ($self) = @_;
+   return if $self->{map_info};
+   my $w = $self->{map_info} = Gtk2::Window->new ('toplevel');
+   $w->set_title ("gcrossedit - map info");
+   $w->add (my $vb = Gtk2::VBox->new);
+   $vb->add (my $sw = Gtk2::ScrolledWindow->new);
+      $sw->set_policy ('automatic', 'automatic');
+      $sw->add (my $txt = Gtk2::TextView->new);
+   $vb->pack_start (my $hb = Gtk2::HBox->new (1, 1), 0, 1, 0);
+      $hb->pack_start (my $svbtn = Gtk2::Button->new ("save"), 1, 1, 0);
+      $hb->pack_start (my $logbtn = Gtk2::Button->new ("add log"), 1, 1, 0);
+      $hb->pack_start (my $closebtn = Gtk2::Button->new ("close"), 1, 1, 0);
+   my $buf = $txt->get_buffer ();
+   $buf->set_text ($self->{map}{map}{info}{msg});
+   $svbtn->signal_connect (clicked => sub {
+      my $buf = $txt->get_buffer ();
+      my $txt = $buf->get_text ($buf->get_start_iter, $buf->get_end_iter, 0);
+      $self->{map}{map}{info}{msg} = $txt;
+   });
+   $logbtn->signal_connect (clicked => sub {
+      my $buf = $txt->get_buffer ();
+      $buf->insert ($buf->get_start_iter, "- " . strftime ("%F %T %Z", localtime (time)) . " by " . ($main::CFG->{username} || $ENV{USER}) . ":\n");
+      $txt->set_buffer ($buf);
+   });
+   $closebtn->signal_connect (clicked => sub {
+      $w->destroy;
+   });
+   ::set_pos_and_size ($w, $main::CFG->{map_info}, 400, 400, 220, 20);
+   $w->signal_connect (destroy => sub {
+      delete $self->{map_info};
+   });
+   $w->show_all;
+}
 sub open_map_prop {
    my ($self) = @_;
    return if $self->{map_properties};
    $w->init (
       dialog_default_size => [500, 500, 220, 20],
       layout_name => 'map_prop_win',
       title       => 'map properties',
       ref_hash    => $self->{map}{map}{info},
+      close_on_save => 1,
       dialog      => [
          [qw/name        Name          string/],
          [qw/region      Region        string/],
          [qw/enter_x     Enter-x       string/],
          [qw/enter_y     Enter-y       string/],
  #        [qw/msg         Text          text/],
 #         [qw/maplore     Maplore       text/],
          [qw/outdoor     Outdoor       check/],
          [qw/unique      Unique        check/],
          [qw/fixed_resettime Fixed-resettime        check/],
+         [per_player => 'Per player' => 'check'],
+         [per_party  => 'Per party'  => 'check'],
+         [no_reset   => 'No reset'   => 'check'],
+         [music      => 'Map Music'  => 'string'],
          [undef,      qw/x             sep/],
          [qw/tile_path_1 Northpath     string/],
          [qw/tile_path_2 Eastpath      string/],
          [qw/tile_path_3 Southpath     string/],
          [qw/tile_path_4 Westpath      string/],

Diff Legend

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

Comparing deliantra/gde/GCE/MapEditor.pm (file contents): Revision 1.46 by root, Thu Dec 7 20:30:25 2006 UTC vs. Revision 1.57 by elmex, Fri Aug 10 12:20:51 2007 UTC

Diff Legend

Comparing deliantra/gde/GCE/MapEditor.pm (file contents):
Revision 1.46 by root, Thu Dec 7 20:30:25 2006 UTC vs.
Revision 1.57 by elmex, Fri Aug 10 12:20:51 2007 UTC