"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/Gscan2pdf/Dialog/Scan.pm" between
gscan2pdf-2.13.1.tar.xz and gscan2pdf-2.13.2.tar.xz

About: gscan2pdf is a GUI to produce PDFs from scanned documents (using Perl).

Scan.pm  (gscan2pdf-2.13.1.tar.xz)	:	Scan.pm  (gscan2pdf-2.13.2.tar.xz)
skipping to change at page 1, line 300		skipping to change at page 1, line 300
),		),
Glib::ParamSpec->boolean(		Glib::ParamSpec->boolean(
'ignore-duplex-capabilities', # name		'ignore-duplex-capabilities', # name
'Ignore duplex capabilities', # nick		'Ignore duplex capabilities', # nick
'Ignore duplex capabilities', # blurb		'Ignore duplex capabilities', # blurb
FALSE, # default_value		FALSE, # default_value
[qw/readable writable/] # flags		[qw/readable writable/] # flags
),		),
];		];
our $VERSION = '2.13.1';		our $VERSION = '2.13.2';
my ( $d_sane, $logger );		my ( $d_sane, $logger );
my $SANE_NAME_SCAN_TL_X = SANE_NAME_SCAN_TL_X;		my $SANE_NAME_SCAN_TL_X = SANE_NAME_SCAN_TL_X;
my $SANE_NAME_SCAN_TL_Y = SANE_NAME_SCAN_TL_Y;		my $SANE_NAME_SCAN_TL_Y = SANE_NAME_SCAN_TL_Y;
my $SANE_NAME_SCAN_BR_X = SANE_NAME_SCAN_BR_X;		my $SANE_NAME_SCAN_BR_X = SANE_NAME_SCAN_BR_X;
my $SANE_NAME_SCAN_BR_Y = SANE_NAME_SCAN_BR_Y;		my $SANE_NAME_SCAN_BR_Y = SANE_NAME_SCAN_BR_Y;
my $SANE_NAME_PAGE_HEIGHT = SANE_NAME_PAGE_HEIGHT;		my $SANE_NAME_PAGE_HEIGHT = SANE_NAME_PAGE_HEIGHT;
my $SANE_NAME_PAGE_WIDTH = SANE_NAME_PAGE_WIDTH;		my $SANE_NAME_PAGE_WIDTH = SANE_NAME_PAGE_WIDTH;
sub INIT_INSTANCE {		sub INIT_INSTANCE {
skipping to change at line 1339		skipping to change at line 1339
$self->{combobp}->set_active(0);		$self->{combobp}->set_active(0);
$self->{combobp}->signal_connect(		$self->{combobp}->signal_connect(
changed => sub {		changed => sub {
if ( not defined $self->{combobp}->get_active_text ) { return }		if ( not defined $self->{combobp}->get_active_text ) { return }
if ( $self->{combobp}->get_active_text eq __('Edit') ) {		if ( $self->{combobp}->get_active_text eq __('Edit') ) {
$self->edit_paper;		$self->edit_paper;
}		}
elsif ( $self->{combobp}->get_active_text eq __('Manual') ) {		elsif ( $self->{combobp}->get_active_text eq __('Manual') ) {
for (		for (
( SANE_NAME_SCAN_TL_X, SANE_NAME_SCAN_TL_Y,		(
		SANE_NAME_SCAN_TL_X, SANE_NAME_SCAN_TL_Y,
SANE_NAME_SCAN_BR_X, SANE_NAME_SCAN_BR_Y,		SANE_NAME_SCAN_BR_X, SANE_NAME_SCAN_BR_Y,
SANE_NAME_PAGE_HEIGHT, SANE_NAME_PAGE_WIDTH		SANE_NAME_PAGE_HEIGHT, SANE_NAME_PAGE_WIDTH
)		)
)		)
{		{
if ( defined $self->{geometry_boxes}{$_} ) {		if ( defined $self->{geometry_boxes}{$_} ) {
$self->{geometry_boxes}{$_}->show_all;		$self->{geometry_boxes}{$_}->show_all;
}		}
}		}
$self->set( 'paper', undef );		$self->set( 'paper', undef );
skipping to change at line 1361		skipping to change at line 1362
else {		else {
my $paper = $self->{combobp}->get_active_text;		my $paper = $self->{combobp}->get_active_text;
$self->set( 'paper', $paper );		$self->set( 'paper', $paper );
}		}
}		}
);		);
# If the geometry is changed, unset the paper size,		# If the geometry is changed, unset the paper size,
# if we are not setting a profile		# if we are not setting a profile
for (		for (
( SANE_NAME_SCAN_TL_X, SANE_NAME_SCAN_TL_Y,		(
		SANE_NAME_SCAN_TL_X, SANE_NAME_SCAN_TL_Y,
SANE_NAME_SCAN_BR_X, SANE_NAME_SCAN_BR_Y,		SANE_NAME_SCAN_BR_X, SANE_NAME_SCAN_BR_Y,
SANE_NAME_PAGE_HEIGHT, SANE_NAME_PAGE_WIDTH		SANE_NAME_PAGE_HEIGHT, SANE_NAME_PAGE_WIDTH
)		)
)		)
{		{
if ( defined $options->by_name($_) ) {		if ( defined $options->by_name($_) ) {
my $widget = $self->{option_widgets}{$_};		my $widget = $self->{option_widgets}{$_};
$widget->signal_connect(		$widget->signal_connect(
changed => sub {		changed => sub {
if ( not @{ $self->{setting_current_scan_options} }		if ( not @{ $self->{setting_current_scan_options} }
skipping to change at line 1387		skipping to change at line 1389
);		);
}		}
}		}
}		}
return;		return;
}		}
sub hide_geometry {		sub hide_geometry {
my ( $self, $options ) = @_;		my ( $self, $options ) = @_;
for (		for (
( SANE_NAME_SCAN_TL_X, SANE_NAME_SCAN_TL_Y,		(
		SANE_NAME_SCAN_TL_X, SANE_NAME_SCAN_TL_Y,
SANE_NAME_SCAN_BR_X, SANE_NAME_SCAN_BR_Y,		SANE_NAME_SCAN_BR_X, SANE_NAME_SCAN_BR_Y,
SANE_NAME_PAGE_HEIGHT, SANE_NAME_PAGE_WIDTH		SANE_NAME_PAGE_HEIGHT, SANE_NAME_PAGE_WIDTH
)		)
)		)
{		{
if ( defined $self->{geometry_boxes}{$_} ) {		if ( defined $self->{geometry_boxes}{$_} ) {
$self->{geometry_boxes}{$_}->hide;		$self->{geometry_boxes}{$_}->hide;
}		}
}		}
return;		return;
skipping to change at line 1653		skipping to change at line 1656
my $formats = $self->get('paper-formats');		my $formats = $self->get('paper-formats');
my $options = $self->get('available-scan-options');		my $options = $self->get('available-scan-options');
my $paper_profile = Gscan2pdf::Scanner::Profile->new;		my $paper_profile = Gscan2pdf::Scanner::Profile->new;
if ( defined( $options->by_name(SANE_NAME_PAGE_HEIGHT) )		if ( defined( $options->by_name(SANE_NAME_PAGE_HEIGHT) )
and not $options->by_name(SANE_NAME_PAGE_HEIGHT)->{cap} &		and not $options->by_name(SANE_NAME_PAGE_HEIGHT)->{cap} &
SANE_CAP_INACTIVE		SANE_CAP_INACTIVE
and defined( $options->by_name(SANE_NAME_PAGE_WIDTH) )		and defined( $options->by_name(SANE_NAME_PAGE_WIDTH) )
and not $options->by_name(SANE_NAME_PAGE_WIDTH)->{cap} &		and not $options->by_name(SANE_NAME_PAGE_WIDTH)->{cap} &
SANE_CAP_INACTIVE )		SANE_CAP_INACTIVE )
{		{
$paper_profile->add_backend_option( SANE_NAME_PAGE_HEIGHT,		$paper_profile->add_backend_option(
		SANE_NAME_PAGE_HEIGHT,
$formats->{$paper}{y} + $formats->{$paper}{t},		$formats->{$paper}{y} + $formats->{$paper}{t},
$options->by_name(SANE_NAME_PAGE_HEIGHT)->{val}		$options->by_name(SANE_NAME_PAGE_HEIGHT)->{val}
);		);
$paper_profile->add_backend_option( SANE_NAME_PAGE_WIDTH,		$paper_profile->add_backend_option(
		SANE_NAME_PAGE_WIDTH,
$formats->{$paper}{x} + $formats->{$paper}{l},		$formats->{$paper}{x} + $formats->{$paper}{l},
$options->by_name(SANE_NAME_PAGE_WIDTH)->{val}		$options->by_name(SANE_NAME_PAGE_WIDTH)->{val}
);		);
}		}
$paper_profile->add_backend_option( SANE_NAME_SCAN_TL_X,		$paper_profile->add_backend_option(
		SANE_NAME_SCAN_TL_X,
$formats->{$paper}{l},		$formats->{$paper}{l},
$options->by_name(SANE_NAME_SCAN_TL_X)->{val}		$options->by_name(SANE_NAME_SCAN_TL_X)->{val}
);		);
$paper_profile->add_backend_option( SANE_NAME_SCAN_TL_Y,		$paper_profile->add_backend_option(
		SANE_NAME_SCAN_TL_Y,
$formats->{$paper}{t},		$formats->{$paper}{t},
$options->by_name(SANE_NAME_SCAN_TL_Y)->{val}		$options->by_name(SANE_NAME_SCAN_TL_Y)->{val}
);		);
$paper_profile->add_backend_option( SANE_NAME_SCAN_BR_X,		$paper_profile->add_backend_option(
		SANE_NAME_SCAN_BR_X,
$formats->{$paper}{x} + $formats->{$paper}{l},		$formats->{$paper}{x} + $formats->{$paper}{l},
$options->by_name(SANE_NAME_SCAN_BR_X)->{val}		$options->by_name(SANE_NAME_SCAN_BR_X)->{val}
);		);
$paper_profile->add_backend_option( SANE_NAME_SCAN_BR_Y,		$paper_profile->add_backend_option(
		SANE_NAME_SCAN_BR_Y,
$formats->{$paper}{y} + $formats->{$paper}{t},		$formats->{$paper}{y} + $formats->{$paper}{t},
$options->by_name(SANE_NAME_SCAN_BR_Y)->{val}		$options->by_name(SANE_NAME_SCAN_BR_Y)->{val}
);		);
# forget the previous option info calls, as these are only interesting		# forget the previous option info calls, as these are only interesting
# *whilst* setting a profile, and now we are starting from scratch		# *whilst* setting a profile, and now we are starting from scratch
delete $self->{option_info};		delete $self->{option_info};
if ( not $paper_profile->num_backend_options ) {		if ( not $paper_profile->num_backend_options ) {
$self->hide_geometry($options);		$self->hide_geometry($options);
End of changes. 10 change blocks.
10 lines changed or deleted		19 lines changed or added

---