partitioning wizard: use mandriva logo on blue background for mandriva partition

5 files changed, 40 insertions, 37 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 30d2ca64f..291b99f15 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
 - fix raid initialisation during install (#54706)
 - fix raid detection during install (#54706)
 - avoid error messages when using lvm in draklive-install (#36415)
+- partitioning wizard:
+  o use mandriva logo on blue background for mandriva partition
 
 Version 12.67 - 18 October 2009
 
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 1dbdb0303..df36e3e3d 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -283,7 +283,7 @@ sub create_display_box {
     $width -= 24 if $resize || $fill_empty;
     my $minwidth = 40;
 
-    my $display_box = ugtk2::gtkset_size_request(Gtk2::HBox->new(0,0), -1, 24);
+    my $display_box = ugtk2::gtkset_size_request(Gtk2::HBox->new(0,0), -1, 26);
 
     my $ratio = $totalsectors ? ($width - @parts * ($minwidth+1)) / $totalsectors : 1;
     while (1) {
@@ -301,11 +301,10 @@ sub create_display_box {
 
     $last = $resize->[-1] if $resize;
     foreach my $entry (@parts) {
-	my $info = $entry->{mntpoint} || $entry->{device_LABEL};
+	my $info = $entry->{device_LABEL};
 	my $w = Gtk2::Label->new($info);
 	my @colorized_fs_types = qw(ext2 ext3 ext4 xfs swap vfat ntfs ntfs-3g);
         $ev = Gtk2::EventBox->new;
-	$ev->add($w);
         my $part;
         if ($last && $last->{device} eq "$entry->{device}") {
             $part = $last;
@@ -314,7 +313,7 @@ sub create_display_box {
             $ev->set_name("PART_vfat");
             $w->set_size_request(ceil($ratio * $part->{min_win}), 0);
             my $ev2 = Gtk2::EventBox->new;
-            my $b2 = Gtk2::Label->new("");
+            my $b2 = gtknew("Image", file=>"small-logo");
             $ev2->add($b2);
             $b2->set_size_request($ratio * MB(600), 0);
             $ev2->set_name("PART_new");
@@ -331,19 +330,19 @@ sub create_display_box {
             my $size = int($hpane->get_position / $ratio);
 
             $desc = Gtk2::HBox->new(0,0);
-            $ev = Gtk2::EventBox->new;
-            $ev->add(Gtk2::Label->new(" " x 4));
-            $ev->set_name("PART_vfat");
-            ugtk2::gtkpack__($desc, $ev);
+            $ev2 = Gtk2::EventBox->new;
+            $ev2->add(Gtk2::Label->new(" " x 4));
+            $ev2->set_name("PART_vfat");
+            ugtk2::gtkpack__($desc, $ev2);
             my $win_size_label = Gtk2::Label->new;
             
             ugtk2::gtkset_size_request($win_size_label, 150, 20);
             ugtk2::gtkpack__($desc, $win_size_label);
             $win_size_label->set_alignment(0,0.5);
-            $ev = Gtk2::EventBox->new;
-            $ev->add(Gtk2::Label->new(" " x 4));
-            $ev->set_name("PART_new");
-            ugtk2::gtkpack__($desc, $ev); 
+            $ev2 = Gtk2::EventBox->new;
+            $ev2->add(Gtk2::Label->new(" " x 4));
+            $ev2->set_name("PART_new");
+            ugtk2::gtkpack__($desc, $ev2);
             my $mdv_size_label = Gtk2::Label->new;
             ugtk2::gtkset_size_request($mdv_size_label, 150, 20);
             ugtk2::gtkpack__($desc, $mdv_size_label);
@@ -385,17 +384,17 @@ sub create_display_box {
             });
         } else {
             if ($fill_empty && isEmpty($entry)) {
-                $w->set_text("Mandriva");
+                $w = gtknew("Image", file=>"small-logo");
                 $ev->set_name("PART_new");
             } else {
                 $ev->set_name("PART_" . (isEmpty($entry) ? 'empty' : 
                                          $entry->{fs_type} && member($entry->{fs_type}, @colorized_fs_types) ? $entry->{fs_type} :
                                          'other'));
             }
-            $w->set_size_request($entry->{size} * $ratio + $minwidth, 0);
+            $ev->set_size_request($entry->{size} * $ratio + $minwidth, 0);
             ugtk2::gtkpack($display_box, $ev);
         }
-
+	$ev->add($w);
 	my $sep = Gtk2::Label->new(".");
 	$ev = Gtk2::EventBox->new;
 	$ev->add($sep);
@@ -443,17 +442,17 @@ sub display_choices {
     
     $mainw->{kind}{display_box} ||= create_display_box($mainw->{kind});
     ugtk2::gtkpack2__($contentbox, $mainw->{kind}{display_box});
-    ugtk2::gtkpack__($contentbox, ugtk2::gtknew('Label',
-                                                text => N("The DrakX Partitioning wizard found the following solutions:"),
-                                                alignment => [0, 0]));
+    ugtk2::gtkpack__($contentbox, gtknew('Label',
+                                         text => N("The DrakX Partitioning wizard found the following solutions:"),
+                                         alignment => [0, 0]));
     
-    my $choicesbox = ugtk2::gtknew('VBox');
+    my $choicesbox = gtknew('VBox');
     my $oldbutton;
     my $sep;
     foreach my $s (@solutions) {
         my $item;
-        my $vbox = ugtk2::gtknew('VBox');
-        my $button = ugtk2::gtknew('RadioButton', child => $vbox);
+        my $vbox = gtknew('VBox');
+        my $button = gtknew('RadioButton', child => $vbox);
         if ($s eq 'free_space') {
             $item = create_display_box($mainw->{kind}, undef, 1);
         } elsif ($s eq 'resize_fat') {
@@ -461,9 +460,9 @@ sub display_choices {
         } elsif ($s eq 'existing_part') {
         } elsif ($s eq 'wipe_drive') {
             $item = Gtk2::EventBox->new;
-            my $b2 = Gtk2::Label->new("Mandriva");
+            my $b2 = gtknew("Image", file=>"small-logo");
             $item->add($b2);
-            $b2->set_size_request(-1,24);
+            $item->set_size_request(-1,26);
             $item->set_name("PART_new");
         } elsif ($s eq 'diskdrake') {
         } else {
@@ -472,15 +471,15 @@ sub display_choices {
         }
         $vbox->set_size_request(1024, -1);
         ugtk2::gtkpack($vbox, 
-                          ugtk2::gtknew('Label',
-                                        text => $solutions{$s}[1],
-                                        alignment => [0, 0]));
+                       gtknew('Label',
+                              text => $solutions{$s}[1],
+                              alignment => [0, 0]));
         ugtk2::gtkpack($vbox, $item) if defined($item);
         $button->set_group($oldbutton->get_group) if $oldbutton;
         $oldbutton = $button;
         $button->signal_connect('pressed', sub { $mainw->{sol} = $solutions{$s} });
         ugtk2::gtkpack2__($choicesbox, $button);
-        $sep = ugtk2::gtknew('HSeparator');
+        $sep = gtknew('HSeparator');
         ugtk2::gtkpack2__($choicesbox, $sep);
     }
     $choicesbox->remove($sep);
@@ -494,7 +493,7 @@ sub main {
     my $sol;
 
     if ($o->isa('interactive::gtk')) {
-        use ugtk2;
+        use mygtk2;
     
         my $mainw = ugtk2->new(N("Partitioning"), %$o, if__($::main_window, transient => $::main_window));
         $mainw->{box_allow_grow} = 1;
@@ -543,9 +542,9 @@ sub main {
         });
 
         my @more_buttons = (
-            [ ugtk2::gtknew('Install_Button',
-                            text => N("Help"),
-                            clicked => sub { interactive::gtk::display_help($o, {interactive_help_id => 'doPartitionDisks'}, $mainw) }),
+            [ gtknew('Install_Button',
+                     text => N("Help"),
+                     clicked => sub { interactive::gtk::display_help($o, {interactive_help_id => 'doPartitionDisks'}, $mainw) }),
               undef, 1 ],
             );
         my $buttons_pack = $mainw->create_okcancel(N("Next"), undef, '', @more_buttons);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d1c2e96b1..8c52a2d61 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,8 @@
 - fix raid detection during install (#54706)
 - allow to set preferred packages list in auto_install
   (comma-separated list in $o->{preferred_packages})
+- partitioning wizard:
+  o use mandriva logo on blue background for mandriva partition
 
 Version 12.67 - 18 October 2009
 
diff --git a/perl-install/pixmaps/small-logo.png b/perl-install/pixmaps/small-logo.png
new file mode 100644
index 000000000..84b33053e
--- /dev/null
+++ b/perl-install/pixmaps/small-logo.png
diff --git a/perl-install/share/diskdrake.rc b/perl-install/share/diskdrake.rc
index b42702502..0cdbea349 100644
--- a/perl-install/share/diskdrake.rc
+++ b/perl-install/share/diskdrake.rc
@@ -44,12 +44,12 @@ style "gray" = "font"
   bg[PRELIGHT] = { 0.57, 0.62, 0.57 }
   fg[NORMAL] = { 0, 0, 0 }
 }
-style "yellow" = "font"
+style "darkblue" = "font"
 {
-  bg[NORMAL] = { 1.0, 1.0, 0 }
-  bg[ACTIVE] = { 1.0, 1.0, 0 }
-  bg[PRELIGHT] = { 1.0, 1.0, 0 }
-  fg[NORMAL] = { 0, 0, 0 }
+  bg[NORMAL] = { 0.12, 0.26, 0.61 }
+  bg[ACTIVE] = { 0.12, 0.26, 0.61 }
+  bg[PRELIGHT] = { 0.12, 0.26, 0.61 }
+  fg[NORMAL] = { 1, 1, 1 }
 }
 
 widget "*PART_ext2"	style "red" 
@@ -61,4 +61,4 @@ widget "*PART_vfat"	style "blue"
 widget "*PART_ntfs*"	style "blue"
 widget "*PART_empty"	style "white"
 widget "*PART_other"	style "gray"
-widget "*PART_new"	style "yellow"
+widget "*PART_new"	style "darkblue"