diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-07-16 10:56:34 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-07-16 10:56:34 +0200 |
| commit | 0ad60209c4f0e5131516cb69c02a0bb183df15b3 (patch) | |
| tree | ffb84aeb7d55e90e8e8b36aef1e88748d806a3d3 /bin | |
| parent | a819e61b6dec46260505af1e957a4a8cda716b43 (diff) | |
| download | uca-0ad60209c4f0e5131516cb69c02a0bb183df15b3.tar.gz uca-0ad60209c4f0e5131516cb69c02a0bb183df15b3.tar.bz2 uca-0ad60209c4f0e5131516cb69c02a0bb183df15b3.tar.xz uca-0ad60209c4f0e5131516cb69c02a0bb183df15b3.zip | |
Move frame slider to acquisition panel
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/gui/control.glade | 359 |
1 files changed, 215 insertions, 144 deletions
diff --git a/bin/gui/control.glade b/bin/gui/control.glade index 5cf339d..74cac1b 100644 --- a/bin/gui/control.glade +++ b/bin/gui/control.glade @@ -210,159 +210,254 @@ <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkTable" id="table3"> + <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> <property name="border_width">12</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Exposure time:</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - <property name="x_padding">6</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Count:</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - <property name="x_padding">6</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spinbutton4"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">acquisitions-adjustment</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - <property name="x_padding">6</property> - <property name="y_padding">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton1"> - <property name="label" translatable="yes">Integrate</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes">Settings</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - <property name="x_padding">6</property> - <property name="y_padding">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="repeat-checkbutton"> - <property name="label" translatable="yes">Repeat</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - <property name="x_padding">6</property> - <property name="y_padding">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label11"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options"></property> - <property name="y_options"></property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="repeat-box"> + <object class="GtkTable" id="table3"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="spacing">6</property> + <property name="border_width">6</property> + <property name="n_rows">4</property> + <property name="n_columns">2</property> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Exposure time:</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + <property name="x_padding">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Acquire:</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + <property name="x_padding">6</property> + </packing> + </child> <child> - <object class="GtkSpinButton" id="spinbutton5"> + <object class="GtkCheckButton" id="checkbutton1"> + <property name="label" translatable="yes">Integrate</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">•</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="position">0</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + <property name="x_padding">6</property> + <property name="y_padding">3</property> </packing> </child> <child> - <object class="GtkLabel" id="label12"> + <object class="GtkCheckButton" id="repeat-checkbutton"> + <property name="label" translatable="yes">Repeat</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">times</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="position">1</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + <property name="x_padding">6</property> + <property name="y_padding">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkHBox" id="repeat-box"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkSpinButton" id="spinbutton5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">times</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="y_options"></property> + <property name="x_padding">6</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkSpinButton" id="spinbutton3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="adjustment">exposure-adjustment</property> + <property name="digits">6</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">seconds</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_padding">6</property> + <property name="y_padding">6</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkSpinButton" id="spinbutton4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="adjustment">acquisitions-adjustment</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">frames</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_padding">6</property> </packing> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - <property name="x_padding">6</property> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="ypad">6</property> + <property name="label" translatable="yes">Control</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="border_width">12</property> + <property name="spacing">12</property> <child> - <object class="GtkSpinButton" id="spinbutton3"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">exposure-adjustment</property> - <property name="digits">6</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Frame:</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label13"> + <object class="GtkHScale" id="hscale1"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">seconds</property> + <property name="can_focus">True</property> + <property name="adjustment">frames-adjustment</property> + <property name="digits">0</property> </object> <packing> <property name="position">1</property> @@ -370,10 +465,8 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - <property name="x_padding">6</property> + <property name="expand">False</property> + <property name="position">3</property> </packing> </child> </object> @@ -514,34 +607,6 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <object class="GtkHScale" id="hscale1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">frames-adjustment</property> - <property name="digits">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Frame:</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="xalign">0</property> @@ -570,6 +635,12 @@ <property name="y_options">GTK_FILL</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">2</property> |