diff options
author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-09-19 14:26:01 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-09-21 06:34:58 -0300 |
commit | f85679e6c08c5ed1c8bee595bb15805d1e9ec081 (patch) | |
tree | 6cfeee80ab0756013e06a18765c21ef6f791a852 /data | |
parent | 6087e0f3b3b2cfd57bf5eb173eaa0d4dd34ba9a4 (diff) |
Add a dialog to optionally select the video device
The first time camorama is started, or if it doesn't find the
previously used camera, it will now open a dialog allowing
the user to choose the camera.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'data')
-rw-r--r-- | data/camorama-gtk2.ui | 80 | ||||
-rw-r--r-- | data/camorama-gtk3.ui | 82 | ||||
-rw-r--r-- | data/camorama-gtk4.ui | 72 |
3 files changed, 231 insertions, 3 deletions
diff --git a/data/camorama-gtk2.ui b/data/camorama-gtk2.ui index 8a19cbe..e32d438 100644 --- a/data/camorama-gtk2.ui +++ b/data/camorama-gtk2.ui @@ -1194,7 +1194,6 @@ <property name="pixbuf">snap-icon-small.xpm</property> </object> <object class="GtkWindow" id="main_window"> - <property name="visible">True</property> <property name="can_focus">False</property> <property name="title" translatable="yes">Camorama-libglade</property> <accel-groups> @@ -1810,4 +1809,83 @@ </object> </child> </object> + <object class="GtkDialog" id="videodev_window"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="videodev_vbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="videodev_ok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="videodev_vbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="videodev_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Select a video device to be used</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="videodev_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">videodev_ok</action-widget> + </action-widgets> + </object> </interface> diff --git a/data/camorama-gtk3.ui b/data/camorama-gtk3.ui index 05520e7..3b74bfe 100644 --- a/data/camorama-gtk3.ui +++ b/data/camorama-gtk3.ui @@ -36,7 +36,6 @@ <property name="pixbuf">snap-icon-small.xpm</property> </object> <object class="GtkWindow" id="main_window"> - <property name="visible">True</property> <property name="can_focus">False</property> <property name="title" translatable="yes">Camorama-libglade</property> <accel-groups> @@ -1773,4 +1772,85 @@ <placeholder/> </child> </object> + <object class="GtkDialog" id="videodev_window"> + <property name="can_focus">False</property> + <property name="modal">True</property> + <property name="window_position">center</property> + <property name="destroy_with_parent">True</property> + <property name="type_hint">dialog</property> + <property name="transient_for">main_window</property> + <child internal-child="vbox"> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="videodev_ok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Select a video device to be used</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="videodev_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="titlebar"> + <placeholder/> + </child> + </object> </interface> diff --git a/data/camorama-gtk4.ui b/data/camorama-gtk4.ui index 7acb03f..ac2a5dd 100644 --- a/data/camorama-gtk4.ui +++ b/data/camorama-gtk4.ui @@ -24,7 +24,6 @@ <property name="step_increment">1</property> </object> <object class="GtkWindow" id="main_window"> - <property name="visible">True</property> <property name="can_focus">False</property> <property name="title" translatable="yes">Camorama-libglade</property> <accel-groups> @@ -1565,4 +1564,75 @@ <placeholder/> </child> </object> + <object class="GtkDialog" id="videodev_window"> + <property name="can_focus">False</property> + <property name="modal">True</property> + <property name="window_position">center</property> + <property name="destroy_with_parent">True</property> + <property name="type_hint">dialog</property> + <property name="transient_for">main_window</property> + <child internal-child="vbox"> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkButton" id="videodev_ok"> + <property name="label">_Ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Select a video device to be used</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="videodev_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="titlebar"> + <placeholder/> + </child> + </object> </interface> |