Merge lp:~l-admin-3/snap-elementary/snap-clutter-gst into lp:snap-elementary

[Marcus Wichelmann]

Rebase application on clutterGst and refactor frontend

This branch rebases the application on the ClutterGst library which provides some useful features and keeps our own code cleaner. Because of these huge backend changes the frontend has been refactored.

Overview:
* Instant start thanks to connecting to the video device in an own thread
* No more flickering when (un)focusing the window
* Video mode is working again (!) and stores records as mp4-files
* Higher frame rate
* Gallery button removed (The camera library should be handled by pantheon-photos now)
* Fullscreen mode added
* Use Granite's AlertView
* Tidy up CMake files
* Code better readable now and only half as long (!)

A camera selection for multiple video devices can be added later, if ClutterGst supports it correctly.

[Marcus Wichelmann (l-admin-3)]

TODO: Change encoding format to webm

[Cody Garver (codygarver)]

Merged with corrected output video container .ogv. Gonna report a bug about webm support.

review: Approve

[Marcus Wichelmann (l-admin-3)]

Okay, thank you! 😄
Sorry, had no time to look into this for now…

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-12-11 19:37:59 +0000
+++ CMakeLists.txt	2016-01-19 15:51:17 +0000
@@ -1,14 +1,16 @@
-# Check http://elementaryos.org/docs/developer-guide/cmake for documentation
+# Project name
+project (snap-photobooth)
 
+# CMake version
 cmake_minimum_required (VERSION 2.8)
 cmake_policy (VERSION 2.8)
-project (snap-photobooth)
-enable_testing ()
+
+# Project configuration
 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share/snap-photobooth")
 set (PKGDATADIR "${DATADIR}/snap-photobooth")
 set (GETTEXT_PACKAGE "snap-photobooth")
-set (RELEASE_NAME "The elementary Text Editor.")
-set (VERSION "0.2.0.1")
+set (RELEASE_NAME "The elementary Camera Viewer.")
+set (VERSION "0.3")
 set (VERSION_INFO "Release")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DOLLAR "$")
@@ -20,6 +22,7 @@
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
 
+# CPack
 include (CPack)
 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
@@ -27,26 +30,29 @@
 configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_SOURCE_DIR}/src/config.vala)
 
 # Some definitions
-add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
+add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 
 # Vala
 find_package (Vala REQUIRED)
 include (ValaVersion)
 ensure_vala_version ("0.20" MINIMUM)
 include (ValaPrecompile)
+add_definitions (-DVALA_VERSION="${VALA_SHORTVER}")
 
-add_definitions(-DVALA_VERSION="${VALA_SHORTVER}")
-add_definitions(-w) # Disable gcc warnings
+# Disable gcc warnings
+add_definitions (-w)
 
 # Dependencies
 find_package (PkgConfig)
-set (SNAP_DEPS gee-0.8 gobject-2.0 glib-2.0 gio-2.0 gtk+-3.0>=3.10 gdk-x11-3.0 granite gstreamer-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0 x11 gudev-1.0 zeitgeist-2.0)
+set (SNAP_DEPS gio-2.0 gee-0.8 gtk+-3.0 granite clutter-gst-3.0 clutter-gtk-1.0)
 pkg_check_modules (DEPS REQUIRED ${SNAP_DEPS})
 
-set(NORMAL_CFLAGS ${DEPS_CFLAGS})
-set(NORMAL_LINK_DIRS ${DEPS_LIBRARY_DIRS})
-set(NORMAL_LIBRARIES ${DEPS_LIBRARIES})
+# Linking paramaters
+set (NORMAL_CFLAGS ${DEPS_CFLAGS})
+set (NORMAL_LINK_DIRS ${DEPS_LIBRARY_DIRS})
+set (NORMAL_LIBRARIES ${DEPS_LIBRARIES})
 
+# Linking
 add_definitions (${DEPS_CFLAGS})
 link_libraries (${DEPS_LIBRARIES})
 link_directories (${DEPS_LIBRARY_DIRS})
@@ -54,8 +60,5 @@
 # Subdirectories
 add_subdirectory (src)
 add_subdirectory (schemas)
-add_subdirectory (po)
-
-# Data
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/snap-photobooth.appdata.xml DESTINATION share/appdata)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/snap-photobooth.desktop DESTINATION share/applications)
+add_subdirectory (data)
+add_subdirectory (po)
\ No newline at end of file

=== modified file 'README'
--- README	2014-04-08 18:58:54 +0000
+++ README	2016-01-19 15:51:17 +0000
@@ -1,11 +1,10 @@
 Dependencies
 ------------
- - valac-0.20
+ - valac-0.30
  - libgtk-3.0-dev
- - libgstreamer1.0-dev
- - libzeitgeist-2.0-dev
  - libgranite-dev
- - libgee-dev
+ - libclutter-gst-3.0-dev
+ - libclutter-gtk-1.0-dev
 
 Testing and installation
 ------------------------

=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2016-01-19 15:51:17 +0000
@@ -0,0 +1,3 @@
+# Install appinfo files
+install (FILES snap-photobooth.appdata.xml DESTINATION share/appdata)
+install (FILES snap-photobooth.desktop DESTINATION share/applications)
\ No newline at end of file

=== removed directory 'data/pixmaps'
=== removed file 'data/pixmaps/thumbnail-frame.png'
Binary files data/pixmaps/thumbnail-frame.png	2012-08-13 07:09:44 +0000 and data/pixmaps/thumbnail-frame.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'schemas/CMakeLists.txt'
--- schemas/CMakeLists.txt	2013-07-27 22:46:41 +0000
+++ schemas/CMakeLists.txt	2016-01-19 15:51:17 +0000
@@ -1,2 +1,3 @@
-include(GSettings)
-add_schema("org.pantheon.snap.gschema.xml")
\ No newline at end of file
+# Install settings schema
+include (GSettings)
+add_schema ("org.pantheon.snap.gschema.xml")
\ No newline at end of file

=== modified file 'schemas/org.pantheon.snap.gschema.xml'
--- schemas/org.pantheon.snap.gschema.xml	2014-03-11 04:31:49 +0000
+++ schemas/org.pantheon.snap.gschema.xml	2016-01-19 15:51:17 +0000
@@ -1,22 +1,11 @@
 <schemalist>
+    <enum id="org.pantheon.snap.settings.mode">
+        <value nick="photo" value="0" />
+        <value nick="video" value="1" />
+    </enum>
     <schema path="/org/pantheon/snap/settings/" id="org.pantheon.snap.settings" gettext-domain="snap">
-        <key name="bg-color" type="s">
-        <default>'black'</default>
-            <summary>The background color of the camera preview.</summary>
-            <description>The background color of the camera preview.</description>
-        </key>
-        <key name="countdown-time" type="i">
-        <default>3</default>
-            <summary>The time for the countdown.</summary>
-            <description>The time for the countdown.</description>
-        </key>
-        <key name="countdown" type="b">
-            <default>true</default>
-            <summary>Use or not the countdown.</summary>
-            <description>Use or not the countdown.</description>
-        </key>
-        <key name="mode" type="i">
-            <default>0</default>
+        <key name="mode" enum="org.pantheon.snap.settings.mode">
+            <default>"photo"</default>
             <summary>The mode of the camera, photo or video</summary>
             <description>Photo mode is represented by 0, video mode by 1</description>
         </key>

=== renamed file 'src/Snap.vala' => 'src/Application.vala'
--- src/Snap.vala	2015-12-21 13:52:21 +0000
+++ src/Application.vala	2016-01-19 15:51:17 +0000
@@ -1,86 +1,79 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2011-2013 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as
-  published    by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program.  If not, see <http://www.gnu.org/licenses>
-
-  END LICENSE
-***/
-
-namespace Snap {
-    public Snap.Services.Settings settings;
-
-    public class SnapApp : Granite.Application {
-        /**
-         * Translatable launcher (.desktop) strings to be added to template (.pot) file.
-         * These strings should reflect any changes in these launcher keys in .desktop file
-         */
-        public const string CAMERA = N_("Camera");
-        public const string COMMENT = N_("Take photos and videos with the camera");
-        public const string GENERIC_NAME = N_("Photo Booth");
-        public const string PROGRAM_NAME = "Snap";
-        public const string QUICKLIST_ABOUT_STOCK = N_("About Snap");
-        public const string QUICKLIST_ABOUT_GENERIC = N_("About Camera");
-
-        public SnapWindow window = null;
-
-        construct {
-            build_data_dir = Constants.DATADIR;
-            build_pkg_data_dir = Constants.PKGDATADIR;
-            build_release_name = Constants.RELEASE_NAME;
-            build_version = Constants.VERSION;
-            build_version_info = Constants.VERSION_INFO;
-
-            program_name = PROGRAM_NAME;
-            exec_name = "snap-photobooth";
-            app_years = "2011-2015";
-            app_icon = "accessories-camera";
-            app_launcher = "snap-photobooth.desktop";
-            application_id = "net.launchpad.snap-elementary";
-            main_url = "https://launchpad.net/snap-elementary";
-            bug_url = "https://bugs.launchpad.net/snap-elementary";
-            help_url = "https://answers.launchpad.net/snap-elementary";
-            translate_url = "https://translations.launchpad.net/snap-elementary";
-            about_authors = {"Mario Guerriero <[e-mail]>", null };
-            about_artists = { "Daniel Fore <[e-mail] >", "Harvey Cabaguio <[e-mail]>", null };
-            about_translators = _("translator-credits");
-            about_license_type = Gtk.License.GPL_3_0;
-        }
-
-        public SnapApp () {
-            Granite.Services.Logger.initialize ("Snap");
-            Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
-
-            settings = new Snap.Services.Settings ();
-        }
-
-        protected override void activate () {
-            if (get_windows () == null) {
-                window = new SnapWindow (this);
-                window.show ();
-            }
-            else {
-                window.present ();
-            }
-        }
-
-        public static int main (string[] args) {
-            Gst.init (ref args);
-
-            var app = new SnapApp ();
-
-            return app.run (args);
-        }
-    }
-}
+/*
+ * Copyright (c) 2011-2016 Snap Developers (http://launchpad.net/snap-elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Marcus Wichelmann <[e-mail]>
+ */
+
+public class Snap.Application : Granite.Application {
+    /**
+     * Translatable launcher (.desktop) strings to be added to template (.pot) file.
+     * These strings should reflect any changes in these launcher keys in .desktop file
+     */
+    public static const string CAMERA = N_("Camera");
+    public static const string COMMENT = N_("Take photos and videos with the camera");
+    public static const string GENERIC_NAME = N_("Photo Booth");
+    public static const string PROGRAM_NAME = "Snap";
+    public static const string QUICKLIST_ABOUT_STOCK = N_("About Snap");
+    public static const string QUICKLIST_ABOUT_GENERIC = N_("About Camera");
+
+    public static int main (string[] args) {
+        ClutterGst.init (ref args);
+
+        var application = new Application ();
+
+        return application.run (args);
+    }
+
+    public MainWindow? main_window = null;
+
+    construct {
+        build_data_dir = Config.DATADIR;
+        build_pkg_data_dir = Config.PKGDATADIR;
+        build_release_name = Config.RELEASE_NAME;
+        build_version = Config.VERSION;
+        build_version_info = Config.VERSION_INFO;
+
+        program_name = PROGRAM_NAME;
+        exec_name = "snap-photobooth";
+        app_years = "2011-2015";
+        app_icon = "accessories-camera";
+        app_launcher = "snap-photobooth.desktop";
+        application_id = "net.launchpad.snap-elementary";
+        main_url = "https://launchpad.net/snap-elementary";
+        bug_url = "https://bugs.launchpad.net/snap-elementary";
+        help_url = "https://answers.launchpad.net/snap-elementary";
+        translate_url = "https://translations.launchpad.net/snap-elementary";
+        about_authors = { "Marcus Wichelmann <[e-mail]>", "Mario Guerriero <[e-mail]>", null };
+        about_artists = { "Daniel Fore <[e-mail] >", "Harvey Cabaguio <[e-mail]>", null };
+        about_translators = _("translator-credits");
+        about_license_type = Gtk.License.GPL_3_0;
+    }
+
+    public Application () {
+        /* TODO */
+    }
+
+    protected override void activate () {
+        if (this.get_windows () == null) {
+            main_window = new MainWindow (this);
+            main_window.show_all ();
+        } else {
+            main_window.present ();
+        }
+    }
+}
\ No newline at end of file

=== added directory 'src/Backend'
=== added file 'src/Backend/Settings.vala'
--- src/Backend/Settings.vala	1970-01-01 00:00:00 +0000
+++ src/Backend/Settings.vala	2016-01-19 15:51:17 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2011-2016 Snap Developers (http://launchpad.net/snap-elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Marcus Wichelmann <[e-mail]>
+ */
+
+public class Snap.Backend.Settings : Granite.Services.Settings {
+    protected string mode { get; set; }
+
+    public signal void action_type_changed (Utils.ActionType action_type);
+
+    public Settings () {
+        base ("org.pantheon.snap.settings");
+
+        connect_signals ();
+    }
+
+    public Utils.ActionType get_action_type () {
+        return (mode == "photo" ? Utils.ActionType.PHOTO : Utils.ActionType.VIDEO);
+    }
+
+    public void set_action_type (Utils.ActionType action_type) {
+        mode = (action_type == Utils.ActionType.PHOTO ? "photo" : "video");
+    }
+
+    private void connect_signals () {
+        this.notify["mode"].connect (() => {
+            action_type_changed (get_action_type ());
+        });
+    }
+}
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-10-01 12:24:52 +0000
+++ src/CMakeLists.txt	2016-01-19 15:51:17 +0000
@@ -1,25 +1,24 @@
-vala_precompile(VALA_C
-    Resources.vala
-    Snap.vala
-    SnapWindow.vala
-    ######
-    Services/Settings.vala
-    Services/ThumbnailProvider.vala
-    ######
-    Widgets/Camera.vala
-    Widgets/Gallery.vala
-    Widgets/NoCamera.vala
-    ######
+# Configure precompilation
+vala_precompile (VALA_C
     config.vala
+    Utils.vala
+    Application.vala
+    MainWindow.vala
+    Widgets/HeaderBar.vala
+    Widgets/LoadingView.vala
+    Widgets/CameraView.vala
+    Backend/Settings.vala
 PACKAGES
     ${SNAP_DEPS}
     posix
 OPTIONS
-    --vapidir=${CMAKE_SOURCE_DIR}/vapi
     --thread
+    --target-glib=2.32
     --enable-experimental
 )
 
+# Register new executable
 add_executable (snap-photobooth ${VALA_C})
 
+# Installation
 install (TARGETS snap-photobooth RUNTIME DESTINATION bin)

=== removed directory 'src/Dialogs'
=== removed file 'src/Dialogs/Preferences.vala'
--- src/Dialogs/Preferences.vala	2015-02-26 12:35:06 +0000
+++ src/Dialogs/Preferences.vala	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2011-2012 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as
-  published    by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program.  If not, see <http://www.gnu.org/licenses>
-
-  END LICENSE
-***/
-
-namespace Snap.Dialogs {
-    public class Preferences : Gtk.Dialog {
-        public Preferences (string? title, SnapWindow? window) {
-            this.title = title;
-            this.type_hint = Gdk.WindowTypeHint.DIALOG;
-            this.set_transient_for (window);
-            set_default_size (300, 200);
-            modal = true;
-        }
-    }
-}

=== renamed file 'src/SnapWindow.vala' => 'src/MainWindow.vala'
--- src/SnapWindow.vala	2015-03-31 22:50:02 +0000
+++ src/MainWindow.vala	2016-01-19 15:51:17 +0000
@@ -1,335 +1,184 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2011-2013 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as
-  published    by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program.  If not, see <http://www.gnu.org/licenses>
-
-  END LICENSE
-***/
-
-namespace Snap {
-
-    public class SnapWindow : Gtk.Window {
-        private const string VIDEO_ICON_SYMBOLIC = "view-list-video-symbolic";
-        private const string PHOTO_ICON_SYMBOLIC = "view-list-images-symbolic";
-        private const string STOP_ICON_SYMBOLIC = "media-playback-stop-symbolic";
-
-        private Snap.SnapApp snap_app;
-
-        private Snap.Widgets.Camera camera;
-        private Snap.Widgets.Gallery gallery;
-        private Snap.Widgets.NoCamera no_camera;
-        private Gtk.HeaderBar toolbar;
-        private Gtk.Stack stack;
-        private Granite.Widgets.ModeButton mode_button;
-        private Gtk.Button take_button;
-        private Gtk.ButtonBox gallery_button_box;
-        private Gtk.ToggleButton gallery_button;
-        private Gtk.Statusbar statusbar;
-        private File photo_path;
-        private File video_path;
-
-        private bool camera_detected;
-        private string camera_uri;
-
-        public SnapWindow (Snap.SnapApp snap_app) {
-            this.snap_app = snap_app;
-            this.set_application (this.snap_app);
-
-            this.title = "Snap";
-            this.icon_name = "snap-photobooth";
-            this.set_size_request (640, 480);
-
-            // Get paths
-            photo_path = File.new_for_path (Resources.get_media_dir (Widgets.Camera.ActionType.PHOTO));
-            video_path = File.new_for_path (Resources.get_media_dir (Widgets.Camera.ActionType.VIDEO));
-
-            // Create missing directories
-            create_directories ();
-
-            // camera
-            camera_uri = this.detect_camera ();
-            camera_detected = camera_uri != "";
-
-            // Setup the camera
-            this.camera = new Snap.Widgets.Camera (camera_uri);
-
-            // Calculate thumbnail sizes
-            var thumb_width = (camera.video_width - 19) / 4 - 18; // 19 = scrollbar_width + 2 * margin; 4 = row-count; 18 = 2 * item_padding + column_spacing
-            var thumb_height = (int)(((float)thumb_width / camera.video_width) * camera.video_height);
-
-            // Init thumbnail providers
-            Resources.photo_thumb_provider = new Services.ThumbnailProvider (photo_path, thumb_width, thumb_height);
-            Resources.video_thumb_provider = new Services.ThumbnailProvider (video_path, thumb_width, thumb_height);
-
-            // Setup UI
-            setup_window ();
-
-            // Set the window position
-            this.window_position = Gtk.WindowPosition.CENTER;
-        }
-
-        void setup_window () {
-            // Toolbar
-            toolbar = new Gtk.HeaderBar ();
-            toolbar.show_close_button = true;
-            this.set_titlebar (toolbar);
-
-            // Gallery button
-            gallery_button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-            gallery_button_box.set_spacing (4);
-            gallery_button_box.set_layout (Gtk.ButtonBoxStyle.START);
-
-            gallery_button = new Gtk.ToggleButton.with_label (_("Gallery"));
-            gallery_button.sensitive = gallery_files_exists ();
-            gallery_button.toggled.connect (() => {
-                if (this.stack.get_visible_child () != this.gallery) {
-                    this.show_gallery ();
-                    this.load_thumbnails ();
-                }
-                else {
-                    this.show_camera ();
-                }
-            });
-            gallery_button_box.pack_start (gallery_button, true, true, 0);
-
-            toolbar.pack_start (gallery_button_box);
-
-            // Mode switcher
-            mode_button = new Granite.Widgets.ModeButton ();
-            mode_button.valign = Gtk.Align.CENTER;
-            mode_button.halign = Gtk.Align.CENTER;
-
-            mode_button.append (load_toolbar_icon (PHOTO_ICON_SYMBOLIC));
-            mode_button.append (load_toolbar_icon (VIDEO_ICON_SYMBOLIC));
-
-            // Hide video mode until fixed https://bugs.launchpad.net/snap-elementary/+bug/1374072
-            //toolbar.pack_end (mode_button);
-
-            var take_button_style = new Gtk.CssProvider ();
-            try {
-                take_button_style.load_from_data (Resources.TAKE_BUTTON_STYLESHEET, -1);
-            } catch (Error e) {
-                warning (e.message);
-            }
-
-            // Take button
-            take_button = new Gtk.Button ();
-            take_button.get_style_context ().add_provider (take_button_style, Gtk.STYLE_PROVIDER_PRIORITY_USER);
-            take_button.get_style_context ().add_class ("take-button");
-            take_button.get_style_context ().add_class ("destructive-action");
-            take_button.get_style_context ().add_class ("raised");
-            take_button.clicked.connect (() => {
-                if (this.stack.get_visible_child () != this.camera) {
-                    gallery_button.set_active (false);
-                    return;
-                }
-                if (!this.camera.get_capturing ()) {
-                    this.camera.take_start ();
-                    if (this.camera.get_action_type() == Widgets.Camera.ActionType.VIDEO) {
-                        set_take_button_icon (Snap.Widgets.Camera.ActionType.CAPTURING);
-                    }
-
-                } else {
-                    this.camera.take_stop ();
-                    if (this.camera.get_action_type() == Widgets.Camera.ActionType.VIDEO) {
-                        set_take_button_icon (Snap.Widgets.Camera.ActionType.VIDEO);
-                    }
-                }
-            });
-            take_button.set_sensitive (camera_detected);
-
-            var take_button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-            take_button_box.set_spacing (4);
-            take_button_box.set_layout (Gtk.ButtonBoxStyle.START);
-            take_button_box.pack_start (take_button, false, false, 0);
-
-            // Make the take button wider
-            take_button.set_size_request (54, -1);
-
-            toolbar.set_custom_title (take_button_box);
-
-            // Setup NoCamera widget
-            this.no_camera = new Snap.Widgets.NoCamera ();
-
-            // Setup gallery widget
-            this.gallery = new Snap.Widgets.Gallery ();
-
-            // Setup preview area
-            this.camera.capture_start.connect (() => {
-                // Disable uneeded buttons
-                gallery_button.sensitive = false;
-                this.mode_button.sensitive = false;
-                this.set_take_button_icon (Snap.Widgets.Camera.ActionType.CAPTURING);
-            });
-            this.camera.capture_stop.connect (() => {
-                // Enable extra buttons
-                gallery_button.sensitive = gallery_files_exists ();
-                this.mode_button.sensitive = true;
-                this.set_take_button_icon (this.camera.get_action_type ());
-            });
-
-            // Setup window main content area
-            this.stack = new Gtk.Stack ();
-            this.stack.transition_type = Gtk.StackTransitionType.SLIDE_UP_DOWN;
-            this.stack.add_named (this.gallery, "Gallery");
-            this.stack.add_named (this.camera, "Camera");
-            this.stack.add_named (this.no_camera, "NoCamera");
-            if (camera_detected)
-                this.stack.set_visible_child (this.camera); // Show camera on launch
-            else
-                this.stack.set_visible_child (this.no_camera); // Show no_camera on launch
-
-            // Statusbar
-            statusbar = new Gtk.Statusbar ();
-
-            // Some signals
-            mode_button.mode_changed.connect (on_mode_changed);
-            this.key_press_event.connect (this.on_key_press_event);
-
-            mode_button.set_active (Snap.settings.mode);
-
-            this.add (this.stack);
-            this.show_all ();
-        }
-
-        private string detect_camera () {
-            try {
-                var video_devices = File.new_for_path ("/dev/.");
-                FileEnumerator enumerator = video_devices.enumerate_children (FileAttribute.STANDARD_NAME, 0);
-                FileInfo info;
-                while ((info = enumerator.next_file (null)) != null) {
-                    if (info.get_name ().has_prefix ("video")){
-                        debug ("camera found: %s", info.get_name ());
-                        return "v4l2:///dev/%s".printf (info.get_name ());
-                    }
-                }
-            } catch (Error err) {
-                debug ("camera detection failed: %s", err.message);
-            }
-
-            debug ("no camera");
-            return "";
-        }
-
-        protected override bool delete_event (Gdk.EventAny event) {
-            Resources.photo_thumb_provider.clear_cache ();
-            Resources.video_thumb_provider.clear_cache ();
-            return false;
-        }
-
-        private void on_mode_changed () {
-            var type = (mode_button.selected == 0) ?
-                Snap.Widgets.Camera.ActionType.PHOTO : Snap.Widgets.Camera.ActionType.VIDEO;
-
-            Snap.settings.mode = type;
-
-            this.camera.set_action_type (type);
-            this.set_take_button_icon (type);
-        }
-
-        private void set_take_button_icon (Snap.Widgets.Camera.ActionType? type) {
-            string icon_name;
-
-            if (type == Snap.Widgets.Camera.ActionType.PHOTO)
-                icon_name = PHOTO_ICON_SYMBOLIC;
-            else if (type == Snap.Widgets.Camera.ActionType.VIDEO)
-                icon_name = VIDEO_ICON_SYMBOLIC;
-            else if (type == Snap.Widgets.Camera.ActionType.CAPTURING)
-                icon_name = STOP_ICON_SYMBOLIC;
-            else
-                assert_not_reached();
-
-            take_button.set_image (load_toolbar_icon (icon_name));
-        }
-
-        private Gtk.Image load_toolbar_icon (string icon_name) {
-            var icon = new ThemedIcon.with_default_fallbacks (icon_name);
-            return new Gtk.Image.from_gicon (icon, Gtk.IconSize.SMALL_TOOLBAR);
-        }
-
-        private bool on_key_press_event (Gdk.EventKey ev) {
-            // 32 is the ASCII value for spacebar
-            if (ev.keyval == 32)
-                this.take_button.clicked ();
-
-            return false;
-        }
-
-        private void lock_camera_actions () {
-            this.mode_button.set_sensitive (false);
-        }
-
-        private void unlock_camera_actions () {
-            this.mode_button.set_sensitive (true);
-        }
-
-        private void load_thumbnails () {
-            this.gallery.clear_view ();
-            Resources.photo_thumb_provider.parse_thumbs.begin ();
-            Resources.video_thumb_provider.parse_thumbs.begin ();
-        }
-
-        private void show_gallery () {
-            if (camera_detected) {
-                this.camera.stop ();
-            }
-            this.lock_camera_actions ();
-            this.stack.set_visible_child (this.gallery);
-        }
-
-        private void show_camera () {
-            if (camera_detected) {
-                this.stack.set_visible_child (this.camera); // Show camera on launch
-                this.camera.play ();
-                this.unlock_camera_actions ();
-            }
-            else {
-                this.stack.set_visible_child (this.no_camera); // Show no_camera on launch
-            }
-        }
-
-        private void create_directories () {
-            try {
-                if (!photo_path.query_exists ())
-                    photo_path.make_directory ();
-
-                if (!video_path.query_exists ())
-                    video_path.make_directory ();
-            } catch (Error e) {
-                warning ("Error: Creating media-directories failed: %s", e.message);
-            }
-        }
-
-        private bool gallery_files_exists () {
-            FileInfo file_info;
-
-            try {
-                FileEnumerator enumerator_photo = photo_path.enumerate_children (FileAttribute.STANDARD_NAME, 0);
-                FileEnumerator enumerator_video = video_path.enumerate_children (FileAttribute.STANDARD_NAME, 0);
-
-                if ((file_info = enumerator_photo.next_file ()) != null ||
-                    (file_info = enumerator_video.next_file ()) != null) {
-                    // Gallery is not empty
-                    return true;
-                }
-            } catch (Error perr) {
-                    warning ("Error: check_gallery_files photo failed: %s", perr.message);
-            }
-
-            // Gallery is empty, button may be disabled
-            return false;
-        }
-    }
-}
+/*
+ * Copyright (c) 2011-2016 Snap Developers (http://launchpad.net/snap-elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Marcus Wichelmann <[e-mail]>
+ */
+
+public class Snap.MainWindow : Gtk.Window {
+    private const string VIDEO_ICON_SYMBOLIC = "view-list-video-symbolic";
+    private const string PHOTO_ICON_SYMBOLIC = "view-list-images-symbolic";
+    private const string STOP_ICON_SYMBOLIC = "media-playback-stop-symbolic";
+
+    private Backend.Settings settings;
+
+    private Widgets.HeaderBar header_bar;
+
+    private Gtk.Stack stack;
+
+    private Widgets.LoadingView loading_view;
+
+    private Granite.Widgets.AlertView no_device_view;
+
+    private GtkClutter.Embed clutter_embed;
+    private Clutter.Stage clutter_stage;
+
+    private Widgets.CameraView? camera_view = null;
+
+    private ClutterGst.Aspectratio camera_content;
+    private Clutter.Actor camera_actor;
+
+    private bool is_fullscreened = false;
+
+    public MainWindow (Application application) {
+        this.set_application (application);
+        this.title = "Snap";
+        this.icon_name = "snap-photobooth";
+        this.set_size_request (640, 480);
+        this.window_position = Gtk.WindowPosition.CENTER;
+
+        settings = new Backend.Settings ();
+
+        build_ui ();
+        connect_signals ();
+
+        new Thread<int> (null, () => {
+            debug ("Initializing camera manager...");
+
+            initialize_camera_manager ();
+
+            return 0;
+        });
+    }
+
+    private void build_ui () {
+        this.add_events (Gdk.EventMask.KEY_PRESS_MASK);
+        this.set_default_size (1000, 700);
+
+        header_bar = new Widgets.HeaderBar (settings);
+
+        stack = new Gtk.Stack ();
+        stack.transition_type = Gtk.StackTransitionType.CROSSFADE;
+        stack.transition_duration = 500;
+
+        loading_view = new Widgets.LoadingView ();
+
+        no_device_view = new Granite.Widgets.AlertView (_("No camera device found"),
+                                                        _("Connect a webcam or any other supported video device to your computer to display it's picture here."),
+                                                        "camera-web");
+
+        clutter_embed = new GtkClutter.Embed ();
+
+        clutter_stage = (Clutter.Stage)clutter_embed.get_stage ();
+        clutter_stage.background_color = Clutter.Color.get_static (Clutter.StaticColor.BLACK);
+        clutter_stage.set_fullscreen (true);
+
+        camera_content = new ClutterGst.Aspectratio ();
+
+        camera_actor = new GtkClutter.Actor ();
+        camera_actor.content = camera_content;
+        camera_actor.add_constraint (new Clutter.BindConstraint (clutter_stage, Clutter.BindCoordinate.SIZE, 0));
+
+        clutter_stage.add_child (camera_actor);
+
+        stack.add_named (loading_view, "loading");
+        stack.add_named (no_device_view, "no-device");
+        stack.add_named (clutter_embed, "camera");
+
+        this.set_titlebar (header_bar);
+        this.add (stack);
+    }
+
+    private void initialize_camera_manager () {
+        ClutterGst.CameraManager camera_manager = ClutterGst.CameraManager.get_default ();
+
+        Idle.add (() => {
+            GenericArray<ClutterGst.CameraDevice> camera_devices = camera_manager.get_camera_devices ();
+
+            if (camera_devices.length > 0 && camera_devices[0].get_name () != null) {
+                initialize_camera_view ();
+            } else {
+                stack.set_visible_child_name ("no-device");
+
+                debug ("No camera device found.");
+            }
+
+            return false;
+        });
+    }
+
+    private void initialize_camera_view () {
+        camera_view = new Widgets.CameraView ();
+        camera_view.initialized.connect (() => {
+            header_bar.set_camera_controls_sensitive (true);
+            stack.set_visible_child_name ("camera");
+        });
+
+        camera_content.set_player (camera_view);
+
+        loading_view.set_status (_("Connecting to \"%s\"…".printf (camera_view.get_camera_device ().get_name ())));
+    }
+
+    private void connect_signals () {
+        this.key_press_event.connect ((event) => {
+            switch (event.keyval) {
+                case Gdk.Key.F11 :
+
+                    if (is_fullscreened) {
+                        this.unfullscreen ();
+                    } else {
+                        this.fullscreen ();
+                    }
+
+                    is_fullscreened = !is_fullscreened;
+
+                    break;
+
+                default:
+
+                    return Gdk.EVENT_PROPAGATE;
+            }
+
+            return Gdk.EVENT_STOP;
+        });
+
+        header_bar.take_photo_clicked.connect (() => {
+            if (camera_view == null) {
+                return;
+            }
+
+            camera_view.take_photo ();
+        });
+        header_bar.start_recording_clicked.connect (() => {
+            if (camera_view == null) {
+                return;
+            }
+
+            if (camera_view.start_recording ()) {
+                header_bar.set_is_recording (true);
+            }
+        });
+        header_bar.stop_recording_clicked.connect (() => {
+            if (camera_view == null) {
+                return;
+            }
+
+            camera_view.stop_recording ();
+            header_bar.set_is_recording (false);
+        });
+    }
+}
\ No newline at end of file

=== removed directory 'src/Services'
=== removed file 'src/Services/Settings.vala'
--- src/Services/Settings.vala	2015-04-01 10:54:18 +0000
+++ src/Services/Settings.vala	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2011-2012 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program.  If not, see <http://www.gnu.org/licenses/>
-
-  END LICENSE
-***/
-
-
-namespace Snap.Services {
-    public class Settings : Granite.Services.Settings {
-        public string bg_color { get; set; }
-        public bool countdown { get; set; }
-        public int countdown_time { get; set; }
-        public int mode { get; set; }
-
-        public Settings ()  {
-            base ("org.pantheon.snap.settings");
-
-            // Reset video mode to 0 until fixed https://bugs.launchpad.net/snap-elementary/+bug/1374072
-            this.mode = 0;
-        }
-    }
-}

=== removed file 'src/Services/ThumbnailProvider.vala'
--- src/Services/ThumbnailProvider.vala	2015-02-26 13:57:05 +0000
+++ src/Services/ThumbnailProvider.vala	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2011-2012 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program.  If not, see <http://www.gnu.org/licenses/>
-
-  END LICENSE
-***/
-
-namespace Snap.Services {
-    public class Thumbnail : GLib.Object {
-        public File file { get; protected set; }
-        public Gdk.Pixbuf pixbuf { get; protected set; }
-        public bool is_temp { get; public set; }
-        public File temp_file { get; public set; }
-
-        public Thumbnail (File file, Gdk.Pixbuf pixbuf) {
-            this.file = file;
-            this.pixbuf = pixbuf;
-        }
-    }
-
-    public class ThumbnailProvider : GLib.Object {
-        private File path;
-        private Gee.Set<Thumbnail> cache;
-        private int temp_thumb;
-
-        public uint thumb_width = 0;
-        public uint thumb_height = 0;
-
-        public signal void thumbnail_loaded (Thumbnail thumbnail);
-
-        /**
-         * Creates a new object of time ThumbnailProvider. This type of objects are used
-         * to obtain thumbnails for files in a specific path
-         * @param path the path where the provider will look for thumbnails
-         */
-        public ThumbnailProvider (File path, uint thumb_width, uint thumb_height) {
-            this.path = path;
-            this.cache = new Gee.TreeSet<Thumbnail> ();
-            this.temp_thumb = 0;
-            this.thumb_width = thumb_width;
-            this.thumb_height = thumb_height;
-        }
-
-        /**
-         * Asynchronously load thumbnails and add them in a Gee.TreeSet object. The thumbnail_loaded
-         * is emitted whenever a new Thumbnail is fully loaded
-         */
-        public async void parse_thumbs () {
-            try {
-                var e = yield this.path.enumerate_children_async (FileAttribute.STANDARD_NAME,
-                                                            0, Priority.DEFAULT);
-                while (true) {
-                    var files = yield e.next_files_async (10, Priority.DEFAULT);
-                    if (files == null) {
-                        break;
-                    }
-
-                    foreach (var info in files) {
-                        File thumb_path = this.path.resolve_relative_path (info.get_name ());
-                        var thumb = this.get_thumbnail (thumb_path);
-                        if (thumb != null) {
-                            this.cache.add (thumb);
-                            thumbnail_loaded (thumb);
-                        }
-                    }
-                }
-            } catch (Error err) {
-                warning ("Error: parse_thumbs failed: %s", err.message);
-            }
-        }
-
-        private Thumbnail? get_thumbnail (File file) {
-            Thumbnail? thumb = null;
-            try {
-                var info = file.query_info ("*", 0, null);
-                var attr = info.get_attribute_byte_string ("thumbnail::path");
-                Gdk.Pixbuf pix = null;
-                if (attr == null) pix = new Gdk.Pixbuf.from_file (file.get_path ());
-                else pix = new Gdk.Pixbuf.from_file (attr);
-                pix = pix.scale_simple ((int)thumb_width, (int)thumb_height, 0);
-                thumb = new Thumbnail (file, pix);
-            } catch (Error err) {
-                warning ("Error: get_thumbnail failed: %s", err.message);
-            }
-
-            if (thumb == null) {
-                // Try to obtain the thumbnail with ffmpegthumbnailer
-                try {
-                    string tmp_path = GLib.Environment.get_tmp_dir ();
-                    string out_path = tmp_path + "/temp" + this.temp_thumb.to_string () + ".png";
-                    string[] spawn_args = {"ffmpegthumbnailer",
-                                            "-i", file.get_path (), // Input file
-                                            "-o", out_path, // Output file
-                                            "-c", "png",
-                                            "-f", "-t", "10",
-                                            "-s", thumb_width.to_string () };
-                    string[] spawn_env = Environ.get ();
-                    Pid child_pid;
-
-                    Process.spawn_async ("/",
-                        spawn_args,
-                        spawn_env,
-                        SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD,
-                        null,
-                        out child_pid);
-
-                    ChildWatch.add (child_pid, (pid, status) => {
-                        // Triggered when the child indicated by child_pid exits
-                        Process.close_pid (pid);
-                    });
-
-                    Gdk.Pixbuf pix = new Gdk.Pixbuf.from_file (out_path);
-                    pix = pix.scale_simple ((int)thumb_width, (int)thumb_height, 0);
-                    thumb = new Thumbnail (file, pix);
-                    thumb.is_temp = true;
-                    thumb.temp_file = File.new_for_path (out_path);
-                    // Increment temp thumbs counter
-                    this.temp_thumb++;
-                } catch (SpawnError serr) {
-                    warning ("Error: get_thumbnail failed: %s", serr.message);
-                } catch (Error err) {
-                    warning ("Error: get_thumbnail failed: %s", err.message);
-                }
-            }
-            return thumb;
-        }
-
-        /**
-         * Execute this method on quitting to clean temp cache
-         */
-        public void clear_cache () {
-            Gee.Iterator<Thumbnail> iterator = this.cache.iterator ();
-            while (iterator.has_next ()) {
-                iterator.next ();
-                Thumbnail? thumb = iterator.get ();
-                if (thumb != null && thumb.is_temp) {
-                    try {
-                        thumb.temp_file.delete (null);
-                    } catch (Error err) {
-                        warning ("Error: clear_cache failed: %s", err.message);
-                    }
-                }
-            }
-        }
-    }
-}

=== renamed file 'src/Resources.vala' => 'src/Utils.vala'
--- src/Resources.vala	2015-02-26 12:35:06 +0000
+++ src/Utils.vala	2016-01-19 15:51:17 +0000
@@ -1,156 +1,59 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/*-
- * Copyright (c) 2011-2012 Snap Developers
+/*
+ * Copyright (c) 2011-2016 Snap Developers (http://launchpad.net/snap-elementary)
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Marcus Wichelmann <[e-mail]>
  */
 
-using Snap.Widgets;
-using Snap.Services;
-
-namespace Resources {
-    public const string TAKE_BUTTON_STYLESHEET = """
-        .take-button {
-            border-radius: 400px;
-        }
-    """;
-
-    public const string PREVIEW_STYLESHEET = """
-        .snap-preview-bg {
-            background-color: #000;
-        }
-    """;
-
-    public const string ICON_VIEW_STYLESHEET = """
-        GtkIconView.view {
-            background-color: @bg_color;
-        }
-
-        GtkIconView.view.cell:selected,
-        GtkIconView.view.cell:selected:focused {
-            background-color: @selected_bg_color;
-            border-radius: 4px;
-        }
-    """;
-
-    /**
-     * @return path to save photos or videos
-     */
-    public string get_media_dir (Camera.ActionType type) {
-        UserDirectory user_dir;
-
-        if (type == Camera.ActionType.PHOTO)
-            user_dir = UserDirectory.PICTURES;
-        else
-            user_dir = UserDirectory.VIDEOS;
-
-        string dir = GLib.Environment.get_user_special_dir (user_dir);
-        return GLib.Path.build_path ("/", dir, "Webcam");
+namespace Snap.Utils {
+    public enum ActionType {
+        PHOTO,
+        VIDEO
     }
 
-    /**
-     * Creates a file name with format 'YYYY-MM-DD HH:MM:SS.ext'
-     *
-     * @param extension file extension [allow-none]
-     *
-     * @return new photo/video filename.
-     */
-    public string get_new_media_filename (Camera.ActionType type, string? ext = null) {
-        // Get date and time
-        var datetime = new GLib.DateTime.now_local ();
-        string time = datetime.format ("%F%H:%M:%S");
-
-        int n = 0;
-        string filename = "";
+    public string get_new_media_filename (ActionType action_type) {
+        string time = new GLib.DateTime.now_local ().format ("%F%H:%M:%S");
+
+        int file_id = 0;
+        string next_filename = "";
+
         do {
-            filename = time + (n > 0 ? "-" + n.to_string () : "");
-            n++;
-        } while (GLib.FileUtils.test (build_media_filename (filename, type, ext), FileTest.EXISTS));
-
-        return build_media_filename (filename, type, ext);
-    }
-
-    /**
-     * @return a valid photo/video filename.
-     */
-    public string build_media_filename (string filename, Camera.ActionType type, string? ext = null) {
-        string new_filename = filename;
-        if (ext == null) {
-            if (type == Camera.ActionType.PHOTO)
-                new_filename += ".jpg";
-            else if (type == Camera.ActionType.VIDEO)
-                new_filename += ".mp4";
-        } else {
-            new_filename += "." + ext;
-        }
-
-        string media_dir = get_media_dir (type);
-        if (!FileUtils.test (media_dir, FileTest.EXISTS))
-            DirUtils.create (media_dir, 0777);
-
-        return GLib.Path.build_filename (Path.DIR_SEPARATOR_S, media_dir, new_filename);
-    }
-
-    /**
-     * @return a valid photo/video uri.
-     */
-    public string build_uri_from_filename (string filename) {
-        var file = File.new_for_path (filename);
-
-        return file.get_uri ();
-    }
-
-    /** Thumbnail providers **/
-    public ThumbnailProvider photo_thumb_provider;
-    public ThumbnailProvider video_thumb_provider;
-
-    /**
-     * @param surface_size size of the new pixbuf. Set a value of 0 to use the pixbuf's natural size.
-     **/
-    public Gdk.Pixbuf get_pixbuf_shadow (Gdk.Pixbuf pixbuf, int surface_size,
-                                          int shadow_size = 5, double alpha = 0.8) {
-        int S_WIDTH = (surface_size > 0)? surface_size : pixbuf.width;
-        int S_HEIGHT = (surface_size > 0)? surface_size : pixbuf.height;
-
-        var buffer_surface = new Granite.Drawing.BufferSurface(S_WIDTH, S_HEIGHT);
-
-        S_WIDTH -= 2 * shadow_size;
-        S_HEIGHT -= 2 * shadow_size;
-
-        buffer_surface.context.rectangle (shadow_size, shadow_size, S_WIDTH, S_HEIGHT);
-        buffer_surface.context.set_source_rgba (0, 0, 0, alpha);
-        buffer_surface.context.fill();
-        buffer_surface.fast_blur(2, 3);
-        Gdk.cairo_set_source_pixbuf(buffer_surface.context, pixbuf.scale_simple (S_WIDTH, S_HEIGHT, Gdk.InterpType.BILINEAR), shadow_size, shadow_size);
-        buffer_surface.context.paint();
-
-        return buffer_surface.load_to_pixbuf();
-    }
-
-    /**
-     * Launch a file with its default handler
-     */
-    public void launch_file (File file) {
-        try {
-            var handler = file.query_default_handler (null);
-            var list = new GLib.List<File> ();
-            list.append (file);
-            handler.launch (list, null);
-        } catch (Error err) {
-            warning (err.message);
-        }
-    }
-}
+            next_filename = time + (file_id > 0 ? "-" + file_id.to_string () : "");
+            file_id++;
+        } while (GLib.FileUtils.test (build_media_filename (next_filename, action_type), FileTest.EXISTS));
+
+        return build_media_filename (next_filename, action_type);
+    }
+
+    public string build_media_filename (string filename, ActionType action_type) {
+        string full_filename = "%s.%s".printf (filename, action_type == ActionType.PHOTO ? "jpg" : "mp4");
+        string media_directory = get_media_directory (action_type);
+
+        if (!FileUtils.test (media_directory, FileTest.EXISTS)) {
+            DirUtils.create (media_directory, 0777);
+        }
+
+        return GLib.Path.build_filename (Path.DIR_SEPARATOR_S, media_directory, full_filename);
+    }
+
+    public string get_media_directory (ActionType action_type) {
+        UserDirectory user_dir = (action_type == ActionType.PHOTO ? UserDirectory.PICTURES : UserDirectory.VIDEOS);
+        string media_directory = GLib.Environment.get_user_special_dir (user_dir);
+
+        return GLib.Path.build_path (Path.DIR_SEPARATOR_S, media_directory, "Webcam");
+    }
+}
\ No newline at end of file

=== removed file 'src/Widgets/Camera.vala'
--- src/Widgets/Camera.vala	2015-03-02 14:02:30 +0000
+++ src/Widgets/Camera.vala	1970-01-01 00:00:00 +0000
@@ -1,176 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as
-  published    by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program.  If not, see <http://www.gnu.org/licenses>
-
-  END LICENSE
-***/
-
-namespace Snap.Widgets {
-    public class Camera : Gtk.DrawingArea {
-        public enum ActionType {
-            PHOTO = 0,
-            VIDEO,
-            CAPTURING;
-        }
-
-        private const double PERCENTAGE_SCREEN = 0.6;
-
-        public uint video_width = 640;
-        public uint video_height = 480;
-
-        private ActionType type;
-
-        private bool capturing = false;
-
-        private Gst.Element? camerabin = null;
-        private Gst.Element? videoflip = null;
-
-        public signal void capture_start ();
-        public signal void capture_stop ();
-
-        public class Camera (string camera_uri) {
-            this.videoflip = Gst.ElementFactory.make ("videoflip", "videoflip");
-            this.videoflip.set_property ("method", 4);
-
-            this.camerabin = Gst.ElementFactory.make ("camerabin","camera");
-            this.camerabin.set_property ("viewfinder-filter", videoflip);
-
-            this.camerabin.bus.add_watch (0,(bus,message) => {
-                if (Gst.Video.is_video_overlay_prepare_window_handle_message (message))
-                    (message.src as Gst.Video.Overlay).set_window_handle ((uint*) Gdk.X11Window.get_xid (this.get_window()));
-                return true;
-            });
-
-            var preview_caps = Gst.Caps.from_string ("video/x-raw, format=\"rgb\"");
-            this.camerabin.set_property ("preview-caps", preview_caps);
-
-            // Workaround to fix a CSD releated bug.
-            // See https://bugzilla.gnome.org/show_bug.cgi?id=721148
-            // for more information
-            Gdk.Visual visual = Gdk.Visual.get_system ();
-            if (visual != null)
-                this.set_visual (visual);
-            // workaround END
-
-            try {
-                var info = new Gst.PbUtils.Discoverer (10 * Gst.SECOND).discover_uri (camera_uri);
-                var video = info.get_video_streams ();
-
-                if (video != null && video.data != null) {
-                    var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
-
-                    video_width = video_info.get_width ();
-                    video_height = video_info.get_height ();
-                }
-
-                var current_screen = this.get_screen ();
-                var screen_width = current_screen.get_width ();
-                var screen_height = current_screen.get_height ();
-
-                if (video_width >= screen_width * PERCENTAGE_SCREEN || video_height >= screen_height * PERCENTAGE_SCREEN) {
-                    if ((float)screen_width / video_width < (float)screen_height / video_height) {
-                        var new_video_width = (int)(screen_width * PERCENTAGE_SCREEN);
-                        video_height = (int)(((float)new_video_width / video_width) * video_height);
-                        video_width = new_video_width;
-                    } else {
-                        var new_video_height = (int)(screen_height * PERCENTAGE_SCREEN);
-                        video_width = (int)(((float)new_video_height / video_height) * video_width);
-                        video_height = new_video_height;
-                    }
-                }
-            } catch (Error e) {
-                debug ("Getting the video-size failed: %s", e.message);
-            }
-
-            this.set_size_request ((int)video_width, (int)video_height);
-            this.show_all ();
-            this.play ();
-        }
-
-        /**
-         * Change the camera recording type (switch between Video or Photo mode)
-         */
-        public void set_action_type (ActionType type) {
-            debug ("mode changed");
-            this.type = type;
-        }
-
-        /**
-         * Starts Camera visualization
-         */
-        public void play () {
-            this.camerabin.set_state (Gst.State.PLAYING);
-        }
-
-        /**
-         * Stops Camera visualization
-         */
-        public void stop () {
-            this.camerabin.set_state (Gst.State.NULL);
-        }
-
-        /**
-         * Send to the Camera an acquire signal depending on its recording mode
-         */
-        public void take_start () {
-            debug ("Recording...");
-
-            this.capture_start ();
-
-            string location = Resources.get_new_media_filename (this.type);
-            // "(int) this.type + 1" is here because GST developers used mode 1 for photos
-            // and mode 2 for videos (can't understand why not 0 and 1)
-            this.camerabin.set_property ("mode", (int) this.type + 1);
-
-            this.capturing = (this.type == ActionType.VIDEO);
-
-            debug ("%s", location);
-
-            camerabin.set_property ("location", location);
-            GLib.Signal.emit_by_name (camerabin, "start-capture");
-
-            if (this.type == ActionType.PHOTO)
-                this.capture_stop ();
-        }
-
-        /**
-         * Tells the camera to stop recording (to be used only in video mode)
-         */
-        public void take_stop () {
-            debug ("Stopping video record...");
-
-            this.capturing = false;
-
-            GLib.Signal.emit_by_name (camerabin, "stop-capture");
-
-            this.capture_stop ();
-        }
-
-        /**
-         * @return the action Camera is supposed to do
-         */
-        public ActionType get_action_type () {
-            return type;
-        }
-
-        /**
-         * @return true if camera is recording a video, false otherwise
-         */
-        public bool get_capturing () {
-            return capturing;
-        }
-    }
-}

=== added file 'src/Widgets/CameraView.vala'
--- src/Widgets/CameraView.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/CameraView.vala	2016-01-19 15:51:17 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2011-2016 Snap Developers (http://launchpad.net/snap-elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Marcus Wichelmann <[e-mail]>
+ */
+
+public class Snap.Widgets.CameraView : ClutterGst.Camera {
+    public signal void initialized ();
+
+    public CameraView () {
+        new Thread<int> (null, () => {
+            debug ("Initializing camera view...");
+
+            initialize_view ();
+
+            return 0;
+        });
+    }
+
+    public new bool take_photo () {
+        if (!this.is_ready_for_capture () || this.is_recording_video ()) {
+            warning ("Device isn't ready for taking photos.");
+
+            return false;
+        }
+
+        base.take_photo (Utils.get_new_media_filename (Utils.ActionType.PHOTO));
+
+        return true;
+    }
+
+    public bool start_recording () {
+        if (!this.is_ready_for_capture () || this.is_recording_video ()) {
+            warning ("Device isn't ready for recording videos.");
+
+            return false;
+        }
+
+        this.start_video_recording (Utils.get_new_media_filename (Utils.ActionType.VIDEO));
+
+        return true;
+    }
+
+    public void stop_recording () {
+        if (!this.is_recording_video ()) {
+            warning ("Cannot stop recording because no record is running.");
+
+            return;
+        }
+
+        this.stop_video_recording ();
+    }
+
+    private void initialize_view () {
+        Gst.Element flip_filter = Gst.ElementFactory.make ("videoflip", "videoflip");
+        flip_filter.set_property ("method", 4);
+
+        this.set_filter (flip_filter);
+        this.set_playing (true);
+
+        if (this.is_ready_for_capture ()) {
+            debug ("Camera view initalized.");
+
+            Idle.add (() => {
+                initialized ();
+
+                return false;
+            });
+        } else {
+            warning ("Initializing camera view failed.");
+        }
+    }
+}
\ No newline at end of file

=== removed file 'src/Widgets/Countdown.vala'
--- src/Widgets/Countdown.vala	2015-02-26 12:35:06 +0000
+++ src/Widgets/Countdown.vala	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2011-2012 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as
-  published    by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program.  If not, see <http://www.gnu.org/licenses>
-
-  END LICENSE
-***/
-
-namespace Snap.Widgets {
-
-    public class Countdown : Granite.Widgets.CompositedWindow {
-        public signal void time_elapsed ();
-
-        public Label count_label {get; private set;}
-        public Label title_label {get; private set;}
-
-        public MediaType media_type {get; private set;}
-
-        private bool window_destroyed = false;
-
-        public Countdown (MediaType media_type) {
-            this.media_type = media_type;
-
-            this.set_default_size (300, 200);
-            this.window_position = 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);
-            box.margin = 40;
-            box.margin_left = box.margin_right = 60;
-
-            this.title_label = new Label ("");
-            this.title_label.use_markup = true;
-
-            this.count_label = new Label ("");
-            this.count_label.use_markup = true;
-
-            box.pack_start (title_label);
-            box.pack_start (count_label);
-
-            this.add (box);
-
-            string media_text = "";
-
-            if (media_type == MediaType.PHOTO)
-                media_text = _("Taking photo in");
-            else if (media_type == MediaType.VIDEO)
-                media_text = _("Recording starts in");
-
-            media_text = media_text.replace ("&", "&amp;");
-
-            title_label.label = "<span size='20000' color='#fbfbfb'>" + media_text + "</span>";
-        }
-
-        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);
-            ctx.set_source_rgba (0.1, 0.1, 0.1, 0.8);
-            ctx.fill ();
-            return base.draw (ctx);
-        }
-
-        public void start (int secs) {
-            set_count (secs);
-
-            if (secs > 0)
-                this.show_all ();
-
-            Timeout.add (1000, () => {
-                secs --;
-
-                if (window_destroyed)
-                    return false;
-
-                if (secs == 0) {
-                    this.hide ();
-                }
-                else if (secs == -1) {
-                    if (!window_destroyed)
-                        this.time_elapsed (); // notify that we're finished here
-                    this.destroy ();
-                    return false; // stop
-                }
-
-                set_count (secs);
-                return true; // keep going
-            });
-        }
-
-        public override void destroy () {
-            window_destroyed = true;
-            base.destroy ();
-        }
-
-        private void set_count (int secs) {
-            count_label.label = "<span size='40000' color='#fbfbfb'>" + secs.to_string () + "</span>";
-        }
-    }
-}
-

=== removed file 'src/Widgets/Gallery.vala'
--- src/Widgets/Gallery.vala	2015-02-26 12:35:06 +0000
+++ src/Widgets/Gallery.vala	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Mario Guerriero <[e-mail]>
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as
-  published    by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program.  If not, see <http://www.gnu.org/licenses>
-
-  END LICENSE
-***/
-
-namespace Snap.Widgets {
-
-    public class Gallery : Gtk.ScrolledWindow {
-        private Gtk.ListStore model;
-        private Gtk.IconView view;
-
-        public Gallery () {
-            this.model = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (Services.Thumbnail));
-
-            this.view = new Gtk.IconView.with_model (model);
-            this.view.set_pixbuf_column (0);
-            this.view.set_selection_mode (Gtk.SelectionMode.SINGLE);
-            this.view.selection_changed.connect (() => {
-                GLib.List<Gtk.TreePath> paths = this.view.get_selected_items ();
-                Gtk.TreeIter iter;
-                Services.Thumbnail thumb = null;
-
-                foreach (Gtk.TreePath path in paths) {
-                    this.model.get_iter (out iter, path);
-
-                    GLib.Value val;
-                    this.model.get_value (iter, 1, out val);
-
-                    thumb = (Services.Thumbnail) val;
-
-                    Resources.launch_file (thumb.file);
-                }
-            });
-
-            Resources.photo_thumb_provider.thumbnail_loaded.connect (add_thumbnail);
-            Resources.video_thumb_provider.thumbnail_loaded.connect (add_thumbnail);
-
-            this.add (view);
-        }
-
-        private void add_thumbnail (Services.Thumbnail thumb) {
-            Gtk.TreeIter iter;
-            this.model.append (out iter);
-            this.model.set (iter, 0, thumb.pixbuf, 1, thumb);
-        }
-
-        /**
-         + Simply clear the IconView as the name suggests
-         */
-        public void clear_view () {
-            this.model.clear ();
-        }
-    }
-}

