From fcd8496fa41fb952ee0306c346e913b929fe28ae Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 16 Apr 2013 13:15:20 +0100
Subject: [PATCH] [Change] resedit: Some cleanups in preperation for planet
editor.
---
utils/resedit/resedit.py | 2 +-
utils/resedit/space.py | 18 +++++++++---------
utils/resedit/space.pyc | Bin 14178 -> 14182 bytes
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/utils/resedit/resedit.py b/utils/resedit/resedit.py
index 9061b8a..a924a15 100755
--- a/utils/resedit/resedit.py
+++ b/utils/resedit/resedit.py
@@ -3,7 +3,7 @@
import space
# Load the universe.
-universe = space.space()
+universe = space.Space()
universe.loadSystems("../../dat/ssys.xml")
universe.loadPlanets("../../dat/planet.xml")
universe.window()
diff --git a/utils/resedit/space.py b/utils/resedit/space.py
index e437bf9..054c9bd 100644
--- a/utils/resedit/space.py
+++ b/utils/resedit/space.py
@@ -11,7 +11,7 @@ except:
import data
-class space:
+class Space:
def __init__(self):
self.glade = "space.glade"
@@ -47,8 +47,8 @@ class space:
# Hook events and stuff.
hooks = {
"winSystems":["destroy",self.__done],
- "treSystems":["button-release-event", self.__update],
- "inpName":["changed", self.__update],
+ "treSystems":["button-release-event", self.__supdate],
+ "inpName":["changed", self.__supdate],
"butDone":["clicked", self.__done],
"butSave":["clicked",self.saveSystems],
"butZoomIn":["clicked", self.__space_zoomin],
@@ -118,13 +118,13 @@ class space:
def __pwidget(self, wgtname):
return self.pwtree.get_widget(wgtname)
- def __update(self, wgt=None, index=None, iter=None):
+ def __supdate(self, wgt=None, index=None, iter=None):
"""
Update the window
"""
# Store the current values.
- self.__store();
+ self.__sstore();
self.cur_system = self.__curSystem()
if self.cur_system == "":
@@ -159,7 +159,7 @@ class space:
self.__space_draw()
- def __store(self):
+ def __sstore(self):
sys_name = self.__swidget("inpName").get_text()
if sys_name == "":
return
@@ -379,7 +379,7 @@ class space:
data.uniq(self.systems[self.cur_system]["jumps"])
data.uniq(self.systems[self.space_sel]["jumps"])
- self.__update()
+ self.__supdate()
self.__space_draw()
def __jump_rm(self, wgt=None, event=None):
@@ -394,7 +394,7 @@ class space:
if e == self.cur_system:
self.systems[self.space_sel]["jumps"].pop(i)
i = i + 1
- self.__update()
+ self.__supdate()
self.__space_draw()
def __new(self, wgt=None, event=None):
@@ -412,7 +412,7 @@ class space:
for row in tree.get_model():
if row[0] == system:
tree.set_cursor(i)
- self.__update()
+ self.__supdate()
break
i = i+1
diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc
index 94b0522bea0ce8d3c9d01e6a88db69a4464ce05c..ae7f72e52250c083001828c6533c9a4197f87a00 100644
GIT binary patch
delta 314
zcmaEq_biW%`7<xq0*8%k%8ZP`o3$8wxU_={5|dNo<5TkUQcL(57#QNA0>z~TDTyVi
zLE=EM5)rV(<Okdm^)P9$wyOO6-2Bp#5@BSGV40%S;?$B70VMIP(%gdh#FP{iTfl-v
zxh3343iDFSOIU&Y%#zgHVieWI<(ZSqdBhllC-?E(mOybyN>O5Yi4fS7$&I`qB{O)#
zfqwkJ`<7jj56Sf6;*$KL)Dl6k(B`kA;*68!h1nR3Hw%e3GXb?tlkA>sXTrW&U1|wC
KQ2!alX`%pw^JI4b
delta 310
zcmaEs_b88z`7<w9sNF_3Wk$y0&035-Tw28iiOH$)@hSOvsU>_23=Hv5fzpDM#FEq?
zaiCC%2v~gbLv9HVs4Rr4%FoZuFD)q%M$!k7DM~F)Eh!N|63;5lEr?G{Nh#rn80N?$
zEDbd*FSWdc6)2inlA2o#lh5aoXDpuF&vRQJ#mbbT#PSj$By%CMDf#7jP~pildBcI8
z`^fv2U4j=`VM%^bYKb6NWb=1XaYi-{5IcUesCY9I(5jh|-E8a-5pAg@>_8(fC{7av
E0O&<xJpcdz