Merge lp:~elementary-apps/eidete/fix-for-freya into lp:eidete

[Tom Beckmann]

Make eidete work for elementary freya:
   - port it to gstreamer 1.0
   - fix contractors
   - fix video-bin (though videobin.org doesn't support webm files anymore)
   - update styling
   - update pot
   - fix misc issues

Note: the project is still compatible with gstreamer 0.10 and luna (see makefile for more info)

Make eidete work for elementary freya: fixing issues and port it to gstreamer 1.0.
The project is still compatible with gstreamer 0.10 (see makefile for more info)

(this is a more public (in terms of access rights) copy of the original 314 compatibility branch)

[lp:~elementary-apps/eidete/fix-for-freya]

205. By Tom Beckmann on 2015-01-04

fix a bunch of compiler warnings

206. By PerfectCarl on 2015-01-04

Fix the pause windows

207. By PerfectCarl on 2015-01-04

Fix size issues

[PerfectCarl (name-is-carl)]

Approved

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-29 17:06:50 +0000
+++ CMakeLists.txt	2015-01-04 16:20:24 +0000
@@ -16,20 +16,44 @@
 set (PKGDATADIR "${DATADIR}/eidete")
 set (GETTEXT_PACKAGE "eidete")
 set (RELEASE_NAME "Feature rich and functional.")
-set (VERSION "0.1")
+set (VERSION "0.2")
 set (VERSION_INFO "Release")
 set (CMAKE_C_FLAGS "-ggdb")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DOLLAR "$")
 
+# Comment this out to enable C compiler warnings
+add_definitions (-w)
+
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
+# Building for GStreamer 1.0 by default
+# Uncomment the following line to build for GStreamer 0.10
+# set (USE_GSTREAMER_0_10 "TRUE")
+
+if(DEFINED USE_GSTREAMER_0_10) 
+    message ("-- Building eidete for GStreamer 0.10")
+    set(EXTRA_DEFINITIONS -DGSTREAMER_0_10_IS_DEFINED)
+    add_definitions(${EXTRA_DEFINITIONS})
+    set(GST_PACKAGES gstreamer-interfaces-0.10 gstreamer-0.10 gstreamer-pbutils-0.10)
+else ()     
+    message ("-- Building eidete for GStreamer 1.0")   
+    set(GST_PACKAGES gstreamer-1.0 gstreamer-pbutils-1.0)
+endif ()
+
 configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.cmake ${CMAKE_BINARY_DIR}/src/Config.vala)
