summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-15 22:21:02 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-15 22:21:02 +0000
commit8e187d972ed59909271d48915eef4af34e7fe068 (patch)
tree9ab1cf4bc2778f42890caed92633da632050120a
parent09d1e8cecc0385d694818ddc6cca3d26fabaff23 (diff)
downloaddrakx-backup-do-not-use-8e187d972ed59909271d48915eef4af34e7fe068.tar
drakx-backup-do-not-use-8e187d972ed59909271d48915eef4af34e7fe068.tar.gz
drakx-backup-do-not-use-8e187d972ed59909271d48915eef4af34e7fe068.tar.bz2
drakx-backup-do-not-use-8e187d972ed59909271d48915eef4af34e7fe068.tar.xz
drakx-backup-do-not-use-8e187d972ed59909271d48915eef4af34e7fe068.zip
split button bars into 3 bars
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/diskdrake/hd_gtk.pm16
-rw-r--r--perl-install/diskdrake/interactive.pm20
-rw-r--r--perl-install/install/NEWS1
4 files changed, 29 insertions, 9 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f54bdd5a6..26add2a55 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- diskdrake:
o fix check for mdadm in live install (#43785)
+ o refresh GUI
- harddrake:
o do not use anymore printerdrake and thus do not detect printers anymore
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index dbccf5cdb..2c85fae9a 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -70,7 +70,8 @@ sub main {
width => mygtk2::get_label_width()
),
1, (my $notebook_widget = Gtk2::Notebook->new),
- 0, (my $per_kind_action_box = Gtk2::HBox->new(0,0)),
+ 0, (my $per_kind_action_box = gtknew('HButtonBox', layout => 'edge')),
+ 0, (my $per_kind_action_box2 = gtknew('HButtonBox', layout => 'end')),
0, (my $general_action_box = gtknew('HButtonBox', spacing => 5, layout => 'spread')),
),
);
@@ -84,7 +85,7 @@ sub main {
partition_table::assign_device_numbers($_) foreach fs::get::hds($all_hds);
create_automatic_notebooks($notebook_widget);
general_action_box($general_action_box);
- per_kind_action_box($per_kind_action_box, $current_kind);
+ per_kind_action_box($per_kind_action_box, $per_kind_action_box2, $current_kind);
current_kind_changed($in, $current_kind);
current_entry_changed($current_kind, $current_entry);
$lock = 0;
@@ -184,16 +185,21 @@ sub general_action_box {
}
}
sub per_kind_action_box {
- my ($box, $kind) = @_;
- $_->destroy foreach $box->get_children;
+ my ($box, $box2, $kind) = @_;
+ $_->destroy foreach $box->get_children, $box2->get_children;
$kind->{type} =~ /hd|lvm/ or return;
- foreach my $s (diskdrake::interactive::hd_possible_actions($in, kind2hd($kind), $all_hds)) {
+ foreach my $s (diskdrake::interactive::hd_possible_actions_base($in, kind2hd($kind), $all_hds)) {
gtkadd($box,
gtksignal_connect(Gtk2::Button->new(translate($s)),
clicked => sub { try($s, kind2hd($kind)) }));
}
+ foreach my $s (diskdrake::interactive::hd_possible_actions_extra($in, kind2hd($kind), $all_hds)) {
+ gtkadd($box2,
+ gtksignal_connect(Gtk2::Button->new(translate($s)),
+ clicked => sub { try($s, kind2hd($kind)) }));
+ }
}
sub per_entry_action_box {
my ($box, $kind, $entry) = @_;
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 9509ab760..25744cfab 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -256,7 +256,7 @@ sub main {
################################################################################
sub general_possible_actions {
my ($_in, $_all_hds) = @_;
- $::expert ? N_("Toggle to normal mode") : N_("Toggle to expert mode");
+ if_($::isInstall, N_("More"));
}
sub Done {
@@ -296,14 +296,26 @@ Quit anyway?", $part->{device}, $part->{mntpoint})) or return if $::isStandalone
################################################################################
# per-hd actions
################################################################################
-sub hd_possible_actions {
- my ($_in, $hd, $_all_hds) = @_;
+sub hd_possible_actions_base {
+ my ($hd) = @_;
(
if_(!$hd->{readonly} || $hd->{getting_rid_of_readonly_allowed}, N_("Clear all")),
if_(!$hd->{readonly} && $::isInstall, N_("Auto allocate")),
- if_($::isInstall, N_("More")),
);
}
+
+sub hd_possible_actions_extra {
+ my ($hd) = @_;
+ $::expert ? N_("Toggle to normal mode") : N_("Toggle to expert mode");
+}
+
+
+sub hd_possible_actions {
+ my ($_in, $hd, $_all_hds) = @_;
+ hd_possible_actions_base($hd);
+ hd_possible_actions_extra($hd);
+}
+
sub hd_possible_actions_interactive {
my ($_in, $_hd, $_all_hds) = @_;
&hd_possible_actions, N_("Hard drive information");
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a48dcd5d9..294c18035 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,6 +3,7 @@
- fix displaying current security level in GUI
(regression introduced on 2008-08-29)
- increase default window height b/c of package selection step
+- refresh partitionning step
- update icons for packages/services selection
Version 11.42 - 12 September 2008