Merge tag 'upstream/0.6.0'

Upstream version 0.6.0

1 files changed, 34 insertions, 34 deletions

diff --git a/src/gui/themeList.vala b/src/gui/themeList.vala
index 1c038a9..4173819 100644
--- a/src/gui/themeList.vala
+++ b/src/gui/themeList.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 {
 
-/////////////////////////////////////////////////////////////////////////    
+/////////////////////////////////////////////////////////////////////////
 /// A widget displaying all available themes of Gnome-Pie.
 /////////////////////////////////////////////////////////////////////////
 
@@ -26,7 +26,7 @@ class ThemeList : Gtk.TreeView {
     /////////////////////////////////////////////////////////////////////
     /// This signal gets emitted, when a new theme is selected by the
     /// user. This new theme is applied automatically, with this signal
-    /// actions may be triggered which should be executed AFTER the 
+    /// actions may be triggered which should be executed AFTER the
     /// change to a new theme.
     /////////////////////////////////////////////////////////////////////
 
@@ -37,11 +37,11 @@ class ThemeList : Gtk.TreeView {
     /////////////////////////////////////////////////////////////////////
 
     private Gtk.TreeIter active { private get; private set; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The positions in the data list store.
     /////////////////////////////////////////////////////////////////////
-    
+
     private enum DataPos {ICON, NAME}
 
     /////////////////////////////////////////////////////////////////////
@@ -50,57 +50,57 @@ class ThemeList : Gtk.TreeView {
 
     public ThemeList() {
         GLib.Object();
-        
-        var data = new Gtk.ListStore(2, typeof(Gdk.Pixbuf), 
+
+        var data = new Gtk.ListStore(2, typeof(Gdk.Pixbuf),
                                         typeof(string));
         this.set_model(data);
         this.set_headers_visible(true);
         this.set_grid_lines(Gtk.TreeViewGridLines.NONE);
         this.set_fixed_height_mode(true);
-        
+
         var main_column = new Gtk.TreeViewColumn();
             main_column.title = _("Themes");
             main_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED);
             var icon_render = new Gtk.CellRendererPixbuf();
                 main_column.pack_start(icon_render, false);
-        
+
             var theme_render = new Gtk.CellRendererText();
                 main_column.pack_start(theme_render, true);
-        
+
         this.append_column(main_column);
-        
+
         main_column.add_attribute(icon_render, "pixbuf", DataPos.ICON);
         main_column.add_attribute(theme_render, "markup", DataPos.NAME);
-        
+
         this.get_selection().changed.connect(() => {
             Gtk.TreeIter active;
             if (this.get_selection().get_selected(null, out active)) {
                 Timeout.add(10, () => {
                     int index = int.parse(data.get_path(active).to_string());
                     Config.global.theme = Config.global.themes[index];
-                    
+
                     this.on_select_new();
-    
+
                     Config.global.theme.load();
                     Config.global.theme.load_images();
                     return false;
-                });  
+                });
             }
         });
-        
+
         // load all themes into the list
         var themes = Config.global.themes;
         foreach(var theme in themes) {
             Gtk.TreeIter current;
             data.append(out current);
-            data.set(current, DataPos.ICON, theme.preview_icon.to_pixbuf()); 
+            data.set(current, DataPos.ICON, theme.preview_icon.to_pixbuf());
             data.set(current, DataPos.NAME, "<b>"+GLib.Markup.escape_text(theme.name)+"</b><small>  -  "
                                             +GLib.Markup.escape_text(theme.description)+"\n"
                                             +"<i>"+GLib.Markup.escape_text(_("By")+" "+theme.author)
-                                            +"</i></small>"); 
+                                            +"</i></small>");
             if(theme == Config.global.theme)
                 get_selection().select_iter(current);
-        }  
+        }
     }
 }