no_comment

12 files changed, 172 insertions, 16 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index cb49dbb09..c5bd1bfae 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -102,6 +102,7 @@ get_needed_files: $(DIRS)
 	install -d $(DEST)/usr/bin
 	install -d $(DEST)/usr/lib
 	install -d $(DEST)/usr/share
+	install -d $(DEST)/usr/share/gtk
 	install -d $(DEST)/usr/share/xmodmap
 	install -d $(ROOTDEST)/Mandrake/base
 	install -s $(LOCALFILES) $(DEST)/usr/bin
@@ -138,6 +139,7 @@ get_needed_files: $(DIRS)
 	cp -a consolefonts $(DEST)/usr/share
 	cp modparm.lst MonitorsDB $(DEST)/usr/share
 	cp logo-mandrake.xpm $(DEST)/usr/share
+	cp -a themes $(DEST)/usr/share/gtk
 	cp compss compssUsers compssList $(ROOTDEST)/Mandrake/base
 
 	cp -f ../modules/modules.cpio.bz2 $(DEST)/lib/
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 628fa3b12..6b937c138 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -16,7 +16,6 @@ selectLanguage =>
       <a href=\"http://www.infoseek.com\">infoseek</a>,
       <a href=\"http://www.altavista.com\">altavista</a>,
       <a href=\"http://www.excite.com\">excite</a>
-    <img src=\"t.xpm\">
 
 
 Choose preferred language for install and system usage."),
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 51f2413f5..364e1ef78 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -467,6 +467,7 @@ sub main {
 #	    ks        => sub { $::auto_install = 1; $cfg = $v; },
 #	    kickstart => sub { $::auto_install = 1; $cfg = $v; },
 	    auto_install => sub { $::auto_install = 1; $cfg = $v; },
+	    simple_themes => sub { $o->{simple_themes} = 1 },
 	    alawindows => sub { $o->{security} = $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
 	    g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 },
 	}}{lc $n}; &$f if $f;
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 381b2546f..7074e6664 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -19,12 +19,6 @@ use my_gtk qw(:helpers :wrappers);
 #-    $o->SUPER::ask_warn(@_);
 #-}
 
