[ViewVC] Diff of: cvs/CV/bin/cv

Comparing CV/bin/cv (file contents):
Revision 1.58 by root, Wed Sep 7 20:17:25 2005 UTC vs.
Revision 1.73 by root, Thu Nov 22 08:52:57 2007 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use Cwd ();	3	use Cwd ();
4	use Encode ();	4	use Encode ();
		5	use File::Glob ();
5		6
6	use Gtk2 -init;	7	use Gtk2 -init;
7	use Gtk2::Gdk::Keysyms;	8	use Gtk2::Gdk::Keysyms;
8		9
9	use Gtk2::CV;	10	use Gtk2::CV;
23		24
24	use File::Spec;	25	use File::Spec;
25		26
26	my $mainwin;	27	my $mainwin;
27	my $viewer;	28	my $viewer;
		29	my $viewer_count;
28	my $schnauzer;	30	my $schnauzer;
29	my $info;	31	my $info;
30	my $help;	32	my $help;
31		33
32	my $schnauzer_idx = 0;	34	my $schnauzer_idx = 0;
…		…
38	$s->signal_connect (activate => sub {	40	$s->signal_connect (activate => sub {
39	my $label = sprintf "%s (%d)",	41	my $label = sprintf "%s (%d)",
40	(File::Spec->splitpath ($_[1]))[2],	42	(File::Spec->splitpath ($_[1]))[2],
41	-s $_[1];	43	-s $_[1];
42	$info->set_label ($label);	44	$info->set_label ($label);
43	$viewer->load_image ($_[1]);	45	$viewer->load_image ($_[1]) if $viewer; # TODO: error, or chose ANY viewer
44	});	46	});
45		47
46	Gtk2::CV::Plugin->call (new_schnauzer => $s);	48	Gtk2::CV::Plugin->call (new_schnauzer => $s);
47		49
48	$s	50	$s
		51	}
		52
		53	sub new_viewer {
		54	my $self = new Gtk2::CV::ImageWindow;
		55
		56	$viewer_count++;
		57
		58	$self->set_title ("CV: Image");
		59
		60	$self->signal_connect (key_press_event => sub {
		61	$viewer = $_[0];
		62
		63	my $key = $_[1]->keyval;
		64	my $state = $_[1]->state;
		65
		66	if ($state * "control-mask" && $key == $Gtk2::Gdk::Keysyms{c}) {
		67	my $viewer = new_viewer ();
		68	$viewer->set_image ($_[0]->{image});
		69	$viewer->show_all;
		70	1
		71	} else {
		72	&std_keys
		73	or $schnauzer->signal_emit (key_press_event => $_[1])
		74	}
		75	});
		76	$self->signal_connect (delete_event => sub { $_[0]->destroy; 0 });
		77	$self->signal_connect (destroy => sub {
		78	$viewer = undef if $viewer == $_[0];
		79
		80	main_quit Gtk2 unless --$viewer_count;
		81
		82	0
		83	});
		84
		85	$self->signal_connect (button3_press_event => sub {
		86	$mainwin->visible
		87	? $mainwin->hide
		88	: $mainwin->show_all;
		89
		90	1
		91	});
		92
		93	Gtk2::CV::Plugin->call (new_imagewindow => $self);
		94
		95	$self
49	}	96	}
50		97
51	sub std_keys {	98	sub std_keys {
52	my $key = $_[1]->keyval;	99	my $key = $_[1]->keyval;
53	my $state = $_[1]->state;	100	my $state = $_[1]->state;
54		101
55	my $ctrl = $state * "control-mask";	102	my $ctrl = $state * "control-mask";
56		103
57	if ($key == $Gtk2::Gdk::Keysyms{q}) {	104	if ($key == $Gtk2::Gdk::Keysyms{q}) {
58	main_quit Gtk2;	105	$viewer->destroy;
59	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {	106	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
60	my $w = new Gtk2::Window;	107	my $w = new Gtk2::Window;
61		108
		109	$w->set_role ("schnauzer");
62	$w->set_title ("CV: Schnauzer");	110	$w->set_title ("CV: Schnauzer");
63	$w->add (my $s = new_schnauzer);	111	$w->add (my $s = new_schnauzer);
64	$s->set_dir (File::Spec->curdir);	112	$s->set_dir (File::Spec->curdir);
65	$s->set_geometry_hints;	113	$s->set_geometry_hints;
66	$w->show_all;	114	$w->show_all;
67		115
68	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {	116	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {
69	unless ($help) {	117	unless ($help) {
70	require Gtk2::PodViewer;	118	require Gtk2::Ex::PodViewer;
71		119
72	$help = new Gtk2::Window;	120	$help = new Gtk2::Window;
		121	$help->set_role ("help");
73	$help->set_title ("CV: Help");	122	$help->set_title ("CV: Help");
74	$help->set_default_size (500, 300);	123	$help->set_default_size (500, 300);
75	$help->signal_connect (delete_event => sub { $help->hide; 1 });	124	$help->signal_connect (delete_event => sub { $help->hide; 1 });
76		125
77	$help->add (my $sw = new Gtk2::ScrolledWindow);	126	$help->add (my $sw = new Gtk2::ScrolledWindow);
78	$sw->add (my $h = new Gtk2::PodViewer);	127	$sw->add (my $h = new Gtk2::Ex::PodViewer);
79		128
80	#binmode DATA, ":utf8";	129	#binmode DATA, ":utf8";
81	$h->load_string (do { local $/; <DATA> });	130	$h->load_string (do { local $/; <DATA> });
82	}	131	}
83		132
…		…
88		137
89	1	138	1
90	}	139	}
91		140
92	{	141	{
93	$viewer = new Gtk2::CV::ImageWindow;	142	$viewer = new_viewer;
94		143	$::cur_viewer = $viewer;
95	$viewer->set_title ("CV: Image");
96
97	$viewer->signal_connect (key_press_event => sub {
98	&std_keys
99	or $schnauzer->signal_emit (key_press_event => $_[1])
100	});
101	$viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
102
103	$viewer->signal_connect (button3_press_event => sub {
104	$mainwin->visible
105	? $mainwin->hide
106	: $mainwin->show_all;
107	1
108	});
109
110	Gtk2::CV::Plugin->call (new_imagewindow => $viewer);
111		144
112	$schnauzer = new_schnauzer;	145	$schnauzer = new_schnauzer;
113		146
114	$mainwin = new Gtk2::Window;	147	$mainwin = new Gtk2::Window;
		148	$mainwin->set_role ("main");
115	$mainwin->set_title ("CV");	149	$mainwin->set_title ("CV");
116	$mainwin->add (my $vbox = new Gtk2::VBox);	150	$mainwin->add (my $vbox = new Gtk2::VBox);
117	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });	151	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });
118		152
119	$vbox->add ($schnauzer);	153	$vbox->add ($schnauzer);
…		…
127		161
128	$schnauzer->set_geometry_hints;	162	$schnauzer->set_geometry_hints;
129	}	163	}
130		164
131	if (@ARGV) {	165	if (@ARGV) {
132	@ARGV == 1 && -d $ARGV[0]	166	my $show_first = sub {
133	? $schnauzer->set_dir (Glib::filename_to_unicode shift)
134	: $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);
135	$schnauzer->show_all;	167	$schnauzer->show_all;
136	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);	168	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
		169	$viewer->show_all;
		170	};
		171
		172	if (@ARGV == 1 && $ARGV[0] eq "-0r") {
		173	local $/;
		174	$schnauzer->set_paths ([map Glib::filename_to_unicode $_, split /\x00/, <STDIN>], 1, $show_first);
		175	} elsif (@ARGV == 1 && -d $ARGV[0]) {
		176	$schnauzer->set_dir (Glib::filename_to_unicode shift, $show_first);
		177	} else {
		178	if ($ARGV[0] eq "-g") {
		179	shift @ARGV;
		180	@ARGV = map +(File::Glob::bsd_glob $_, File::Glob::GLOB_BRACE \| File::Glob::GLOB_QUOTE), @ARGV;
		181	}
		182	$schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV], 1, $show_first);
		183	}
