Merge tag 'upstream/0.6.0'

Upstream version 0.6.0

1 files changed, 24 insertions, 24 deletions

diff --git a/src/pies/defaultConfig.vala b/src/pies/defaultConfig.vala
index 87fd30d..6ca45e4 100644
--- a/src/pies/defaultConfig.vala
+++ b/src/pies/defaultConfig.vala
@@ -1,37 +1,37 @@
-/* 
-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 helper class which creates a user-specific default configuration.
 /////////////////////////////////////////////////////////////////////////
 
 namespace Pies {
 
     public void create_default_config() {
-        
+
         // add a pie with playback controls
         var multimedia = PieManager.create_persistent_pie(_("Multimedia"), "stock_media-play", new Trigger.from_string("<Control><Alt>m"));
             multimedia.add_action(new KeyAction(_("Next Track"), "stock_media-next", "XF86AudioNext", true));
             multimedia.add_action(new KeyAction(_("Stop"), "stock_media-stop", "XF86AudioStop"));
             multimedia.add_action(new KeyAction(_("Previous Track"), "stock_media-prev", "XF86AudioPrev"));
             multimedia.add_action(new KeyAction(_("Play/Pause"), "stock_media-play", "XF86AudioPlay"));
-        
+
         // add a pie with the users default applications
         var apps = PieManager.create_persistent_pie(_("Applications"), "applications-accessories", new Trigger.from_string("<Control><Alt>a"));
             apps.add_action(ActionRegistry.default_for_mime_type("text/plain"));
@@ -40,20 +40,20 @@ namespace Pies {
             apps.add_action(ActionRegistry.default_for_mime_type("image/jpg"));
             apps.add_action(ActionRegistry.default_for_uri("http"));
             apps.add_action(ActionRegistry.default_for_uri("mailto"));
-        
+
         // add a pie with the users bookmarks and devices
         var bookmarks = PieManager.create_persistent_pie(_("Bookmarks"), "user-bookmarks", new Trigger.from_string("<Control><Alt>b"));
             bookmarks.add_group(new BookmarkGroup(bookmarks.id));
             bookmarks.add_group(new DevicesGroup(bookmarks.id));
-        
+
         // add a pie with session controls
         var session = PieManager.create_persistent_pie(_("Session"), "gnome-session-halt", new Trigger.from_string("<Control><Alt>q"));
             session.add_group(new SessionGroup(session.id));
-        
+
         // add a pie with a main menu
         var menu = PieManager.create_persistent_pie(_("Main Menu"), "alacarte", new Trigger.from_string("<Control><Alt>space"));
             menu.add_group(new MenuGroup(menu.id));
-        
+
         // add a pie with window controls
         var window = PieManager.create_persistent_pie(_("Window"), "gnome-window-manager", new Trigger.from_string("<Control><Alt>w"));
             window.add_action(new KeyAction(_("Scale"), "top", "<Control><Alt>s"));
@@ -61,7 +61,7 @@ namespace Pies {
             window.add_action(new KeyAction(_("Close"), "window-close", "<Alt>F4"));
             window.add_action(new KeyAction(_("Maximize"), "window_fullscreen", "<Alt>F10"));
             window.add_action(new KeyAction(_("Restore"), "window_nofullscreen", "<Alt>F5"));
-    
+
         // save the configuration to file
         Pies.save();
     }