That one was done the wrong way round. Try this one :-)
I should really look at the diff manpage
On Sun, 2002-08-25 at 16:08, David Sansome wrote:
> Ok, sorry about that, here it is again.
> (I have no idea why the #! line is there...)
>
> David Sansome
>
> On Sun, 2002-08-25 at 15:53, Thierry Vignaud wrote:
> > David Sansome <[EMAIL PROTECTED]> writes:
> >
> > > I've been playing around with draksplash, and it seems to be working
> > > fine :-)
> > >
> > > The only problem is that it looks REALLY ugly! The labels are all
> > > centered and the other widgets are squashed up to the right in all
> > > different sizes. I'm not sure how to fix these, but I've attatched
> > > a diff to correct most of the strings. I assume this will need
> > > changes in the po files?
> >
> > (...)
> >
> > > 1c1
> > > < #!/usr/bin/perl
> > > ---
> > >> #!/usr/bin/perl
> >
> > i cannot speak about patch interest, but please send unified context
> > (aka diff -u), this is a lot more readable.
> > thanks
> >
> >
--- draksplashOld 2002-08-23 20:45:18.000000000 +0100
+++ draksplash 2002-08-25 13:05:58.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl
use lib qw(/usr/lib/libDrakX);
use MDK::Common;
@@ -73,16 +73,16 @@
'ph'=> $theme{'res'}{'h'},
);
-my %first = ('frame'=>new Gtk::Frame(_("first step creation")),
- 'widget'=>{ 'label'=> { 'res'=>_("final resolution"),
- 'file'=>_("choose image file"),
+my %first = ('frame'=>new Gtk::Frame(_("Theme Selection")),
+ 'widget'=>{ 'label'=> { 'res'=>_("Resolution"),
+ 'file'=>_("(No Image selected)"),
'name'=>_("Theme name")
},
- 'button'=>{ 'boot_conf'=>_("make bootsplash step 2"),
- 'lilo_conf'=>_("go to lilosplash configuration"),
- 'kill'=>_("quit"),
- 'save'=>_("save theme"),
- 'file'=>_("browse"),
+ 'button'=>{ 'boot_conf'=>_("Advanced..."),
+ 'lilo_conf'=>_("Configure Lilo"),
+ 'kill'=>_("Cancel"),
+ 'save'=>_("OK"),
+ 'file'=>_("Browse..."),
},
'combo'=> {'res'=>['800x600', '1024x768', '1280x1024'],
'name'=>[ $theme{'name'} , &giv_exist_thm]
@@ -96,15 +96,15 @@
'kill'],
);
my %boot_conf_frame = ('frame' => new Gtk::Frame( _("Configure bootsplash picture") ),
- 'widget'=> { 'label' => { 'tx'=> _("x coordinate of text box in number of character"),
- 'ty'=> _("y coordinate of text box in number of character"),
- 'tw'=> _("text width"),
- 'th'=> _("text box height"),
- 'px'=> _("the progress bar x coordinate of its upper left corner"),
- 'py'=> _("the progress bar y coordinate of its upper left corner"),
- 'pw'=> _("the width of the progress bar"),
- 'ph'=> _("the heigth of the progress bar"),
- 'pc'=> _("the color of the progress bar")
+ 'widget'=> { 'label' => { 'tx'=> _("X coordinate of text box (in number of characters)"),
+ 'ty'=> _("Y coordinate of text box (in number of characters)"),
+ 'tw'=> _("Text width"),
+ 'th'=> _("Text height"),
+ 'px'=> _("X coordinate of progress bar (pixels)"),
+ 'py'=> _("Y coordinate of progress bar (pixels)"),
+ 'pw'=> _("Progress bar width"),
+ 'ph'=> _("Progress bar height"),
+ 'pc'=> _("Progress bar colour")
},
#- must set scale values to true to get them created by mk_frame
'scale' => {'tx'=> 1,
@@ -116,13 +116,13 @@
'pw'=> 1,
'ph'=> 1,
},
- 'button' => { 'annul'=> _("go back"),
- 'prev'=>_("preview"),
- 'pc'=> _("choose color"),
+ 'button' => { 'annul'=> _("OK"),
+ 'prev'=>_("Preview"),
+ 'pc'=> _("Choose colour"),
},
- 'check' => { 'logo' => _("Display logo on Console" ),
- 'quiet'=> _("Make kernel message quiet by default"),
+ 'check' => { 'logo' => _("Display logo on console" ),
+ 'quiet'=> _("Make kernel messages quiet by default"),
},
},
'pos'=> [ 'tx' ,
@@ -158,7 +158,7 @@
$boot_conf_frame{'frame'}->destroy ;
$boot_conf_frame{'frame'} = new Gtk::Frame(_("Configure bootsplash picture") );
&make_boot_frame;
- member( $theme{'name'}, &giv_exist_thm) and &thm_in_this_res and &get_this_thm_res_conf or $in->ask_warn(_("Notice"),_("This theme haven't yet any bootsplash in %s !",$theme{'res'}{'res'}));
+ member( $theme{'name'}, &giv_exist_thm) and &thm_in_this_res and &get_this_thm_res_conf or $in->ask_warn(_("Warning"),_("This theme does not yet have a picture in %s!\nYou will need to select one",$theme{'res'}{'res'}));
});
#- quit button
$first{'widgets'}{'button'}{'kill'}->signal_connect( clicked => \&CloseAppWindow);
@@ -166,8 +166,8 @@
$first{'widgets'}{'button'}{'boot_conf'}->signal_connect( clicked => sub{show_act(\%boot_conf_frame) } );
#- image file selection for new theme
$first{'widgets'}{'button'}{'file'}->signal_connect( clicked =>sub{
- my $file_dialog = new Gtk::FileSelection('choose image');
- $file_dialog->set_filename( ( $first{'widgets'}{'label'}{'file'}->get ne _("choose image file") )?$first{'widgets'}{'label'}{'file'}->get:'~/' );
+ my $file_dialog = new Gtk::FileSelection('Browse...');
+ $file_dialog->set_filename( ( $first{'widgets'}{'label'}{'file'}->get ne _("Browse...") )?$first{'widgets'}{'label'}{'file'}->get:'~/' );
$file_dialog->cancel_button->signal_connect( clicked => sub{ $file_dialog->destroy} );
$file_dialog->ok_button->signal_connect( clicked => sub{ $first{'widgets'}{'label'}{'file'}->set_text($file_dialog->get_filename) ; $file_dialog->destroy ;});
$file_dialog->show;
@@ -210,7 +210,7 @@
#- Desc => write config file for boot theme and copy image in the right location
sub write_boot_thm{
- my $w = $in->wait_message('',_("saving Bootsplash theme..."));
+ my $w = $in->wait_message('',_("Saving theme..."));
&set_thm_values;
my $logo = ($boot_conf_frame{'widgets'}{'check'}{'logo'}->get_active)?'yes':'no';
my $quiet = ($boot_conf_frame{'widgets'}{'check'}{'quiet'}->get_active)?'yes':'no';
@@ -327,7 +327,7 @@
and last;
}
- $is_ok == 1 or $in->ask_warn(_("Notice"),_("This theme haven't yet any bootsplash in %s !",$theme{'res'}{'res'})) and return 0;
+ $is_ok == 1 or $in->ask_warn(_("Warning"),_("This theme does not yet have a picture in %s!\nYou will need to select one",$theme{'res'}{'res'})) and return 0;
return 1;
}
@@ -451,7 +451,7 @@
#- made a preview
$boot_conf_frame{'widgets'}{'button'}{'prev'}->signal_connect( clicked => sub{
if(! -f $first{'widgets'}{'label'}{'file'}->get) {
- $in->ask_warn(_("Notice"),_("You must choose an image file first!"));
+ $in->ask_warn(_("Warning"),_("You must choose an image file first!"));
return 0;
}
#- calculation of the 2 angle of text box and progress bar
