fixed indentation issues and mix of tabs and spaces.

svn: r11943
This commit is contained in:
Raphael Ackermann 2009-02-09 23:37:40 +00:00
parent 7f1cbf9063
commit baef4d76a4
18 changed files with 30 additions and 30 deletions

View File

@ -1063,9 +1063,9 @@ class GeoView(HtmlView):
if maxlong < 0.1 : if maxlong < 0.1 :
zoomlong = 13 zoomlong = 13
if zoomlat < zoomlong: if zoomlat < zoomlong:
self.zoom = zoomlat self.zoom = zoomlat
else: else:
self.zoom = zoomlong self.zoom = zoomlong
self.zoom -= 1 self.zoom -= 1
if self.zoom < 2: if self.zoom < 2:
self.zoom = 2 self.zoom = 2
@ -1100,8 +1100,8 @@ class GeoView(HtmlView):
longt = self.minlon+self.centerlon longt = self.minlon+self.centerlon
# for all maps, 0.0 for longitude and latitude means no location. # for all maps, 0.0 for longitude and latitude means no location.
if latit == 0.0 and longt == 0.0: if latit == 0.0 and longt == 0.0:
latit = 0.00000001 latit = 0.00000001
longt = 0.00000001 longt = 0.00000001
LOG.debug( "self.maxlon = %f\n" % self.maxlon) LOG.debug( "self.maxlon = %f\n" % self.maxlon)
LOG.debug("self.minlon = %f\n" % self.minlon) LOG.debug("self.minlon = %f\n" % self.minlon)

View File

@ -78,7 +78,7 @@ except AttributeError:
NoteView, NoteView,
] ]
if geopresent: if geopresent:
DATA_VIEWS.append(GeoView) DATA_VIEWS.append(GeoView)
def get_views(): def get_views():
""" """

View File

@ -114,7 +114,7 @@ class EditLocation(EditSecondary):
def save(self,*obj): def save(self,*obj):
if self.callback: if self.callback:
self.callback(self.obj) self.callback(self.obj)
self.close() self.close()

View File

@ -52,7 +52,7 @@ class HasAddress(Rule):
def prepare(self, db): def prepare(self, db):
# things we want to do just once, not for every handle # things we want to do just once, not for every handle
if self.list[1] == _('lesser than'): if self.list[1] == _('lesser than'):
self.count_type = 0 self.count_type = 0
elif self.list[1] == _('greater than'): elif self.list[1] == _('greater than'):
self.count_type = 2 self.count_type = 2
else: else:

View File

@ -51,7 +51,7 @@ class HasAssociation(Rule):
def prepare(self, db): def prepare(self, db):
# things we want to do just once, not for every handle # things we want to do just once, not for every handle
if self.list[1] == _('lesser than'): if self.list[1] == _('lesser than'):
self.count_type = 0 self.count_type = 0
elif self.list[1] == _('greater than'): elif self.list[1] == _('greater than'):
self.count_type = 2 self.count_type = 2
else: else:

View File

@ -48,7 +48,7 @@ class HasGalleryBase(Rule):
def prepare(self, db): def prepare(self, db):
# things we want to do just once, not for every handle # things we want to do just once, not for every handle
if self.list[1] == _('lesser than'): if self.list[1] == _('lesser than'):
self.count_type = 0 self.count_type = 0
elif self.list[1] == _('greater than'): elif self.list[1] == _('greater than'):
self.count_type = 2 self.count_type = 2
else: else:

View File

@ -51,7 +51,7 @@ class HasLDSBase(Rule):
def prepare(self, db): def prepare(self, db):
# things we want to do just once, not for every handle # things we want to do just once, not for every handle
if self.list[1] == _('lesser than'): if self.list[1] == _('lesser than'):
self.count_type = 0 self.count_type = 0
elif self.list[1] == _('greater than'): elif self.list[1] == _('greater than'):
self.count_type = 2 self.count_type = 2
else: else:

View File

@ -372,7 +372,7 @@ class ErrorReportAssistant:
# side_label = gtk.Label(_("This is the completed bug report. The next page "\ # side_label = gtk.Label(_("This is the completed bug report. The next page "\
# "of the assistant will help you to send the report "\ # "of the assistant will help you to send the report "\
# "to the bug report mailing list.")) # "to the bug report mailing list."))
side_label = gtk.Label(_("This is the completed bug report. The next page "\ side_label = gtk.Label(_("This is the completed bug report. The next page "\
"of the assistant will help you to file a bug "\ "of the assistant will help you to file a bug "\
" on the Gramps bug tracking system website.")) " on the Gramps bug tracking system website."))
@ -484,10 +484,10 @@ class ErrorReportAssistant:
outer_frame.get_label_widget().set_use_markup(True) outer_frame.get_label_widget().set_use_markup(True)
outer_frame.add(inner_align) outer_frame.add(inner_align)
# side_label = gtk.Label(_("This is the final step. Use the buttons on this " # side_label = gtk.Label(_("This is the final step. Use the buttons on this "
# "page to transfer the bug report to your email client.")) # "page to transfer the bug report to your email client."))
side_label = gtk.Label(_("This is the final step. Use the buttons on this " side_label = gtk.Label(_("This is the final step. Use the buttons on this "
"page to start a web browser and file a bug " "page to start a web browser and file a bug "
"report on the Gramps bug tracking system.")) "report on the Gramps bug tracking system."))

View File

