Imported Upstream version 0.5.7upstream/0.5.7

1 files changed, 39 insertions, 39 deletions

diff --git a/src/gui/triggerSelectWindow.vala b/src/gui/triggerSelectWindow.vala
index 23eea3c..611c179 100644
--- a/src/gui/triggerSelectWindow.vala
+++ b/src/gui/triggerSelectWindow.vala
@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (c) 2011 by Simon Schneegans
 
 This program is free software: you can redistribute it and/or modify it
@@ -12,56 +12,56 @@ 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/>. 
+this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 namespace GnomePie {
 
-/////////////////////////////////////////////////////////////////////////    
+/////////////////////////////////////////////////////////////////////////
 /// This window allows the selection of a hotkey. It is returned in form
 /// of a Trigger. Therefore it can be either a keyboard driven hotkey or
 /// a mouse based hotkey.
 /////////////////////////////////////////////////////////////////////////
 
 public class TriggerSelectWindow : GLib.Object {
-    
+
     /////////////////////////////////////////////////////////////////////
     /// This signal is emitted when the user selects a new hot key.
     /////////////////////////////////////////////////////////////////////
-    
+
     public signal void on_ok(Trigger trigger);
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Some private members which are needed by other methods.
     /////////////////////////////////////////////////////////////////////
-    
+
     private Gtk.Dialog window;
     private Gtk.CheckButton turbo;
     private Gtk.CheckButton delayed;
     private Gtk.CheckButton centered;
     private TriggerSelectButton button;
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The currently configured trigger.
     /////////////////////////////////////////////////////////////////////
-    
+
     private Trigger trigger = null;
-    
+
     /////////////////////////////////////////////////////////////////////
     /// The trigger which was active when this window was opened. It is
     /// stored in order to check whether anything has changed when the
     /// user clicks on OK.
     /////////////////////////////////////////////////////////////////////
-    
+
     private Trigger original_trigger = null;
-    
+
     /////////////////////////////////////////////////////////////////////
     /// C'tor, constructs a new TriggerSelectWindow.
     /////////////////////////////////////////////////////////////////////
-    
+
     public TriggerSelectWindow() {
         try {
-        
+
             Gtk.Builder builder = new Gtk.Builder();
 
             builder.add_from_file (Paths.ui_files + "/trigger_select.ui");
@@ -69,7 +69,7 @@ public class TriggerSelectWindow : GLib.Object {
             this.window = builder.get_object("window") as Gtk.Dialog;
             this.button = new TriggerSelectButton(true);
             this.button.show();
-            
+
             this.button.on_select.connect((trigger) => {
                 this.trigger = new Trigger.from_values(trigger.key_sym,
                                                        trigger.modifiers,
@@ -78,80 +78,80 @@ public class TriggerSelectWindow : GLib.Object {
                                                        this.delayed.active,
                                                        this.centered.active);
             });
-            
-            (builder.get_object("trigger-box") as Gtk.VBox).pack_start(this.button, true, true);
-            
+
+            (builder.get_object("trigger-box") as Gtk.Box).pack_start(this.button, true, true);
+
             (builder.get_object("ok-button") as Gtk.Button).clicked.connect(this.on_ok_button_clicked);
             (builder.get_object("cancel-button") as Gtk.Button).clicked.connect(this.on_cancel_button_clicked);
-            
+
             this.turbo = builder.get_object("turbo-check") as Gtk.CheckButton;
             this.turbo.toggled.connect(this.on_check_toggled);
-            
+
             this.delayed = builder.get_object("delay-check") as Gtk.CheckButton;
             this.delayed.toggled.connect(this.on_check_toggled);
-            
+
             this.centered = builder.get_object("center-check") as Gtk.CheckButton;
             this.centered.toggled.connect(this.on_check_toggled);
-            
+
             this.window.delete_event.connect(this.window.hide_on_delete);
-                
+
         } catch (GLib.Error e) {
             error("Could not load UI: %s\n", e.message);
         }
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Sets the parent window, in order to make this window stay in
     /// front.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void set_parent(Gtk.Window parent) {
         this.window.set_transient_for(parent);
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Displays the window on the screen.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void show() {
         this.window.show_all();
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Initilizes all members to match the Trigger of the Pie with the
     /// given ID.
     /////////////////////////////////////////////////////////////////////
-    
+
     public void set_pie(string id) {
         var trigger = new Trigger.from_string(PieManager.get_accelerator_of(id));
-        
+
         this.turbo.active = trigger.turbo;
         this.delayed.active = trigger.delayed;
         this.centered.active = trigger.centered;
         this.original_trigger = trigger;
         this.trigger = trigger;
-        
+
         this.button.set_trigger(trigger);
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when one of the three checkoxes is toggled.
     /////////////////////////////////////////////////////////////////////
-    
+
     private void on_check_toggled() {
         if (this.trigger != null)
             this.trigger = new Trigger.from_values(this.trigger.key_sym, this.trigger.modifiers,
                                                    this.trigger.with_mouse, this.turbo.active,
                                                    this.delayed.active, this.centered.active);
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when the OK-button is pressed.
     /////////////////////////////////////////////////////////////////////
-    
+
     private void on_ok_button_clicked() {
         var assigned_id = PieManager.get_assigned_id(this.trigger);
-    
+
         if (this.trigger == this.original_trigger) {
             // nothing did change
             this.window.hide();
@@ -175,14 +175,14 @@ public class TriggerSelectWindow : GLib.Object {
             this.window.hide();
         }
     }
-    
+
     /////////////////////////////////////////////////////////////////////
     /// Called when the cancel button is pressed.
     /////////////////////////////////////////////////////////////////////
-    
+
     private void on_cancel_button_clicked() {
         this.window.hide();
-    } 
+    }
 }
 
 }