Applied coding style

M4rtinK · Jul 22, 2013 · d211dc3 · d211dc3
1 parent f5eba17
commit d211dc3
Show file tree

Hide file tree

Showing 138 changed files with 27,669 additions and 27,079 deletions.
diff --git a/core/backports/__init__.py b/core/backports/__init__.py
@@ -6,35 +6,35 @@
 # Python 2.6+/3.0+. The code is based on
 # http://bruynooghe.blogspot.com/2008/04/xsetter-syntax-in-python-25.html
 if sys.version_info[:2] <= (2, 5):
-  # If you need to access original built-in property(), uncomment the next line.
-  # __builtin__._property = property
-  class property(property):
-
-      def __init__(self, fget, *args, **kwargs):
-
-          self.__doc__ = fget.__doc__
-          super(property, self).__init__(fget, *args, **kwargs)
-
-      def setter(self, fset):
-
-          cls_ns = sys._getframe(1).f_locals
-          for k, v in cls_ns.iteritems():
-              if v == self:
-                  propname = k
-                  break
-          cls_ns[propname] = property(self.fget, fset,
-                                      self.fdel, self.__doc__)
-          return cls_ns[propname]
-
-      def deleter(self, fdel):
-
-          cls_ns = sys._getframe(1).f_locals
-          for k, v in cls_ns.iteritems():
-              if v == self:
-                  propname = k
-                  break
-          cls_ns[propname] = property(self.fget, self.fset,
-                                      fdel, self.__doc__)
-          return cls_ns[propname]
-
-  __builtin__.property = property
+    # If you need to access original built-in property(), uncomment the next line.
+    # __builtin__._property = property
+    class property(property):
+
+        def __init__(self, fget, *args, **kwargs):
+
+            self.__doc__ = fget.__doc__
+            super(property, self).__init__(fget, *args, **kwargs)
+
+        def setter(self, fset):
+
+            cls_ns = sys._getframe(1).f_locals
+            for k, v in cls_ns.iteritems():
+                if v == self:
+                    propname = k
+                    break
+            cls_ns[propname] = property(self.fget, fset,
+                                        self.fdel, self.__doc__)
+            return cls_ns[propname]
+
+        def deleter(self, fdel):
+
+            cls_ns = sys._getframe(1).f_locals
+            for k, v in cls_ns.iteritems():
+                if v == self:
+                    propname = k
+                    break
+            cls_ns[propname] = property(self.fget, self.fset,
+                                        fdel, self.__doc__)
+            return cls_ns[propname]
+
+    __builtin__.property = property
diff --git a/core/color.py b/core/color.py
@@ -2,82 +2,86 @@
 
 # only import GKT libs if GTK GUI is used
 from core import gs
+
 if gs.GUIString == "GTK":
-  import gtk
+    import gtk
+
 
 class Color(object):
-  """an object representing a color
-     provides:
-     * hex color string
-     * cairo compatible rgba tuple
-     * a gtk.gdkColor object
-     """
-
-  #TODO: use palette ?
-
-
-  def __init__(self,name,colorStringAlphaTupple=None,cairoColor=None):
-    self.name = name
-    self.valid = False
-    self.gtkColor = None
-    self.cairoColor=None
-    self.colorStringAlphaTupple = None
-    self.alpha = None
-    if colorStringAlphaTupple:
-      self.setColorFromColorStringAlphaTuple(colorStringAlphaTupple)
-
-  def __str__(self):
-    print("color name: %s" % self.name)
-    print(self.valid)
-    print(self.gtkColor)
-    print(self.cairoColor)
-    print(self.colorStringAlphaTupple)
-    print(self.alpha)
-
-  def isValid(self):
-    return self.valid
-
-  def setColorFromColorStringAlphaTuple(self, colorStringAlphaTupple):
-    if gs.GUIString == "GTK":
-      try:
-        import gtk
-        (colorString,alpha) = colorStringAlphaTupple
-        gtkColor = gtk.gdk.color_parse(colorString)
-        gtkColorRange = float(2**16)
-        cairoR = gtkColor.red/gtkColorRange
-        cairoG = gtkColor.green/gtkColorRange
-        cairoB = gtkColor.blue/gtkColorRange
-        self.setAlpha(alpha)
-        self.setCairoColor(cairoR,cairoG,cairoB,alpha)
-        self.gtkColor = gtkColor
-        self.valid = True
-      except Exception:
-        import sys
-        e = sys.exc_info()[1]
-        print("** color string parsing failed **")
-        print("** input that caused this:", colorStringAlphaTupple)
-        print("** exception: %s" % e)
-        # fallback
-        self.gtkColor = "ff0000"
-
-  def setCairoColor(self,r,g,b,a):
-    self.cairoColor = (r,g,b,a)
-
-  def setAlpha(self, alpha):
-    self.alpha = alpha
-
-  def getAlpha(self):
-    return self.alpha
-
-  def getGtkColor(self):
-    return self.gtkColor
-
-  def getCairoColor(self):
-    return self.cairoColor
-
-  def getColorStringAlphaTupple(self):
-    return self.colorStringAlphaTupple
-
-  def getColorString(self):
-#    return self.gtkColor.to_string()
-    return str(self.gtkColor)
+    """an object representing a color
+       provides:
+       * hex color string
+       * cairo compatible rgba tuple
+       * a gtk.gdkColor object
+       """
+
+    #TODO: use palette ?
+
+
+    def __init__(self, name, colorStringAlphaTupple=None, cairoColor=None):
+        self.name = name
+        self.valid = False
+        self.gtkColor = None
+        self.cairoColor = None
+        self.colorStringAlphaTupple = None
+        self.alpha = None
+        if colorStringAlphaTupple:
+            self.setColorFromColorStringAlphaTuple(colorStringAlphaTupple)
+
+    def __str__(self):
+        print("color name: %s" % self.name)
+        print(self.valid)
+        print(self.gtkColor)
+        print(self.cairoColor)
+        print(self.colorStringAlphaTupple)
+        print(self.alpha)
+
+    def isValid(self):
+        return self.valid
+
+    def setColorFromColorStringAlphaTuple(self, colorStringAlphaTupple):
+        if gs.GUIString == "GTK":
+            try:
+                import gtk
+
+                (colorString, alpha) = colorStringAlphaTupple
+                gtkColor = gtk.gdk.color_parse(colorString)
+                gtkColorRange = float(2 ** 16)
+                cairoR = gtkColor.red / gtkColorRange
+                cairoG = gtkColor.green / gtkColorRange
+                cairoB = gtkColor.blue / gtkColorRange
+                self.setAlpha(alpha)
+                self.setCairoColor(cairoR, cairoG, cairoB, alpha)
+                self.gtkColor = gtkColor
+                self.valid = True
+            except Exception:
+                import sys
+
+                e = sys.exc_info()[1]
+                print("** color string parsing failed **")
+                print("** input that caused this:", colorStringAlphaTupple)
+                print("** exception: %s" % e)
+                # fallback
+                self.gtkColor = "ff0000"
+
+    def setCairoColor(self, r, g, b, a):
+        self.cairoColor = (r, g, b, a)
+
+    def setAlpha(self, alpha):
+        self.alpha = alpha
+
+    def getAlpha(self):
+        return self.alpha
+
+    def getGtkColor(self):
+        return self.gtkColor
+
+    def getCairoColor(self):
+        return self.cairoColor
+
+    def getColorStringAlphaTupple(self):
+        return self.colorStringAlphaTupple
+
+    def getColorString(self):
+    #    return self.gtkColor.to_string()
+        return str(self.gtkColor)