Skip to content
Snippets Groups Projects
Commit 4ce78c1b authored by Fredrik Hübinette (Hubbe)'s avatar Fredrik Hübinette (Hubbe)
Browse files

bugfix: GUI uses picture from source dir now

Rev: bin/install.pike:1.40
Rev: src/install-welcome:1.1
parent e59df89d
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*.pnm binary *.pnm binary
*.rs binary *.rs binary
init_nt -text -crlf init_nt -text -crlf
install-welcome binary
lib -text -crlf lib -text -crlf
testfont binary testfont binary
......
...@@ -652,7 +652,6 @@ object vbox1; ...@@ -652,7 +652,6 @@ object vbox1;
object label4; object label4;
object frame1; object frame1;
object hbox1; object hbox1;
object pixmap1;
object vbox2; object vbox2;
object label3; object label3;
object table1; object table1;
...@@ -762,7 +761,7 @@ void begin_wizard(string *argv) ...@@ -762,7 +761,7 @@ void begin_wizard(string *argv)
->set_shadow_type(GTK.SHADOW_IN) ->set_shadow_type(GTK.SHADOW_IN)
->set_border_width(11) ->set_border_width(11)
->add(hbox1=GTK.Hbox(0,0) ->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) ->PS(vbox2=GTK.Vbox(0,0),1,1,0)
),1,1,0) ),1,1,0)
->PS(hbuttonbox1=GTK.HbuttonBox() ->PS(hbuttonbox1=GTK.HbuttonBox()
...@@ -1035,6 +1034,7 @@ void do_install() ...@@ -1035,6 +1034,7 @@ void do_install()
to_export+=({master, to_export+=({master,
combine_path(vars->TMP_BUILDDIR,"master.pike"), combine_path(vars->TMP_BUILDDIR,"master.pike"),
combine_path(vars->SRCDIR,"COPYING"), combine_path(vars->SRCDIR,"COPYING"),
combine_path(vars->SRCDIR,"install-welcome"),
combine_path(vars->SRCDIR,"dumpmaster.pike"), combine_path(vars->SRCDIR,"dumpmaster.pike"),
combine_path(vars->SRCDIR,"dumpmodule.pike") combine_path(vars->SRCDIR,"dumpmodule.pike")
}); });
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment