Sergey77
/
OSG_Mugshot_fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove temp file when exiting, show camera option only if camera is installed

This commit is contained in:
Sean Davis 2013-07-15 22:15:31 -04:00
parent 5cc3f035f0
commit 1f95800db7
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mugshot/CameraMugshotDialog.py
View File

@ -230,6 +230,8 @@ class CameraMugshotDialog(CameraDialog):
self.hide() self.hide()
def on_camera_mugshot_dialog_destroy(self, widget, data=None): 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 #clean up the camera before exiting
self.camerabin.set_state(Gst.State.NULL) self.camerabin.set_state(Gst.State.NULL)

2
mugshot/MugshotWindow.py
View File

@ -108,6 +108,7 @@ class MugshotWindow(Window):
self.user_image = builder.get_object('user_image') self.user_image = builder.get_object('user_image')
self.image_menu = builder.get_object('image_menu') self.image_menu = builder.get_object('image_menu')
self.image_menu.attach_to_widget(self.image_button, detach_cb) self.image_menu.attach_to_widget(self.image_button, detach_cb)
self.image_from_camera = builder.get_object('image_from_camera')
# Entry widgets (chfn) # Entry widgets (chfn)
self.first_name_entry = builder.get_object('first_name') self.first_name_entry = builder.get_object('first_name')
@ -236,6 +237,7 @@ class MugshotWindow(Window):
def on_image_button_clicked(self, widget): def on_image_button_clicked(self, widget):
"""When the menu button is clicked, display the photo menu.""" """When the menu button is clicked, display the photo menu."""
logger.debug('Show photo menu') logger.debug('Show photo menu')
self.image_from_camera.set_visible(os.path.exists('/dev/video0'))
if widget.get_active(): if widget.get_active():
self.image_menu.popup(None, None, menu_position, self.image_menu.popup(None, None, menu_position,
self.image_menu, 3, self.image_menu, 3,