From 4ce78c1b555c50cecc4b9fab38fc296ffda59255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Sun, 9 Jan 2000 23:37:41 -0800 Subject: [PATCH] bugfix: GUI uses picture from source dir now Rev: bin/install.pike:1.40 Rev: src/install-welcome:1.1 --- .gitattributes | 1 + bin/install.pike | 4 ++-- src/install-welcome | Bin 0 -> 3649 bytes 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/install-welcome diff --git a/.gitattributes b/.gitattributes index f90b6c3f70..9c40b62821 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ *.pnm binary *.rs binary init_nt -text -crlf +install-welcome binary lib -text -crlf testfont binary diff --git a/bin/install.pike b/bin/install.pike index 72e2667970..f3fa29684b 100644 --- a/bin/install.pike +++ b/bin/install.pike @@ -652,7 +652,6 @@ object vbox1; object label4; object frame1; object hbox1; -object pixmap1; object vbox2; object label3; object table1; @@ -762,7 +761,7 @@ void begin_wizard(string *argv) ->set_shadow_type(GTK.SHADOW_IN) ->set_border_width(11) ->add(hbox1=GTK.Hbox(0,0) - ->PS(pixmap1=GTK.Pixmap(GDK.Pixmap(Image.GIF.decode(Stdio.read_bytes("/home/hubbe/gfx/pike/Welcome.GIF")))),0,0,0) + ->PS(GTK.Pixmap(GTK.Util.load_image(combine_path(vars->SRCDIR,"install-welcome"))->img),0,0,0) ->PS(vbox2=GTK.Vbox(0,0),1,1,0) ),1,1,0) ->PS(hbuttonbox1=GTK.HbuttonBox() @@ -1035,6 +1034,7 @@ void do_install() to_export+=({master, combine_path(vars->TMP_BUILDDIR,"master.pike"), combine_path(vars->SRCDIR,"COPYING"), + combine_path(vars->SRCDIR,"install-welcome"), combine_path(vars->SRCDIR,"dumpmaster.pike"), combine_path(vars->SRCDIR,"dumpmodule.pike") }); diff --git a/src/install-welcome b/src/install-welcome new file mode 100644 index 0000000000000000000000000000000000000000..8c43f4b1674a2a6bc2fa41930d58c9bc062bce43 GIT binary patch literal 3649 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 TI;x~vs-}9XsG6$5lK=oaXF#bS literal 0 HcmV?d00001 -- GitLab