summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-11-19 21:16:40 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-11-19 21:16:40 +0000
commit1b639b95ba87d0f4aeb4e275a40962d9f5e6795f (patch)
tree2869275beb0fe07146f9fc930b80d933aefbb729
parent5c0b132397f056a5271f25c2e0cb562d81f3a64e (diff)
downloaddrakx-1b639b95ba87d0f4aeb4e275a40962d9f5e6795f.tar
drakx-1b639b95ba87d0f4aeb4e275a40962d9f5e6795f.tar.gz
drakx-1b639b95ba87d0f4aeb4e275a40962d9f5e6795f.tar.bz2
drakx-1b639b95ba87d0f4aeb4e275a40962d9f5e6795f.tar.xz
drakx-1b639b95ba87d0f4aeb4e275a40962d9f5e6795f.zip
use boot images
-rw-r--r--move/Makefile4
-rw-r--r--move/data/BOOT-1024-MOVE.jpgbin0 -> 134082 bytes
-rw-r--r--move/data/BOOT-1280-MOVE.jpgbin0 -> 195812 bytes
-rw-r--r--move/data/BOOT-1600-MOVE.jpgbin0 -> 263651 bytes
-rw-r--r--move/data/BOOT-800-MOVE.jpgbin0 -> 96119 bytes
-rw-r--r--move/move.pm3
6 files changed, 5 insertions, 2 deletions
diff --git a/move/Makefile b/move/Makefile
index 12475b6ec..d46966b99 100644
--- a/move/Makefile
+++ b/move/Makefile
@@ -4,7 +4,9 @@ DEST_STAGE2 = $(DEST_LIVETREE)/usr/bin/stage2
ISO = /BIG/mdkmove.iso
-DATA_FILES = devices symlinks directories-to-create etcfiles all-etcfiles keyfiles
+DATA_FILES = devices symlinks directories-to-create etcfiles all-etcfiles keyfiles \
+ BOOT-800-MOVE.jpg BOOT-1024-MOVE.jpg BOOT-1280-MOVE.jpg BOOT-1600-MOVE.jpg
+
PROGRAM_FILES = etc-monitorer.pl
LANG_FILES = $(shell perl -ne 'print $$1 if /ALLOWED_LANGS = qw\((.*)\)/' move.pm)
diff --git a/move/data/BOOT-1024-MOVE.jpg b/move/data/BOOT-1024-MOVE.jpg
new file mode 100644
index 000000000..4abb003a3
--- /dev/null
+++ b/move/data/BOOT-1024-MOVE.jpg
Binary files differ
diff --git a/move/data/BOOT-1280-MOVE.jpg b/move/data/BOOT-1280-MOVE.jpg
new file mode 100644
index 000000000..cc11b0b0c
--- /dev/null
+++ b/move/data/BOOT-1280-MOVE.jpg
Binary files differ
diff --git a/move/data/BOOT-1600-MOVE.jpg b/move/data/BOOT-1600-MOVE.jpg
new file mode 100644
index 000000000..b83294c92
--- /dev/null
+++ b/move/data/BOOT-1600-MOVE.jpg
Binary files differ
diff --git a/move/data/BOOT-800-MOVE.jpg b/move/data/BOOT-800-MOVE.jpg
new file mode 100644
index 000000000..5e7f92088
--- /dev/null
+++ b/move/data/BOOT-800-MOVE.jpg
Binary files differ
diff --git a/move/move.pm b/move/move.pm
index 5ea93fb72..63dde3ba4 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -406,7 +406,8 @@ sub install2::startMove {
$::WizardWindow->destroy if $::WizardWindow;
require ugtk2;
my $root = ugtk2::gtkroot();
- my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file('/usr/share/mdk/screensaver/3.png');
+ my $pixbuf = eval { Gtk2::Gdk::Pixbuf->new_from_file("/image/move/BOOT-$::rootwidth-MOVE.jpg") };
+ $pixbuf ||= Gtk2::Gdk::Pixbuf->new_from_file('/usr/share/mdk/screensaver/3.png');
my ($w, $h) = ($pixbuf->get_width, $pixbuf->get_height);
$root->draw_pixbuf(Gtk2::Gdk::GC->new($root), $pixbuf, 0, 0, ($::rootwidth - $w) / 2, ($::rootheight - $h)/2, $w, $h, 'none', 0, 0);
ugtk2::gtkflush();