@ -41,7 +41,7 @@ class FastFilterModel(gtk.GenericTreeModel):
def __init__(self,db,data_filter): def __init__(self,db,data_filter):
gtk.GenericTreeModel.__init__(self) gtk.GenericTreeModel.__init__(self)
self._db = db self._db = db
self._data_filter = data_filter self._data_filter = data_filter
self._fetch_func = self._get_fetch_func(db) self._fetch_func = self._get_fetch_func(db)

View File

@ -41,9 +41,9 @@ class FastModel(gtk.GenericTreeModel):
def __init__(self,db): def __init__(self,db):
gtk.GenericTreeModel.__init__(self) gtk.GenericTreeModel.__init__(self)
self._db = db self._db = db
self._table = self._get_table(db) self._table = self._get_table(db)
self._cursor = self._get_cursor(db) self._cursor = self._get_cursor(db)
self._object_class = self._get_object_class(db) self._object_class = self._get_object_class(db)
self._length = self._get_length(db) self._length = self._get_length(db)

View File

@ -113,8 +113,8 @@ class RecentFiles:
def rename_filename(self,filename, new_filename): def rename_filename(self,filename, new_filename):
# First we need to walk the existing items to see # First we need to walk the existing items to see
# if our item is already there # if our item is already there
found = False found = False
for index in range(len(self.gramps_recent_files)): for index in range(len(self.gramps_recent_files)):
if self.gramps_recent_files[index].get_name() == filename: if self.gramps_recent_files[index].get_name() == filename:

View File

@ -2063,8 +2063,8 @@ def _testsibling(rc):
(gen.lib.Person.FEMALE, 'female'), (gen.lib.Person.FEMALE, 'female'),
(gen.lib.Person.UNKNOWN, 'unknown')]: (gen.lib.Person.UNKNOWN, 'unknown')]:
for inlaw in [False, True]: for inlaw in [False, True]:
for sibt, str in vals: for sibt, str in vals:
print FMT % rc.get_sibling_relationship_string( print FMT % rc.get_sibling_relationship_string(
sibt, gen.lib.Person.MALE, gendr, sibt, gen.lib.Person.MALE, gendr,
in_law_a = inlaw) + ' |info:', str, strgen in_law_a = inlaw) + ' |info:', str, strgen

View File

@ -1,4 +1,4 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2000-2007 Donald N. Allingham

View File

@ -568,7 +568,7 @@ def copy_lds_ords(db, original_obj,clean_obj):
""" """
for lds_ord in original_obj.get_lds_ord_list(): for lds_ord in original_obj.get_lds_ord_list():
if not lds_ord.get_privacy(): if not lds_ord.get_privacy():
clean_obj.add_lds_ord( lds_ord ) clean_obj.add_lds_ord( lds_ord )
def copy_addresses(db, original_obj,clean_obj): def copy_addresses(db, original_obj,clean_obj):
""" """

View File

@ -291,7 +291,7 @@ class Calendar(Report):
'person' : short_name, 'person' : short_name,
'relation' : ""} 'relation' : ""}
else: else:
text = (ngettext('%(person)s, %(age)d%(relation)s', text = (ngettext('%(person)s, %(age)d%(relation)s',
'%(person)s, %(age)d%(relation)s', nyears) '%(person)s, %(age)d%(relation)s', nyears)
% {'person' : short_name, % {'person' : short_name,
'age' : nyears, 'age' : nyears,

View File

@ -169,7 +169,7 @@ class FanChartWidget(gtk.Widget):
line_style=gdk.SOLID, line_style=gdk.SOLID,
join_style=gdk.JOIN_ROUND) join_style=gdk.JOIN_ROUND)
self.window.set_user_data(self) self.window.set_user_data(self)
self.style.attach(self.window) self.style.attach(self.window)
self.style.set_background(self.window, gtk.STATE_NORMAL) self.style.set_background(self.window, gtk.STATE_NORMAL)
self.window.move_resize(*self.allocation) self.window.move_resize(*self.allocation)
@ -178,9 +178,9 @@ class FanChartWidget(gtk.Widget):
""" """
Overridden method to handle size request events. Overridden method to handle size request events.
""" """
width, height = self.layout.get_size() width, height = self.layout.get_size()
requisition.width = (width // pango.SCALE + self.BORDER_WIDTH*4)* 1.45 requisition.width = (width // pango.SCALE + self.BORDER_WIDTH*4)* 1.45
requisition.height = (3 * height // pango.SCALE + self.BORDER_WIDTH*4) * 1.2 requisition.height = (3 * height // pango.SCALE + self.BORDER_WIDTH*4) * 1.2
def do_size_allocate(self, allocation): def do_size_allocate(self, allocation):
""" """

View File

@ -913,7 +913,7 @@ class WebCalReport(Report):
for cal_year in range(self.start_year, (self.end_year + 1)): for cal_year in range(self.start_year, (self.end_year + 1)):
# generate progress pass for year ???? # generate progress pass for year ????
self.progress.set_pass(_('Creating year %d calendars') % cal_year, '') self.progress.set_pass(_('Creating year %d calendars') % cal_year, '')
# initialize the holidays dict to fill: # initialize the holidays dict to fill:

View File

@ -183,7 +183,7 @@ class TestLogger():
"""get current content of logfile as list of lines""" """get current content of logfile as list of lines"""
txt = [] txt = []
if self.lfname and os.path.isfile(self.lfname): if self.lfname and os.path.isfile(self.lfname):
txt = open(self.lfname).readlines() txt = open(self.lfname).readlines()
return txt return txt
#===eof=== #===eof===