diff options
| author | MaZderMind <git@mazdermind.de> | 2015-08-07 11:32:34 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2015-08-07 11:32:34 +0200 |
| commit | 2aa635013174a8c73839d52d678e503eabed2900 (patch) | |
| tree | 7aab1e6b67cc09a10c2641819d8d7db4bcc9e770 /voctogui/ui/voctogui.ui | |
| parent | 74c0cf9f94ff4ab2a0490eb1819175d3daf0793c (diff) | |
| parent | 4ba884d3a81d215b341b44626483f1df6f471762 (diff) | |
Merge branch 'great-refactoring'
Diffstat (limited to 'voctogui/ui/voctogui.ui')
| -rw-r--r-- | voctogui/ui/voctogui.ui | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/voctogui/ui/voctogui.ui b/voctogui/ui/voctogui.ui index 80ca348..1eb64cc 100644 --- a/voctogui/ui/voctogui.ui +++ b/voctogui/ui/voctogui.ui @@ -32,20 +32,6 @@ <property name="can_focus">False</property> <property name="pixbuf">stream-live.svg</property> </object> - <object class="GtkListStore" id="liststore_audio"> - <columns> - <!-- column-name name --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">cam1</col> - </row> - <row> - <col id="0" translatable="yes">cam2</col> - </row> - </data> - </object> <object class="GtkWindow" id="window"> <property name="can_focus">False</property> <property name="default_width">1280</property> @@ -168,6 +154,7 @@ <object class="GtkToolButton" id="preview_fullscreen"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> <property name="label" translatable="yes">Fullscreen Preview</property> <property name="use_underline">True</property> </object> @@ -180,6 +167,7 @@ <object class="GtkToolButton" id="preview_freeze"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> <property name="label" translatable="yes">Freeze Preview</property> <property name="use_underline">True</property> </object> @@ -225,21 +213,23 @@ </packing> </child> <child> - <object class="GtkComboBox" id="combo_audio"> + <object class="GtkEventBox" id="combo_audio_events"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> - <property name="model">liststore_audio</property> - <property name="id_column">0</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkComboBoxText" id="combo_audio"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> + <property name="margin_top">5</property> + <property name="margin_bottom">5</property> + <items> + <item translatable="yes">Foo</item> + <item translatable="yes">Bar</item> + </items> + </object> </child> </object> <packing> |