Merge lp:~l-admin-3/eidete/fix-for-fix-for-freya into lp:eidete

[Marcus Wichelmann]

I've corrected the style of the whole code and maked it more consistent.

[Cody Garver (codygarver)]

Might as well remove all the "using Gtk;", "using Granite;" while you're at it.

[lp:~l-admin-3/eidete/fix-for-fix-for-freya]

196. By Marcus Wichelmann on 2015-01-05

All using-statements removed.

197. By Marcus Wichelmann on 2015-01-05

some spaces removed.

198. By Marcus Wichelmann on 2015-01-05

Loaded patch by ~tombeckmann

=== modified file 'src/Config.vala.cmake'
--- src/Config.vala.cmake	2011-12-30 00:26:42 +0000
+++ src/Config.vala.cmake	2015-01-05 22:47:30 +0000
@@ -16,11 +16,11 @@
 //
 
 namespace Constants {
-public const string DATADIR = "@DATADIR@";
-public const string PKGDATADIR = "@PKGDATADIR@";
-public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
-public const string RELEASE_NAME = "@RELEASE_NAME@";
-public const string VERSION = "@VERSION@";
-public const string VERSION_INFO = "@VERSION_INFO@";
-public const string PLUGINDIR = "@PLUGINDIR@";
+	public const string DATADIR = "@DATADIR@";
+	public const string PKGDATADIR = "@PKGDATADIR@";
+	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+	public const string RELEASE_NAME = "@RELEASE_NAME@";
+	public const string VERSION = "@VERSION@";
+	public const string VERSION_INFO = "@VERSION_INFO@";
+	public const string PLUGINDIR = "@PLUGINDIR@";
 }
 
