ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CV/bin/cv
(Generate patch)

Comparing CV/bin/cv (file contents):
Revision 1.19 by root, Fri Nov 7 04:03:03 2003 UTC vs.
Revision 1.20 by root, Fri Nov 7 14:01:45 2003 UTC

… …
8 8
9use Gtk2::CV; 9use Gtk2::CV;
10 10
11Gtk2::Rc->parse (Gtk2::CV::find_rcfile "gtkrc"); 11Gtk2::Rc->parse (Gtk2::CV::find_rcfile "gtkrc");
12 12
13use File::Spec;
14
15my $mainwin;
13my $viewer; 16my $viewer;
14my $schnauzer; 17my $schnauzer;
18my $info;
15 19
16sub new_schnauzer { 20sub new_schnauzer {
17 my $w = new Gtk2::Window;
18 $w->add (my $s = new Gtk2::CV::Schnauzer); 21 my $s = new Gtk2::CV::Schnauzer;
19 22
20 $s->signal_connect (activate => sub { $viewer->load_image ($_[1]) });
21 $s->signal_connect_after (key_press_event => \&std_keys); 23 $s->signal_connect_after (key_press_event => \&std_keys);
24 $s->signal_connect (activate => sub {
25 my $label = sprintf "%s (%d)",
26 (File::Spec->splitpath ($_[1]))[2],
27 -s $_[1];
28 $info->set_label ($label);
29 $viewer->load_image ($_[1]);
30 });
22 31
23 $s; 32 $s;
24} 33}
25
26$schnauzer = new_schnauzer;
27
28my $mainwin = $schnauzer->get_toplevel;
29 34
30sub std_keys { 35sub std_keys {
31 my $key = $_[1]->keyval; 36 my $key = $_[1]->keyval;
32 my $state = $_[1]->state; 37 my $state = $_[1]->state;
33 38
34 my $ctrl = grep $_ eq "control-mask", @$state; 39 my $ctrl = grep $_ eq "control-mask", @$state;
35 40
36 if ($key == $Gtk2::Gdk::Keysyms{q}) { 41 if ($key == $Gtk2::Gdk::Keysyms{q}) {
37 main_quit Gtk2; 42 main_quit Gtk2;
38 } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) { 43 } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
44 my $w = new Gtk2::Window;
39 my $s = new_schnauzer; 45 $w->add (my $s = new_schnauzer);
40 $s->set_dir ("."); 46 $s->set_dir (File::Spec->curdir);
41 $s->get_toplevel->show_all 47 $w->show_all
42 } else { 48 } else {
43 #$mainwin->show_all; 49 #$mainwin->show_all;
44 $schnauzer->handle_key ($key, $state); 50 $schnauzer->handle_key ($key, $state);
45 } 51 }
46 52
47 1; 53 1;
48} 54}
49 55
56{
50$viewer = new Gtk2::CV::ImageWindow; 57 $viewer = new Gtk2::CV::ImageWindow;
51 58
52$viewer->set_title ("CV"); 59 $viewer->set_title ("CV: Image");
53 60
54$viewer->signal_connect (key_press_event => \&std_keys); 61 $viewer->signal_connect (key_press_event => \&std_keys);
55$viewer->signal_connect (delete_event => sub { main_quit Gtk2 }); 62 $viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
56 63
57$viewer->signal_connect (button3_press_event => sub { 64 $viewer->signal_connect (button3_press_event => sub {
58 $mainwin->visible 65 $mainwin->visible
59 ? $mainwin->hide 66 ? $mainwin->hide
60 : $mainwin->show_all; 67 : $mainwin->show_all;
61}); 68 });
69
70 $schnauzer = new_schnauzer;
71
72 $mainwin = new Gtk2::Window;
73 $mainwin->set_title ("CV");
74 $mainwin->add (my $vbox = new Gtk2::VBox);
75
76 $vbox->add ($schnauzer);
77 $vbox->add (my $frame = new Gtk2::Frame);
78 $frame->add (my $hbox = new Gtk2::HBox 0, 0);
79 $hbox->pack_start ((new Gtk2::Label "Info"), 0, 0, 0);
80 $hbox->pack_start (($info = new Gtk2::Label), 1, 1, 0);
81}
62 82
63if (@ARGV) { 83if (@ARGV) {
64 $schnauzer->set_paths (\@ARGV); 84 $schnauzer->set_paths (\@ARGV);
65 $schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []); 85 $schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
66} else { 86} else {
67 $schnauzer->set_dir ("."); 87 $schnauzer->set_dir (File::Spec->curdir);
68 $mainwin->show_all; 88 $mainwin->show_all;
69} 89}
70 90
71$viewer->show_all; 91$viewer->show_all;
72 92

Diff Legend

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