From 6b5c8aab839d9543419a049566e026bed4fd3192 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 26 Aug 2013 06:05:25 -0500 Subject: [PATCH] fixed windows paths, thanks Niphlod --- VERSION | 2 +- gluon/widget.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index c53c7539..9a63ee53 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.08.25.21.22.25 +Version 2.6.0-development+timestamp.2013.08.26.06.04.21 diff --git a/gluon/widget.py b/gluon/widget.py index bb13cda6..ed966dc1 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -151,7 +151,7 @@ def presentation(root): canvas.pack() root.update() - logo = 'extras/icons/splashlogo.gif' + logo = os.path.join('extras','icons','splashlogo.gif') if os.path.exists(logo): img = Tkinter.PhotoImage(file=logo) pnl = Tkinter.Label(canvas, image=img, background='white', bd=0) @@ -199,7 +199,7 @@ class web2pyDialog(object): self.menu = Tkinter.Menu(self.root) servermenu = Tkinter.Menu(self.menu, tearoff=0) httplog = os.path.join(self.options.folder, 'httpserver.log') - iconphoto = 'extras/icons/web2py.gif' + iconphoto = os.path.join('extras','icons','web2py.gif') if os.path.exists(iconphoto): img = Tkinter.PhotoImage(file=iconphoto) self.root.tk.call('wm', 'iconphoto', self.root._w, img)