"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/Gscan2pdf/Dialog/MultipleMessage.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).

MultipleMessage.pm  (gscan2pdf-2.13.1.tar.xz)	:	MultipleMessage.pm  (gscan2pdf-2.13.2.tar.xz)
skipping to change at line 16		skipping to change at line 16
use Glib 1.220 qw(TRUE FALSE); # To get TRUE and FALSE		use Glib 1.220 qw(TRUE FALSE); # To get TRUE and FALSE
use Gscan2pdf::Translation '__'; # easier to extract strings with xgettext		use Gscan2pdf::Translation '__'; # easier to extract strings with xgettext
use Gscan2pdf::Dialog;		use Gscan2pdf::Dialog;
use Glib::Object::Subclass Gscan2pdf::Dialog::;		use Glib::Object::Subclass Gscan2pdf::Dialog::;
use Readonly;		use Readonly;
Readonly my $COL_MESSAGE => 3;		Readonly my $COL_MESSAGE => 3;
Readonly my $COL_CHECKBOX => 4;		Readonly my $COL_CHECKBOX => 4;
my %types;		my %types;
our $VERSION = '2.13.1';		our $VERSION = '2.13.2';
my $SPACE = q{ };		my $SPACE = q{ };
my $HEXREGEX = qr{^(.*) # start of message		my $HEXREGEX = qr{^(.*) # start of message
\b0x[[:xdigit:]]+\b # hex (e.g. address)		\b0x[[:xdigit:]]+\b # hex (e.g. address)
(.*)$ # rest of message		(.*)$ # rest of message
}xsm;		}xsm;
my $INTREGEX = qr{^(.*) # start of message		my $INTREGEX = qr{^(.*) # start of message
\b[[:digit:]]+\b # integer		\b[[:digit:]]+\b # integer
(.*)$ # rest of message		(.*)$ # rest of message
}xsm;		}xsm;
		my $TEMPFILEREGEX = qr{^(.*) # start of message
		gscan2pdf[-][[:alnum:]]+/[[:word:]]+ # temp filename
		(.*)$ # rest of message
		}xsm;
sub INIT_INSTANCE {		sub INIT_INSTANCE {
my $self = shift;		my $self = shift;
%types = (		%types = (
error => __('Error'),		error => __('Error'),
warning => __('Warning'),		warning => __('Warning'),
);		);
$self->set_position('center-on-parent');		$self->set_position('center-on-parent');
my $vbox = $self->get_content_area;		my $vbox = $self->get_content_area;
skipping to change at line 269		skipping to change at line 273
return $message;		return $message;
}		}
# External tools sometimes throws warning messages including a number,		# External tools sometimes throws warning messages including a number,
# e.g. hex address. As the number is very rarely the same, although the message		# e.g. hex address. As the number is very rarely the same, although the message
# itself is, filter out the number from the message		# itself is, filter out the number from the message
sub filter_message {		sub filter_message {
my ($message) = @_;		my ($message) = @_;
$message =~ s/\s+$//xsm;		$message =~ s/\s+$//xsm;
		while ( $message =~ /$TEMPFILEREGEX/xsmo ) {
		$message =~ s/$TEMPFILEREGEX/$1%%t$2/xsmo;
		}
while ( $message =~ /$HEXREGEX/xsmo ) {		while ( $message =~ /$HEXREGEX/xsmo ) {
$message =~ s/$HEXREGEX/$1%%x$2/xsmo;		$message =~ s/$HEXREGEX/$1%%x$2/xsmo;
}		}
while ( $message =~ /$INTREGEX/xsmo ) {		while ( $message =~ /$INTREGEX/xsmo ) {
$message =~ s/$INTREGEX/$1%%d$2/xsmo;		$message =~ s/$INTREGEX/$1%%d$2/xsmo;
}		}
return $message;		return $message;
}		}
sub close_callback {		sub close_callback {
End of changes. 3 change blocks.
1 lines changed or deleted		8 lines changed or added

---