Merge tag 'upstream/0.6.0'

Upstream version 0.6.0

1 files changed, 46 insertions, 46 deletions

diff --git a/src/gui/pieComboList.vala b/src/gui/pieComboList.vala
index 3be3bff..f0fd22f 100644
--- a/src/gui/pieComboList.vala
+++ b/src/gui/pieComboList.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 drop-down list, containing one entry for each existing Pie.
 /////////////////////////////////////////////////////////////////////////
 
@@ -26,19 +26,19 @@ class PieComboList : Gtk.ComboBox {
     /////////////////////////////////////////////////////////////////////
     /// This signal gets emitted when the user selects a new Pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     public signal void on_select(string id);
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The currently selected row.
     /////////////////////////////////////////////////////////////////////
-    
+
     public string current_id { get; private set; default=""; }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Stores the data internally.
     /////////////////////////////////////////////////////////////////////
-    
+
     private Gtk.ListStore data;
     private enum DataPos {ICON, NAME, ID}
 
@@ -48,25 +48,25 @@ class PieComboList : Gtk.ComboBox {
 
     public PieComboList() {
         GLib.Object();
-        
-        this.data = new Gtk.ListStore(3, typeof(Gdk.Pixbuf),   
+
+        this.data = new Gtk.ListStore(3, typeof(Gdk.Pixbuf),
                                          typeof(string),
                                          typeof(string));
-                                         
+
         this.data.set_sort_column_id(1, Gtk.SortType.ASCENDING);
-        
+
         base.set_model(this.data);
-        
+
         var icon_render = new Gtk.CellRendererPixbuf();
             icon_render.xpad = 4;
             this.pack_start(icon_render, false);
-    
+
         var name_render = new Gtk.CellRendererText();
             this.pack_start(name_render, true);
-        
+
         this.add_attribute(icon_render, "pixbuf", DataPos.ICON);
         this.add_attribute(name_render, "text", DataPos.NAME);
-        
+
         this.changed.connect(() => {
             Gtk.TreeIter active;
             if (this.get_active_iter(out active)) {
@@ -76,36 +76,36 @@ class PieComboList : Gtk.ComboBox {
                 this.current_id = id;
             }
         });
-        
+
         reload();
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Loads all existing Pies to the list.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void reload() {
         Gtk.TreeIter active;
         string id = "";
         if (this.get_active_iter(out active))
             this.data.get(active, DataPos.ID, out id);
-    
+
         data.clear();
         foreach (var pie in PieManager.all_pies.entries) {
             this.load_pie(pie.value);
         }
-        
+
         select_first();
         select(id);
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Selects the first Pie.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void select_first() {
         Gtk.TreeIter active;
-        
+
         if(this.data.get_iter_first(out active) ) {
             this.set_active_iter(active);
             string id = "";
@@ -117,37 +117,37 @@ class PieComboList : Gtk.ComboBox {
             this.current_id = "";
         }
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Selects the Pie with the given ID.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void select(string id) {
         this.data.foreach((model, path, iter) => {
             string pie_id;
             this.data.get(iter, DataPos.ID, out pie_id);
-            
+
             if (id == pie_id) {
                 this.set_active_iter(iter);
                 return true;
             }
-            
+
             return false;
         });
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Loads one given pie to the list.
     /////////////////////////////////////////////////////////////////////
-    
+
     private void load_pie(Pie pie) {
         if (pie.id.length == 3) {
             Gtk.TreeIter last;
             this.data.append(out last);
             var icon = new Icon(pie.icon, 24);
-            this.data.set(last, DataPos.ICON, icon.to_pixbuf(), 
+            this.data.set(last, DataPos.ICON, icon.to_pixbuf(),
                                 DataPos.NAME, pie.name,
-                                DataPos.ID, pie.id); 
+                                DataPos.ID, pie.id);
         }
     }
 }