# HG changeset patch
# User cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1233276847 0
# Node ID 28532ae6f9f692513391821e3d30363e7e4bdb0e
# Parent 7dc59bd3d6b1344f2723ec22be03c7acab8cfabc
Moved all editor content out of content, as chewie says it's deprecated as hell ;-)
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/fonts/samanata.fontdef
--- a/clients/editor/content/fonts/samanata.fontdef Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-[Font/samanata_large]
-
-type: truetype
-source: content/fonts/samanata.ttf
-size: 30
-
-antialias: 0
-
-color: 255,255,0
-
-[Font/samanata_small]
-
-type: truetype
-source: content/fonts/samanata.ttf
-size: 8
-
-antialias: 0
-row_spacing: 50
-glyph_spacing: 50
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/fonts/samanata.ttf
Binary file clients/editor/content/fonts/samanata.ttf has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/cameraedit.xml
--- a/clients/editor/content/gui/cameraedit.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/eleveditor.xml
--- a/clients/editor/content/gui/eleveditor.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/filebrowser.xml
--- a/clients/editor/content/gui/filebrowser.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/help.xml
--- a/clients/editor/content/gui/help.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/input.xml
--- a/clients/editor/content/gui/input.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/mapeditor.xml
--- a/clients/editor/content/gui/mapeditor.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/offsetedit.xml
--- a/clients/editor/content/gui/offsetedit.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/rootpanel.xml
--- a/clients/editor/content/gui/rootpanel.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/selection.xml
--- a/clients/editor/content/gui/selection.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/statuspanel.xml
--- a/clients/editor/content/gui/statuspanel.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/gui/tools.xml
--- a/clients/editor/content/gui/tools.xml Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/add_instance.png
Binary file clients/editor/content/icons/add_instance.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/add_layer.png
Binary file clients/editor/content/icons/add_layer.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/delete_layer.png
Binary file clients/editor/content/icons/delete_layer.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/eraser.png
Binary file clients/editor/content/icons/eraser.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/hand.png
Binary file clients/editor/content/icons/hand.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/help.png
Binary file clients/editor/content/icons/help.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/load_map.png
Binary file clients/editor/content/icons/load_map.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/map_wizard.png
Binary file clients/editor/content/icons/map_wizard.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/new_map.png
Binary file clients/editor/content/icons/new_map.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/quit.png
Binary file clients/editor/content/icons/quit.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/save_map.png
Binary file clients/editor/content/icons/save_map.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/select_layer.png
Binary file clients/editor/content/icons/select_layer.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/take_screenshot.png
Binary file clients/editor/content/icons/take_screenshot.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/zoom_default.png
Binary file clients/editor/content/icons/zoom_default.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/zoom_in.png
Binary file clients/editor/content/icons/zoom_in.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/icons/zoom_out.png
Binary file clients/editor/content/icons/zoom_out.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/content/infotext.txt
--- a/clients/editor/content/infotext.txt Fri Jan 30 00:24:50 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-This is the standalone FIFE editor, release 2008.1
-
-Keybindings:
---------------
-- P = Make screenshot
-- LEFT = Move camera left
-- RIGHT = Move camera right
-- UP = Move camera up
-- DOWN = Move camera down
-- F10 = Toggle console on / off
-- ESC = Quit techdemo
-
-- INS = Makes a new instance on the map with
- current object selection at current
- mouse selection (toggle).
-- DEL = Removes instances at current mouse
- selection (toggle).
-- R = Rotates selected instace (if object
- contains rotated images)
-- M = Moves selected instace (drag it around)
-- T = shows / hides grid
-- B = shows / hides blocking info
-- U = Undo an instance placement or removal
-- CTRL = Enters pan/zoom mode. Pan with LMB drag,
- zoom with mouse wheel while CTRL is
- pressed
-
-
-http://www.fifengine.de
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/fifedit.py
--- a/clients/editor/fifedit.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/fifedit.py Fri Jan 30 00:54:07 2009 +0000
@@ -11,7 +11,7 @@
"""
def __init__(self, engine):
pychan.init(engine,debug=False)
- self.gui = pychan.loadXML('content/gui/rootpanel.xml')
+ self.gui = pychan.loadXML('gui/rootpanel.xml')
eventMap = {
'quitButton' : self.quit
}
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/fonts/samanata.fontdef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/fonts/samanata.fontdef Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,19 @@
+[Font/samanata_large]
+
+type: truetype
+source: content/fonts/samanata.ttf
+size: 30
+
+antialias: 0
+
+color: 255,255,0
+
+[Font/samanata_small]
+
+type: truetype
+source: content/fonts/samanata.ttf
+size: 8
+
+antialias: 0
+row_spacing: 50
+glyph_spacing: 50
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/fonts/samanata.ttf
Binary file clients/editor/fonts/samanata.ttf has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/cameraedit.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/cameraedit.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/eleveditor.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/eleveditor.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/filebrowser.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/filebrowser.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/help.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/help.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,4 @@
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/input.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/input.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/mapeditor.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/mapeditor.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/offsetedit.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/offsetedit.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/rootpanel.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/rootpanel.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,3 @@
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/selection.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/selection.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/statuspanel.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/statuspanel.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,3 @@
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/gui/tools.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/gui/tools.xml Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/add_instance.png
Binary file clients/editor/icons/add_instance.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/add_layer.png
Binary file clients/editor/icons/add_layer.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/delete_layer.png
Binary file clients/editor/icons/delete_layer.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/eraser.png
Binary file clients/editor/icons/eraser.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/hand.png
Binary file clients/editor/icons/hand.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/help.png
Binary file clients/editor/icons/help.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/load_map.png
Binary file clients/editor/icons/load_map.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/map_wizard.png
Binary file clients/editor/icons/map_wizard.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/new_map.png
Binary file clients/editor/icons/new_map.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/quit.png
Binary file clients/editor/icons/quit.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/save_map.png
Binary file clients/editor/icons/save_map.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/select_layer.png
Binary file clients/editor/icons/select_layer.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/take_screenshot.png
Binary file clients/editor/icons/take_screenshot.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/zoom_default.png
Binary file clients/editor/icons/zoom_default.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/zoom_in.png
Binary file clients/editor/icons/zoom_in.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/icons/zoom_out.png
Binary file clients/editor/icons/zoom_out.png has changed
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/input.py
--- a/clients/editor/input.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/input.py Fri Jan 30 00:54:07 2009 +0000
@@ -9,7 +9,7 @@
def __init__(self, prompt, onEntry):
self._callback = onEntry
- self._widget = pychan.loadXML('content/gui/input.xml')
+ self._widget = pychan.loadXML('gui/input.xml')
self._widget.mapEvents({
'okButton' : self._complete,
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/listener.py
--- a/clients/editor/listener.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/listener.py Fri Jan 30 00:54:07 2009 +0000
@@ -84,7 +84,7 @@
self.app.quit()
if command.lower() in ( 'help', 'help()' ):
- self.engine.getGuiManager().getConsole().println( open( 'content/infotext.txt', 'r' ).read() )
+ self.engine.getGuiManager().getConsole().println( open( 'misc/infotext.txt', 'r' ).read() )
return "-- End of help --"
try:
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/misc/infotext.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/editor/misc/infotext.txt Fri Jan 30 00:54:07 2009 +0000
@@ -0,0 +1,29 @@
+This is the standalone FIFE editor, release 2008.1
+
+Keybindings:
+--------------
+- P = Make screenshot
+- LEFT = Move camera left
+- RIGHT = Move camera right
+- UP = Move camera up
+- DOWN = Move camera down
+- F10 = Toggle console on / off
+- ESC = Quit techdemo
+
+- INS = Makes a new instance on the map with
+ current object selection at current
+ mouse selection (toggle).
+- DEL = Removes instances at current mouse
+ selection (toggle).
+- R = Rotates selected instace (if object
+ contains rotated images)
+- M = Moves selected instace (drag it around)
+- T = shows / hides grid
+- B = shows / hides blocking info
+- U = Undo an instance placement or removal
+- CTRL = Enters pan/zoom mode. Pan with LMB drag,
+ zoom with mouse wheel while CTRL is
+ pressed
+
+
+http://www.fifengine.de
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/plugins/mapeditor.py
--- a/clients/editor/plugins/mapeditor.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/plugins/mapeditor.py Fri Jan 30 00:54:07 2009 +0000
@@ -32,7 +32,7 @@
def show(self, map):
if not self._mapedit:
- self._mapedit = pychan.loadXML('content/gui/mapeditor.xml')
+ self._mapedit = pychan.loadXML('gui/mapeditor.xml')
self._mapedit.mapEvents({
'layerButton' : self._onLayerSelect,
'objButton' : self._onObjectSelect,
@@ -63,7 +63,7 @@
def show(self):
if not self._toolbar:
- self._toolbar = pychan.loadXML('content/gui/tools.xml')
+ self._toolbar = pychan.loadXML('gui/tools.xml')
evtmap = {
'btnSelect' : self._onSelect,
'btnMove' : self._onMove,
@@ -107,7 +107,7 @@
class StatusBar(object):
def __init__(self, screenw, screenh):
- self._statusbar = pychan.loadXML('content/gui/statuspanel.xml')
+ self._statusbar = pychan.loadXML('gui/statuspanel.xml')
self._statusbar.show()
height = 25
self._statusbar.position = (0, screenh - height)
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/plugins/mapwizard.py
--- a/clients/editor/plugins/mapwizard.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/plugins/mapwizard.py Fri Jan 30 00:54:07 2009 +0000
@@ -17,7 +17,7 @@
def __init__(self, engine, callback=None, map=None, layer=None):
self.engine = engine
self.callback = callback
- self._widget = pychan.loadXML('content/gui/cameraedit.xml')
+ self._widget = pychan.loadXML('gui/cameraedit.xml')
if map:
self._widget.distributeData({
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/plugins/objectedit.py
--- a/clients/editor/plugins/objectedit.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/plugins/objectedit.py Fri Jan 30 00:54:07 2009 +0000
@@ -115,7 +115,7 @@
- creates the gui skeleton by loading the xml file
- finds some important childs and saves their widget in the object
"""
- self.container = pychan.loadXML('content/gui/offsetedit.xml')
+ self.container = pychan.loadXML('gui/offsetedit.xml')
self.container.mapEvents({
'x_offset_up' : cbwa(self.change_offset_x, 1),
'x_offset_dn' : cbwa(self.change_offset_x, -1),
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/run.py
--- a/clients/editor/run.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/run.py Fri Jan 30 00:54:07 2009 +0000
@@ -42,9 +42,9 @@
if self._helpWidget:
self._helpWidget.show()
return
- self._helpWidget = pychan.loadXML('content/gui/help.xml')
+ self._helpWidget = pychan.loadXML('gui/help.xml')
self._helpWidget.mapEvents({ 'closeButton' : self._helpWidget.hide })
- self._helpWidget.distributeData({ 'helpText' : open("content/infotext.txt").read() })
+ self._helpWidget.distributeData({ 'helpText' : open("misc/infotext.txt").read() })
self._helpWidget.show()
class Editor(basicapplication.ApplicationBase):
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/selection.py
--- a/clients/editor/selection.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/selection.py Fri Jan 30 00:54:07 2009 +0000
@@ -11,7 +11,7 @@
self.list = list
self._callback = onSelection
- self._widget = pychan.loadXML('content/gui/selection.xml')
+ self._widget = pychan.loadXML('gui/selection.xml')
self._widget.mapEvents({
'okButton' : self._selected,
@@ -40,7 +40,7 @@
self.list = list
self._callback = onSelection
- self._widget = pychan.loadXML('content/gui/selection.xml')
+ self._widget = pychan.loadXML('gui/selection.xml')
self._widget.mapEvents({
'okButton' : self._widget.hide,
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 clients/editor/settings.py
--- a/clients/editor/settings.py Fri Jan 30 00:24:50 2009 +0000
+++ b/clients/editor/settings.py Fri Jan 30 00:54:07 2009 +0000
@@ -7,7 +7,7 @@
ScreenWidth = 1024
ScreenHeight = 768
-Font = 'content/fonts/samanata.ttf'
+Font = 'fonts/samanata.ttf'
FontGlyphs = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\""
LogModules = ['controller']
diff -r 7dc59bd3d6b1 -r 28532ae6f9f6 engine/extensions/filebrowser.py
--- a/engine/extensions/filebrowser.py Fri Jan 30 00:24:50 2009 +0000
+++ b/engine/extensions/filebrowser.py Fri Jan 30 00:54:07 2009 +0000
@@ -12,7 +12,7 @@
The savefile option provides a box for supplying a new filename that doesn't exist yet.
The selectdir option allows directories to be selected as well as files.
"""
- def __init__(self, engine, fileSelected, savefile=False, selectdir=False, extensions=('xml',), guixmlpath="content/gui/filebrowser.xml"):
+ def __init__(self, engine, fileSelected, savefile=False, selectdir=False, extensions=('xml',), guixmlpath="gui/filebrowser.xml"):
self.engine = engine
self.fileSelected = fileSelected