evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

basic cleanup

Browse Source
This commit is contained in:
unknown 2009-11-03 13:49:16 -05:00
parent 9ec1eb48e1
commit 0e6254ce0d
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pyfpdb/Configuration.py
View File

@ -110,25 +110,18 @@ class Site:
self.xpad = node.getAttribute("xpad") self.xpad = node.getAttribute("xpad")
self.ypad = node.getAttribute("ypad") self.ypad = node.getAttribute("ypad")
self.layout = {} self.layout = {}
print self.site_name, self.HH_path print "Loading site", self.site_name
for layout_node in node.getElementsByTagName('layout'): for layout_node in node.getElementsByTagName('layout'):
lo = Layout(layout_node) lo = Layout(layout_node)
self.layout[lo.max] = lo self.layout[lo.max] = lo
# Site defaults # Site defaults
if self.xpad == "": self.xpad = 1 self.xpad = 1 if self.xpad == "" else int(self.xpad)
else: self.xpad = int(self.xpad) self.ypad = 0 if self.ypad == "" else int(self.ypad)
self.font_size = 7 if self.font_size == "" else int(self.font_size)
if self.ypad == "": self.ypad = 0 self.hudopacity = 1.0 if self.hud_opacity == "" else float(self.hudopacity)
else: self.ypad = int(self.ypad)
if self.font_size == "": self.font_size = 7
else: self.font_size = int(self.font_size)
if self.hudopacity == "": self.hudopacity = 1.0
else: self.hudopacity = float(self.hudopacity)
if self.use_frames == "": self.use_frames = False if self.use_frames == "": self.use_frames = False
if self.font == "": self.font = "Sans" if self.font == "": self.font = "Sans"
@ -436,7 +429,7 @@ class Config:
db = self.get_db_parameters() db = self.get_db_parameters()
if db['db-password'] == 'YOUR MYSQL PASSWORD': if db['db-password'] == 'YOUR MYSQL PASSWORD':
df_file = self.find_default_conf() df_file = self.find_default_conf()
if df_file == None: # this is bad if df_file is None: # this is bad
pass pass
else: else:
df_parms = self.read_default_conf(df_file) df_parms = self.read_default_conf(df_file)
@ -769,7 +762,7 @@ class Config:
return locations return locations
def get_aux_locations(self, aux = "mucked", max = "9"): def get_aux_locations(self, aux = "mucked", max = "9"):
try: try:
locations = self.aux_windows[aux].layout[max].location locations = self.aux_windows[aux].layout[max].location
except: except: