Imported Upstream version 0.6.0upstream/0.6.0

1 files changed, 32 insertions, 32 deletions

diff --git a/src/themes/sliceLayer.vala b/src/themes/sliceLayer.vala
index 3c650c0..17ac3bb 100644
--- a/src/themes/sliceLayer.vala
+++ b/src/themes/sliceLayer.vala
@@ -1,23 +1,23 @@
-/* 
-Copyright (c) 2011 by Simon Schneegans
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
+/////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2011-2015 by Simon Schneegans
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////
 
 namespace GnomePie {
 
-/////////////////////////////////////////////////////////////////////////    
+/////////////////////////////////////////////////////////////////////////
 /// This class representing a layer of a slice of a pie. Each theme may
 /// have plenty of them.
 /////////////////////////////////////////////////////////////////////////
@@ -26,35 +26,35 @@ public class SliceLayer : GLib.Object {
 
     public enum Type { FILE, ICON, CAPTION }
     public enum Visibility { ANY, WITH_CAPTION, WITHOUT_CAPTION }
-    
+
     public Type layer_type { get; private set; }
     public Visibility visibility { get; private set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Information on the contained image.
     /////////////////////////////////////////////////////////////////////
-    
+
     public Image image {get; set;}
-    
-    
+
+
     /////////////////////////////////////////////////////////////////////
     /// Properties of this layer.
     /////////////////////////////////////////////////////////////////////
-    
+
     public string icon_file {get; private set; default="";}
     public bool colorize {get; private set; default=false;}
     public int icon_size {get; private set; default=1;}
-    
+
     public string font {get; private set; default="";}
     public int width {get; private set; default=0;}
     public int height {get; private set; default=0;}
     public int position {get; private set; default=0;}
     public Color color {get; private set; default=new Color();}
-    
+
     /////////////////////////////////////////////////////////////////////
     /// C'tor, initializes all members of the layer.
     /////////////////////////////////////////////////////////////////////
-    
+
     public SliceLayer.file(string icon_file, int icon_size, bool colorize, Visibility visibility) {
         this.layer_type = Type.FILE;
         this.icon_file = icon_file;
@@ -62,7 +62,7 @@ public class SliceLayer : GLib.Object {
         this.icon_size = icon_size;
         this.visibility = visibility;
     }
-    
+
     public SliceLayer.icon(string icon_file, int icon_size, bool colorize, Visibility visibility) {
         this.layer_type = Type.ICON;
         this.icon_file = icon_file;
@@ -70,7 +70,7 @@ public class SliceLayer : GLib.Object {
         this.icon_size = icon_size;
         this.visibility = visibility;
     }
-    
+
     public SliceLayer.caption(string font, int width, int height, int position, Color color, bool colorize, Visibility visibility) {
         this.layer_type = Type.CAPTION;
         this.font = font;
@@ -81,15 +81,15 @@ public class SliceLayer : GLib.Object {
         this.visibility = visibility;
         this.colorize = colorize;
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Loads the contained image.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void load_image() {
         this.image = null;
-    
-        if (this.icon_file == "" && this.layer_type == Type.ICON) 
+
+        if (this.icon_file == "" && this.layer_type == Type.ICON)
             this.image = new Image.empty(this.icon_size, this.icon_size, new Color.from_rgb(1, 1, 1));
         else if (this.icon_file != "")
             this.image = new Image.from_file_at_size(this.icon_file, this.icon_size, this.icon_size);