diff --git a/utils/resedit/space.glade b/utils/resedit/space.glade
index 5180b2e..e21763d 100644
--- a/utils/resedit/space.glade
+++ b/utils/resedit/space.glade
@@ -180,8 +180,8 @@
- 296
- 248
+ 300
+ 250
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
@@ -420,4 +420,467 @@
+
+ 600
+ 450
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 150
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ True
+
+
+ False
+ True
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 70
+ 37
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ New
+ 0
+
+
+ 17
+ 12
+
+
+
+
+ 80
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Name:
+
+
+ 94
+ 21
+
+
+
+
+ 121
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 160
+ 19
+
+
+
+
+ 129
+ 29
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 80
+ 58
+
+
+
+
+ 88
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Faction
+
+
+ 62
+
+
+
+
+ 404
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 11
+ 94
+
+
+
+
+ 188
+ 166
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ True
+
+
+ 16
+ 116
+
+
+
+
+ 189
+ 24
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 15
+ 287
+
+
+
+
+ 86
+ 38
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Add
+ 0
+
+
+ 15
+ 318
+
+
+
+
+ 88
+ 40
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Remove
+ 0
+
+
+ 115
+ 316
+
+
+
+
+ 20
+ 255
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 209
+ 110
+
+
+
+
+ 408
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 7
+ 360
+
+
+
+
+ 100
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Services
+
+
+ 232
+ 115
+
+
+
+
+ 73
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Land
+ 0
+ True
+
+
+ 240
+ 145
+
+
+
+
+ 70
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Basic
+ 0
+ True
+
+
+ 320
+ 145
+
+
+
+
+ 112
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Commodity
+ 0
+ True
+
+
+ 240
+ 170
+
+
+
+
+ 80
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Outfits
+ 0
+ True
+
+
+ 240
+ 195
+
+
+
+
+ 100
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Shipyard
+ 0
+ True
+
+
+ 320
+ 195
+
+
+
+
+ 191
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 221
+ 217
+
+
+
+
+ 57
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Tech
+
+
+ 246
+ 238
+
+
+
+
+ 63
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Main
+
+
+ 222
+ 260
+
+
+
+
+ 72
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0 0 100000 1 10 10
+
+
+ 272
+ 260
+
+
+
+
+ 67
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Special
+
+
+ 225
+ 290
+
+
+
+
+ 60
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0 0 100000 1 10 10
+
+
+ 235
+ 315
+
+
+
+
+ 60
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0 0 100000 1 10 10
+
+
+ 300
+ 315
+
+
+
+
+ 60
+ 20
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0 0 100000 1 10 10
+
+
+ 235
+ 340
+
+
+
+
+ 60
+ 20
+ 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
+
+
+ 300
+ 340
+
+
+
+
+ 160
+ 25
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 12
+ 400
+
+
+
+
+ 100
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ System
+
+
+ 378
+
+
+
+
+ 100
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Save
+ 0
+
+
+ 190
+ 377
+
+
+
+
+ 62
+ 20
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Class
+
+
+ 227
+ 60
+
+
+
+
+ True
+ True
+
+
+
+
+
+
diff --git a/utils/resedit/space.py b/utils/resedit/space.py
index 66e42c6..e437bf9 100644
--- a/utils/resedit/space.py
+++ b/utils/resedit/space.py
@@ -48,6 +48,7 @@ class space:
hooks = {
"winSystems":["destroy",self.__done],
"treSystems":["button-release-event", self.__update],
+ "inpName":["changed", self.__update],
"butDone":["clicked", self.__done],
"butSave":["clicked",self.saveSystems],
"butZoomIn":["clicked", self.__space_zoomin],
@@ -66,6 +67,7 @@ class space:
self.zoom = 1
self.space_sel = ""
area = self.__swidget("draSpace")
+ area.set_double_buffered(True)
area.set_events(gtk.gdk.EXPOSURE_MASK
| gtk.gdk.LEAVE_NOTIFY_MASK
| gtk.gdk.BUTTON_PRESS_MASK
@@ -83,6 +85,10 @@ class space:
# ---------------- PLANETS --------------------
+ self.pwtree = gtk.glade.XML(self.glade, "winPlanets")
+ self.__pwidget("winPlanets").show_all()
+ self.cur_planet = ""
+
# ---------------------------------------------
gtk.main()
@@ -109,6 +115,9 @@ class space:
"""
return self.swtree.get_widget(wgtname)
+ def __pwidget(self, wgtname):
+ return self.pwtree.get_widget(wgtname)
+
def __update(self, wgt=None, index=None, iter=None):
"""
Update the window
@@ -360,6 +369,9 @@ class space:
layout = area.create_pango_layout(sys_name)
area.window.draw_layout(gc, dx+r/2+2, dy-r/2, layout)
+ # Draw the frame at the end.
+ area.window.draw_rectangle(sys_gc, False, 0, 0, ww-1, wh-1)
+
def __jump_add(self, wgt=None, event=None):
if self.space_sel in self.systems.keys() and self.cur_system in self.systems.keys():
self.systems[self.cur_system]["jumps"].append(self.space_sel)
diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc
index 2f26820..94b0522 100644
Binary files a/utils/resedit/space.pyc and b/utils/resedit/space.pyc differ