-sub ask_from_entryW {
-    my ($o, $title, $messages, $def) = @_;
-    my $w = my_gtk->new($title, %$o);
-    $w->_ask_from_entry(@$messages);
-    $w->main;
-}
 sub ask_from_listW {
     my ($o, $title, $messages, $l, $def) = @_;
 
diff --git a/perl-install/interactive_newt.pm b/perl-install/interactive_newt.pm
index b6d5823a3..254e27eb1 100644
--- a/perl-install/interactive_newt.pm
+++ b/perl-install/interactive_newt.pm
@@ -14,12 +14,6 @@ my $n = Term::Newt->new;
 $n->init;
 $n->cls;
 
-#sub ask_from_entryW {
-#    my ($o, $title, $messages, $def) = @_;
-#    my $w = my_gtk->new($title, %$o);
-#    $w->_ask_from_entry(@$messages);
-#    $w->main;
-#}
 sub ask_from_listW {
     my ($o, $title_, $messages, $l, $def) = @_;
     my ($title, @okcancel) = ref $title_ ? @$title_ : ($title_, _("Ok"), _("Cancel"));
diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc
index b18c395b8..5e8a9d7d0 100644
--- a/perl-install/share/install.rc
+++ b/perl-install/share/install.rc
@@ -17,9 +17,6 @@ style "default-font"
 
 style "steps"
 {
-  bg[NORMAL] = { 0, 0, 0 }
-  fg[NORMAL] = { 1.0, 1.0, 1.0 }
-
   fontset = "\
 -mdk-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*,\
 -mdk-helvetica-medium-r-normal-*-*-100-*-*-*-*-iso8859-3,\
diff --git a/perl-install/share/list b/perl-install/share/list
index e5dcd8be7..959d76371 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -12,6 +12,9 @@
 /usr/bin/bzip2
 /usr/bin/perl
 /usr/bin/zsh
+/usr/lib/gtk/themes/engines/libpixmap.so
+/usr/lib/gtk/themes/engines/libpixmap.la
+/usr/lib/libimlib-xpm.so
 /usr/lib/perl5/5.00503/AutoLoader.pm
 /usr/lib/perl5/5.00503/Carp.pm
 /usr/lib/perl5/5.00503/Data/Dumper.pm
diff --git a/perl-install/share/themes-blackwhite.rc b/perl-install/share/themes-blackwhite.rc
index 48d5f9400..76ab4f800 100644
--- a/perl-install/share/themes-blackwhite.rc
+++ b/perl-install/share/themes-blackwhite.rc
@@ -46,6 +46,12 @@ style "background"
   bg[PRELIGHT] = { 0.67, 0.67, 0.67 }
 }
 
+style "steps"
+{
+  bg[NORMAL] = { 0, 0, 0 }
+  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+}
+
 widget_class "*" style "any"
 widget_class "*GtkSpin*" style "entry"
 widget_class "*GtkEntry*" style "entry"
@@ -53,3 +59,4 @@ widget_class "*Gtk*List*" style "entry"
 widget_class "*GtkNotebook*" style "notebook"
 widget "*GtkButton*" style "button"
 widget "*background*" style "background"
+widget "*Steps*" style "steps"
diff --git a/perl-install/share/themes-blue.rc b/perl-install/share/themes-blue.rc
index 53ed55159..bc8b2f4c0 100644
--- a/perl-install/share/themes-blue.rc
+++ b/perl-install/share/themes-blue.rc
@@ -46,6 +46,12 @@ style "background"
   bg[PRELIGHT] = { 0, 0, 0.67 }
 }
 
+style "steps"
+{
+  bg[NORMAL] = { 0, 0, 0 }
+  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+}
+
 widget_class "*" style "any"
 widget_class "*GtkSpin*" style "entry"
 widget_class "*GtkEntry*" style "entry"
@@ -53,3 +59,4 @@ widget_class "*Gtk*List*" style "entry"
 widget_class "*GtkNotebook*" style "notebook"
 widget "*GtkButton*" style "button"
 widget "*background*" style "background"
+widget "*Steps*" style "steps"
diff --git a/perl-install/share/themes-marble3d.rc b/perl-install/share/themes-marble3d.rc
new file mode 100644
index 000000000..ec9bcd788
--- /dev/null
+++ b/perl-install/share/themes-marble3d.rc
@@ -0,0 +1,139 @@
+style "button"
+{
+  engine "pixmap" 
+    {
+    image 
+      {
+        function        = BOX
+	recolorable     = TRUE
+	state           = NORMAL
+	detail          = "buttondefault"
+	shadow          = IN
+	file            = "marble3d-button_def.xpm"
+	border          = { 9, 9, 9, 9 }
+	stretch         = TRUE
+      }
+    image 
+      {
+        function        = BOX
+	recolorable     = TRUE
+	state           = NORMAL
+	shadow          = OUT
+	file            = "marble3d-button1.xpm"
+	border          = { 3, 3, 3, 3 }
+	stretch         = TRUE
+      }
+    image 
+      {
+        function        = BOX
+	recolorable     = TRUE
+	state           = PRELIGHT
+	shadow          = OUT
+	file            = "marble3d-button2.xpm"
+	border          = { 3, 3, 3, 3 }
+	stretch         = TRUE
+      }
+    image 
+      {
+        function        = BOX
+	recolorable     = TRUE
+	state           = NORMAL
+	shadow          = IN
+	file            = "marble3d-button4.xpm"
+	border          = { 2, 2, 2, 2 }
+	stretch         = TRUE
+      }
+    image 
+      {
+        function        = BOX
+	recolorable     = TRUE
+	state           = SELECTED
+	shadow          = IN
+	file            = "marble3d-button4.xpm"
+	border          = { 3, 3, 3, 3 }
+	stretch         = TRUE
+      }
+    image 
+      {
+        function        = BOX
+	recolorable     = TRUE
+	state           = ACTIVE
+	shadow          = IN
+	file            = "marble3d-button4.xpm"
+	border          = { 3, 3, 3, 3 }
+	stretch         = TRUE
+      }
+   }
+}
+
+style "window" 
+{
+  engine "pixmap" {
+    image 
+      {
+	function        = FLAT_BOX
+	recolorable     = TRUE
+	file            = "marble3d-bg1.xpm"
+	stretch         = FALSE
+      }
+  }
+}
+
+
+style "any"
+{
+  fg[NORMAL]      = { 0.00, 0.00, 0.00 }
+  fg[PRELIGHT]    = { 0.25, 0.25, 0.25 }
+  fg[ACTIVE]      = { 0.00, 0.00, 0.00 }
+  fg[SELECTED]    = { 0.00, 0.00, 0.00 }
+  fg[INSENSITIVE] = { 0.50, 0.50, 0.50 }
+  
+  bg[NORMAL]      = { 0.80, 0.80, 0.80 }
+  bg[PRELIGHT]    = { 0.85, 0.85, 0.85 }
+  bg[ACTIVE]      = { 0.90, 0.90, 0.90 }
+  bg[SELECTED]    = { 0.90, 0.80, 0.70 }
+  bg[INSENSITIVE] = { 0.80, 0.75, 0.70 }
+}
+
+style "entry"
+{
+  base[NORMAL] = { 1.0, 1.0, 1.0 }
+  base[ACTIVE] = { 1.0, 1.0, 1.0 }
+  fg[NORMAL] = { 0.67, 0.67, 0.67 }
+}
+
+style "notebook"
+{
+  bg[NORMAL]	  = { 0.82, 0.8, 0.8 }
+  bg[ACTIVE]	  = { 0.72, 0.7, 0.7 }
+  fg[NORMAL]      = { 0, 0, 0 }
+}
+
+style "button" = "any"
+{
+  bg[NORMAL] = { 1.0, 1.0, 1.0 }
+  fg[NORMAL] = { 0, 0, 0 }
+  bg[PRELIGHT] = { 1.0, 1.0, 1.0 }
+  fg[PRELIGHT] = { 0.67, 0.67, 0.67 }
+}
+
+style "background"
+{
+  bg[NORMAL] = { 0.8, 0.8, 0.8 }
+  bg[PRELIGHT] = { 0.74, 0.72, 0.7 }
+}
+
+
+style "steps"
+{
+  fg[NORMAL] = { 0.40, 0.30, 0.20 }
+}
+
+widget_class "GtkWindow" style "window"
+widget_class "*" style "any"
+widget_class "*GtkSpin*" style "entry"
+widget_class "*GtkEntry*" style "entry"
+widget_class "*Gtk*List*" style "entry"
+widget_class "*GtkNotebook*" style "notebook"
+widget "*GtkButton" style "button"
+widget "*background*" style "background"
diff --git a/perl-install/share/themes-savane.rc b/perl-install/share/themes-savane.rc
index 18a45ca32..4d903660e 100644
--- a/perl-install/share/themes-savane.rc
+++ b/perl-install/share/themes-savane.rc
@@ -46,6 +46,12 @@ style "background"
   bg[PRELIGHT] = { 0.67, 0.33, 0 }
 }
 