-add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DWNCK_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs gstreamer-interfaces-0.10`)
+add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DWNCK_I_KNOW_THIS_IS_UNSTABLE)
 
 find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED gtk+-3.0>=3.10 libwnck-3.0 gstreamer-interfaces-0.10 gstreamer-0.10 gstreamer-pbutils-0.10 granite xtst gdk-x11-3.0 x11)
+pkg_check_modules(DEPS REQUIRED gtk+-3.0>=3.10
+    libwnck-3.0
+    granite
+    xtst
+    gdk-x11-3.0
+    x11
+    ${GST_PACKAGES})
 
+# TEST
 add_definitions(${DEPS_CFLAGS})
 
 link_libraries(${DEPS_LIBRARIES})
@@ -40,6 +64,7 @@
 ensure_vala_version("0.16.0" MINIMUM)
 
 include(ValaPrecompile)
+
 vala_precompile(VALA_C
     src/eidete.vala
     src/Widgets/countdown.vala
@@ -51,15 +76,14 @@
 PACKAGES
     granite
     gtk+-3.0
-    gstreamer-0.10
-    gstreamer-pbutils-0.10
-    gstreamer-interfaces-0.10
+    ${GST_PACKAGES}
     libwnck-3.0
     gdk-x11-3.0
 OPTIONS
-    -X -lXtst
+    --enable-experimental
     --thread
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
+    ${EXTRA_DEFINITIONS}
     )
 
 vala_precompile(VALA_C_VIDEOBIN
@@ -79,4 +103,4 @@
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.desktop DESTINATION share/applications)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/eidete.svg DESTINATION share/icons/hicolor/48x48/apps)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.svg DESTINATION share/icons/hicolor/48x48/apps)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
 \ No newline at end of file
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/videobin.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
 
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2015-01-04 16:20:24 +0000
@@ -0,0 +1,22 @@
+## Introduction
+
+A simple screencasting app for the elementary project
+
+Current Features
+- encoding to webm
+- selection of the area to be recorded
+- display of the pressed keys
+- audio recording
+
+For more information go to: https://launchpad.net/eidete
+
+## How to build
+Install dependencies
+    sudo apt-get build-dep eidete 
+OR 
+    sudo apt-get build-dep granite-demo
+    sudo apt-get install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+
+    mkdir build && cd build
+    cmake -DCMAKE_INSTALL_PREFIX=/usr ../ 
+    make
 
=== modified file 'po/eidete.pot'
--- po/eidete.pot	2013-05-17 20:02:58 +0000
+++ po/eidete.pot	2015-01-04 16:20:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-17 23:02+0300\n"
+"POT-Creation-Date: 2015-01-04 12:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,183 +17,198 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/kristjan/translations/po/../src/desktop_launcher.vala:5
-msgid "Record screencasts"
-msgstr ""
-
-#: /home/kristjan/translations/po/../src/desktop_launcher.vala:6
-msgid "Screencaster"
-msgstr ""
-
-#: /home/kristjan/translations/po/../src/videobin_uploader.vala:45
-msgid "Upload"
-msgstr ""
-
-#: /home/kristjan/translations/po/../src/savedialog.vala:8
-#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:28
-#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:64
-#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:100
-msgid "Save"
-msgstr ""
-
-#: /home/kristjan/translations/po/../src/eidete.vala:138
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:140
 msgid "Monitor"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:158
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:160
 msgid "Fullscreen"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:159
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:161
 msgid "Custom"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:170
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:172
 msgid "Default"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:179
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:181
 msgid "Sound"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:182
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:184
 msgid "Video"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:185
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:187
 msgid "Keyboard"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:188
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:190
 msgid "Mouse"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:191
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:193
 msgid "Start Recording"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:197
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:199
 msgid "About"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:210
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:212
 msgid "Record Computer Sounds"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:212
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:214
 msgid "Record from Microphone"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:215
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:217
 msgid "Record from Monitor"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:217
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:219
 msgid "Recording Area"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:219
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:221
 msgid "Width"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:221
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:223
 msgid "Height"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:245
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:247
 msgid "Pressed keys on screen"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:248
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:250
 msgid "Mouse clicks on screen"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:250
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:252
 msgid "Circle around the cursor"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:256
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:258
 msgid "Behavior"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:257
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:259
 msgid "Appearance"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:449
-#: /home/kristjan/translations/po/../src/eidete.vala:456
-#: /home/kristjan/translations/po/../src/eidete.vala:641
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:461
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:682
 msgid "Recording paused"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:459
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:464
 msgid "You can continue or finish the recording now"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:468
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:473
 msgid "Continue"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:469
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:474
 msgid "Continue recording"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:472
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:477
 msgid "Finish"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:473
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:478
 msgid "Stop the recording and save the file"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:476
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:481
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:50
 msgid "Cancel"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:477
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:482
 msgid "Cancel the recording without saving the file"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:651
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:690
 msgid "Pause recording"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:671
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:719
 msgid "Pause Recording"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/eidete.vala:672
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/eidete.vala:720
 msgid "Finish Recording"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:24
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/desktop_launcher.vala:5
+msgid "Record screencasts"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/desktop_launcher.vala:6
+msgid "Screencaster"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:40
 msgid "Recording complete"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:33
-msgid "Don't save"
-msgstr ""
-
-#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:62
-msgid "Could not contact Contractor. Click the Save button to save the file."
-msgstr ""
-
-#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:48
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:44
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:107
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:146
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:226
+msgid "Save"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:144
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:224
+msgid "Could not contact Contractor."
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:214
+msgid "Save file"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/end_dialog.vala:216
+msgid "Execute"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/countdown.vala:27
+msgid "Recording starts in"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/countdown.vala:34
+msgid "Focus Eidete to stop recording"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/keyview.vala:48
 msgid "Left"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:51
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/keyview.vala:51
 msgid "Middle"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:54
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/Widgets/keyview.vala:54
 msgid "Right"
 msgstr ""
 
-#: /home/kristjan/translations/po/../src/Widgets/countdown.vala:27
-msgid "Recording starts in"
-msgstr ""
-
-#: /home/kristjan/translations/po/../src/Widgets/countdown.vala:34
-msgid "Focus Eidete to stop recording"
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/videobin_uploader.vala:41
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/videobin_uploader.vala:43
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/videobin_uploader.vala:45
+msgid "Optional"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/videobin_uploader.vala:48
+msgid "Upload"
+msgstr ""
+
+#: /home/cran/Documents/Projects/elementary/eidete/fix-for-freya/po/../src/videobin_uploader.vala:57
+msgid "Your email address for relocating your videos"
 msgstr ""
 
=== modified file 'src/Widgets/end_dialog.vala'
--- src/Widgets/end_dialog.vala	2013-05-15 15:57:25 +0000
+++ src/Widgets/end_dialog.vala	2015-01-04 16:20:24 +0000
@@ -1,122 +1,238 @@
 using Gtk;
 
-
 namespace Eidete.Widgets {
 
-	private bool contractor;
+	public class EndDialog : Dialog {
 
-	public class EndDialog : Window {
+		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.set_default_size (400, 200);
+			this.app = app ; 
+			//build_ui () ;
+			this.window_position = 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 ();
-			this.window_position = WindowPosition.CENTER;
+			        app.keyview.destroy ();
+            
 			this.icon_name = "eidete";
 
-			var grid = new Grid ();
+			grid = new Grid ();
 			grid.margin = 12;
 
+			var content = (Gtk.Box) this.get_content_area () ;
 			var title = new Label ("<span size='30000'>"+_("Recording complete")+"</span>");
 			title.use_markup = true;
 			title.halign = Align.START;
 
-			var export = new Button.with_label (_("Save"));
+			export = new Button.with_label (_("Save"));
 			export.image = new Image.from_stock (Stock.SAVE, IconSize.BUTTON);
 			export.can_default = true;
+			export.get_style_context ().add_class ("suggested-action");
 			this.set_default (export);
 
-			var cancel = new Button.with_label (_("Don't save"));
+			var cancel = new Button.with_label (_("Cancel"));
 			cancel.image = new Image.from_stock (Stock.DELETE, IconSize.BUTTON);
-			cancel.halign = Align.END;
+			cancel.margin_end = 6;
 
 			var bbox = new ButtonBox (Orientation.HORIZONTAL);
+			bbox.homogeneous = true;
 			bbox.pack_end (cancel, false, true, 0);
 			bbox.pack_end (export, false, true, 0);
 			bbox.layout_style = ButtonBoxStyle.END;
 
-			//contractor
-			var list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
-			var t = new TreeView.with_model (list);
-			t.headers_visible = false;
-			t.hexpand = true;
+
+			list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
+			treeview = new 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) ;
 
 			var cell1 = new CellRendererPixbuf ();
 			cell1.set_padding (5, 15);
-			t.insert_column_with_attributes (-1, "", cell1, "pixbuf", 0);
+			treeview.insert_column_with_attributes (-1, "", cell1, "pixbuf", 0);
 			var cell2 = new CellRendererText ();
 			cell2.set_padding (2, 15);
-			t.insert_column_with_attributes (-1, "", cell2, "markup", 1);
-
-
-			var c = Granite.Services.Contractor.get_contract (app.settings.destination, "video");
-			if (c == null || c.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. Click the Save button to save the file.")));
-				grid.attach (info, 0, 3, 2, 1);
-				export.label = _("Save");
-			}else{
-				contractor = true;
-				for (var i=0;i<c.length; i++){
-					TreeIter it;
-					list.append (out it);
-					Gdk.Pixbuf icon = null;
-					try{
-						icon = IconTheme.get_default ().load_icon (c[i].lookup ("IconName"), 32, 0);
-					}catch (Error e){warning (e.message);}
-					list.set (it, 0, icon, 1,
-					    "<b>"+c[i].lookup ("Name")+"</b>\n"+c[i].lookup ("Description"));
-				}
-				t.set_cursor (new TreePath.from_string ("0"), null, false);
-			}
-
+			treeview.insert_column_with_attributes (-1, "", cell2, "markup", 1);
+
+			//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 (t, 0, 4, 1, 1);
+			grid.attach (scrolled, 0, 4, 1, 1);
 			grid.attach (new 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 ( () => {
-					TreePath path;
-					t.get_cursor (out path, null);
-					try{
-						Process.spawn_command_line_async (c[int.parse (path.to_string ())].lookup ("Exec"));
-					}catch (Error e){
-						print(e.message);
-					}
-					this.destroy ();
-				});
+			        export.clicked.connect (on_contract_executed) ;
 			} else {
-				export.clicked.connect ( () => {
-					var source = File.new_for_path (app.settings.destination);
-					var file = new FileChooserDialog (_("Save"), null, FileChooserAction.SAVE, Stock.OK, ResponseType.OK);
-					file.set_current_name (source.get_basename ());
-					file.do_overwrite_confirmation = true;
-					var res = file.run ();
-					if (res == ResponseType.OK){
-						var destination = File.new_for_path (file.get_filename ());
-						try{
-							source.copy (destination, FileCopyFlags.OVERWRITE);
-						}catch (GLib.Error e){stderr.printf ("Error: %s\n", e.message);}
-
-						file.destroy ();
-						this.destroy ();
-					}else{
-						file.destroy ();
-					}
-				});
+			        export.clicked.connect ( () => {
+			                save_file () ;
+			                this.destroy ();
+			        });
 			}
 			cancel.clicked.connect ( () => {this.destroy  ();});
 
-			this.add (grid);
+			content.add (grid);
+		}
+		
+  		public void display () {
+  		        build_ui () ;
+  		        show_all () ;
+  		}      
+                
+		private void on_contract_executed () {
+			TreePath path;
+			treeview.get_cursor (out path, null);
+			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);
+			dialog.set_current_name (source.get_basename ());
+			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);
+			        }
+                        }
+			dialog.destroy ();
+		}
+		// Using deprecated Contractor API. Necesserary to maintain luna compatibility
+#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);
+			}
+		}
+           
+		private HashTable<string,string>[] contracts_dep ; 
+        
+		private void load_contracts_deprecated () {
+			// 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);
+			}
+		}
+#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");
+			}
 		}
 	}
 }
 
=== modified file 'src/Widgets/keyview.vala'
--- src/Widgets/keyview.vala	2013-05-17 01:00:15 +0000
+++ src/Widgets/keyview.vala	2015-01-04 16:20:24 +0000
@@ -243,7 +243,10 @@
 			if (mouse_circle) {
 			    this.circle = new YellowCircle (mouse_circle_color);
 		        this.captured_move.connect ( (x, y) => {
-		            this.circle.move (x, y);
+			    Idle.add (() => {
+				this.circle.move (x, y);
+				return false;
+			    });
 		            //debug ("Moved to %i, %i\n", x, y);
 		        });
 		    }
@@ -257,175 +260,182 @@
 
 			if (keyboard)
 			this.captured.connect ( (keyvalue, 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 ()) &&
-					    (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 ();
-						}
-					}
-				}
+				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 ()) &&
+				(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 ();
+			    }
+			}
+		    }
+		}
+
 		public void capture (){
 			try{
 				Thread.create<void*> (this.intercept_key_thread, true);
 
=== modified file 'src/Widgets/selectionarea.vala'
--- src/Widgets/selectionarea.vala	2012-04-04 00:02:38 +0000
+++ src/Widgets/selectionarea.vala	2015-01-04 16:20:24 +0000
@@ -42,38 +42,41 @@
 			});
 
 			this.configure_event.connect ((e) => {
+				var screen_width = Gdk.Screen.width ();
+				var screen_height = Gdk.Screen.height ();
+
 				// check if coordinates are out of the screen and check
 				// 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 > e.window.get_screen().width() ) {
+				if( e.x < 0 || e.x > screen_width ) {
 					x = 0;
-				} else if( e.x + e.width > e.window.get_screen().width()
-						   && e.width < e.window.get_screen().width() ) {
-					x = e.window.get_screen().width() - e.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 ) {
 					y = 0;
-				} else if( e.y + e.height >= e.window.get_screen().height()
-						   && e.height < e.window.get_screen().height() ) {
-					y = e.window.get_screen().height() - e.height - 1;
+				} else if( e.y + e.height >= screen_height
+						   && e.height < screen_height ) {
+					y = screen_height - e.height - 1;
 				} else {
 					y = e.y;
 				}
 
 				// 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 > e.window.get_screen().width() ) {
-					w = e.window.get_screen().width() - x;
+				if( x + e.width > screen_width ) {
+					w = screen_width - x;
 				} else {
 					w = e.width;
 				}
 
-				if( y + e.height > e.window.get_screen().height() ) {
-					h = e.window.get_screen().height() - y;
+				if( y + e.height > screen_height ) {
+					h = screen_height - y;
 				} else {
 					h = e.height;
 				}
 
=== modified file 'src/eidete.vala'
--- src/eidete.vala	2014-05-29 17:08:23 +0000
+++ src/eidete.vala	2015-01-04 16:20:24 +0000
@@ -1,4 +1,3 @@
-//valac --pkg gtk+-3.0 --pkg gstreamer-0.10 --pkg gstreamer-pbutils-0.10 --pkg granite screencast.vala
 
 using Gst;
 using Granite;
@@ -81,9 +80,10 @@
 		public Window main_window;
 		public Eidete.Widgets.KeyView keyview;
 		public Eidete.Widgets.SelectionArea selectionarea;
-		public Granite.Widgets.StaticNotebook tabs;
-		public Grid pause_grid;
-		public Image pause_icon;
+		private Gtk.Stack tabs;
+		private 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;
@@ -93,8 +93,8 @@
 		public bool recording;
 		public bool typing_size;
 
-        public Gst.Bin videobin;
-        public Gst.Bin audiobin;
+		public Gst.Bin videobin;
+		public Gst.Bin audiobin;
 
 		public EideteApp (){
 		}
@@ -125,12 +125,7 @@
 			  UI
 			*/
 
-			tabs = new Granite.Widgets.StaticNotebook (false);
-			tabs.margin = 12;
-
-			pause_icon = new Image.from_icon_name ("media-playback-pause", IconSize.DIALOG);
-			pause_icon.pixel_size = 64;
-
+			tabs = new Gtk.Stack ();
 
 			var grid = new Grid ();
 			grid.column_spacing = 12;
@@ -140,6 +135,7 @@
 			var monitors_combo = new ComboBoxText ();
 			monitors_combo.hexpand = true;
 			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)
@@ -148,12 +144,10 @@
 			var width = new SpinButton.with_range (50, Gdk.Screen.get_default ().get_width (), 1);
 			width.max_length = 4;
 			width.margin_left = 1;
-			width.margin_right = -4;
 
 			var height = new SpinButton.with_range (50, Gdk.Screen.get_default ().get_height (), 1);
 			height.max_length = 4;
 			height.margin_left = 1;
-			height.margin_right = -4;
 			width.set_sensitive (false);
 			height.set_sensitive (false);
 			width.halign = Align.START;
@@ -181,23 +175,24 @@
 			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"));
 			start_bt.can_default = true;
 			start_bt.get_style_context ().add_class ("noundo");
-
-			var cancel_bt = new Button.from_stock (Stock.CANCEL);
+			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);
@@ -212,7 +207,7 @@
 			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 (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 (audio_box, 1, 2, 1, 1);
@@ -258,10 +253,24 @@
 			grid2.row_spacing = 6;
 			grid2.hexpand = true;
 
-			tabs.append_page (grid, new Label (_("Behavior")));
-			tabs.append_page (grid2, new Label (_("Appearance")));
-
-			this.main_window.add (tabs);
+			tabs.add_titled (grid, "behavior", _("Behavior"));
+			tabs.add_titled (grid2, "apperance", _("Appearance"));
+
+			main_box = new Gtk.Grid ();
+			stack_switcher = new Gtk.StackSwitcher ();
+			stack_switcher.stack = tabs;
+			stack_switcher.halign = Gtk.Align.CENTER;
+			build_pause_ui () ;
+			pause_grid.show_all();
+			pause_grid.hide();
+			pause_grid.no_show_all = true;
+			main_box.attach (stack_switcher, 0, 0, 1, 1);
+			main_box.attach (tabs, 0, 1, 1, 1);
+			main_box.attach (pause_grid, 0, 2, 1, 1);
+			main_box.margin = 12;
+
+			this.main_window.add (main_box);
+			
 			this.main_window.show_all ();
 			this.main_window.present ();
 
@@ -353,11 +362,7 @@
 			settings.audio = false;
 			use_audio.toggled.connect ( () => {
 				settings.audio = use_audio.active;
-				if (use_audio.active){
-					audio_source.set_sensitive (true);
-				}else{
-					audio_source.set_sensitive (false);
-				}
+				audio_source.set_sensitive (use_audio.active);
 			});
 
 
@@ -433,6 +438,12 @@
 
 			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 ) ;
 		}
 
 		public override void activate (){
@@ -451,7 +462,7 @@
 
 			pause_grid = new Grid ();
 			pause_grid.margin = 12;
-			this.main_window.title = _("Recording paused");
+			//this.main_window.title = _("Recording paused");
 
 
 			var img_text_grid = new Grid ();
@@ -477,6 +488,7 @@
 			var stop_bt = new 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.get_style_context ().add_class ("suggested-action");
 
 			var cancel_bt = new Button.with_label (_("Cancel"));
 			cancel_bt.set_tooltip_text (_("Cancel the recording without saving the file"));
@@ -539,15 +551,25 @@
 			}
 
 			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
 			//video bin
 			this.videobin = new Gst.Bin ("video");
 			try {
-				videobin = (Gst.Bin)parse_bin_from_description (
-				    "ximagesrc name=\"videosrc\" ! video/x-raw-rgb, framerate=15/1 !
-				     ffmpegcolorspace ! vp8enc name=\"encoder\" ! queue", true);
+				#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);}
 
 			//audio bin
@@ -564,19 +586,32 @@
 			}catch (Error e){warning (e.message);}
 
 			//configure
+			assert( sink != null ) ;
 			sink.set ("location", settings.destination);
-			videobin.get_by_name ("videosrc").set ("startx", this.settings.sx);
-			videobin.get_by_name ("videosrc").set ("starty", this.settings.sy);
-			videobin.get_by_name ("videosrc").set ("endx",   this.settings.ex);
-			videobin.get_by_name ("videosrc").set ("endy",   this.settings.ey);
-			videobin.get_by_name ("videosrc").set ("use-damage", false);
-			videobin.get_by_name ("videosrc").set ("screen-num", this.settings.monitor);
+			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 ("endy",   this.settings.ey);
+			src.set ("use-damage", false);
+			src.set ("screen-num", this.settings.monitor);
 
 			//videobin.get_by_name ("encoder").set  ("mode", 1);
-			videobin.get_by_name ("encoder").set  ("quality", 8.0);
-			videobin.get_by_name ("encoder").set  ("speed", 6);
-			videobin.get_by_name ("encoder").set  ("max-keyframe-distance", 150);
-			videobin.get_by_name ("encoder").set  ("threads", int.parse (cores.substring (2)));
+			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
+			// 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
+			encoder.set ("threads", int.parse (cores.substring (2)));
 
 
 			if (pipeline==null||muxer==null||sink==null||videobin==null||audiobin==null){
@@ -589,14 +624,28 @@
 				pipeline.add_many (videobin, muxer, sink);
 
 
-			videobin.get_static_pad ("src").link(muxer.get_request_pad ("video_%d"));
-			if (settings.audio)
-				audiobin.get_static_pad ("src").link(muxer.get_request_pad ("audio_%d"));
-
+			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
+				audiobin.get_static_pad ("src").link (muxer.get_request_pad ("audio_%d"));
+			#else
+				audiobin.get_static_pad ("src").link (muxer.get_request_pad ("audio_%u"));
+			#endif
+			}
 			muxer.link (sink);
-
-			pipeline.get_bus ().add_watch (bus_message_cb);
-
+			#if GSTREAMER_0_10_IS_DEFINED
+				pipeline.get_bus ().add_watch (bus_message_cb);
+			#else
+				pipeline.get_bus ().add_watch (Priority.DEFAULT, bus_message_cb);
+			#endif
 			pipeline.set_state (State.READY);
 
 			if (selectionarea != null)
@@ -620,7 +669,10 @@
 				case Gst.MessageType.ERROR:
 					GLib.Error err; string debug;
 					msg.parse_error (out err, out debug);
-					stderr.printf ("Error: %s\n", err.message);
+
+					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);
 					break;
 				case Gst.MessageType.EOS:
@@ -629,7 +681,7 @@
 					this.recording = false;
 
 					var end = new Eidete.Widgets.EndDialog (this);
-					end.show_all ();
+					end.display ();
 					this.main_window.destroy ();
 
 					break;
@@ -644,26 +696,43 @@
 
 			if (to_normal){
 				this.main_window.title = _("Recording paused");
-				this.main_window.remove (pause_icon);
-				if (pause_grid == null)
-					this.build_pause_ui ();
-				this.main_window.add (pause_grid);
+                                tabs.hide () ;
+                                stack_switcher.hide () ;
+                                pause_grid.show () ;
 				this.main_window.icon_name = "eidete";
 				this.app_icon = "eidete";
-				this.main_window.show_all ();
-				this.main_window.resize (1, 1);
+
 			}else{
 				this.main_window.title = _("Pause recording");
-				if (this.main_window.get_child () == tabs)
-					this.main_window.remove (tabs);
-				else
-					this.main_window.remove (pause_grid);
-				this.main_window.add (pause_icon);
+				if (tabs.visible) {
+					tabs.hide () ;
+                                        stack_switcher.hide () ;
+                                        pause_grid.show () ;
+				}
 				this.main_window.icon_name = "media-playback-pause";
 				this.app_icon = "media-playback-pause";
-				this.main_window.show_all ();
+				
 			}
 		}
+
+		/**
+		 * Displays an error dialog with the given message to the user
+		 *
+		 * @param error The message to display
+		 * @param fatal Quit eidete after the user dismissed the dialog
+		 */
+		private void display_error (string error, bool fatal) {
+			var dialog = new Gtk.MessageDialog (main_window, Gtk.DialogFlags.MODAL,
+					Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, error);
+			dialog.show_all ();
+			dialog.response.connect (() => {
+				dialog.destroy ();
+
+				if (fatal)
+					main_window.destroy ();
+			});
+			dialog.run ();
+		}
 	}
 }
 
@@ -692,4 +761,4 @@
 	eidete = new Eidete.EideteApp ();
 
 	return eidete.run (args);
-}
 \ No newline at end of file
+}
 
=== modified file 'src/keycapture.c'
--- src/keycapture.c	2012-04-04 00:02:38 +0000
+++ src/keycapture.c	2015-01-04 16:20:24 +0000
@@ -4,8 +4,12 @@
 #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>
+#else
+#include <gstreamer-1.0/gst/gst.h>
+#endif
 /*
 GList *list_devices (){
 	GstElement *pulsesrc = gst_element_factory_make ("pulsesrc", "src");
@@ -47,6 +51,8 @@
 	    default:
 	        break;
 	}
+
+	XRecordFreeData (d);
 }
 
 void* intercept_key_thread (void *data) {
 
=== modified file 'src/videobin_uploader.vala'
--- src/videobin_uploader.vala	2012-01-03 12:54:48 +0000
+++ src/videobin_uploader.vala	2015-01-04 16:20:24 +0000
@@ -27,7 +27,7 @@
 	}
 	
 	
-	public Uploader (string file){
+	public Uploader (File file){
 		this.title = "Upload to videobin.org";
 		this.set_default_size (300, 1);
 		this.window_position = WindowPosition.CENTER;
@@ -38,21 +38,26 @@
 		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 = new Button.with_label (_("Upload"));
+		var upload_button = new Button.with_label (_("Upload"));
+		upload_button.get_style_context ().add_class ("suggested-action");
 		var cancel = new Button.from_stock (Stock.CANCEL);
+		cancel.margin_end = 6;
 		
 		var bbox = new Box (Orientation.HORIZONTAL, 0);
-		bbox.pack_end (upload, false, true, 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.image = new Image.from_icon_name ("mail-reply-sender", IconSize.BUTTON);
-		upload.can_default = true;
-		this.set_default (upload);
+		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.can_default = true;
+		this.set_default (upload_button);
 		
 		grid.attach (img, 0, 0, 1, 2);
 		grid.attach (new LLabel ("Title"), 1, 0, 1, 1);
@@ -68,9 +73,12 @@
 		
 		cancel.clicked.connect (Gtk.main_quit);
 		
-		upload.clicked.connect ( () => {
+		upload_button.clicked.connect ( () => {
 			string url;
-			string command = "curl -F\"api=1\" -F\"videoFile=@"+file+"\" ";
+			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+"\" ";
 			if (title.text != "")
@@ -78,11 +86,15 @@
 			if (description.text != "")
 				command += "-F\"description="+description.text+"\" ";
 			command += "http://videobin.org/add";
-			
 			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);}
 			Gtk.main_quit ();
@@ -93,9 +105,17 @@
 
 public static void main (string [] args){
 	Gtk.init (ref args);
-	var file = File.new_for_uri (args[1]);
-	var u = new Uploader (file.get_path ());
-	u.show_all ();
-	Gtk.main ();
+	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 ();
+        }
 }