summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-07-14 19:21:31 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-07-14 19:21:31 +0000
commit1dfeece63ce449df5f3b16c0e7223b6c1d157a0a (patch)
treec58c2f7e9caba4edbc0c1ce9fba50e15cbecded7 /perl-install/standalone
parent52094cbbfb2a26bbf518e2d2d527aa6ecfaec2e6 (diff)
downloaddrakx-1dfeece63ce449df5f3b16c0e7223b6c1d157a0a.tar
drakx-1dfeece63ce449df5f3b16c0e7223b6c1d157a0a.tar.gz
drakx-1dfeece63ce449df5f3b16c0e7223b6c1d157a0a.tar.bz2
drakx-1dfeece63ce449df5f3b16c0e7223b6c1d157a0a.tar.xz
drakx-1dfeece63ce449df5f3b16c0e7223b6c1d157a0a.zip
use new Gtk2::OptionMenu compatibility layer to get better designed GUIes
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakconnect10
-rwxr-xr-xperl-install/standalone/draksec3
2 files changed, 4 insertions, 9 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index b2a161af8..3466c6b63 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -78,19 +78,16 @@ unless ($::isEmbedded) {
}
$window1->{rwindow}->set_border_width(10);
-my $combo1 = new Gtk2::Combo;
+my $combo1 = new Gtk2::OptionMenu;
$combo1->set_popdown_strings(network::netconnect::get_profiles());
my $old_profile = $netcnx->{PROFILE};
-
$combo1->entry->set_text($netcnx->{PROFILE} || "default");
-$combo1->entry->set_editable(0);
my $button_del = new Gtk2::Button(N("Del profile..."));
$button_del->signal_connect(clicked => sub {
my $dialog = _create_dialog(N("Delete profile"));
$dialog->vbox->pack_start(new Gtk2::Label(N("Profile to delete:")),1,1,0);
- my $combo_dialog = new Gtk2::Combo;
+ my $combo_dialog = new Gtk2::Option_menu;
$combo_dialog->set_popdown_strings(grep { ! /default/ } network::netconnect::get_profiles());
- $combo_dialog->entry->set_editable(0);
$dialog->vbox->pack_start($combo_dialog,1,1,0);
my $bbox_dialog = new Gtk2::HButtonBox;
$dialog->action_area->add($bbox_dialog);
@@ -421,10 +418,9 @@ Configure them first by clicking on 'Configure'")),1,1,0);
$infos[2*$i]->pack_start($l,1,1,0);
$vbox_local->pack_start($infos[2*$i],0,0,0);
if (defined $j->[2]) {
- my $c = new Gtk2::Combo();
+ my $c = new Gtk2::OptionMenu;
$c->set_popdown_strings(@{$j->[2]});
$infos[2*$i+1] = $c->entry;
- $infos[2*$i+1]->set_editable(0);
$infos[2*$i]->pack_start($c,0,0,0);
} else {
$infos[2*$i+1] = new Gtk2::Entry();
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 39431f6bf..a3fe96f0e 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -75,8 +75,7 @@ Security Administrator:
sub new_editable_combo {
my ($string_list, $o_default_value) = @_;
- my $w = new Gtk2::Combo();
- $w->entry->set_editable(0);
+ my $w = new Gtk2::OptionMenu();
$w->set_popdown_strings(@$string_list) unless is_empty_array_ref $string_list;
$w->entry->set_text($o_default_value) if $o_default_value;
$w;