137	} else {	184	} else {
138	$schnauzer->set_dir (File::Spec->curdir);	185	$schnauzer->set_dir (File::Spec->curdir, sub {
139	$mainwin->show_all;	186	$mainwin->show_all;
140	}
141
142	$viewer->show_all;	187	$viewer->show_all;
		188	});
		189	}
143		190
144	main Gtk2;	191	main Gtk2;
		192
		193	Gtk2::CV::flush_aio;
145		194
146	__DATA__	195	__DATA__
147		196
148	=encoding utf-8	197	=encoding utf-8
149		198
…		…
259	. enlarge the image by 10%	308	. enlarge the image by 10%
260	n reset to normal size	309	n reset to normal size
261	m maximize to screensize	310	m maximize to screensize
262	M maximize to screensize, respecting image aspect	311	M maximize to screensize, respecting image aspect
263	ctrl-m toggle maxpect-always mode	312	ctrl-m toggle maxpect-always mode
		313	ctrl-sift-m toggle using current image size as max image size
264	u uncrop	314	u uncrop
265	r set scaling mode to 'nearest' (fastest)	315	r set scaling mode to 'nearest' (fastest)
266	s set scaling mode to 'bilinear' (default)	316	s set scaling mode to 'bilinear' (default)
267	shift-s set scaling mode to 'hyper' (slowest)	317	shift-s set scaling mode to 'hyper' (slowest)
268	t rotate clockwise 90°	318	t rotate clockwise 90°
269	T rotate counterclockwise°	319	T rotate counterclockwise°
		320	a apply all rotations loslessly to a jpeg file (using exiftran)