+style "steps"
+{
+  bg[NORMAL] = { 0, 0, 0 }
+  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+}
+
 widget_class "*" style "any"
 widget_class "*GtkSpin*" style "entry"
 widget_class "*GtkEntry*" style "entry"
@@ -53,3 +59,4 @@ widget_class "*Gtk*List*" style "entry"
 widget_class "*GtkNotebook*" style "notebook"
 widget "*GtkButton*" style "button"
 widget "*background*" style "background"
+widget "*Steps*" style "steps"
diff --git a/perl-install/share/themes.rc b/perl-install/share/themes.rc
index 5d8db5b90..5b05c2294 100644
--- a/perl-install/share/themes.rc
+++ b/perl-install/share/themes.rc
@@ -1,3 +1,8 @@
+style "marble3d"
+{
+  bg[NORMAL] = { 0.80, 0.80, 0.8 }
+  bg[PRELIGHT] = { 0.9, 0.9, 0.9 }
+}
 style "savane"
 {
   bg[NORMAL] = { 1.0, 0.67, 0 }
@@ -13,6 +18,7 @@ style "blue"
   bg[NORMAL] = { 0, 0, 0.67 }
   bg[PRELIGHT] = { 0, 0, 1.0 }
 }
+widget "*marble3d*" style "marble3d"
 widget "*savane*" style "savane"
 widget "*blackwhite*" style "blackwhite"
 widget "*blue*" style "blue"