comparison orpg/mapper/map.py @ 14:0b8b7e3ed78d traipse_dev

Adding fixes from OpenRPG 1.8.0 Includes GUI patch for Linux users, init2 plugin, cherrypy XML refrence Completely removes approot from the startup process and creates a software cleanup process as well.
author sirebral
date Mon, 20 Jul 2009 21:25:13 -0500
parents 4385a7d0efd1
children 78407d627cba
comparison
equal deleted inserted replaced
13:3add6bbc3a56 14:0b8b7e3ed78d
890 self.layer_handlers.append(fog_handler(self.layer_tabs,-1,self.canvas)) 890 self.layer_handlers.append(fog_handler(self.layer_tabs,-1,self.canvas))
891 self.layer_tabs.AddPage(self.layer_handlers[4],"Fog") 891 self.layer_tabs.AddPage(self.layer_handlers[4],"Fog")
892 self.layer_handlers.append(map_handler(self.layer_tabs,-1,self.canvas)) 892 self.layer_handlers.append(map_handler(self.layer_tabs,-1,self.canvas))
893 self.layer_tabs.AddPage(self.layer_handlers[5],"General") 893 self.layer_tabs.AddPage(self.layer_handlers[5],"General")
894 self.layer_tabs.SetSelection(2) 894 self.layer_tabs.SetSelection(2)
895
896 self.sizer = wx.BoxSizer(wx.VERTICAL)
897 self.sizer.Add(self.canvas, 1, wx.EXPAND)
898 self.sizer.Add(self.layer_tabs, 0, wx.EXPAND)
899 self.SetSizer(self.sizer)
900
895 self.Bind(FNB.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.on_layer_change) 901 self.Bind(FNB.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.on_layer_change)
896 self.Bind(wx.EVT_SIZE, self.on_size) 902 #self.Bind(wx.EVT_SIZE, self.on_size)
897 self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave) 903 self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave)
898 self.load_default() 904 self.load_default()
905
906 """
899 # size of tabs is diffrent on windows and linux :( 907 # size of tabs is diffrent on windows and linux :(
900 if wx.Platform == '__WXMSW__': 908 if wx.Platform == '__WXMSW__':
901 self.toolbar_height = 50 909 self.toolbar_height = 50
902 else: 910 else:
903 self.toolbar_height = 55 911 self.toolbar_height = 55
912 """
913
904 self.log.log("Exit map_wnd", ORPG_DEBUG) 914 self.log.log("Exit map_wnd", ORPG_DEBUG)
905 915
906 def OnLeave(self, evt): 916 def OnLeave(self, evt):
907 if "__WXGTK__" in wx.PlatformInfo: 917 if "__WXGTK__" in wx.PlatformInfo:
908 wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) 918 wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
1121 self.log.log("Enter map_wnd->get_hot_keys(self)", ORPG_DEBUG) 1131 self.log.log("Enter map_wnd->get_hot_keys(self)", ORPG_DEBUG)
1122 self.build_menu() 1132 self.build_menu()
1123 self.log.log("Exit map_wnd->get_hot_keys(self)", ORPG_DEBUG) 1133 self.log.log("Exit map_wnd->get_hot_keys(self)", ORPG_DEBUG)
1124 return [] 1134 return []
1125 1135
1136 """
1126 def on_size(self, evt): 1137 def on_size(self, evt):
1127 self.log.log("Enter map_wnd->on_size(self, evt)", ORPG_DEBUG) 1138 self.log.log("Enter map_wnd->on_size(self, evt)", ORPG_DEBUG)
1128 s = self.GetClientSizeTuple() 1139 s = self.GetClientSizeTuple()
1129 self.canvas.SetDimensions(0,0,s[0],s[1]-self.toolbar_height) 1140 self.canvas.SetDimensions(0,0,s[0],s[1]-self.toolbar_height)
1130 self.layer_tabs.SetDimensions(0,s[1]-self.toolbar_height,s[0],self.toolbar_height) 1141 self.layer_tabs.SetDimensions(0,s[1]-self.toolbar_height,s[0],self.toolbar_height)
1131 self.log.log("Exit map_wnd->on_size(self, evt)", ORPG_DEBUG) 1142 self.log.log("Exit map_wnd->on_size(self, evt)", ORPG_DEBUG)
1143 """