270	ctrl-v open a new visual schnauzer window for the current dir	321	ctrl-v open a new visual schnauzer window for the current dir
		322	ctrl-c clone the current image window
271	ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image	323	ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image
272	ctrl-p fire up the print dialog	324	ctrl-p fire up the print dialog
273	escape cancel a crop action	325	escape cancel a crop action
274		326
275	And when playing movies, these additional keys are active:	327	And when playing movies, these additional keys are active:
…		…
292	Left-clicking into the image window will let you crop the image (usually	344	Left-clicking into the image window will let you crop the image (usually
293	to zoom into large images that CV scales down).	345	to zoom into large images that CV scales down).
294		346
295	=head2 THE VISUAL SCHNAUZER	347	=head2 THE VISUAL SCHNAUZER
296		348
		349	Any image-loading action in a schnauzer window acts on the
		350	"last-recently-activated" imagewindow, which currently is simply the last
		351	image window that received a keypress.
		352
297	You can use the following keys in the schnauzer window:	353	You can use the following keys in the schnauzer window:
298		354
299	ctrl-space,	355	ctrl-space,
300	space move to and display next image	356	space move to and display next image
301	ctrl-backspace,	357	ctrl-backspace,
…		…
323	a-z find the first filename beginning with this letter	379	a-z find the first filename beginning with this letter
324		380
325	Right-clicking into the schnauzer window displays a pop-up menu with	381	Right-clicking into the schnauzer window displays a pop-up menu with
326	additional actions.	382	additional actions.
327		383
		384	=head3 SELECTION
		385
		386	You can select entries in the Schnauzer in a variety of ways:
		387
		388	=over 4
		389
		390	=item Keyboard
		391
		392	Moving the cursor with the keyboard will first deselect all files and then
		393	select the file you moved to.
		394
		395	=item Clicking
		396
		397	Clicking on an entry will select the one you clicked and deselect all
		398	others.
		399
		400	=item Shift-Clicking
		401
		402	Shift-clicking will toggle the selection on the entry under the mouse.
		403
		404	=item Dragging
		405
		406	Dragging will select all entries between the one selected when pushing the
		407	button and the one selected when releasing the button. If you move above
		408	or below the schnauzer area while drag-selecting, the schnauzer will move
		409	up/down one row twice per second. In addition, horizontal mouse movement
		410	acts as a kind of invisible horizontal scrollbar.
		411
		412	=item Hint: double-click works while click-selecting
		413
		414	You can double-click any image while click-selecting to display it
		415	without stopping the selection process. This will act as if you normally
		416	double-clicked the image to display it, and will toggle the selection
		417	twice, resulting in no change.
		418
		419	=back
		420
328	=head1 FILES	421	=head1 FILES
329		422
330	When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if	423	When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if
331	it were a perl script. in that, you will mostly load plug-ins.	424	it were a perl script. in that, you will mostly load plug-ins.
332		425
…		…
344		437
345	=item CV_EDITOR	438	=item CV_EDITOR
346		439
347	The program that gets executed when the user presses C<CTRL-e> in the	440	The program that gets executed when the user presses C<CTRL-e> in the
348	Schnauzer or image window. The default is C<gimp>.	441	Schnauzer or image window. The default is C<gimp>.
		442
		443	=item CV_AUDIO_PLAYER
		444
		445	Program used to play all sorts of audio (wav, aif, mp3, ogg...), default "play".
		446	Will be called like C<< $CV_AUDIO_PLAYER -- <path> >>.
349		447
350	=item CV_PRINT_DESTINATION	448	=item CV_PRINT_DESTINATION
351		449
352	The default (perl-style) destination to use in the print dialog.	450	The default (perl-style) destination to use in the print dialog.
353		451

Diff Legend

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

Comparing CV/bin/cv (file contents): Revision 1.58 by root, Wed Sep 7 20:17:25 2005 UTC vs. Revision 1.73 by root, Thu Nov 22 08:52:57 2007 UTC

Diff Legend

Comparing CV/bin/cv (file contents):
Revision 1.58 by root, Wed Sep 7 20:17:25 2005 UTC vs.
Revision 1.73 by root, Thu Nov 22 08:52:57 2007 UTC