=== modified file 'src/Widgets/countdown.vala'
--- src/Widgets/countdown.vala	2013-05-17 01:00:15 +0000
+++ src/Widgets/countdown.vala	2015-01-05 22:47:30 +0000
@@ -1,37 +1,31 @@
-using Gtk;
-using Granite;
-
-
-namespace Eidete.Widgets{
-
+namespace Eidete.Widgets {
 	public class Countdown : Granite.Widgets.CompositedWindow {
-
-		public Label count;
+		public Gtk.Label count;
 		public int time;
 
 		public Countdown (){
 			this.time = 5;
 
 			this.set_default_size (300, 200);
-			this.window_position = WindowPosition.CENTER;
+			this.window_position = Gtk.WindowPosition.CENTER;
 			this.set_keep_above (true);
 			this.stick ();
 			this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
 			this.skip_pager_hint = true;
 			this.skip_taskbar_hint = true;
 
-			var box = new Box (Orientation.VERTICAL, 0);
+			var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
 			box.margin = 40;
 			box.margin_left = box.margin_right = 60;
 
-			var title = new Label ("<span size='20000' color='#fbfbfb'>"+_("Recording starts in")+"…"+"</span>");
+			var title = new Gtk.Label ("<span size='20000' color='#fbfbfb'>" + _("Recording starts in") + "…" + "</span>");
 			title.use_markup = true;
 			title.margin_bottom = 20;
 
-			this.count = new Label ("<span size='40000' color='#fbfbfb'>"+time.to_string ()+"</span>");
+			this.count = new Gtk.Label ("<span size='40000' color='#fbfbfb'>" + time.to_string () + "</span>");
 			this.count.use_markup = true;
 
-			var tipp = new Label("<span size='10000' color='#fbfbfb' font-style='italic'>"+_("Focus Eidete to stop recording")+"</span>");
+			var tipp = new Gtk.Label("<span size='10000' color='#fbfbfb' font-style='italic'>" + _("Focus Eidete to stop recording") + "</span>");
 			tipp.use_markup = true;
 			tipp.margin_top = 20;
 
@@ -42,38 +36,43 @@
 			this.add (box);
 		}
 
-		public override bool draw (Cairo.Context ctx){
-			int w = this.get_allocated_width  ();
+		public override bool draw (Cairo.Context ctx) {
+			int w = this.get_allocated_width ();
 			int h = this.get_allocated_height ();
-			Granite.Drawing.Utilities.cairo_rounded_rectangle (ctx, 4, 4, w-8, h-8, 4);
+
+			Granite.Drawing.Utilities.cairo_rounded_rectangle (ctx, 4, 4, w - 8, h - 8, 4);
+
 			ctx.set_source_rgba (0.1, 0.1, 0.1, 0.8);
 			ctx.fill ();
+
 			return base.draw (ctx);
 		}
 
-		public void start (EideteApp app){
-
+		public void start (EideteApp app) {
 			this.show_all ();
+
 			Timeout.add (1000, () => {
-				this.time --;
-				count.label = "<span size='40000' color='#fbfbfb'>"+time.to_string ()+"</span>";
-				if (time == -1){
+				this.time--;
+
+				count.label = "<span size='40000' color='#fbfbfb'>" + time.to_string () + "</span>";
+
+				if (time == -1) {
 					this.destroy ();
+
 					Timeout.add (100, () => { //let the countdown disappear before starting
-					    app.record ();
-					    app.main_window.iconify ();
-					    app.switch_to_paused (false);
-					    return false;
-				    });
-				    return false;
+						app.record ();
+						app.main_window.iconify ();
+						app.switch_to_paused (false);
+
+						return false;
+					});
+
+					return false;
 				}
+
 				return true;
 			});
 		}
-
 	}
-
-
 }
 
-
 
=== modified file 'src/Widgets/end_dialog.vala'
--- src/Widgets/end_dialog.vala	2015-01-04 16:20:11 +0000
+++ src/Widgets/end_dialog.vala	2015-01-05 22:47:30 +0000
@@ -1,240 +1,301 @@
-using Gtk;
-
 namespace Eidete.Widgets {
-
-	public class EndDialog : Dialog {
-
-		private bool contractor;        
-        
-		private EideteApp app ;
-		private Button export  ; 
-		private Grid grid; 
-		private ListStore list ; 
-		private TreeView treeview  ;
-		private File source ; 
-         
-		public EndDialog (EideteApp app){
-			this.app = app ; 
-			//build_ui () ;
-			this.window_position = WindowPosition.CENTER_ON_PARENT;
+	public class EndDialog : Gtk.Dialog {
+		private bool contractor;
+
+		private EideteApp app;
+		private Gtk.Button export;
+		private Gtk.Grid grid;
+		private Gtk.ListStore list;
+		private Gtk.TreeView treeview;
+		private File source;
+
+		public EndDialog (EideteApp app) {
+			this.app = app;
+
+			//build_ui ();
+
+			this.window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
 		}
 
 		private void build_ui () {
 			this.get_header_bar ().get_style_context ().remove_class ("header-bar");
 			this.set_default_size (600, 600);
 			this.set_application (app);
-            
+
 			if (app.selectionarea != null)
-			        app.selectionarea.destroy ();
+				app.selectionarea.destroy ();
+
 			if (app.keyview != null)
-			        app.keyview.destroy ();
-            
+				app.keyview.destroy ();
+
 			this.icon_name = "eidete";
 
-			grid = new Grid ();
+			grid = new Gtk.Grid ();
 			grid.margin = 12;
 
-			var content = (Gtk.Box) this.get_content_area () ;
-			var title = new Label ("<span size='30000'>"+_("Recording complete")+"</span>");
+			var content = (this.get_content_area () as Gtk.Box);
+
+			var title = new Gtk.Label ("<span size='30000'>" + _("Recording complete") + "</span>");
 			title.use_markup = true;
-			title.halign = Align.START;
+			title.halign = Gtk.Align.START;
 
-			export = new Button.with_label (_("Save"));
-			export.image = new Image.from_stock (Stock.SAVE, IconSize.BUTTON);
+			export = new Gtk.Button.with_label (_("Save"));
+			export.image = new Gtk.Image.from_stock (Gtk.Stock.SAVE, Gtk.IconSize.BUTTON);
+			export.get_style_context ().add_class ("suggested-action");
 			export.can_default = true;
-			export.get_style_context ().add_class ("suggested-action");
+
 			this.set_default (export);
 
-			var cancel = new Button.with_label (_("Cancel"));
-			cancel.image = new Image.from_stock (Stock.DELETE, IconSize.BUTTON);
+			var cancel = new Gtk.Button.with_label (_("Cancel"));
+			cancel.image = new Gtk.Image.from_stock (Gtk.Stock.DELETE, Gtk.IconSize.BUTTON);
 			cancel.margin_end = 6;
 
-			var bbox = new ButtonBox (Orientation.HORIZONTAL);
+			var bbox = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+			bbox.layout_style = Gtk.ButtonBoxStyle.END;
 			bbox.homogeneous = true;
+
 			bbox.pack_end (cancel, false, true, 0);
 			bbox.pack_end (export, false, true, 0);
-			bbox.layout_style = ButtonBoxStyle.END;
-
-
-			list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
-			treeview = new TreeView.with_model (list);
+
+			list = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
+
+			treeview = new Gtk.TreeView.with_model (list);
 			treeview.headers_visible = false;
 			treeview.hexpand = true;
-			treeview.set_activate_on_single_click (false) ;
-			treeview.row_activated.connect ( on_contract_executed) ;
+			treeview.set_activate_on_single_click (false);
+			treeview.row_activated.connect (on_contract_executed);
 
-			var cell1 = new CellRendererPixbuf ();
+			var cell1 = new Gtk.CellRendererPixbuf ();
 			cell1.set_padding (5, 15);
+
 			treeview.insert_column_with_attributes (-1, "", cell1, "pixbuf", 0);
-			var cell2 = new CellRendererText ();
+
+			var cell2 = new Gtk.CellRendererText ();
 			cell2.set_padding (2, 15);
+
 			treeview.insert_column_with_attributes (-1, "", cell2, "markup", 1);
 
-			//contractor
-			load_contracts () ;           
+			// contractor
+
+			load_contracts ();
 
 			var scrolled = new Gtk.ScrolledWindow (null, null);
 			scrolled.vexpand = true;
 			scrolled.add (treeview);
-			
+
 			grid.attach (title, 0, 0, 2, 1);
-			grid.attach (new Label (""), 0, 2, 1, 1);
+			grid.attach (new Gtk.Label (""), 0, 2, 1, 1);
+
 			grid.attach (scrolled, 0, 4, 1, 1);
-			grid.attach (new Label (""), 0, 5, 1, 1);
+
+			grid.attach (new Gtk.Label (""), 0, 5, 1, 1);
 			grid.attach (bbox, 0, 6, 1, 1);
+
 			source = File.new_for_path (app.settings.destination);
-            
-			if (contractor){
-			        export.clicked.connect (on_contract_executed) ;
+
+			if (contractor) {
+				export.clicked.connect (on_contract_executed);
 			} else {
-			        export.clicked.connect ( () => {
-			                save_file () ;
-			                this.destroy ();
-			        });
+				export.clicked.connect (() => {
+					save_file ();
+
+					this.destroy ();
+				});
 			}
-			cancel.clicked.connect ( () => {this.destroy  ();});
+
+			cancel.clicked.connect (() => {
+				this.destroy ();
+			});
 
 			content.add (grid);
 		}
-		
-  		public void display () {
-  		        build_ui () ;
-  		        show_all () ;
-  		}      
-                
-		private void on_contract_executed () {
-			TreePath path;
+
+		public void display () {
+			build_ui ();
+
+			show_all ();
+		}
+
+		private void on_contract_executed (){
+			Gtk.TreePath path;
+
 			treeview.get_cursor (out path, null);
-			int index = int.parse (path.to_string ()) ;
-			execute_command (index) ;
+
+			int index = int.parse (path.to_string ());
+
+			execute_command (index);
+
 			this.destroy ();
-		} 
-        
+		}
+
 		private void save_file () {
-			var dialog = new FileChooserDialog (_("Save"), null, FileChooserAction.SAVE, Stock.OK, ResponseType.OK);
+			var dialog = new Gtk.FileChooserDialog (_("Save"), null, Gtk.FileChooserAction.SAVE, Gtk.Stock.OK, Gtk.ResponseType.OK);
 			dialog.set_current_name (source.get_basename ());
-			var videos_folder = Environment.get_user_special_dir(UserDirectory.VIDEOS);
+
+			var videos_folder = Environment.get_user_special_dir (UserDirectory.VIDEOS);
+
 			dialog.set_current_folder (videos_folder);
 			dialog.do_overwrite_confirmation = true;
+
 			var res = dialog.run ();
-			if (res == ResponseType.OK){
-			        var destination = File.new_for_path (dialog.get_filename ());
-			        try{
-			                source.copy (destination, FileCopyFlags.OVERWRITE);
-			        }catch (GLib.Error e){
-			                stderr.printf ("Error: %s\n", e.message);
-			        }
-                        }
+
+			if (res == Gtk.ResponseType.OK) {
+				var destination = File.new_for_path (dialog.get_filename ());
+
+				try {
+					source.copy (destination, FileCopyFlags.OVERWRITE);
+				} catch (GLib.Error e) {
+					stderr.printf ("Error: %s\n", e.message);
+				}
+			}
+
 			dialog.destroy ();
 		}
+
 		// Using deprecated Contractor API. Necesserary to maintain luna compatibility
-#if false        
+#if false
 		private void execute_command_deprecated (int index) {
-			string cmd =  contracts_dep[index].lookup ("Exec") ;
-			try{
-			        Process.spawn_command_line_async (cmd);
-			}catch (Error e){
-			        print(e.message);
+			string cmd = contracts_dep[index].lookup ("Exec");
+
+			try {
+				Process.spawn_command_line_async (cmd);
+			} catch (Error e) {
+				print (e.message);
 			}
 		}
-           
-		private HashTable<string,string>[] contracts_dep ; 
-        
+
+		private HashTable<string,string>[] contracts_dep;
+
 		private void load_contracts_deprecated () {
-			// CARL deprecated Contractor API 
+			// CARL deprecated Contractor API
 			contracts_dep = Granite.Services.Contractor.get_contract (app.settings.destination, "video");
-			if (contracts_dep == null || contracts_dep.length <= 1){
-			        warning ("You should install and/or run contractor");
-			        contractor = false;
-			        var info = new InfoBar ();
-			        info.message_type = MessageType.WARNING;
-			        info.pack_start (new Label (_("Could not contact Contractor.")));
-			        grid.attach (info, 0, 3, 2, 1);
-			        export.label = _("Save");
-			}else{
-			        contractor = true;
-			        for (var i=0;i<contracts_dep.length; i++){
-			                TreeIter it;
-			                list.append (out it);
-			                Gdk.Pixbuf icon = null;
-			                try{
-			                        icon = IconTheme.get_default ().load_icon (contracts_dep[i].lookup ("IconName"), 32, 0);
-			                }catch (Error e){
-			                        warning (e.message);
-			                }
-			                        list.set (it, 0, icon, 1,
-			                        "<b>"+contracts_dep[i].lookup ("Name")+"</b>\n"+contracts_dep[i].lookup ("Description"));
-			        }
-			        treeview.set_cursor (new TreePath.from_string ("0"), null, false);
+
+			if (contracts_dep == null || contracts_dep.length <= 1) 
+				warning ("You should install and/or run contractor");
+
+				contractor = false;
+
+				var info = new InfoBar ();
+				info.message_type = MessageType.WARNING;
+
+				info.pack_start (new Label (_("Could not contact Contractor.")));
+
+				grid.attach (info, 0, 3, 2, 1);
+
+				export.label = _("Save");
+			} else {
+				contractor = true;
+
+				for (var i = 0; i < contracts_dep.length; i++) {
+					TreeIter it;
+
+					list.append (out it);
+
+					Gdk.Pixbuf icon = null;
+
+					try {
+						icon = IconTheme.get_default ().load_icon (contracts_dep[i].lookup ("IconName"), 32, 0);
+					} catch (Error e) {
+						warning (e.message);
+					}
+
+					list.set (it, 0, icon, 1,
+							"<b>" + contracts_dep[i].lookup ("Name") +
+							"</b>\n" + contracts_dep[i].lookup ("Description"));
+				}
+
+				treeview.set_cursor (new TreePath.from_string ("0"), null, false);
 			}
 		}
-#endif         
-		private Gee.List<Granite.Services.Contract> contracts ; 
-		private int contracts_size = 0 ; 
-        
-		private void execute_command (int index) {
-			if( index == 0) 
-			        save_file () ;
-			else {
-			        var contract = contracts.@get (index-1) ;
-			        try{
-			                contract.execute_with_file (source) ;
-			        }catch (Error e){
-		                        warning (e.message);
-		                }
+#endif
+
+		private Gee.List<Granite.Services.Contract> contracts;
+
+		private int contracts_size = 0;
+
+		private void execute_command (int index){
+			if(index == 0) {
+				save_file ();
+			} else {
+				var contract = contracts.@get (index-1);
+
+				try {
+					contract.execute_with_file (source);
+				} catch (Error e) {
+					warning (e.message);
+				}
 			}
-			
 		}
 
 		private void load_contracts () {
-			contracts_size = 0 ;
-			try{
-			        contracts = Granite.Services.ContractorProxy.get_contracts_by_mime ("video");
-			}catch (Error e){
-		                warning (e.message);
-		        }
-			if (contracts != null){
-
-			        contractor = true;
-			        foreach( var contract in contracts ) {
-			                TreeIter it;
-			                list.append (out it);
-			                Gdk.Pixbuf icon = null;
-			                try{
-			                        icon = IconTheme.get_default ().load_icon (contract.get_icon ().to_string (), 32, 0);
-			                        
-			                }catch (Error e){
-			                        warning (e.message);
-			                }
-			                list.set (it, 0, icon, 1,
-                                        "<b>"+contract.get_display_name ()+"</b>\n"+contract.get_description ());
-			                contracts_size ++ ;
-			        }
-			        TreeIter it;
-			        list.insert (out it, 0);
-			        Gdk.Pixbuf icon = null;
-			        try{
-			                icon = IconTheme.get_default ().load_icon ("document-save", 32, 0);     
-			        }catch (Error e){
-		                        warning (e.message);
-		                }
-		                list.set (it, 0, icon, 1,
-                                        "<b>"+_("Save file")+"</b>\n"+("Save the file onto a disk"));
-         			treeview.set_cursor (new TreePath.from_string ("0"), null, false);
-			        export.label = _("Execute");
-			}
-			if( contracts_size == 0 ) 
-			{
-			        warning ("You should install and/or run contractor");
-			        contractor = false;
-			        var info = new InfoBar ();
-			        info.message_type = MessageType.WARNING;
-			        info.pack_start (new Label (_("Could not contact Contractor.")));
-			        grid.attach (info, 0, 3, 2, 1);
-			        export.label = _("Save");
+			contracts_size = 0;
+
+			try {
+				contracts = Granite.Services.ContractorProxy.get_contracts_by_mime ("video");
+			} catch (Error e) {
+				warning (e.message);
+			}
+
+			if (contracts != null) {
+				contractor = true;
+
+				foreach (var contract in contracts) {
+					Gtk.TreeIter it;
+
+					list.append (out it);
+
+					Gdk.Pixbuf icon = null;
+
+					try {
+						icon = Gtk.IconTheme.get_default ().load_icon (contract.get_icon ().to_string (), 32, 0);
+
+					} catch (Error e) {
+						warning (e.message);
+					}
+
+					list.set (it, 0, icon, 1,
+							"<b>" + contract.get_display_name () + "</b>\n" +
+							contract.get_description ());
+
+					contracts_size++;
+				}
+
+				Gtk.TreeIter it;
+
+				list.insert (out it, 0);
+
+				Gdk.Pixbuf icon = null;
+
+				try {
+					icon = Gtk.IconTheme.get_default ().load_icon ("document-save", 32, 0);
+				} catch (Error e) {
+					warning (e.message);
+				}
+
+				list.set (it, 0, icon, 1,
+						"<b>" + _("Save file") + "</b>\n" +
+						("Save the file onto a disk"));
+
+				treeview.set_cursor (new Gtk.TreePath.from_string ("0"), null, false);
+
+				export.label = _("Execute");
+			}
+
+			if (contracts_size == 0) {
+				warning ("You should install and/or run contractor");
+
+				contractor = false;
+
+				var info = new Gtk.InfoBar ();
+				info.message_type = Gtk.MessageType.WARNING;
+
+				info.pack_start (new Gtk.Label (_("Could not contact Contractor.")));
+
+				grid.attach (info, 0, 3, 2, 1);
+
+				export.label = _("Save");
 			}
 		}
 	}
 }
 
-
 
=== modified file 'src/Widgets/keyview.vala'
--- src/Widgets/keyview.vala	2015-01-04 14:30:20 +0000
+++ src/Widgets/keyview.vala	2015-01-05 22:47:30 +0000
@@ -1,119 +1,123 @@
-using Granite;
-using Gtk;
-
-
 namespace Eidete.Widgets {
-
-    public class YellowCircle : Granite.Widgets.CompositedWindow {
-
-        public YellowCircle (Gdk.RGBA color) {
-            this.skip_pager_hint = true;
-            this.skip_taskbar_hint = true;
-            this.set_keep_above (true);
-            this.stick ();
-            this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
-            this.accept_focus = false;
-
-            this.draw.connect ( (ctx) => {
-                ctx.arc (this.get_allocated_width () / 2, this.get_allocated_height () / 2,
-                         this.get_allocated_width () / 2, 0, 6.28318);
-                ctx.set_source_rgba (color.red, color.green, color.blue, color.alpha);
-                ctx.fill ();
-                return false;
-            });
-
-            this.set_size_request (70, 70);
-            this.realize ();
-            this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle ({0, 0, 1, 1}), 0, 0);
-            this.show_all ();
-        }
-
-        public new void move (int x, int y) {
-            base.move (x - (int)(this.get_allocated_width ()/2), y - (int)(this.get_allocated_height ()/2));
-        }
-    }
-
-    public class ClickWindow : Granite.Widgets.CompositedWindow {
-        public ClickWindow (int x, int y, int button) {
-            this.skip_pager_hint = true;
-            this.skip_taskbar_hint = true;
-            this.set_keep_above (true);
-            this.stick ();
-            this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
-            this.accept_focus = false;
-
-            string label = "";
-            switch (button) {
-                case 1:
-                    label = _("Left");
-                    break;
-                case 2:
-                    label = _("Middle");
-                    break;
-                case 3:
-                    label = _("Right");
-                    break;
-                default:
-                    break;
-            }
-            var lbl = new Gtk.Label (label);
-            lbl.attributes = new Pango.AttrList ();
-            lbl.attributes.insert (new Pango.AttrFontDesc (Pango.FontDescription.from_string ("16px")));
-            this.add (lbl);
-            var css = new Gtk.CssProvider ();
-            try {
-                css.load_from_data ("*{color:#fff; text-shadow:1 1 #000;}", -1);
-            } catch (Error e) { warning (e.message); }
-            lbl.get_style_context ().add_provider (css, 20000);
-
-            this.realize ();
-            this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle ({0, 0, 1, 1}), 0, 0);
-            this.show_all ();
-            this.move (x + 5, y + 5);
-
-            Timeout.add (10, () => {
-                this.opacity -= 0.007;
-                if (this.opacity < 0.1) //prevent flickering
-                    this.foreach ( (c) => this.remove (c) );
-                if (this.opacity <= 0) {
-                    this.destroy ();
-                    return false;
-                }
-                return true;
-            });
-        }
-    }
-
-
-    public class Key : Label {
-
-        public string key;
-        public bool ctrl;
-        public bool shift;
-        public bool alt;
-        public bool super;
-        public bool iso_level3_shift;
-        public int count;
-
-        public Key (string key, bool ctrl, bool shift, bool alt, bool super, bool iso_level3_shift){
-            this.key = key;
-            this.ctrl = ctrl;
-            this.shift = shift;
-            this.alt = alt;
-            this.super = super;
-            this.iso_level3_shift = iso_level3_shift;
-            this.count = 1;
-        }
-    }
-
-
-    public class KeyView : Granite.Widgets.CompositedWindow {
-
+	public class YellowCircle : Granite.Widgets.CompositedWindow {
+		public YellowCircle (Gdk.RGBA color) {
+			this.skip_pager_hint = true;
+			this.skip_taskbar_hint = true;
+			this.set_keep_above (true);
+			this.stick ();
+			this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
+			this.accept_focus = false;
+
+			this.draw.connect ((ctx) => {
+				ctx.arc (this.get_allocated_width () / 2, this.get_allocated_height () / 2,
+						this.get_allocated_width () / 2, 0, 6.28318);
+				ctx.set_source_rgba (color.red, color.green, color.blue, color.alpha);
+				ctx.fill ();
+
+				return false;
+			});
+
+			this.set_size_request (70, 70);
+			this.realize ();
+			this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle ({0, 0, 1, 1}), 0, 0);
+			this.show_all ();
+		}
+
+		public new void move (int x, int y) {
+			base.move (x - (int)(this.get_allocated_width () / 2), y - (int)(this.get_allocated_height () / 2));
+		}
+	}
+
+	public class ClickWindow : Granite.Widgets.CompositedWindow {
+		public ClickWindow (int x, int y, int button) {
+			this.skip_pager_hint = true;
+			this.skip_taskbar_hint = true;
+			this.set_keep_above (true);
+			this.stick ();
+			this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
+			this.accept_focus = false;
+
+			string label = "";
+
+			switch (button) {
+				case 1:
+					label = _("Left");
+
+					break;
+				case 2:
+					label = _("Middle");
+
+					break;
+				case 3:
+					label = _("Right");
+
+					break;
+				default:
+					break;
+			}
+
+			var lbl = new Gtk.Label (label);
+			lbl.attributes = new Pango.AttrList ();
+			lbl.attributes.insert (new Pango.AttrFontDesc (Pango.FontDescription.from_string ("16px")));
+
+			this.add (lbl);
+
+			var css = new Gtk.CssProvider ();
+
+			try {
+				css.load_from_data ("*{color:#fff; text-shadow:1 1 #000;}", -1);
+			} catch (Error e) {
+				warning (e.message);
+			}
+
+			lbl.get_style_context ().add_provider (css, 20000);
+
+			this.realize ();
+			this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle ({0, 0, 1, 1}), 0, 0);
+			this.show_all ();
+			this.move (x + 5, y + 5);
+
+			Timeout.add (10, () => {
+				this.opacity -= 0.007;
+
+				if (this.opacity < 0.1) //prevent flickering
+					this.foreach ((c) => this.remove (c));
+				if (this.opacity <= 0) {
+					this.destroy ();
+
+					return false;
+				}
+
+				return true;
+			});
+		}
+	}
+
+	public class Key : Gtk.Label {
+		public string key;
+		public bool ctrl;
+		public bool shift;
+		public bool alt;
+		public bool super;
+		public bool iso_level3_shift;
+		public int count;
+
+		public Key (string key, bool ctrl, bool shift, bool alt, bool super, bool iso_level3_shift){
+			this.key = key;
+			this.ctrl = ctrl;
+			this.shift = shift;
+			this.alt = alt;
+			this.super = super;
+			this.iso_level3_shift = iso_level3_shift;
+			this.count = 1;
+		}
+	}
+
+
+	public class KeyView : Granite.Widgets.CompositedWindow {
 		public int key_size;
 		public int fade_duration;
 
-
-
 		private bool ctrl;
 		private bool shift;
 		private bool alt;
@@ -194,7 +198,7 @@
 			this.screen_h = h;
 		}
 
-		public KeyView (bool keyboard, bool mouse, bool mouse_circle, Gdk.RGBA mouse_circle_color){
+		public KeyView (bool keyboard, bool mouse, bool mouse_circle, Gdk.RGBA mouse_circle_color) {
 			this.key_size = 75;
 			this.fade_duration = 2000;
 
@@ -204,20 +208,22 @@
 			this.resizable = false;
 			this.set_has_resize_grip (false);
 			this.skip_pager_hint = true;
-            this.skip_taskbar_hint = true;
-            this.accept_focus = false;
+			this.skip_taskbar_hint = true;
+			this.accept_focus = false;
 
-            this.type_hint = Gdk.WindowTypeHint.NOTIFICATION;
-            this.events = Gdk.EventMask.BUTTON_MOTION_MASK | Gdk.EventMask.BUTTON1_MOTION_MASK |
-                Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK ;
+			this.type_hint = Gdk.WindowTypeHint.NOTIFICATION;
+			this.events = Gdk.EventMask.BUTTON_MOTION_MASK | Gdk.EventMask.BUTTON1_MOTION_MASK |
+					Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK;
 
 			this.realize ();
 
 			Cairo.RectangleInt rect = {0, 0, 1, 1};
+
 			this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
 
-			this.enter_notify_event.connect ( () => {
+			this.enter_notify_event.connect (() => {
 				this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
+
 				return true;
 			});
 
@@ -225,7 +231,9 @@
 
 			//setup the key background
 			key_bg = new Cairo.ImageSurface (Cairo.Format.ARGB32, key_size, key_size);
+
 			var ctx = new Cairo.Context (key_bg);
+
 			Granite.Drawing.Utilities.cairo_rounded_rectangle (ctx, 5, 5, key_size-10, key_size-10, 5);
 			ctx.set_source_rgba (0.2, 0.2, 0.2, 0.7);
 			ctx.fill_preserve ();
@@ -237,209 +245,327 @@
 					keys.pop_tail ();
 					this.queue_draw ();
 				}
+
 				return true;
 			});
 
 			if (mouse_circle) {
-			    this.circle = new YellowCircle (mouse_circle_color);
-		        this.captured_move.connect ( (x, y) => {
-			    Idle.add (() => {
-				this.circle.move (x, y);
-				return false;
-			    });
-		            //debug ("Moved to %i, %i\n", x, y);
-		        });
-		    }
-
-			if (mouse)
-			this.captured_mouse.connect ( (x, y, button) => {
-			    debug ("Button %i pressed at %i, %i ", button, x, y);
-	            if (button <= 3)
-	                Timeout.add (10, () => { new ClickWindow (x, y, button); return false; });
-			});
-
-			if (keyboard)
-			this.captured.connect ( (keyvalue, released) => {
-				Idle.add (() => {
-				    handle_key_event (keyvalue, released);
-				    return false;
-				});
-			});
+				this.circle = new YellowCircle (mouse_circle_color);
+				this.captured_move.connect ((x, y) => {
+					Idle.add (() => {
+						this.circle.move (x, y);
+
+						return false;
+					});
+
+					//debug ("Moved to %i, %i\n", x, y);
+				});
+			}
+
+			if (mouse) {
+				this.captured_mouse.connect ((x, y, button) => {
+					debug ("Button %i pressed at %i, %i ", button, x, y);
+
+					if (button <= 3) {
+						Timeout.add (10, () => {
+							new ClickWindow (x, y, button);
+
+							return false;
+						});
+					}
+				});
+			}
+
+			if (keyboard) {
+				this.captured.connect ((keyvalue, released) => {
+					Idle.add (() => {
+						handle_key_event (keyvalue, released);
+
+						return false;
+					});
+				});
+			}
 		}
 
 		void handle_key_event (string keyvalue, bool released) {
-		    if (released){
-			switch (keyvalue){
-			    case "Control_L":
-			    case "Control_R":
-				this.ctrl = false;
-				this.queue_draw ();
-				break;
-			    case "Shift_L":
-			    case "Shift_R":
-				this.shift = false;
-				this.queue_draw ();
-				break;
-			    case "Alt_L":
-			    case "Alt_R":
-				this.alt = false;
-				this.queue_draw ();
-				break;
-			    case "Super_L":
-			    case "Super_R":
-				this.super = false;
-				this.queue_draw ();
-				return;
-			    case "ISO_Level3_Shift":
-				this.iso_level3_shift = false;
-				this.queue_draw ();
-				return;
-			}
-		    }else{
-			string res = keyvalue;
-			switch (res){
-			    case "Control_L":
-			    case "Control_R":
-				this.ctrl = true;
-				this.queue_draw ();
-				return;
-			    case "Shift_L":
-			    case "Shift_R":
-				this.shift = true;
-				this.queue_draw ();
-				return;
-			    case "Alt_L":
-			    case "Alt_R":
-				this.alt = true;
-				this.queue_draw ();
-				return;
-			    case "Super_L":
-			    case "Super_R":
-				this.super = true;
-				this.queue_draw ();
-				return;
-			    case "ISO_Level3_Shift":
-				this.iso_level3_shift = true;
-				this.queue_draw ();
-				return;
-			    case "Escape":
-				res = "Esc"; break;
-			    case "Return":
-				res = "⏎"; break;
-			    case "Delete":
-				res = "Del"; break;
-			    case "Insert":
-				res = "Ins"; break;
-			    case "comma":
-				res = ","; break;
-			    case "period":
-				res = "."; break;
-			    case "minus":
-				res = "-"; break;
-			    case "plus":
-				res = "+"; break;
-			    case "Tab":
-				res = "Tab"; break;
-			    case "BackSpace":
-				res = "⌫"; break;
-			    case "Left":
-				res = "◄"; break;
-			    case "Right":
-				res = "►"; break;
-			    case "Up":
-				res = "▲"; break;
-			    case "Down":
-				res = "▼"; break;
-			    case "space":
-				res = " "; break;
-			    case "backslash":
-				res = "\\"; break;
-			    case "bracketleft":
-				res = "["; break;
-			    case "bracketright":
-				res = "]"; break;
-			    case "braceleft":
-				res = "{"; break;
-			    case "braceright":
-				res = "}"; break;
-			    case "apostrophe":
-				res = "'"; break;
-			    case "asciitilde":
-				res = "~"; break;
-			    case "grave":
-				res = "`"; break;
-			    case "bar":
-				res = "|"; break;
-			    case "ampersand":
-				res = "&"; break;
-			    case "parenleft":
-				res = "("; break;
-			    case "parenright":
-				res = ")"; break;
-			    case "less":
-				res = "<"; break;
-			    case "greater":
-				res = ">"; break;
-			    case "equal":
-				res = "="; break;
-			    case "exclam":
-				res = "!"; break;
-			    case "quotedbl":
-				res = "\""; break;
-			    case "numbersign":
-				res = "\""; break;
-			    case "dollar":
-				res = "$"; break;
-			    case "slash":
-				res = "/"; break;
-			    case "asterisk":
-				res = "*"; break;
-			    case "colon":
-				res = ":"; break;
-			    case "semicolon":
-				res = ";"; break;
-			    case "underscore":
-				res = "_"; break;
-			    case "Next":
-				res = "Pg▲"; break;
-			    case "Prior":
-				res = "Pg▼"; break;
-			    case "asciicircum":
-				res = "^"; break;
-			    case "at":
-				res = "@"; break;
-			    case "question":
-				res = "?"; break;
-			    default:
-				if (keyvalue.length > 9)
-				    res = keyvalue.substring (0, 9);
-				break;
-			}
-
-			if ((!keys.is_empty ()) &&
+			if (released) {
+				switch (keyvalue) {
+					case "Control_L":
+					case "Control_R":
+						this.ctrl = false;
+						this.queue_draw ();
+
+						break;
+					case "Shift_L":
+					case "Shift_R":
+						this.shift = false;
+						this.queue_draw ();
+
+						break;
+					case "Alt_L":
+					case "Alt_R":
+						this.alt = false;
+						this.queue_draw ();
+
+						break;
+					case "Super_L":
+					case "Super_R":
+						this.super = false;
+						this.queue_draw ();
+
+						return;
+					case "ISO_Level3_Shift":
+						this.iso_level3_shift = false;
+						this.queue_draw ();
+
+						return;
+				}
+			} else {
+				string res = keyvalue;
+
+				switch (res) {
+					case "Control_L":
+					case "Control_R":
+						this.ctrl = true;
+						this.queue_draw ();
+
+						return;
+					case "Shift_L":
+					case "Shift_R":
+						this.shift = true;
+						this.queue_draw ();
+
+						return;
+					case "Alt_L":
+					case "Alt_R":
+						this.alt = true;
+						this.queue_draw ();
+
+						return;
+					case "Super_L":
+					case "Super_R":
+						this.super = true;
+						this.queue_draw ();
+
+						return;
+					case "ISO_Level3_Shift":
+						this.iso_level3_shift = true;
+						this.queue_draw ();
+
+						return;
+					case "Escape":
+						res = "Esc";
+
+						break;
+					case "Return":
+						res = "⏎";
+
+						break;
+					case "Delete":
+						res = "Del";
+
+						break;
+					case "Insert":
+						res = "Ins";
+
+						break;
+					case "comma":
+						res = ",";
+
+						break;
+					case "period":
+						res = ".";
+
+						break;
+					case "minus":
+						res = "-";
+
+						break;
+					case "plus":
+						res = "+";
+
+						break;
+					case "Tab":
+						res = "Tab";
+
+						break;
+					case "BackSpace":
+						res = "⌫";
+
+						break;
+					case "Left":
+						res = "◄";
+
+						break;
+					case "Right":
+						res = "►";
+
+						break;
+					case "Up":
+						res = "▲";
+
+						break;
+					case "Down":
+						res = "▼";
+
+						break;
+					case "space":
+						res = " ";
+
+						break;
+					case "backslash":
+						res = "\\";
+
+						break;
+					case "bracketleft":
+						res = "[";
+
+						break;
+					case "bracketright":
+						res = "]";
+
+						break;
+					case "braceleft":
+						res = "{";
+
+						break;
+					case "braceright":
+						res = "}";
+
+						break;
+					case "apostrophe":
+						res = "'";
+
+						break;
+					case "asciitilde":
+						res = "~";
+
+						break;
+					case "grave":
+						res = "`";
+
+						break;
+					case "bar":
+						res = "|";
+
+						break;
+					case "ampersand":
+						res = "&";
+
+						break;
+					case "parenleft":
+						res = "(";
+
+						break;
+					case "parenright":
+						res = ")";
+
+						break;
+					case "less":
+						res = "<";
+
+						break;
+					case "greater":
+						res = ">";
+
+						break;
+					case "equal":
+						res = "=";
+
+						break;
+					case "exclam":
+						res = "!";
+
+						break;
+					case "quotedbl":
+						res = "\"";
+
+						break;
+					case "numbersign":
+						res = "\"";
+
+						break;
+					case "dollar":
+						res = "$";
+
+						break;
+					case "slash":
+						res = "/";
+
+						break;
+					case "asterisk":
+						res = "*";
+
+						break;
+					case "colon":
+						res = ":";
+
+						break;
+					case "semicolon":
+						res = ";";
+
+						break;
+					case "underscore":
+						res = "_";
+
+						break;
+					case "Next":
+						res = "Pg▲";
+
+						break;
+					case "Prior":
+						res = "Pg▼";
+
+						break;
+					case "asciicircum":
+						res = "^";
+
+						break;
+					case "at":
+						res = "@";
+
+						break;
+					case "question":
+						res = "?";
+
+						break;
+					default:
+						if (keyvalue.length > 9)
+							res = keyvalue.substring (0, 9);
+
+						break;
+				}
+
+				if ((!keys.is_empty ()) &&
 				(keys.peek_head ().key == res) &&
 				(keys.peek_head ().ctrl == ctrl) &&
 				(keys.peek_head ().shift == shift) &&
 				(keys.peek_head ().alt == alt) &&
-				(keys.peek_head ().iso_level3_shift == iso_level3_shift)){
-			    keys.peek_head ().count ++;
-			    this.queue_draw ();
-			}else{
-			    var key = new Key (res, ctrl, shift, alt, super, iso_level3_shift);
-			    if (!released){
-				keys.push_head (key);
-				if (keys.length+2 > (screen_h / key_size))
-				    keys.pop_tail ();
-				this.queue_draw ();
-			    }
+				(keys.peek_head ().iso_level3_shift == iso_level3_shift)) {
+					keys.peek_head ().count++;
+
+					this.queue_draw ();
+				} else {
+					var key = new Key(res, ctrl, shift, alt, super, iso_level3_shift);
+
+					if (!released) {
+						keys.push_head (key);
+
+						if (keys.length + 2 > (screen_h / key_size))
+							keys.pop_tail ();
+
+						this.queue_draw ();
+					}
+				}
 			}
-		    }
 		}
 
-		public void capture (){
-			try{
+		public void capture () {
+			try {
 				Thread.create<void*> (this.intercept_key_thread, true);
-			}catch (ThreadError e){stderr.printf (e.message);}
+			} catch (ThreadError e) {
+				stderr.printf (e.message);
+			}
 		}
 	}
 }
 
=== modified file 'src/Widgets/selectionarea.vala'
--- src/Widgets/selectionarea.vala	2015-01-04 14:53:16 +0000
+++ src/Widgets/selectionarea.vala	2015-01-05 22:47:30 +0000
@@ -1,43 +1,41 @@
-using Gtk;
-using Granite;
-
-
-namespace Eidete.Widgets{
-	
-	public class SelectionArea : Granite.Widgets.CompositedWindow{
-	
+namespace Eidete.Widgets {
+	public class SelectionArea : Granite.Widgets.CompositedWindow {
 		private int[,] pos;
 		public bool discrete;
 		public bool not_visible;
-		
+
 		public int x;
 		public int y;
 		public int w;
 		public int h;
-		
-		public SelectionArea (){
+
+		public SelectionArea () {
 			this.stick ();
 			this.resizable = true;
 			this.set_has_resize_grip (false);
 			this.set_default_geometry (640, 480);
-			this.events = Gdk.EventMask.BUTTON_MOTION_MASK | Gdk.EventMask.BUTTON1_MOTION_MASK | 
-			    Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK ;
+			this.events = Gdk.EventMask.BUTTON_MOTION_MASK | Gdk.EventMask.BUTTON1_MOTION_MASK |
+					Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK;
 			this.skip_taskbar_hint = true;
 			this.skip_pager_hint = true;
 			this.not_visible = false;
-			
-			this.button_press_event.connect ( (e) => {
+
+			this.button_press_event.connect ((e) => {
 				Gdk.WindowEdge [] dir = {Gdk.WindowEdge.NORTH_WEST,
-					Gdk.WindowEdge.NORTH,Gdk.WindowEdge.NORTH_EAST,
-					Gdk.WindowEdge.EAST,Gdk.WindowEdge.SOUTH_EAST,Gdk.WindowEdge.SOUTH,
-					Gdk.WindowEdge.SOUTH_WEST,Gdk.WindowEdge.WEST};
-				for (var i=0;i<8;i++){
-					if (in_quad (pos[i,0]-12, pos[i,1]-10, 24, 24, (int)e.x, (int)e.y)){
+						Gdk.WindowEdge.NORTH,Gdk.WindowEdge.NORTH_EAST,
+						Gdk.WindowEdge.EAST,Gdk.WindowEdge.SOUTH_EAST,Gdk.WindowEdge.SOUTH,
+						Gdk.WindowEdge.SOUTH_WEST,Gdk.WindowEdge.WEST};
+
+				for (var i = 0; i < 8; i++) {
+					if (in_quad (pos[i,0] - 12, pos[i,1] - 10, 24, 24, (int)e.x, (int)e.y)) {
 						this.begin_resize_drag (dir[i], (int)e.button, (int)e.x_root, (int)e.y_root, e.time);
+
 						return false;
 					}
 				}
+
 				this.begin_move_drag ((int)e.button, (int)e.x_root, (int)e.y_root, e.time);
+
 				return false;
 			});
 
@@ -49,19 +47,18 @@
 				// if coordinate + width/height is out of the screen, then
 				// adjust coordinates to keep width and height (and aspect
 				// ratio) intact
-				if( e.x < 0 || e.x > screen_width ) {
+
+				if (e.x < 0 || e.x > screen_width) {
 					x = 0;
-				} else if( e.x + e.width > screen_width
-						   && e.width < screen_width ) {
+				} else if (e.x + e.width > screen_width && e.width < screen_width) {
 					x = screen_width - e.width;
 				} else {
 					x = e.x;
 				}
-				
-				if( e.y < 0 ) {
+
+				if (e.y < 0) {
 					y = 0;
-				} else if( e.y + e.height >= screen_height
-						   && e.height < screen_height ) {
+				} else if (e.y + e.height >= screen_height && e.height < screen_height) {
 					y = screen_height - e.height - 1;
 				} else {
 					y = e.y;
@@ -69,95 +66,100 @@
 
 				// just in case an edge is still outside of the screen
 				// we'll modify the width/height if thats the case
-				if( x + e.width > screen_width ) {
+
+				if (x + e.width > screen_width) {
 					w = screen_width - x;
 				} else {
 					w = e.width;
 				}
 
-				if( y + e.height > screen_height ) {
+				if (y + e.height > screen_height) {
 					h = screen_height - y;
 				} else {
 					h = e.height;
 				}
-				
+
 				geometry_changed (x, y, w, h);
+
 				return false;
 			});
-			
-			this.destroy.connect ( () => {
+
+			this.destroy.connect (() => {
 				this.not_visible = true;
 			});
 		}
-		
-		private bool in_quad (int qx, int qy, int qh, int qw, int x, int y){
-			return ((x>qx) && (x<(qx+qw)) && (y>qy) && (y<qy+qh));
+
+		private bool in_quad (int qx, int qy, int qh, int qw, int x, int y) {
+			return ((x > qx) && (x < (qx + qw)) && (y > qy) && (y < qy + qh));
 		}
-		
-		public override bool draw (Cairo.Context ctx){
-			int w = this.get_allocated_width  ();
+
+		public override bool draw (Cairo.Context ctx) {
+			int w = this.get_allocated_width ();
 			int h = this.get_allocated_height ();
 			int r = 16;
-			if (!discrete){
+
+			if (!discrete) {
 				pos = {{1, 1}, // upper left
-					   {w/2, 1}, // upper midpoint
-					   {w-1, 1}, // upper right
-					   {w-1, h/2}, // right midpoint
-					   {w-1, h-1}, // lower right
-					   {w/2, h-1}, // lower midpoint
-					   {1, h-1}, // lower left
-					   {1, h/2}}; // left midpoint
+						{w / 2, 1}, // upper midpoint
+						{w - 1, 1}, // upper right
+						{w - 1, h / 2}, // right midpoint
+						{w - 1, h - 1}, // lower right
+						{w / 2, h - 1}, // lower midpoint
+						{1, h - 1}, // lower left
+						{1, h / 2}}; // left midpoint
 
-				
 				ctx.rectangle (0, 0, w, h);
 				ctx.set_source_rgba (0.1, 0.1, 0.1, 0.2);
 				ctx.fill ();
-				
-				for (var i=0;i<8;i++){
-					ctx.arc (pos[i,0], pos[i,1], r, 0.0, 2*3.14);
+
+				for (var i = 0; i < 8; i++) {
+					ctx.arc (pos[i,0], pos[i,1], r, 0.0, 2 * 3.14);
 					ctx.set_source_rgb (0.7, 0.7, 0.7);
 					ctx.fill ();
 				}
+
 				ctx.rectangle (0, 0, w, h);
 				ctx.set_source_rgb (1.0, 1.0, 1.0);
 				ctx.set_line_width (1.0);
 				ctx.stroke ();
-			}else{
+			} else {
 				ctx.rectangle (0, 0, w, h);
 				ctx.set_source_rgb (0.8, 0.0, 0.0);
 				ctx.set_line_width (3.0);
 				ctx.stroke ();
 			}
+
 			return base.draw (ctx);
 		}
-		
+
 		public signal void geometry_changed (int x, int y, int width, int height);
-		
-		public void to_discrete (){
-			if (!this.is_composited ()){
+
+		public void to_discrete () {
+			if (!this.is_composited ()) {
 				this.destroy ();
+
 				return;
 			}
+
 			this.discrete = true;
 			this.set_keep_above (true);
 			this.queue_draw ();
-			this.resize (w+6, h+6);
-			this.move (x-2, y-2);
+			this.resize (w + 6, h + 6);
+			this.move (x - 2, y - 2);
 			this.deletable = false;
 			this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
 			this.accept_focus = false;
-			
+
 			this.realize ();
-			
+
 			Cairo.RectangleInt rect = {0, 0, 1, 1};
 			this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
-			
-			this.enter_notify_event.connect ( () => {
+
+			this.enter_notify_event.connect (() => {
 				this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
+
 				return true;
 			});
 		}
 	}
 }
-
-
 
=== modified file 'src/desktop_launcher.vala'
--- src/desktop_launcher.vala	2012-06-07 04:40:05 +0000
+++ src/desktop_launcher.vala	2015-01-05 22:47:30 +0000
@@ -1,8 +1,7 @@
 namespace DesktopLauncher {
-    /* Translatable launcher (.desktop) strings to be added to   */
-    /* template (.pot) file. These strings MUST reflect any      */
-    /* changes in these launcher keys in .desktop file.          */
+	// Translatable launcher (.desktop) strings to be added to
+	// template (.pot) file. These strings MUST reflect any
+	// changes in these launcher keys in .desktop file.
 	public const string COMMENT = N_("Record screencasts");
 	public const string GENERIC_NAME = N_("Screencaster");
-
 }
 
=== modified file 'src/eidete.vala'
--- src/eidete.vala	2015-01-04 16:20:11 +0000
+++ src/eidete.vala	2015-01-05 22:47:30 +0000
@@ -1,37 +1,33 @@
-
-using Gst;
-using Granite;
-using Gtk;
-
-
-namespace Eidete{
-
-	class LLabel : Label{
-		public LLabel (string label){
-			this.set_halign (Align.START);
+namespace Eidete {
+	class LLabel : Gtk.Label {
+		public LLabel (string label) {
+			this.set_halign (Gtk.Align.START);
 			this.label = label;
 		}
-		public LLabel.indent (string label){
+
+		public LLabel.indent (string label) {
 			this (label);
 			this.margin_left = 10;
 		}
-		public LLabel.markup (string label){
+
+		public LLabel.markup (string label) {
 			this (label);
 			this.use_markup = true;
 		}
-		public LLabel.right (string label){
-			this.set_halign (Align.END);
+
+		public LLabel.right (string label) {
+			this.set_halign (Gtk.Align.END);
 			this.label = label;
 		}
-		public LLabel.right_with_markup (string label){
-			this.set_halign (Align.END);
+
+		public LLabel.right_with_markup (string label) {
+			this.set_halign (Gtk.Align.END);
 			this.use_markup = true;
 			this.label = label;
 		}
 	}
 
-
-	public struct Settings{
+	public struct Settings {
 		public int sx;
 		public int sy;
 		public int ex;
@@ -45,9 +41,8 @@
 		public string destination;
 	}
 
-	public class EideteApp : Granite.Application{
-
-		construct{
+	public class EideteApp : Granite.Application {
+		construct {
 			program_name = "Eidete";
 			exec_name = "eidete";
 
@@ -67,23 +62,23 @@
 			help_url = "https://code.launchpad.net/eidete";
 			translate_url = "https://translations.launchpad.net/eidete";
 
-			about_authors = {"Tom Beckmann <[e-mail]>"};
-			about_documenters = {"Tom Beckmann <[e-mail]>"};
-			about_artists = {"Harvey Cabaguio", "Sergey 'shnatsel' Davidoff"};
+			about_authors = { "Tom Beckmann <[e-mail]>" };
+			about_documenters = { "Tom Beckmann <[e-mail]>" };
+			about_artists = { "Harvey Cabaguio", "Sergey 'shnatsel' Davidoff" };
 			about_comments = "Development release (all features not implemented)";
 			about_translators = "";
-			about_license_type = License.GPL_3_0;
+			about_license_type = Gtk.License.GPL_3_0;
 		}
 
-		public dynamic Pipeline pipeline;
+		public dynamic Gst.Pipeline pipeline;
 
-		public Window main_window;
+		public Gtk.Window main_window;
 		public Eidete.Widgets.KeyView keyview;
 		public Eidete.Widgets.SelectionArea selectionarea;
 		private Gtk.Stack tabs;
-		private Grid pause_grid;
-		private Gtk.Grid main_box ;
-		private Gtk.StackSwitcher stack_switcher ;
+		private Gtk.Grid pause_grid;
+		private Gtk.Grid main_box;
+		private Gtk.StackSwitcher stack_switcher;
 		public Wnck.Window win;
 		public Gdk.Screen screen;
 		public Gdk.Rectangle monitor_rec;
@@ -96,17 +91,16 @@
 		public Gst.Bin videobin;
 		public Gst.Bin audiobin;
 
-		public EideteApp (){
+		public EideteApp () {
 		}
 
 		public void start_and_build () {
-
 			Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
 
-			this.main_window = new Window ();
+			this.main_window = new Gtk.Window ();
 			this.main_window.icon_name = exec_name;
 			this.main_window.set_application (this);
-			this.main_window.window_position = WindowPosition.CENTER;
+			this.main_window.window_position = Gtk.WindowPosition.CENTER;
 			this.main_window.set_resizable (false);
 
 			/* Use CSD */
@@ -114,90 +108,94 @@
 			header.title = program_name;
 			header.set_show_close_button (true);
 			header.get_style_context ().remove_class ("header-bar");
+
 			this.main_window.set_titlebar (header);
 
 			if (!this.main_window.is_composited ()){
 				warning ("Compositing is not supported. No transparency available.");
 			}
 
-
 			/*
 			  UI
 			*/
 
 			tabs = new Gtk.Stack ();
 
-			var grid = new Grid ();
+			var grid = new Gtk.Grid ();
 			grid.column_spacing = 12;
 			grid.row_spacing = 6;
 			grid.hexpand = false;
 
-			var monitors_combo = new ComboBoxText ();
+			var monitors_combo = new Gtk.ComboBoxText ();
 			monitors_combo.hexpand = true;
-			for (var i=0;i<Gdk.Screen.get_default ().get_n_monitors (); i++)
+
+			for (var i = 0; i < Gdk.Screen.get_default ().get_n_monitors (); i++) {
 				// TODO proper translation here
 				monitors_combo.append (i.to_string (), _("Monitor")+" "+(i+1).to_string ());
+			}
+
 			monitors_combo.active = 0;
+
 			if (Gdk.Screen.get_default ().get_n_monitors () == 1)
 				monitors_combo.set_sensitive (false);
 
-			var width = new SpinButton.with_range (50, Gdk.Screen.get_default ().get_width (), 1);
+			var width = new Gtk.SpinButton.with_range (50, Gdk.Screen.get_default ().get_width (), 1);
 			width.max_length = 4;
 			width.margin_left = 1;
 
-			var height = new SpinButton.with_range (50, Gdk.Screen.get_default ().get_height (), 1);
+			var height = new Gtk.SpinButton.with_range (50, Gdk.Screen.get_default ().get_height (), 1);
 			height.max_length = 4;
 			height.margin_left = 1;
 			width.set_sensitive (false);
 			height.set_sensitive (false);
-			width.halign = Align.START;
-			height.halign = Align.START;
+			width.halign = Gtk.Align.START;
+			height.halign = Gtk.Align.START;
 
-			var recordingarea_combo = new ComboBoxText ();
+			var recordingarea_combo = new Gtk.ComboBoxText ();
 			recordingarea_combo.append ("full", _("Fullscreen"));
 			recordingarea_combo.append ("custom", _("Custom"));
 			recordingarea_combo.active = 0;
 
-			var use_comp_sounds    = new CheckButton ();
-			use_comp_sounds.halign = Align.START;
+			var use_comp_sounds = new Gtk.CheckButton ();
+			use_comp_sounds.halign = Gtk.Align.START;
 			use_comp_sounds.set_sensitive (false);
 
-			var use_audio          = new CheckButton ();
-			use_audio.halign       = Align.START;
+			var use_audio = new Gtk.CheckButton ();
+			use_audio.halign =Gtk. Align.START;
 
-			var audio_source = new ComboBoxText ();
+			var audio_source = new Gtk.ComboBoxText ();
 			audio_source.append ("0", _("Default"));
 			audio_source.active = 0;
 			audio_source.hexpand = true;
 			audio_source.set_sensitive (false);
 
-			var audio_box = new Box (Orientation.HORIZONTAL, 0);
+			var audio_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
 			audio_box.pack_start (use_audio, false, true, 0);
 			audio_box.pack_start (audio_source, true, true, 0);
 
-			var sound = new LLabel.markup ("<b>"+_("Sound")+"</b>");
+			var sound = new LLabel.markup ("<b>" + _("Sound") + "</b>");
 			sound.margin_top = 18;
 
-			var video = new LLabel.markup ("<b>"+_("Video")+"</b>");
+			var video = new LLabel.markup ("<b>" + _("Video") + "</b>");
 			video.margin_top = 12;
 
-			var keyboard = new LLabel.markup ("<b>"+_("Keyboard")+"</b>");
+			var keyboard = new LLabel.markup ("<b>" + _("Keyboard") + "</b>");
 			keyboard.margin_top = 18;
 
-			var mouse = new LLabel.markup ("<b>"+_("Mouse")+"</b>");
+			var mouse = new LLabel.markup ("<b>" + _("Mouse") + "</b>");
 			mouse.margin_top = 12;
 
-			var start_bt = new Button.with_label (_("Start Recording"));
+			var start_bt = new Gtk.Button.with_label (_("Start Recording"));
 			start_bt.can_default = true;
 			start_bt.get_style_context ().add_class ("noundo");
 			start_bt.get_style_context ().add_class ("suggested-action");
 			
-			var cancel_bt = new Button.with_label (_("Cancel"));
-
-			var about_bt = new Button.with_label (_("About"));
-			about_bt.image = new Image.from_stock (Stock.ABOUT, IconSize.BUTTON);
-
-			var buttons = new Box (Orientation.HORIZONTAL, 5);
+			var cancel_bt = new Gtk.Button.with_label (_("Cancel"));
+
+			var about_bt = new Gtk.Button.with_label (_("About"));
+			about_bt.image = new Gtk.Image.from_stock (Gtk.Stock.ABOUT, Gtk.IconSize.BUTTON);
+
+			var buttons = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 5);
 			buttons.homogeneous = true;
 			buttons.pack_start (about_bt, false, true, 0);
 			buttons.pack_start (cancel_bt, false, true, 0);
@@ -206,48 +204,48 @@
 
 			this.main_window.set_default (start_bt);
 
-			grid.attach ((sound), 0, 0, 1, 1);
-			grid.attach (new LLabel.right (_("Record Computer Sounds")+":"), 0, 1, 1, 1);
+			grid.attach (sound, 0, 0, 1, 1);
+			grid.attach (new LLabel.right (_("Record Computer Sounds") + ":"), 0, 1, 1, 1);
 			grid.attach (use_comp_sounds, 1, 1, 1, 1);
-			grid.attach (new LLabel.right (_("Record from Microphone")+":"), 0, 2, 1, 1);
+			grid.attach (new LLabel.right (_("Record from Microphone") + ":"), 0, 2, 1, 1);
 			grid.attach (audio_box, 1, 2, 1, 1);
 			grid.attach ((video), 0, 3, 2, 1);
-			grid.attach (new LLabel.right ("        "+_("Record from Monitor")+":"), 0, 4, 1, 1);
+			grid.attach (new LLabel.right ("        " + _("Record from Monitor") + ":"), 0, 4, 1, 1);
 			grid.attach (monitors_combo, 1, 4, 1, 1);
-			grid.attach (new LLabel.right (_("Recording Area")+":"), 0, 5, 1, 1);
+			grid.attach (new LLabel.right (_("Recording Area") + ":"), 0, 5, 1, 1);
 			grid.attach (recordingarea_combo, 1, 5, 1, 1);
-			grid.attach (new LLabel.right (_("Width")+":"), 0, 6, 1, 1);
+			grid.attach (new LLabel.right (_("Width") + ":"), 0, 6, 1, 1);
 			grid.attach (width, 1, 6, 1, 1);
-			grid.attach (new LLabel.right (_("Height")+":"), 0, 7, 1, 1);
+			grid.attach (new LLabel.right (_("Height") + ":"), 0, 7, 1, 1);
 			grid.attach (height, 1, 7, 1, 1);
 			grid.attach (buttons, 0, 8, 2, 1);
 
 			//grid2
-			var grid2 = new Grid ();
-
-			var use_keyview        = new Gtk.CheckButton ();
-			use_keyview.halign     = Gtk.Align.START;
-
-			var use_clickview      = new Gtk.CheckButton ();
-			use_clickview.halign   = Gtk.Align.START;
-
-			var use_circle         = new Gtk.CheckButton ();
-			use_circle.halign      = Gtk.Align.START;
-
-			var circle_color       = new Gtk.ColorButton ();
-
-			var circle_box         = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+			var grid2 = new Gtk.Grid ();
+
+			var use_keyview = new Gtk.CheckButton ();
+			use_keyview.halign = Gtk.Align.START;
+
+			var use_clickview = new Gtk.CheckButton ();
+			use_clickview.halign = Gtk.Align.START;
+
+			var use_circle = new Gtk.CheckButton ();
+			use_circle.halign = Gtk.Align.START;
+
+			var circle_color = new Gtk.ColorButton ();
+
+			var circle_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
 			circle_box.pack_start (use_circle, false);
 			circle_box.pack_start (circle_color);
 
 			//grid2.attach (new LLabel
 			grid2.attach ((keyboard), 0, 0, 1, 1);
-			grid2.attach (new LLabel.right (_("Pressed keys on screen")+":"), 0, 1, 1, 1);
+			grid2.attach (new LLabel.right (_("Pressed keys on screen") + ":"), 0, 1, 1, 1);
 			grid2.attach (use_keyview, 1, 1, 1, 1);
 			grid2.attach ((mouse), 0, 2, 1, 1);
-			grid2.attach (new LLabel.right (_("Mouse clicks on screen")+":"), 0, 3, 1, 1);
+			grid2.attach (new LLabel.right (_("Mouse clicks on screen") + ":"), 0, 3, 1, 1);
 			grid2.attach (use_clickview, 1, 3, 1, 1);
-			grid2.attach (new LLabel.right (_("Circle around the cursor")+":"), 0, 4, 1, 1);
+			grid2.attach (new LLabel.right (_("Circle around the cursor") + ":"), 0, 4, 1, 1);
 			grid2.attach (circle_box, 1, 4, 1, 1);
 			grid2.column_spacing = 12;
 			grid2.row_spacing = 6;
@@ -260,7 +258,7 @@
 			stack_switcher = new Gtk.StackSwitcher ();
 			stack_switcher.stack = tabs;
 			stack_switcher.halign = Gtk.Align.CENTER;
-			build_pause_ui () ;
+			build_pause_ui ();
 			pause_grid.show_all();
 			pause_grid.hide();
 			pause_grid.no_show_all = true;
@@ -278,15 +276,15 @@
 			  Events
 			*/
 
-			about_bt.clicked.connect ( () => {
+			about_bt.clicked.connect (() => {
 				this.show_about (this.main_window);
 			});
 
-			cancel_bt.clicked.connect ( () => {
+			cancel_bt.clicked.connect (() => {
 				this.main_window.destroy ();
 			});
 
-			start_bt.clicked.connect ( () => {
+			start_bt.clicked.connect (() => {
 				var count = new Eidete.Widgets.Countdown ();
 				this.main_window.iconify ();
 				count.start (this);
@@ -294,9 +292,11 @@
 
 			this.screen = Gdk.Screen.get_default();
 			settings.monitor = 0;
-			monitors_combo.changed.connect ( () => {
+			monitors_combo.changed.connect (() => {
 				settings.monitor = int.parse (monitors_combo.active_id);
+
 				this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
+
 				settings.sx = this.monitor_rec.x;
 				settings.sy = this.monitor_rec.y;
 				settings.ex = settings.sx + this.monitor_rec.width - 1;
@@ -304,69 +304,88 @@
 			});
 
 			settings.monitor = int.parse (monitors_combo.active_id);
+
 			this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
+
 			settings.sx = this.monitor_rec.x;
 			settings.sy = this.monitor_rec.y;
 			settings.ex = settings.sx + this.monitor_rec.width - 1;
 			settings.ey = settings.sy + this.monitor_rec.height - 1;
 
-			recordingarea_combo.changed.connect ( () => {
+			recordingarea_combo.changed.connect (() => {
 				if (recordingarea_combo.active_id != "full"){
 					selectionarea = new Eidete.Widgets.SelectionArea ();
 					selectionarea.show_all ();
 					width.set_sensitive (true);
 					height.set_sensitive (true);
-					selectionarea.geometry_changed.connect ( (x, y, w, h) => {
+					selectionarea.geometry_changed.connect ((x, y, w, h) => {
 						if (!typing_size){
 							width.value  = (int)w;
 							height.value = (int)h;
 							settings.sx = x;
 							settings.sy = y;
-							settings.ex = settings.sx+w-1;
-							settings.ey = settings.sy+h-1;
+							settings.ex = settings.sx + w-1;
+							settings.ey = settings.sy + h-1;
 						}
 					});
-					selectionarea.focus_in_event.connect( (ev) => {
+
+					selectionarea.focus_in_event.connect((ev) => {
 						if (this.recording){
 							this.main_window.deiconify();
 							this.main_window.present();
 						}
+
 						return false;
 					});
-				}else{
+				} else {
 					selectionarea.destroy ();
 					settings.monitor = int.parse (monitors_combo.active_id);
+
 					this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
+
 					settings.sx = this.monitor_rec.x;
 					settings.sy = this.monitor_rec.y;
 					settings.ex = settings.sx + this.monitor_rec.width - 1;
 					settings.ey = settings.sy + this.monitor_rec.height - 1;
+
 					width.set_sensitive (false);
 					height.set_sensitive (false);
 				}
 			});
 
-			width.key_release_event.connect ( (e) => {
-				selectionarea.resize ((int)width.value, (int)height.value);
-				typing_size = true;
-				return false;
-			});
-			width.focus_out_event.connect ( (e) => {typing_size = false;return false;});
-			height.key_release_event.connect ( (e) => {
-				selectionarea.resize ((int)width.value, (int)height.value);
-				typing_size = true;
-				return false;
-			});
-			height.focus_out_event.connect ( (e) => {typing_size = false;return false;});
+			width.key_release_event.connect ((e) => {
+				selectionarea.resize ((int)width.value, (int)height.value);
+				typing_size = true;
+
+				return false;
+			});
+
+			width.focus_out_event.connect ((e) => {
+				typing_size = false;
+
+				return false;
+			});
+
+			height.key_release_event.connect ((e) => {
+				selectionarea.resize ((int)width.value, (int)height.value);
+				typing_size = true;
+
+				return false;
+			});
+
+			height.focus_out_event.connect ((e) => {
+				typing_size = false;
+
+				return false;
+			});
 
 			settings.audio = false;
-			use_audio.toggled.connect ( () => {
+			use_audio.toggled.connect (() => {
 				settings.audio = use_audio.active;
 				audio_source.set_sensitive (use_audio.active);
 			});
 
-
-			Gdk.Screen.get_default ().monitors_changed.connect ( () => {
+			Gdk.Screen.get_default ().monitors_changed.connect (() => {
 				if (Gdk.Screen.get_default ().get_n_monitors () > 1)
 					monitors_combo.set_sensitive (true);
 				else
@@ -374,84 +393,92 @@
 			});
 
 			settings.keyview = false;
-			use_keyview.toggled.connect ( () => {
+			use_keyview.toggled.connect (() => {
 				settings.keyview = use_keyview.active;
 			});
 
 			settings.clickview = false;
-			use_clickview.toggled.connect ( () => {
-			    settings.clickview = use_clickview.active;
+			use_clickview.toggled.connect (() => {
+				settings.clickview = use_clickview.active;
 			});
 
 			settings.mouse_circle = false;
-			use_circle.toggled.connect ( () => {
-			    settings.mouse_circle = use_circle.active;
+			use_circle.toggled.connect (() => {
+				settings.mouse_circle = use_circle.active;
 			});
 
 			settings.mouse_circle_color = {1, 1, 0, 0.3};
 			circle_color.use_alpha = true;
 			circle_color.rgba = settings.mouse_circle_color;
-			circle_color.color_set.connect ( () => {
-			    settings.mouse_circle_color = circle_color.rgba;
-			});
-
-			settings.destination = GLib.Environment.get_tmp_dir ()+
-			    "/screencast"+new GLib.DateTime.now_local ().to_unix ().to_string ()+".webm";
-
-            ulong handle = 0;
-            handle = Wnck.Screen.get_default().active_window_changed.connect ( () => {
-                this.win = Wnck.Screen.get_default().get_active_window ();
-                this.win.state_changed.connect ( (changed_s, new_s) => {
-                    if (recording && (new_s == 0)){
-                        pipeline.set_state (State.PAUSED);
-                            this.recording = false;
-                        switch_to_paused (true);
-                    }
-                });
-                Wnck.Screen.get_default ().disconnect (handle);
-            });
-
-            this.main_window.focus_in_event.connect ( (ev) => {
-                if (this.selectionarea != null && !this.selectionarea.not_visible){
-                    this.selectionarea.present ();
-                    this.main_window.present ();
-			    }
-			    return false;
-			});
+			circle_color.color_set.connect (() => {
+				settings.mouse_circle_color = circle_color.rgba;
+			});
+
+			settings.destination = GLib.Environment.get_tmp_dir () +
+					"/screencast" + new GLib.DateTime.now_local ().to_unix ().to_string () + ".webm";
+
+			ulong handle = 0;
+			handle = Wnck.Screen.get_default().active_window_changed.connect (() => {
+				this.win = Wnck.Screen.get_default().get_active_window ();
+				this.win.state_changed.connect ( (changed_s, new_s) => {
+					if (recording && (new_s == 0)) {
+						pipeline.set_state (Gst.State.PAUSED);
+						this.recording = false;
+						switch_to_paused (true);
+					}
+				});
+
+				Wnck.Screen.get_default ().disconnect (handle);
+			});
+
+			this.main_window.focus_in_event.connect ((ev) => {
+				if (this.selectionarea != null && !this.selectionarea.not_visible){
+					this.selectionarea.present ();
+					this.main_window.present ();
+				}
+
+				return false;
+			});
+
 /* disabled for now until mutter supports it better
-			this.main_window.visibility_notify_event.connect ( (ev) => {
+			this.main_window.visibility_notify_event.connect ((ev) => {
 				if (this.recording && ev.state == 0){
 					debug ("pausing recording");
+
 					pipeline.set_state (State.PAUSED);
 					this.recording = false;
 					switch_to_paused (true);
 				}
+
 				return false;
 			});
 */
 
-			this.main_window.destroy.connect ( () => {
-				if ( recording ) {
+			this.main_window.destroy.connect (() => {
+				if (recording) {
 					finish_recording ();
 				}
 			});
 
 			Granite.Services.Logger.initialize ("Eidete");
 			Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
-			uint major ;
-			uint minor ;
-			uint micro ;
-			uint nano ;
-			Gst.version (out major, out minor, out micro, out nano) ;
-			message ("GStreamer version: %u.%u.%u.%u", major, minor, micro, nano ) ;
+
+			uint major;
+			uint minor;
+			uint micro;
+			uint nano;
+
+			Gst.version (out major, out minor, out micro, out nano);
+
+			message ("GStreamer version: %u.%u.%u.%u", major, minor, micro, nano );
 		}
 
-		public override void activate (){
-			if (this.get_windows ().length () == 0){
+		public override void activate () {
+			if (this.get_windows ().length () == 0) {
 				this.start_and_build ();
-			}else{
-		        if (pause_rec)
-    				this.main_window.present ();
+			} else {
+				if (pause_rec)
+					this.main_window.present ();
 				else if (finish_rec) {
 					finish_recording ();
 				}
@@ -459,47 +486,44 @@
 		}
 
 		private void build_pause_ui (){
-
-			pause_grid = new Grid ();
+			pause_grid = new Gtk.Grid ();
 			pause_grid.margin = 12;
 			//this.main_window.title = _("Recording paused");
 
-
-			var img_text_grid = new Grid ();
-
-			var text_grid = new Grid ();
-
-			var title = new LLabel.markup ("<span weight='bold' size='larger'>"+_("Recording paused")+"</span>");
-			title.valign = Align.START;
+			var img_text_grid = new Gtk.Grid ();
+			var text_grid = new Gtk.Grid ();
+
+			var title = new LLabel.markup ("<span weight='bold' size='larger'>" + _("Recording paused") + "</span>");
+			title.valign = Gtk.Align.START;
 
 			var info = new LLabel (_("You can continue or finish the recording now"));
-			info.valign = Align.START;
+			info.valign = Gtk.Align.START;
 			info.margin_top = 6;
 
-			var buttons = new Box (Orientation.HORIZONTAL, 0);
+			var buttons = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
 			buttons.homogeneous = true;
 			buttons.spacing = 6;
 			buttons.margin_top = 24;
 
-			var continue_bt = new Button.with_label (_("Continue"));
+			var continue_bt = new Gtk.Button.with_label (_("Continue"));
 			continue_bt.set_tooltip_text (_("Continue recording"));
-			continue_bt.image = new Image.from_stock (Stock.MEDIA_RECORD, IconSize.BUTTON);
+			continue_bt.image = new Gtk.Image.from_stock (Gtk.Stock.MEDIA_RECORD, Gtk.IconSize.BUTTON);
 
-			var stop_bt = new Button.with_label (_("Finish"));
+			var stop_bt = new Gtk.Button.with_label (_("Finish"));
 			stop_bt.set_tooltip_text (_("Stop the recording and save the file"));
-			stop_bt.image = new Image.from_stock (Stock.APPLY, IconSize.BUTTON);
+			stop_bt.image = new Gtk.Image.from_stock (Gtk.Stock.APPLY, Gtk.IconSize.BUTTON);
 			stop_bt.get_style_context ().add_class ("suggested-action");
 
-			var cancel_bt = new Button.with_label (_("Cancel"));
+			var cancel_bt = new Gtk.Button.with_label (_("Cancel"));
 			cancel_bt.set_tooltip_text (_("Cancel the recording without saving the file"));
-			cancel_bt.image = new Image.from_stock (Stock.DELETE, IconSize.BUTTON);
+			cancel_bt.image = new Gtk.Image.from_stock (Gtk.Stock.DELETE, Gtk.IconSize.BUTTON);
 
 			buttons.pack_end (stop_bt, false, true, 0);
 			buttons.pack_end (continue_bt, false, true, 0);
 			buttons.pack_end (cancel_bt, false, true, 0);
 
-			var img = new Image.from_stock (Stock.MEDIA_PAUSE, IconSize.DIALOG);
-			img.valign = Align.START;
+			var img = new Gtk.Image.from_stock (Gtk.Stock.MEDIA_PAUSE, Gtk.IconSize.DIALOG);
+			img.valign = Gtk.Align.START;
 			img.margin_right = 12;
 
 			text_grid.attach (title, 0, 0, 1, 1);
@@ -511,25 +535,26 @@
 			pause_grid.attach (img_text_grid, 0, 0, 1, 1);
 			pause_grid.attach (buttons, 0, 2, 1, 1);
 
-
 			stop_bt.can_default = true;
 			this.main_window.set_default (stop_bt);
 
 			/*
 			  Events
 			*/
-			cancel_bt.clicked.connect ( () => {
+
+			cancel_bt.clicked.connect (() => {
 				this.main_window.destroy ();
 			});
 
-			stop_bt.clicked.connect ( () => {
+			stop_bt.clicked.connect (() => {
 				finish_recording ();
 			});
 
-			continue_bt.clicked.connect ( () => {
+			continue_bt.clicked.connect (() => {
 				this.main_window.iconify ();
-				this.pipeline.set_state (State.PLAYING);
+				this.pipeline.set_state (Gst.State.PLAYING);
 				this.recording = true;
+
 				switch_to_paused (false);
 			});
 		}
@@ -542,79 +567,92 @@
 						this.main_window.deiconify ();
 						this.main_window.present ();
 					}
+
 					return false;
 				});
-				keyview.place (settings.ex,
-							   settings.sy,
-							   settings.ey - settings.sy);
+
+				keyview.place (settings.ex, settings.sy, settings.ey - settings.sy);
 				keyview.show_all ();
 			}
 
-			pipeline                    = new Pipeline ("screencast-pipe");
-
-			#if GSTREAMER_0_10_IS_DEFINED
-			dynamic Element muxer      = ElementFactory.make ("webmmux", "mux");
-			dynamic Element sink       = ElementFactory.make ("filesink", "sink");
-			#else
-			var muxer      = ElementFactory.make ("webmmux", "mux");
-			var sink       = ElementFactory.make ("filesink", "sink");
-			#endif
+			pipeline = new Gst.Pipeline ("screencast-pipe");
+
+#if GSTREAMER_0_10_IS_DEFINED
+			dynamic Element muxer = Gst.ElementFactory.make ("webmmux", "mux");
+			dynamic Element sink = Gst.ElementFactory.make ("filesink", "sink");
+#else
+			var muxer = Gst.ElementFactory.make ("webmmux", "mux");
+			var sink = Gst.ElementFactory.make ("filesink", "sink");
+#endif
+
 			//video bin
 			this.videobin = new Gst.Bin ("video");
+
 			try {
-				#if GSTREAMER_0_10_IS_DEFINED
-					videobin = (Gst.Bin)parse_bin_from_description (
-					"ximagesrc name=\"videosrc\" ! video/x-raw-rgb, framerate=15/1 !
-					ffmpegcolorspace ! vp8enc name=\"encoder\" ! queue", true);
-				#else
-					videobin = (Gst.Bin)parse_bin_from_description (
-					"ximagesrc name=\"videosrc\" ! video/x-raw, framerate=24/1 ! videoconvert ! vp8enc name=\"encoder\" ! queue", true);
-				#endif
-			}catch (Error e){ stderr.printf ("Error: %s\n", e.message);}
+#if GSTREAMER_0_10_IS_DEFINED
+					videobin = (Gst.Bin)Gst.parse_bin_from_description (
+							"ximagesrc name=\"videosrc\" ! video/x-raw-rgb, framerate=15/1 !
+							ffmpegcolorspace ! vp8enc name=\"encoder\" ! queue", true);
+#else
+					videobin = (Gst.Bin)Gst.parse_bin_from_description (
+							"ximagesrc name=\"videosrc\" ! video/x-raw, framerate=24/1 ! videoconvert ! vp8enc name=\"encoder\" ! queue", true);
+#endif
+			} catch (Error e) {
+				stderr.printf ("Error: %s\n", e.message);
+			}
 
 			//audio bin
 			this.audiobin = new Gst.Bin ("audio");
-			try{
-				audiobin = (Gst.Bin)parse_bin_from_description ("pulsesrc name=\"audiosrc\" !
-				                  audioconvert ! audioresample ! audiorate ! vorbisenc ! queue", true);
-			}catch (Error e){ stderr.printf ("Error: %s\n", e.message);}
 
+			try {
+				audiobin = (Gst.Bin)Gst.parse_bin_from_description ("pulsesrc name=\"audiosrc\" !
+						audioconvert ! audioresample ! audiorate ! vorbisenc ! queue", true);
+			} catch (Error e) {
+				stderr.printf ("Error: %s\n", e.message);
+			}
 
 			string cores;
-			try{
+
+			try	{
 				Process.spawn_command_line_sync ("cat /sys/devices/system/cpu/online", out cores);
-			}catch (Error e){warning (e.message);}
+			} catch (Error e) {
+				warning (e.message);
+			}
 
 			//configure
-			assert( sink != null ) ;
+			assert( sink != null );
 			sink.set ("location", settings.destination);
-			var src = videobin.get_by_name ("videosrc") ;
-			assert (src != null) ;
+
+			var src = videobin.get_by_name ("videosrc");
+
+			assert (src != null);
+
 			src.set ("startx", this.settings.sx);
 			src.set ("starty", this.settings.sy);
- 			src.set ("endx",   this.settings.ex);
+			src.set ("endx",   this.settings.ex);
 			src.set ("endy",   this.settings.ey);
 			src.set ("use-damage", false);
 			src.set ("screen-num", this.settings.monitor);
 
 			//videobin.get_by_name ("encoder").set  ("mode", 1);
-			var encoder = videobin.get_by_name ("encoder") ;
-			assert (encoder != null) ;
-			#if GSTREAMER_0_10_IS_DEFINED
+			var encoder = videobin.get_by_name ("encoder");
+
+			assert (encoder != null);
+
+#if GSTREAMER_0_10_IS_DEFINED
 			encoder.set ("quality", 8.0);
 			encoder.set ("speed", 6);
 			encoder.set ("max-keyframe-distance", 150);
-			#else
+#else
 			// From these values see https://mail.gnome.org/archives/commits-list/2012-September/msg08183.html
 			encoder.set ("min_quantizer", 13);
 			encoder.set ("max_quantizer", 13);
 			encoder.set ("cpu-used", 5);
 			encoder.set ("deadline", 1000000);
-			#endif
+#endif
 			encoder.set ("threads", int.parse (cores.substring (2)));
 
-
-			if (pipeline==null||muxer==null||sink==null||videobin==null||audiobin==null){
+			if (pipeline == null || muxer == null || sink == null || videobin == null || audiobin == null){
 				stderr.printf ("Error: Elements weren't made correctly!\n");
 			}
 
@@ -623,61 +661,75 @@
 			else
 				pipeline.add_many (videobin, muxer, sink);
 
-
-			var video_pad = videobin.get_static_pad ("src") ;
-			assert (video_pad != null ) ;
-			#if GSTREAMER_0_10_IS_DEFINED
-				var m = muxer.get_request_pad ("video_%d") ;
-			#else
-				var m = muxer.get_request_pad ("video_%u") ;
-			#endif
-			assert (m != null ) ;
+			var video_pad = videobin.get_static_pad ("src");
+
+			assert (video_pad != null );
+
+#if GSTREAMER_0_10_IS_DEFINED
+				var m = muxer.get_request_pad ("video_%d");
+#else
+				var m = muxer.get_request_pad ("video_%u");
+#endif
+
+			assert (m != null);
+
 			video_pad.link(m);
-			if (settings.audio){
-			#if GSTREAMER_0_10_IS_DEFINED
+
+			if (settings.audio) {
+#if GSTREAMER_0_10_IS_DEFINED
 				audiobin.get_static_pad ("src").link (muxer.get_request_pad ("audio_%d"));
-			#else
+#else
 				audiobin.get_static_pad ("src").link (muxer.get_request_pad ("audio_%u"));
-			#endif
+#endif
 			}
+
 			muxer.link (sink);
-			#if GSTREAMER_0_10_IS_DEFINED
+#if GSTREAMER_0_10_IS_DEFINED
 				pipeline.get_bus ().add_watch (bus_message_cb);
-			#else
+#else
 				pipeline.get_bus ().add_watch (Priority.DEFAULT, bus_message_cb);
-			#endif
-			pipeline.set_state (State.READY);
+#endif
+
+			pipeline.set_state (Gst.State.READY);
 
 			if (selectionarea != null)
 				selectionarea.to_discrete ();
 
-			pipeline.set_state (State.PLAYING);
+			pipeline.set_state (Gst.State.PLAYING);
 			this.recording = true;
 		}
 
 		public void finish_recording () {
-			if ( ! this.recording ) {
+			if (!this.recording) {
 				debug ("resuming recording\n");
-				this.pipeline.set_state(State.PLAYING);
+
+				this.pipeline.set_state(Gst.State.PLAYING);
 				this.recording = true;
 			}
-			pipeline.send_event (new Event.eos());
+
+			pipeline.send_event (new Gst.Event.eos ());
 		}
 
-		private bool bus_message_cb (Gst.Bus bus, Message msg){
-			switch (msg.type){
+		private bool bus_message_cb (Gst.Bus bus, Gst.Message msg) {
+			switch (msg.type) {
 				case Gst.MessageType.ERROR:
-					GLib.Error err; string debug;
+					GLib.Error err;
+
+					string debug;
+
 					msg.parse_error (out err, out debug);
 
 					display_error ("Eidete encountered a gstreamer error while recording, creating a screencast is not possible:\n%s\n\n[%s]"
 						.printf (err.message, debug), true);
 					stderr.printf ("Error: %s\n", debug);
-					pipeline.set_state (State.NULL);
+					pipeline.set_state (Gst.State.NULL);
+
 					break;
 				case Gst.MessageType.EOS:
 					debug ("received EOS\n");
-					pipeline.set_state (State.NULL);
+
+					pipeline.set_state (Gst.State.NULL);
+
 					this.recording = false;
 
 					var end = new Eidete.Widgets.EndDialog (this);
@@ -688,27 +740,30 @@
 				default:
 					break;
 			}
+
 			return true;
 		}
 
 		//only visuals
-		public void switch_to_paused (bool to_normal){
-
-			if (to_normal){
+		public void switch_to_paused (bool to_normal) {
+			if (to_normal) {
 				this.main_window.title = _("Recording paused");
-                                tabs.hide () ;
-                                stack_switcher.hide () ;
-                                pause_grid.show () ;
+
+				tabs.hide ();
+				stack_switcher.hide ();
+				pause_grid.show ();
+
 				this.main_window.icon_name = "eidete";
 				this.app_icon = "eidete";
-
-			}else{
+			} else {
 				this.main_window.title = _("Pause recording");
+
 				if (tabs.visible) {
-					tabs.hide () ;
-                                        stack_switcher.hide () ;
-                                        pause_grid.show () ;
+					tabs.hide ();
+					stack_switcher.hide ();
+					pause_grid.show ();
 				}
+
 				this.main_window.icon_name = "media-playback-pause";
 				this.app_icon = "media-playback-pause";
 				
@@ -744,17 +799,19 @@
 static const OptionEntry[] entries = {
 	{"pause", 'n', 0, OptionArg.NONE, ref pause_rec, N_("Pause Recording"), ""},
 	{"finish", 'n', 0, OptionArg.NONE, ref finish_rec, N_("Finish Recording"), ""},
-	{ null }
+	{null}
 };
 
-
 public static int main (string [] args) {
 	var context = new OptionContext ("ctx");
 	context.add_main_entries (entries, "eidete");
 	context.add_group (Gtk.get_option_group (true));
-	try{
+
+	try {
 		context.parse (ref args);
-	}catch (Error e){ error ("Error: "+e.message);}
+	} catch (Error e) {
+		error ("Error: " + e.message);
+	}
 
 	Gst.init (ref args);
 
 
=== modified file 'src/keycapture.c'
--- src/keycapture.c	2015-01-04 14:30:20 +0000
+++ src/keycapture.c	2015-01-05 22:47:30 +0000
@@ -4,12 +4,14 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/record.h> //libxtst-dev, Xtst
+
 #ifdef GSTREAMER_0_10_IS_DEFINED
-#include <gstreamer-0.10/gst/gst.h>
-#include <gstreamer-0.10/gst/gstinterface.h>
+	#include <gstreamer-0.10/gst/gst.h>
+	#include <gstreamer-0.10/gst/gstinterface.h>
 #else
-#include <gstreamer-1.0/gst/gst.h>
+	#include <gstreamer-1.0/gst/gst.h>
 #endif
+
 /*
 GList *list_devices (){
 	GstElement *pulsesrc = gst_element_factory_make ("pulsesrc", "src");
@@ -24,32 +26,30 @@
 void key_pressed_cb(XPointer arg, XRecordInterceptData *d) {
 	if (d->category != XRecordFromServer) return;
 
-    xEvent* event = (xEvent*)d->data;
-    
+	xEvent* event = (xEvent*)d->data;
+
 	unsigned char type = ((unsigned char*)d->data)[0] & 0x7F;
 	unsigned char detail = ((unsigned char*)d->data)[1];
-    unsigned int shiftlevel = 0;
-
-    if( event->u.keyButtonPointer.state == 0 ||
-        event->u.keyButtonPointer.state == 1 ) {
-        shiftlevel = event->u.keyButtonPointer.state;
-    }
-	
+	unsigned int shiftlevel = 0;
+
+	if(event->u.keyButtonPointer.state == 0 || event->u.keyButtonPointer.state == 1 )
+		shiftlevel = event->u.keyButtonPointer.state;
+
 	switch (type) {
-	    case KeyPress:
-		    g_signal_emit_by_name (arg, "captured", XKeysymToString (XkbKeycodeToKeysym (dpy, detail, 0, shiftlevel)), FALSE);
-		    break;
-	    case KeyRelease:
-		    g_signal_emit_by_name (arg, "captured", XKeysymToString (XkbKeycodeToKeysym (dpy, detail, 0, shiftlevel)), TRUE);
-		    break;
-        case ButtonPress:
-            g_signal_emit_by_name (arg, "captured-mouse", event->u.keyButtonPointer.rootX, event->u.keyButtonPointer.rootY, event->u.u.detail);
-            break;
-        case MotionNotify:
-            g_signal_emit_by_name (arg, "captured-move", event->u.keyButtonPointer.rootX, event->u.keyButtonPointer.rootY);
-            break;
-	    default:
-	        break;
+		case KeyPress:
+			g_signal_emit_by_name (arg, "captured", XKeysymToString (XkbKeycodeToKeysym (dpy, detail, 0, shiftlevel)), FALSE);
+			break;
+		case KeyRelease:
+			g_signal_emit_by_name (arg, "captured", XKeysymToString (XkbKeycodeToKeysym (dpy, detail, 0, shiftlevel)), TRUE);
+			break;
+		case ButtonPress:
+			g_signal_emit_by_name (arg, "captured-mouse", event->u.keyButtonPointer.rootX, event->u.keyButtonPointer.rootY, event->u.u.detail);
+			break;
+		case MotionNotify:
+			g_signal_emit_by_name (arg, "captured-move", event->u.keyButtonPointer.rootX, event->u.keyButtonPointer.rootY);
+			break;
+		default:
+			break;
 	}
 
 	XRecordFreeData (d);
@@ -59,23 +59,27 @@
 	XRecordClientSpec rcs;
 	XRecordRange* rr;
 	dpy = XOpenDisplay (0);
-	
+
 	XKeysymToString (XkbKeycodeToKeysym (dpy, 11, 1, 0));
-	
+
 	if (!(rr = XRecordAllocRange())) {
 		fprintf(stderr, "XRecordAllocRange error\n");
 	}
+
 	rr->device_events.first = KeyPress;
 	rr->device_events.last = MotionNotify;
 	rcs = XRecordAllClients;
-	
+
 	if (!(rc = XRecordCreateContext(dpy, 0, &rcs, 1, &rr, 1))) {
 		fprintf(stderr, "XRecordCreateContext error\n");
 	}
+
 	XFree(rr);
+
 	if (!XRecordEnableContext(dpy, rc, key_pressed_cb, data)) {
 		fprintf(stderr, "XRecordEnableContext error\n");
 	}
+
 	return 0;
 }
 
 
=== modified file 'src/videobin_uploader.vala'
--- src/videobin_uploader.vala	2015-01-04 11:44:37 +0000
+++ src/videobin_uploader.vala	2015-01-05 22:47:30 +0000
@@ -1,64 +1,70 @@
-using Gtk;
-
-public class Uploader : Window{
-	
-	class LLabel : Label{
-		public LLabel (string label){
-			this.set_halign (Align.START);
+public class Uploader : Gtk.Window {
+	class LLabel : Gtk.Label {
+		public LLabel (string label) {
+			this.set_halign (Gtk.Align.START);
 			this.label = label;
 		}
-		public LLabel.indent (string label){
+
+		public LLabel.indent (string label) {
 			this (label);
 			this.margin_left = 10;
 		}
-		public LLabel.markup (string label){
+
+		public LLabel.markup (string label) {
 			this (label);
 			this.use_markup = true;
 		}
-		public LLabel.right (string label){
-			this.set_halign (Align.END);
+
+		public LLabel.right (string label) {
+			this.set_halign (Gtk.Align.END);
 			this.label = label;
 		}
-		public LLabel.right_with_markup (string label){
-			this.set_halign (Align.END);
+
+		public LLabel.right_with_markup (string label) {
+			this.set_halign (Gtk.Align.END);
 			this.use_markup = true;
 			this.label = label;
 		}
 	}
-	
-	
-	public Uploader (File file){
+
+	public Uploader (File file) {
 		this.title = "Upload to videobin.org";
-		this.set_default_size (300, 1);
-		this.window_position = WindowPosition.CENTER;
-		
-		var grid = new Grid ();
+		this.set_default_size (300, -1);
+		this.window_position = Gtk.WindowPosition.CENTER;
+
+		var grid = new Gtk.Grid ();
 		grid.margin = 12;
 		grid.column_spacing = 12;
 		grid.row_spacing = 5;
-		
-		var title = new Entry ();
-		title.placeholder_text = _("Optional") ;
-		var description = new Entry ();
-		description.placeholder_text = _("Optional") ;
-		var email = new Entry ();
-		email.placeholder_text = _("Optional") ;
-		var img = new Image.from_icon_name ("videobin", IconSize.DIALOG);
-		
-		var upload_button = new Button.with_label (_("Upload"));
+
+		var title = new Gtk.Entry ();
+		title.placeholder_text = _("Optional");
+
+		var description = new Gtk.Entry ();
+		description.placeholder_text = _("Optional");
+
+		var email = new Gtk.Entry ();
+		email.placeholder_text = _("Optional");
+
+		var img = new Gtk.Image.from_icon_name ("videobin", Gtk.IconSize.DIALOG);
+
+		var upload_button = new Gtk.Button.with_label (_("Upload"));
 		upload_button.get_style_context ().add_class ("suggested-action");
-		var cancel = new Button.from_stock (Stock.CANCEL);
+
+		var cancel = new Gtk.Button.from_stock (Gtk.Stock.CANCEL);
 		cancel.margin_end = 6;
-		
-		var bbox = new Box (Orientation.HORIZONTAL, 0);
+
+		var bbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
 		bbox.pack_end (upload_button, false, true, 0);
 		bbox.pack_end (cancel, false, true, 0);
-		
+
 		email.set_tooltip_text (_("Your email address for relocating your videos"));
-		upload_button.image = new Image.from_icon_name ("mail-reply-sender", IconSize.BUTTON);
+
+		upload_button.image = new Gtk.Image.from_icon_name ("mail-reply-sender", Gtk.IconSize.BUTTON);
 		upload_button.can_default = true;
+
 		this.set_default (upload_button);
-		
+
 		grid.attach (img, 0, 0, 1, 2);
 		grid.attach (new LLabel ("Title"), 1, 0, 1, 1);
 		grid.attach (title, 2, 0, 1, 1);
@@ -67,55 +73,66 @@
 		grid.attach (new LLabel ("Description"), 1, 2, 1, 1);
 		grid.attach (description, 2, 2, 1, 1);
 		grid.attach (bbox, 0, 3, 3, 1);
-		
+
 		this.add (grid);
 		this.destroy.connect (Gtk.main_quit);
-		
+
 		cancel.clicked.connect (Gtk.main_quit);
-		
-		upload_button.clicked.connect ( () => {
+
+		upload_button.clicked.connect (() => {
 			string url;
-			string path = file.get_path() ;
-			if( path.has_prefix ("'") && path.has_suffix ("'"))
-			        path = path.substring (1, path.length-2) ;
-			string command = "curl -F\"api=1\" -F\"videoFile=@"+path+"\" ";
+			string path = file.get_path();
+
+			if (path.has_prefix ("'") && path.has_suffix ("'"))
+				path = path.substring (1, path.length-2);
+
+			string command = "curl -F\"api=1\" -F\"videoFile=@" + path + "\" ";
+
 			if (email.text != "")
-				command += "-F\"email="+email.text+"\" ";
+				command += "-F\"email=%s\" ".printf (email.text);
+
 			if (title.text != "")
-				command += "-F\"title="+title.text+"\" ";
+				command += "-F\"title=%s\" ".printf (title.text);
+
 			if (description.text != "")
-				command += "-F\"description="+description.text+"\" ";
+				command += "-F\"description=%s\" ".printf (description.text);
+
 			command += "http://videobin.org/add";
-			try{
+
+			try {
 				Process.spawn_command_line_sync (command, out url);
-			}catch (Error e){error (e.message);}
-			try{
-			        if( url == null || url == "" ) 
-			        {
-			                warning( "The upload has failed. Command: %s", command) ;
-			        }
-			        else
-				Process.spawn_command_line_async ("sensible-browser "+url);
-			}catch (Error e){error (e.message);}
+			} catch (Error e) {
+				error (e.message);
+			}
+
+			try {
+				if (url == null || url == "") {
+					warning("The upload has failed. Command: %s", command);
+				} else {
+					Process.spawn_command_line_async ("sensible-browser " + url);
+				}
+			} catch (Error e) {
+				error (e.message);
+			}
+
 			Gtk.main_quit ();
 		});
 	}
-	
 }
 
-public static void main (string [] args){
+public static void main (string [] args) {
 	Gtk.init (ref args);
-	if( args.length<=1) 
-	{
-	        warning ("You must provide a valid file path" ) ;
+
+	if (args.length <= 1) {
+		warning ("You must provide a valid file path");
+	} else {
+		var path = args[1];
+		var file = File.new_for_path (path);
+
+		var dialog = new Uploader (file);
+		dialog.show_all ();
+
+		Gtk.main ();
 	}
-	else 
-	{
-	        var path = args[1] ; 
-	        var file = File.new_for_path (path);
-	        var dialog = new Uploader (file);
-	        dialog.show_all ();
-	        Gtk.main ();
-        }
 }