=== added file 'src/Widgets/HeaderBar.vala'
--- src/Widgets/HeaderBar.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/HeaderBar.vala	2016-01-19 15:51:17 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2011-2016 Snap Developers (http://launchpad.net/snap-elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Marcus Wichelmann <[e-mail]>
+ */
+
+public class Snap.Widgets.HeaderBar : Gtk.HeaderBar {
+    private static const string PHOTO_ICON_SYMBOLIC = "view-list-images-symbolic";
+    private static const string VIDEO_ICON_SYMBOLIC = "view-list-video-symbolic";
+    private static const string STOP_ICON_SYMBOLIC = "media-playback-stop-symbolic";
+
+    public const string TAKE_BUTTON_STYLESHEET = """
+        .take-button {
+            border-radius: 400px;
+        }
+    """;
+
+    public Backend.Settings settings { private get; construct; }
+
+    private Gtk.Button take_button;
+    private Granite.Widgets.ModeButton mode_button;
+
+    private bool is_recording = false;
+
+    public signal void take_photo_clicked ();
+    public signal void start_recording_clicked ();
+    public signal void stop_recording_clicked ();
+
+    public HeaderBar (Backend.Settings settings) {
+        Object (settings: settings);
+
+        build_ui ();
+        update_take_button_icon ();
+        connect_signals ();
+    }
+
+    public void set_is_recording (bool is_recording) {
+        this.is_recording = is_recording;
+
+        update_take_button_icon ();
+    }
+
+    public void set_camera_controls_sensitive (bool sensitive) {
+        take_button.set_sensitive (sensitive);
+        mode_button.set_sensitive (sensitive);
+    }
+
+    private void build_ui () {
+        this.show_close_button = true;
+
+        take_button = new Gtk.Button.from_icon_name (PHOTO_ICON_SYMBOLIC, Gtk.IconSize.BUTTON);
+        take_button.set_size_request (54, -1);
+        take_button.sensitive = false;
+
+        Gtk.CssProvider take_button_style_provider = new Gtk.CssProvider ();
+
+        try {
+            take_button_style_provider.load_from_data (TAKE_BUTTON_STYLESHEET, -1);
+        } catch (Error e) {
+            warning ("Styling take button failed: %s", e.message);
+        }
+
+        Gtk.StyleContext take_button_style_context = take_button.get_style_context ();
+        take_button_style_context.add_provider (take_button_style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        take_button_style_context.add_class ("take-button");
+        take_button_style_context.add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION);
+        take_button_style_context.add_class (Gtk.STYLE_CLASS_RAISED);
+
+        mode_button = new Granite.Widgets.ModeButton ();
+        mode_button.append_icon (PHOTO_ICON_SYMBOLIC, Gtk.IconSize.BUTTON);
+        mode_button.append_icon (VIDEO_ICON_SYMBOLIC, Gtk.IconSize.BUTTON);
+        mode_button.sensitive = false;
+
+        this.set_custom_title (take_button);
+        this.pack_end (mode_button);
+    }
+
+    private void connect_signals () {
+        settings.action_type_changed.connect (update_take_button_icon);
+
+        take_button.clicked.connect (() => {
+            if (settings.get_action_type () == Utils.ActionType.PHOTO) {
+                take_photo_clicked ();
+            } else {
+                if (is_recording) {
+                    stop_recording_clicked ();
+                } else {
+                    start_recording_clicked ();
+                }
+            }
+        });
+
+        mode_button.mode_changed.connect (() => {
+            settings.set_action_type (mode_button.selected == 0 ? Utils.ActionType.PHOTO : Utils.ActionType.VIDEO);
+        });
+    }
+
+    private void update_take_button_icon () {
+        string icon_name;
+        Utils.ActionType action_type = settings.get_action_type ();
+
+        if (action_type == Utils.ActionType.PHOTO) {
+            icon_name = PHOTO_ICON_SYMBOLIC;
+        } else {
+            icon_name = (is_recording ? STOP_ICON_SYMBOLIC : VIDEO_ICON_SYMBOLIC);
+        }
+
+        ((Gtk.Image)take_button.image).set_from_icon_name (icon_name, Gtk.IconSize.BUTTON);
+        mode_button.set_active ((int)(action_type == Utils.ActionType.VIDEO));
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/LoadingView.vala'
--- src/Widgets/LoadingView.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/LoadingView.vala	2016-01-19 15:51:17 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2011-2016 Snap Developers (http://launchpad.net/snap-elementary)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Marcus Wichelmann <[e-mail]>
+ */
+
+public class Snap.Widgets.LoadingView : Gtk.Box {
+    private Gtk.Grid inner_grid;
+
+    private Gtk.Spinner spinner;
+    private Gtk.Label status_label;
+
+    public LoadingView () {
+        Object (orientation: Gtk.Orientation.HORIZONTAL);
+
+        build_ui ();
+    }
+
+    public void set_status (string status) {
+        status_label.set_label (status);
+    }
+
+    private void build_ui () {
+        this.override_background_color (Gtk.StateFlags.NORMAL, { 0, 0, 0, 1 });
+        this.override_color (Gtk.StateFlags.NORMAL, { 1, 1, 1, 1 });
+
+        inner_grid = new Gtk.Grid ();
+        inner_grid.halign = Gtk.Align.CENTER;
+        inner_grid.valign = Gtk.Align.CENTER;
+
+        spinner = new Gtk.Spinner ();
+        spinner.active = true;
+
+        status_label = new Gtk.Label (_("Searching for video devices…"));
+        status_label.margin_top = 12;
+
+        inner_grid.attach (spinner, 0, 0, 1, 1);
+        inner_grid.attach (status_label, 0, 1, 1, 1);
+
+        this.pack_start (inner_grid);
+    }
+}
\ No newline at end of file

=== removed file 'src/Widgets/NoCamera.vala'
--- src/Widgets/NoCamera.vala	2015-02-26 12:35:06 +0000
+++ src/Widgets/NoCamera.vala	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-Copyright (C) 2014 elementary Developers and Artem Anufrij
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Authors :   Artem Anufrij <[e-mail]>
-***/
-
-namespace Snap.Widgets {
-
-    public class NoCamera : Gtk.ScrolledWindow {
-        Gtk.Label no_camera_label;
-
-        public class NoCamera () {
-            no_camera_label = new Gtk.Label ("");
-            no_camera_label.set_markup ("<span color='gray'>%s</span>".printf(_("Your webcam has not been detected. Please be sure you plugged it in.")));
-            this.add (no_camera_label);
-            this.show_all ();
-        }
-    }
-}

=== modified file 'src/config.vala.cmake'
--- src/config.vala.cmake	2012-05-25 15:00:03 +0000
+++ src/config.vala.cmake	2016-01-19 15:51:17 +0000
@@ -1,12 +1,12 @@
-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@";
-/* Translation template for .desktop file */
-public const string COMMENT = N_("Take photos with your web cam");
-public const string GENERIC = N_("Photo Booth");
+namespace Snap.Config {
+    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@";
+    /* Translation template for .desktop file */
+    public const string COMMENT = N_("Take photos with your web cam");
+    public const string GENERIC = N_("Photo Booth");
 }