summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-08 14:28:51 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-08 14:28:51 +0000
commitb0608a450f1cb1921cbabe571d5c2cd697d2803f (patch)
tree46804cb8503321814eb550f1fe4a4757a5627965
parentdc04d56c82e4f0f1f8202691808bf7bbe9e30660 (diff)
downloaddrakx-b0608a450f1cb1921cbabe571d5c2cd697d2803f.tar
drakx-b0608a450f1cb1921cbabe571d5c2cd697d2803f.tar.gz
drakx-b0608a450f1cb1921cbabe571d5c2cd697d2803f.tar.bz2
drakx-b0608a450f1cb1921cbabe571d5c2cd697d2803f.tar.xz
drakx-b0608a450f1cb1921cbabe571d5c2cd697d2803f.zip
(Create,create_widget) fix file system type drop down list showing most types
as "..." in expert mode due to ellipsizing (#43611)
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/interactive/gtk.pm2
4 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e3a292c09..1e4525774 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- diskdrake
+ o fix file system type drop down list showing most types as "..." in expert
+ mode due to ellipsizing (#43611)
+
Version 11.37 - 8 September 2008
- add descriptions to menu entries (#26106)
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index de4b0e8f5..fe7af2af5 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -449,7 +449,7 @@ sub Create {
{ label => N("Size in MB: "), val => \$mb_size, min => to_Mb(min_partition_size($hd)), max => to_Mb($def_size),
type => 'range', SpinButton => $::expert, changed => sub { $part->{start} = min($part->{start}, $max - $mb_size * 2048) } },
{ label => N("Filesystem type: "), val => \$type_name, list => [ fs::type::type_names($::expert, $hd) ],
- sort => 0, if_($::expert, gtk => { wrap_width => 4 }) },
+ sort => 0, if_($::expert, gtk => { wrap_width => 4 }, do_not_ellipsize => 1) },
{ label => N("Mount point: "), val => \$part->{mntpoint}, list => [ fsedit::suggestions_mntpoint($all_hds), '' ],
disabled => sub { my $p = fs::type::type_name2subpart($type_name); isSwap($p) || isNonMountable($p) }, type => 'combo', not_edit => 0,
},
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3a86e5547..1dcb0af7d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,8 @@
- do not size radio button that have a label thus preventing uneeded horizontal
scrollbars to appear
+- partitionning step
+ o fix file system type drop down list showing most types as "..." in expert
+ mode due to ellipsizing (#43611)
Version 11.34 - 2 September 2008
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 9a35a16ac..d18daa183 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -495,7 +495,7 @@ sub create_widget {
if (!$e->{separator}) {
if ($e->{not_edit} && $width < 160) { #- ComboBoxes do not have an horizontal scroll-bar. This can cause havoc for long strings (eg: diskdrake Create dialog box in expert mode)
$w = Gtk2::ComboBox->new_text;
- ($w->child->get_cell_renderers)[0]->set_property('ellipsize', 'end');
+ ($w->child->get_cell_renderers)[0]->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize};
$w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width};
} else {
$w = Gtk2::Combo->new;