summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-12-03 12:30:10 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-03 12:37:25 +0100
commitee5d25217f323d435e06de59cc091586213d4ab7 (patch)
treee16c993b4447e9cb0707283a15fc1263c10ecc00 /perl-install
parentff8a9294dc6f9d1da88ccb7718f696b415a74fd1 (diff)
downloaddrakx-ee5d25217f323d435e06de59cc091586213d4ab7.tar
drakx-ee5d25217f323d435e06de59cc091586213d4ab7.tar.gz
drakx-ee5d25217f323d435e06de59cc091586213d4ab7.tar.bz2
drakx-ee5d25217f323d435e06de59cc091586213d4ab7.tar.xz
drakx-ee5d25217f323d435e06de59cc091586213d4ab7.zip
show labels on partition buttons again but make them ellipsized (mga#11858)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/diskdrake/hd_gtk.pm5
-rw-r--r--perl-install/install/NEWS1
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 21a48e73b..42f48471f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- diskdrake:
o detect eMMc block devices (Luc Menut, mga#11812)
+ o show labels on partition buttons again but ellipsized (mga#11858)
Version 16.4 - 2 December 2013
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 688a476f1..c8e9215c8 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -321,7 +321,7 @@ sub create_automatic_notebooks {
sub create_buttons4partitions {
my ($kind, $totalsectors, @parts) = @_;
- $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 50 if $w->{window}->get_window;
+ $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 60 if $w->{window}->get_window;
my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1;
my $i = 1;
@@ -346,7 +346,8 @@ sub create_buttons4partitions {
}
my $info = $entry->{mntpoint} || $entry->{device_LABEL} || '';
$info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info;
- my $w = Gtk3::ToggleButton->new() or internal_error('new_with_label');
+ my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label');
+ $w->get_child->set_ellipsize('end');
$w->set_tooltip_text($info);
$w->signal_connect(clicked => sub {
$current_button != $w or return;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d669de58a..33acd6960 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- partitioning:
o detect eMMc block devices (Luc Menut, mga#11812)
+ o show labels on partition buttons again but ellipsized (mga#11858)
Version 16.4 - 2 December 2013