diff options
Diffstat (limited to 'perl-install/standalone/drakfloppy')
| -rwxr-xr-x | perl-install/standalone/drakfloppy | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index d8f2e11b6..e94ee0225 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -32,6 +32,7 @@ use common; use ugtk2 qw(:create :dialogs :helpers :wrappers); use detect_devices; +$ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakfloppy-mdk.png"; require_root_capability(); my $window = ugtk2->new('drakfloppy'); @@ -62,34 +63,28 @@ eval { %options = getVarsFromSh($conffile) }; ######## up part # device part -my $device_combo = Gtk2::ComboBox->new_text; -$device_combo->set_popdown_strings(map { "/dev/" . $_->{device} } detect_devices::floppies()); +my $device_combo = Gtk2::ComboBox->new_with_strings([ map { "/dev/" . $_->{device} } detect_devices::floppies() ]); $device_combo->set_active(0); - # kernel part -my $kernel_combo = Gtk2::ComboBox->new_text; -$kernel_combo->set_popdown_strings(sort grep { !/^\.\.?$/ } sort(all("/lib/modules"))); -$kernel_combo->entry->set_text(chomp_(`uname -r`)); +my $kernel_combo = Gtk2::ComboBox->new_with_strings([ sort grep { !/^\.\.?$/ } sort(all("/lib/modules")) ], chomp_(`uname -r`)); ########################################################## -my $tips = new Gtk2::Tooltips; - ### main window $window->{window}->add( gtkpack_(Gtk2::VBox->new, - if_($::isEmbedded, 0, new Gtk2::Label(N("Boot disk creation"))), + if_($::isEmbedded, 0, Gtk2::Label->new(N("Boot disk creation"))), 0, gtkadd(Gtk2::Frame->new(N("General")), - gtkpack__(new Gtk2::VBox(0, 0), - gtkpack__(new Gtk2::HBox(1, 0), + gtkpack__(Gtk2::VBox->new(0, 0), + gtkpack__(Gtk2::HBox->new(1, 0), Gtk2::Label->new(N("Device")), $device_combo, gtksignal_connect(Gtk2::Button->new(N("Default")), clicked => sub { $device_combo->entry->set_text("/dev/fd0") }), ), - gtkpack__(new Gtk2::HBox(1, 0), + gtkpack__(Gtk2::HBox->new(1, 0), Gtk2::Label->new(N("Kernel version")), $kernel_combo, gtksignal_connect(Gtk2::Button->new(N("Default")), @@ -143,10 +138,10 @@ sub pref_dialog() { gtkpack_($dialog->vbox, 0, gtkadd(Gtk2::Frame->new(N("Mkinitrd optional arguments")), gtkpack__(Gtk2::VBox->new(0, 5), - $buttons{force} = new Gtk2::CheckButton(N("force")), - $buttons{raid} = new Gtk2::CheckButton(N("omit raid modules")), - $buttons{needed} = new Gtk2::CheckButton(N("if needed")), - $buttons{scsi} = new Gtk2::CheckButton(N("omit scsi modules")), + $buttons{force} = Gtk2::CheckButton->new(N("force")), + $buttons{raid} = Gtk2::CheckButton->new(N("omit raid modules")), + $buttons{needed} = Gtk2::CheckButton->new(N("if needed")), + $buttons{scsi} = Gtk2::CheckButton->new(N("omit scsi modules")), ), ), 1, gtkadd(Gtk2::Frame->new(N("Add a module")), |