summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/gui/control.c5
-rw-r--r--bin/gui/control.glade109
2 files changed, 48 insertions, 66 deletions
diff --git a/bin/gui/control.c b/bin/gui/control.c
index 069b825..b161e9b 100644
--- a/bin/gui/control.c
+++ b/bin/gui/control.c
@@ -53,7 +53,6 @@ typedef struct {
GtkDialog *download_dialog;
GtkProgressBar *download_progressbar;
- GtkWidget *download_close_button;
GtkAdjustment *download_adjustment;
GtkAdjustment *count;
GtkAdjustment *hadjustment, *vadjustment;
@@ -636,7 +635,6 @@ download_frames (ThreadData *data)
g_object_get (data->camera, "recorded-frames", &n_frames, NULL);
gdk_threads_enter ();
- gtk_widget_set_sensitive (data->download_close_button, FALSE);
gtk_adjustment_set_upper (data->download_adjustment, n_frames);
gdk_threads_leave ();
@@ -676,7 +674,7 @@ download_frames (ThreadData *data)
g_printerr ("Failed to stop reading out of camera memory: %s\n", error->message);
gdk_threads_enter ();
- gtk_widget_set_sensitive (data->download_close_button, TRUE);
+ gtk_dialog_response (data->download_dialog, GTK_RESPONSE_OK);
gdk_threads_leave ();
return NULL;
@@ -812,7 +810,6 @@ create_main_window (GtkBuilder *builder, const gchar* camera_name)
td.download_dialog = GTK_DIALOG (gtk_builder_get_object (builder, "download-dialog"));
td.download_adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "download-adjustment"));
- td.download_close_button = GTK_WIDGET (gtk_builder_get_object (builder, "download-close-button"));
/* Set initial data */
pixel_size = bits_per_sample > 8 ? 2 : 1;
diff --git a/bin/gui/control.glade b/bin/gui/control.glade
index e713371..7a339cf 100644
--- a/bin/gui/control.glade
+++ b/bin/gui/control.glade
@@ -82,10 +82,10 @@
<child>
<object class="GtkButton" id="cancel-button">
<property name="label">gtk-quit</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="gtk_main_quit" swapped="no"/>
</object>
@@ -98,10 +98,10 @@
<child>
<object class="GtkButton" id="proceed-button">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -142,19 +142,7 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="download-close-button">
- <property name="label">gtk-close</property>
- <property name="use_action_appearance">False</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">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
+ <placeholder/>
</child>
</object>
<packing>
@@ -204,9 +192,6 @@
</child>
</object>
</child>
- <action-widgets>
- <action-widget response="0">download-close-button</action-widget>
- </action-widgets>
</object>
<object class="GtkAdjustment" id="exposure-adjustment">
<property name="upper">100</property>
@@ -228,36 +213,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkListStore" id="zoom-values">
- <columns>
- <!-- column-name display -->
- <column type="gchararray"/>
- <!-- column-name factor -->
- <column type="gdouble"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">400 %</col>
- <col id="1">4</col>
- </row>
- <row>
- <col id="0" translatable="yes">200 %</col>
- <col id="1">2</col>
- </row>
- <row>
- <col id="0" translatable="yes">100 %</col>
- <col id="1">1</col>
- </row>
- <row>
- <col id="0" translatable="yes">50 %</col>
- <col id="1">0.5</col>
- </row>
- <row>
- <col id="0" translatable="yes">25 %</col>
- <col id="1">0.25</col>
- </row>
- </data>
- </object>
<object class="GtkWindow" id="window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Camera Control</property>
@@ -274,9 +229,9 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="menuitem1">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -286,9 +241,9 @@
<child>
<object class="GtkImageMenuItem" id="imagemenuitem1">
<property name="label">gtk-new</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
@@ -296,9 +251,9 @@
<child>
<object class="GtkImageMenuItem" id="imagemenuitem2">
<property name="label">gtk-open</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
@@ -306,9 +261,9 @@
<child>
<object class="GtkImageMenuItem" id="save-item">
<property name="label">gtk-save-as</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
@@ -322,9 +277,9 @@
<child>
<object class="GtkImageMenuItem" id="imagemenuitem_quit">
<property name="label">gtk-quit</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="gtk_main_quit" swapped="no"/>
@@ -336,9 +291,9 @@
</child>
<child>
<object class="GtkMenuItem" id="menuitem4">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -348,9 +303,9 @@
<child>
<object class="GtkImageMenuItem" id="imagemenuitem_about">
<property name="label">gtk-about</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
@@ -372,9 +327,9 @@
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton" id="start-button">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Run</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-media-play</property>
@@ -386,9 +341,9 @@
</child>
<child>
<object class="GtkToolButton" id="record-button">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Record</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-media-record</property>
@@ -400,9 +355,9 @@
</child>
<child>
<object class="GtkToolButton" id="stop-button">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Stop</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-media-stop</property>
@@ -414,9 +369,9 @@
</child>
<child>
<object class="GtkToolButton" id="download-button">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Download</property>
<property name="use_underline">True</property>
<property name="icon_name">network-receive</property>
@@ -625,10 +580,10 @@
<child>
<object class="GtkCheckButton" id="repeat-checkbutton">
<property name="label" translatable="yes">Repeat</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -865,11 +820,11 @@
<child>
<object class="GtkCheckButton" id="histogram-checkbutton">
<property name="label" translatable="yes">Live Update</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -1079,11 +1034,11 @@
<child>
<object class="GtkCheckButton" id="logarithmus-checkbutton">
<property name="label" translatable="yes">Logarithmus</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="border_width">10</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -1160,4 +1115,34 @@
</object>
</child>
</object>
+ <object class="GtkListStore" id="zoom-values">
+ <columns>
+ <!-- column-name display -->
+ <column type="gchararray"/>
+ <!-- column-name factor -->
+ <column type="gdouble"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">400 %</col>
+ <col id="1">4</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">200 %</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">100 %</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">50 %</col>
+ <col id="1">0.5</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">25 %</col>
+ <col id="1">0.25</col>
+ </row>
+ </data>
+ </object>
</interface>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 03:45:57 +0000