changes

.gitignore

@@ -5,4 +5,4 @@ Makefile.rules
 config.h
 *.oo
 simpleskycam
-
+*~

Makefile

@@ -4,7 +4,7 @@ APP = simpleskycam
 
 -include Makefile.rules
 
-OBJECTS = gui.oo main.oo
+OBJECTS = gui.oo main.oo video.oo videodev.oo
 DISTNAME=simpleskycam-$(VERSION)
 
 ifeq ($(TARGET),)

gui.h

@@ -16,6 +16,7 @@
 #include <list>
 
 #define BUILDER_FILE "simpleskycam.ui"
+extern GtkBuilder *_builder_;
 
 void displayerror (std::string error);
 
@@ -32,6 +33,9 @@ G_MODULE_EXPORT void cb_window_show  (GtkWidget *widget, gpointer data);
 G_MODULE_EXPORT gboolean cb_window_delete_event (GtkWidget *widget,
 				GdkEvent *event, gpointer data);
 
+G_MODULE_EXPORT void cb_video_refreshlist  (GtkWidget *widget, gpointer data);
+
+
 //
 // thread handles
 G_MODULE_EXPORT gboolean cb_thread_video (gpointer data);
@@ -41,4 +45,5 @@ G_MODULE_EXPORT gboolean cb_thread_video (gpointer data);
 #endif
 
 
-#endif
+#endif // _GUI_H_
+

simpleskycam.ui

@@ -6,6 +6,7 @@
     <property name="can-focus">False</property>
     <property name="default-width">1024</property>
     <property name="default-height">786</property>
+    <signal name="delete-event" handler="cb_window_delete_event" swapped="no"/>
     <child>
       <object class="GtkPaned">
         <property name="visible">True</property>
@@ -58,15 +59,11 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBoxText">
+                          <object class="GtkComboBoxText" id="cb-videodev">
+                            <property name="name">cb-videodev</property>
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                             <property name="has-entry">True</property>
-                            <child internal-child="entry">
-                              <object class="GtkEntry">
-                                <property name="can-focus">False</property>
-                              </object>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -77,11 +74,14 @@
                         <child>
                           <object class="GtkButton" id="btn_devicescan">
                             <property name="label">gtk-refresh</property>
+                            <property name="name">btn-videodev-refresh</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>
                             <property name="use-stock">True</property>
                             <property name="always-show-image">True</property>
+                            <signal name="activate" handler="cb_video_refreshlist" swapped="no"/>
+                            <signal name="pressed" handler="cb_video_refreshlist" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -92,6 +92,7 @@
                         <child>
                           <object class="GtkButton" id="btn_device_connect">
                             <property name="label">gtk-apply</property>
+                            <property name="name">btn-videodev-ok</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">True</property>