From 1f95800db77e1580af79e4225cef1a8d8943ac27 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Mon, 15 Jul 2013 22:15:31 -0400 Subject: [PATCH] Remove temp file when exiting, show camera option only if camera is installed --- mugshot/CameraMugshotDialog.py | 2 ++ mugshot/MugshotWindow.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mugshot/CameraMugshotDialog.py b/mugshot/CameraMugshotDialog.py index 81ad47a..8b5e0c6 100644 --- a/mugshot/CameraMugshotDialog.py +++ b/mugshot/CameraMugshotDialog.py @@ -230,6 +230,8 @@ class CameraMugshotDialog(CameraDialog): self.hide() def on_camera_mugshot_dialog_destroy(self, widget, data=None): + # Clear away the temp file. + os.remove(self.filename) #clean up the camera before exiting self.camerabin.set_state(Gst.State.NULL) diff --git a/mugshot/MugshotWindow.py b/mugshot/MugshotWindow.py index 652e181..259f5c9 100644 --- a/mugshot/MugshotWindow.py +++ b/mugshot/MugshotWindow.py @@ -108,6 +108,7 @@ class MugshotWindow(Window): self.user_image = builder.get_object('user_image') self.image_menu = builder.get_object('image_menu') self.image_menu.attach_to_widget(self.image_button, detach_cb) + self.image_from_camera = builder.get_object('image_from_camera') # Entry widgets (chfn) self.first_name_entry = builder.get_object('first_name') @@ -236,6 +237,7 @@ class MugshotWindow(Window): def on_image_button_clicked(self, widget): """When the menu button is clicked, display the photo menu.""" logger.debug('Show photo menu') + self.image_from_camera.set_visible(os.path.exists('/dev/video0')) if widget.get_active(): self.image_menu.popup(None, None, menu_position, self.image_menu, 3,