Merge lp:~artem-anufrij/snap-elementary/Bugfix-1365978 into lp:snap-elementary

[Artem Anufrij]

Show a message when no camera detected

[Cody Garver (codygarver)]

Does not compile

review: Needs Fixing

[Cody Garver (codygarver)]

Also some code style violations, function() should be function ()

[Cody Garver (codygarver)]

http://elementaryos.org/docs/code/code-style

[lp:~artem-anufrij/snap-elementary/Bugfix-1365978]

260. By artem-anufrij on 2014-10-01

NoCamera.vala added

[Artem Anufrij (artem-anufrij)]

Hey Gody,

sorry, I forgot to add "NoCamera.vala".

[Corentin Noël (tintou)]

You don't need to translate the second argument in stack.add_named, the name is internal to Gtk and is used to identify the widget

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

Hey Cody,
"Gallery" and "Camera" are translated, too. Should I fixed them?

"
78. this.stack.add_named (this.gallery, _("Gallery"));
79. this.stack.add_named (this.camera, _("Camera"));
"

[Artem Anufrij (artem-anufrij)]

Sorry. I mean Corentin.

[Corentin Noël (tintou)]

Yes, please fix it
Le 1 oct. 2014 14:07, "Artem Anufrij" <email address hidden> a écrit :

> Sorry. I mean Corentin.
> --
>
> https://code.launchpad.net/~artem-anufrij/snap-elementary/Bugfix-1365978/+merge/235849
> You are reviewing the proposed merge of
> lp:~artem-anufrij/snap-elementary/Bugfix-1365978 into lp:snap-elementary.
>

[lp:~artem-anufrij/snap-elementary/Bugfix-1365978]

261. By artem-anufrij on 2014-10-01

Second argument in 'stack.add_named' will not be translated.

[Artem Anufrij (artem-anufrij)]

done

[Cody Garver (codygarver)]

Code style is still wrong

Also the copyright should be attributed to something like "elementary Developers", not Mario

review: Needs Fixing

[lp:~artem-anufrij/snap-elementary/Bugfix-1365978]

262. By artem-anufrij on 2014-10-03

License text was changed. Code style was corrected.

263. By artem-anufrij on 2014-10-03

Code style was corrected.

[Cody Garver (codygarver)]

The warning could look better but design team can deal with that later

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-05-16 16:15:44 +0000
+++ src/CMakeLists.txt	2014-10-03 08:46:09 +0000
@@ -8,6 +8,7 @@
     ######
     Widgets/Camera.vala
     Widgets/Gallery.vala
+    Widgets/NoCamera.vala
     ######
     config.vala
 PACKAGES

=== modified file 'src/SnapWindow.vala'
--- src/SnapWindow.vala	2014-10-03 01:33:47 +0000
+++ src/SnapWindow.vala	2014-10-03 08:46:09 +0000
@@ -21,11 +21,12 @@
 namespace Snap {
 
     public class SnapWindow : Gtk.Window {
-
+    
         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;
@@ -36,6 +37,8 @@
         private File photo_path;
         private File video_path;
 
+        private bool camera_detected;
+
         public SnapWindow (Snap.SnapApp snap_app) {
 
             this.snap_app = snap_app;
@@ -53,6 +56,9 @@
             Resources.photo_thumb_provider = new Services.ThumbnailProvider (photo_path);
             Resources.video_thumb_provider = new Services.ThumbnailProvider (video_path);
 
+            // camera
+            camera_detected = this.detect_camera ();
+
             // Setup UI
             setup_window ();
         }
@@ -74,7 +80,7 @@
             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.camera) {
+                if (this.stack.get_visible_child () != this.gallery) {
                     this.show_gallery ();
                     this.load_thumbnails ();
                 }
@@ -119,6 +125,7 @@
                     this.camera.take_stop ();
                 }
             });
+            take_button.set_sensitive (camera_detected);
             
             var take_button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
             take_button_box.set_spacing (4);
@@ -130,6 +137,9 @@
 
             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 ();
             
@@ -151,10 +161,14 @@
             // 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.set_visible_child (this.camera); // Show camera on launch
-
+            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 ();
 
@@ -169,6 +183,25 @@
             
         }
         
+        private bool 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 true;
+                    }
+                }                
+            } catch (Error err) {
+                debug ("camera detection failed: %s", err.message);
+            }
+           
+            debug ("no camera");
+            return false;
+        }
+        
         protected override bool delete_event (Gdk.EventAny event) {
             Resources.photo_thumb_provider.clear_cache ();
             Resources.video_thumb_provider.clear_cache ();
@@ -226,15 +259,23 @@
         }
         
         private void show_gallery () {
-            this.camera.stop ();
+            if (camera_detected) {
+                this.camera.stop ();                
+            }
             this.lock_camera_actions ();
             this.stack.set_visible_child (this.gallery);
         }
         
         private void show_camera () {
-            this.camera.play ();
-            this.unlock_camera_actions ();
-            this.stack.set_visible_child (this.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 bool gallery_files_exists () {
@@ -257,4 +298,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/Camera.vala'
--- src/Widgets/Camera.vala	2014-05-27 11:23:34 +0000
+++ src/Widgets/Camera.vala	2014-10-03 08:46:09 +0000
@@ -41,13 +41,15 @@
         public signal void capture_stop ();
         
         public class Camera () {
+            
             this.set_size_request (WIDTH, HEIGHT); // FIXME
 
-            this.videoflip = Gst.ElementFactory.make ("videoflip", "videoflip");
+            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()));

=== added file 'src/Widgets/NoCamera.vala'
--- src/Widgets/NoCamera.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/NoCamera.vala	2014-10-03 08:46:09 +0000
@@ -0,0 +1,33 @@
+// -*- 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 ();
+        }       
+    }
+}
\ No newline at end of file