From 8b27730dc210561d22807727b2041758a81c2c28 Mon Sep 17 00:00:00 2001 From: Allanis Date: Sat, 13 Apr 2013 17:38:16 +0100 Subject: [PATCH] [Change] Few improvements to resedit. --- .gitignore | 3 ++- utils/resedit/space.glade | 6 ++--- utils/resedit/space.py | 55 +++++++++++++++++++++++++++++++------- utils/resedit/space.pyc | Bin 5003 -> 6104 bytes 4 files changed, 51 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 08d6a38..bb87919 100644 --- a/.gitignore +++ b/.gitignore @@ -30,8 +30,9 @@ *core screenshots/*.png *VERSION +utils/resedit/*.xml # Windows Crap win32/Lephisto/* win32/Pack/* -win32/Makefile \ No newline at end of file +win32/Makefile diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade index a990eeb..d05f1dd 100644 --- a/utils/resedit/space.glade +++ b/utils/resedit/space.glade @@ -121,7 +121,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 100 1 10 10 + 0 0 1000 1 10 10 120 @@ -148,7 +148,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 100 1 10 10 + 0 0 1000 1 10 10 120 @@ -175,7 +175,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 100 1 10 10 + 0 0 1000 1 10 10 120 diff --git a/utils/resedit/space.py b/utils/resedit/space.py index 203527f..0ffc091 100644 --- a/utils/resedit/space.py +++ b/utils/resedit/space.py @@ -65,6 +65,7 @@ class space: # Display the window and such. self.__swidget("winSystems").show_all() + self.cur_system = "" # ---------------- PLANETS -------------------- @@ -79,22 +80,20 @@ class space: return self.swtree.get_widget(wgtname) - def __update(self, wgt=None, foo=None, bar=None): + def __update(self, wgt=None, index=None, iter=None): """ Update the window """ - # Important thingies. - tree = self.__swidget("treSystems") - model = tree.get_model() + + # Store the current values. + self.__store(); - # Get system. - sel = model.iter_nth_child(None, foo[0]) - sys_name = model.get_value( sel, 0 ) - system = self.systems[sys_name] + self.cur_system = self.__curSystem() + system = self.systems[self.cur_system] # Load it all. dic = { - "inpName":sys_name, + "inpName":self.cur_system, "spiInterference":system["general"]["interference"], "spiAsteroids":system["general"]["asteroids"], "spiStars":system["general"]["stars"], @@ -118,6 +117,44 @@ class space: col.add_attribute(cell, 'text', 0) wgt.set_model(jumps) + def __store(self): + sys_name = self.__swidget("inpName").get_text() + + # Renamed the current system. + if sys_name != self.cur_system: + self.systems[sys_name] = self.systems[self.cur_systems] # Copy it over. + del self.systems[self.cur_system] # Get rid of the old one. + self.cur_system = sys_name # Now use self.cur_system again. + + try: + system = self.systems[self.cur_system] + except: + return # No system selected yet. + + # Start to load all the input stuff. + # General crap. + self.__sinpStore(system, "spiStars", "general", "stars") + self.__sinpStore(system, "spiInterference", "general", "interference") + self.__sinpStore(system, "spiAsteroids", "general", "asteroids") + + def __sinpStore(self, system, wgt, tag, minortag=None): + text = self.__swidget(wgt).get_text() + if minortag==None: + system[tag] = text + else: + system[tag][minortag] = text + + def __curSystem(self): + # Important thingies. + tree = self.__swidget("treSystems") + model = tree.get_model() + iter = tree.get_selection().get_selected()[1] + p = model.iter_parent(iter) + if p == None: + return model.get_value(iter, 0) + else: + return model.get_value(p, 0) + def __done(self, widget=None, data=None): """ Window is done diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc index f37563a83ac407b050c7c0dd4a574ea4b1225b44..d996ec3b61c5e0b9f3b9661611409703f0c81068 100644 GIT binary patch delta 1949 zcmY*ZOK%%h6h3#x_SoZRU6aO0sFXBe8bn$iirNy?qzzC+G13?m6s1^}XNc@3PU4w{ zM6zX}WP?CLFzk?!c>DlR7C<)$@dFSN3w{DCHmun3eRrHVQ8J(JIrrRqUf;PNKmFI$ zl=*Moe)6LqQa6?QG+I)xzmXR&{b}8X0<*ehe}p+;@MhxVw{yjLskpo z<+Q#iZrv#y{ixQG>hq{#JyQATck8z*w)-ND3lfTSCgngx!5d7YZ_;0;p%ke()uY9X zqY5^J*27*S*bhQ~Gg`MlQ!~+j_Kcx2(Zy_2O-CPQcZc_26&O62XeEGod`WzF@C64- z=&vK%6IY5WhG6IoQ==i(K|Dwr?1SjedBMh(oj>Da=vGmyvcg+(^g7VR?zqJQ!~4cq99xR(GmrvePwvPQ7oZ265w5N`E+Ts+o*0(H#*cOF`|$P;XE8>9%_ z8H#B@;D?RS-wWL-YBGR(?I5i4I`>tCo=_mXKzI@0FdjDr z2u;8T>tXD#>*0D*44!-L_2{VRWN*;)CgG*%>(p{ITgp}H5Q8~@q->+8N~Wpos8+f> z1R3G|6g_{25YrQsL#1MN4s>6rH{^jSy|=YZ%+v(fg$)Qw7Dg*=_%albL2I;YzjEpb z$!*9=H$4=klqXVumj}T(gA@nDLGXhFdUm1(L!bpA&uA^JMN6UOH4ckha~FZ`YlJ1j ztAsm*+k{sL%K#_!9+xNmT0idBxT{$hj0ZkA!-AmQ-PX-?Si!hEy6yWxqubo{(GS#r zXkl|iqCG5wNr0%w%%ZxW@+xPTs-jGlOiZW=)gp`7X5Pq%gGB(V05neZ1Es=ni##x- zH^(7ntxZ|zVpfg?4*i06mt|p_YjK#&)?Fiz4-TE_(B11?y#vq`3!Cej!<+5yRu6)E z3CY|YB9Y^)KY?k$e36XGsl3sm7bb8L{5FI*_?S#FjYgEhYX^EEDP(67`M3>0BZDsz zk^%eh1dj7ull~BUc#gmXY#UOiEo77;mNf?w@LF@90Ja&Co^6L+h&xS+u+y7cp1+|7 zol@X$_^q(L)eUo_{aE9BAvwVLYHT-e_55zA3#Z4K2X~tr4}FJe#|)tNu;=@FK(!Bd zg(`-!9er;s&G5cP<4$n9f5D{#oofSolYC*h^ud0Oes1SnwfhQQ`Gxv6vB$&209q@Xhz^hmrAVm? zLMZ_yuq)6@BT1u0I?&4?$)J^j8bv~wLS;9Fo@=e-=dy_{S(}2qv#9iPXj)AX3!E&tYYa1$F z)kR`W9k=W2dZqqgrMar)^#5Mn#_CoqLpJfVAlJ1HO-ql1Qs{VF%ZYvWTg{HH>5XXKAmTSCT>|Y8JX+TFT-w;M=lw=o^UKujIJP|u z8fVuI4PblO>D1R7Yq6}FXJJ&Bqbqrd;j($}&YRG2k8C|u4IN7k;=;&;!gtDISOktE zvSzk4X0+qQw!^y#; fbw&x?l$Z6=e}9u+c6cguISdg`Dksdv@#lX4eoDQQ