From 1aa5bd022bb3c4d6f579e9ca65d22cdd3f064445 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 6 Oct 2014 12:20:40 +0200 Subject: [PATCH] simplify code (always use combo box for target HD) --- proxinstall | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/proxinstall b/proxinstall index 12dee69..17d0fc2 100755 --- a/proxinstall +++ b/proxinstall @@ -1761,33 +1761,27 @@ sub create_hdsel_view { $master_hd = find_master ($target_hd); my $label; - if (scalar (@$hds) == 1) { - my $devdesc = get_device_desc ($devname, $size, $model); - $label = Gtk3::Label->new ("Target Harddisk: $devdesc"); - $hbox->pack_start ($label, 0, 0, 0); - } else { - $label = Gtk3::Label->new ("Target Harddisks: "); - $hbox->pack_start ($label, 0, 0, 0); + $label = Gtk3::Label->new ("Target Harddisks: "); + $hbox->pack_start ($label, 0, 0, 0); - my $combo = Gtk3::ComboBoxText->new_with_entry(); - my $e = $combo->get_child(); - $e->set_width_chars(40); + my $combo = Gtk3::ComboBoxText->new_with_entry(); + my $e = $combo->get_child(); + $e->set_width_chars(40); - foreach my $hd (@$hds) { - ($disk, $devname, $size, $model) = @$hd; - $combo->append_text (get_device_desc ($devname, $size, $model)); - } + foreach my $hd (@$hds) { + ($disk, $devname, $size, $model) = @$hd; + $combo->append_text (get_device_desc ($devname, $size, $model)); + } - $combo->set_active (0); - $combo->signal_connect (changed => sub { - $a = shift->get_active; - my ($disk, $devname) = @{@$hds[$a]}; - $target_hd = $devname; - $master_hd = find_master ($target_hd); - }); + $combo->set_active (0); + $combo->signal_connect (changed => sub { + $a = shift->get_active; + my ($disk, $devname) = @{@$hds[$a]}; + $target_hd = $devname; + $master_hd = find_master ($target_hd); + }); - $hbox->pack_start ($combo, 0, 0, 0); - } + $hbox->pack_start ($combo, 0, 0, 0); $inbox->show_all; -- 2.39.5