commit 488a69c8a6330a51e93a55d40c2e24e66cfd6d80
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Dec 8 21:28:00 2012 +0100
Supressed central column from main window
glade/chronojump.glade | 505 +++++++++++++++++------------------------------
src/gui/chronojump.cs | 20 ++-
src/gui/eventExecute.cs | 3 +
src/gui/run.cs | 2 +-
4 files changed, 199 insertions(+), 331 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 9c42851..02c56e1 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -9,7 +9,6 @@
<property name="default_width">800</property>
<property name="default_height">600</property>
<signal name="delete_event" handler="on_delete_event" swapped="no"/>
- <signal name="size_allocate" handler="on_app1_size_allocate" swapped="no"/>
<child>
<widget class="GtkVBox" id="vbox69">
<property name="visible">True</property>
@@ -336,7 +335,7 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_activate_chronopics_new">
+ <widget class="GtkButton" id="button_activate_chronopics">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -1185,8 +1184,8 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="label_yalign">0.89999997615814209</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
@@ -3356,27 +3355,38 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
+ <property name="homogeneous">True</property>
<child>
<widget class="GtkFrame" id="frame_test_options">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="label_yalign">0.89999997615814209</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkAlignment" id="alignment6">
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">4</property>
- <property name="left_padding">4</property>
- <property name="right_padding">4</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
<child>
- <widget class="GtkVBox" id="vbox23">
+ <widget class="GtkViewport" id="viewport1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkNotebook" id="notebook_options">
+ <widget class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="left_padding">4</property>
+ <child>
+ <widget class="GtkVBox" id="vbox23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkNotebook" id="notebook_options">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
@@ -3394,7 +3404,7 @@ Chronopic</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -3430,6 +3440,7 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -3501,6 +3512,7 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -3672,7 +3684,6 @@ weight</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
</widget>
@@ -3824,6 +3835,7 @@ weight</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -3855,7 +3867,6 @@ weight</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">extra_window_jumps_radiobutton_single_leg_dominance_this_limb</property>
</widget>
@@ -3982,7 +3993,7 @@ weight</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -4013,7 +4024,7 @@ weight</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -4049,6 +4060,7 @@ weight</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -4120,6 +4132,7 @@ weight</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -4191,6 +4204,7 @@ weight</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -4324,6 +4338,7 @@ weight</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -4408,8 +4423,7 @@ weight</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Fix when two or more contacts
-happen in less than</property>
+ <property name="label" translatable="yes">Fix if found two or more contacts in</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -4463,19 +4477,6 @@ happen in less than</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label104">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Proceed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<widget class="GtkAlignment" id="alignment29">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -4508,7 +4509,6 @@ happen in less than</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radio_runs_prevent_double_contact_first</property>
</widget>
@@ -4525,7 +4525,6 @@ happen in less than</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radio_runs_prevent_double_contact_first</property>
</widget>
@@ -4541,7 +4540,7 @@ happen in less than</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -4562,7 +4561,7 @@ happen in less than</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -4633,6 +4632,7 @@ happen in less than</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -4704,6 +4704,7 @@ happen in less than</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -4882,6 +4883,7 @@ happen in less than</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -4902,6 +4904,7 @@ happen in less than</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -4996,6 +4999,7 @@ happen in less than</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -5161,6 +5165,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
@@ -5225,15 +5230,15 @@ Second Chronopic to platforms.</property>
<property name="type">tab</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox28">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -5338,12 +5343,16 @@ Second Chronopic to platforms.</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -5370,19 +5379,20 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox24">
+ <widget class="GtkVBox" id="vbox_execute_and_results">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox25">
+ <widget class="GtkVBox" id="vbox_execute">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkAlignment" id="alignment14">
+ <widget class="GtkHBox" id="hbox102">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">10</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkButton" id="button_execute_test">
<property name="height_request">60</property>
@@ -5425,24 +5435,16 @@ Second Chronopic to platforms.</property>
</widget>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
<child>
- <widget class="GtkVBox" id="vbox17">
+ <widget class="GtkVBox" id="vbox88">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
<widget class="GtkVBox" id="vbox18">
<property name="visible">True</property>
@@ -5567,28 +5569,14 @@ Second Chronopic to platforms.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTextView" id="event_execute_textview_message">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
+ <widget class="GtkVBox" id="vbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <property name="layout_style">spread</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkButton" id="event_execute_button_cancel">
<property name="label">gtk-cancel</property>
@@ -5603,8 +5591,8 @@ Second Chronopic to platforms.</property>
<signal name="clicked" handler="on_event_execute_button_cancel_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -5622,8 +5610,8 @@ Second Chronopic to platforms.</property>
<signal name="clicked" handler="on_event_execute_finish_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -5636,160 +5624,40 @@ Second Chronopic to platforms.</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame5">
- <property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">6</property>
- <child>
- <widget class="GtkVBox" id="vbox15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">4</property>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label36">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Connected Chronopics</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_connected_chronopics_old">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTextView" id="textview_message_connected_chronopics">
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image_connected_chronopics">
- <property name="can_focus">False</property>
- <property name="stock">gtk-no</property>
- </widget>
- <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_options"></property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_activate_chronopics">
- <property name="label" translatable="yes">Configure Chronopic/s</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Configure connection with external hardware.</property>
- <property name="use_action_appearance">False</property>
- <signal name="clicked" handler="on_chronopic_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
<child>
- <widget class="GtkLabel" id="label35">
+ <widget class="GtkTextView" id="event_execute_textview_message">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Chronopic connection</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ <property name="cursor_visible">False</property>
</widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="padding">2</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
<child>
<widget class="GtkAlignment" id="event_execute_alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox22">
+ <widget class="GtkVBox" id="vbox26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -5798,7 +5666,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox26">
+ <widget class="GtkVBox" id="vbox30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -5835,23 +5703,37 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame13">
+ <widget class="GtkVBox" id="vbox85">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">in</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkVBox" id="vbox30">
+ <widget class="GtkHBox" id="hbox103">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkFrame" id="frame5">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">out</property>
+ <child>
<widget class="GtkDrawingArea" id="event_execute_drawingarea">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
<signal name="configure_event" handler="on_event_execute_drawingarea_configure_event" swapped="no"/>
<signal name="expose_event" handler="on_event_execute_drawingarea_expose_event" swapped="no"/>
</widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -5859,23 +5741,17 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment10">
+ <widget class="GtkVBox" id="vbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox37">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkHBox" id="hbox67">
+ <widget class="GtkVBox" id="vbox17">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
<child>
<widget class="GtkLabel" id="label68">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Width</property>
+ <property name="label">W</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -5897,27 +5773,16 @@ Second Chronopic to platforms.</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox68">
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
<child>
<widget class="GtkLabel" id="label69">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Height</property>
+ <property name="label">H</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -5931,88 +5796,68 @@ Second Chronopic to platforms.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="event_execute_button_update">
+ <widget class="GtkButton" id="event_execute_button_properties">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Update</property>
+ <property name="tooltip" translatable="yes">Properties</property>
<property name="use_action_appearance">False</property>
- <signal name="clicked" handler="on_event_execute_button_update_clicked" swapped="no"/>
+ <signal name="clicked" handler="on_event_execute_button_properties_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image1665">
+ <widget class="GtkImage" id="image1664">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-refresh</property>
- <property name="icon-size">2</property>
+ <property name="stock">gtk-properties</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="event_execute_button_properties">
+ <widget class="GtkButton" id="event_execute_button_update">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Properties</property>
+ <property name="tooltip" translatable="yes">Update</property>
<property name="use_action_appearance">False</property>
- <signal name="clicked" handler="on_event_execute_button_properties_clicked" swapped="no"/>
+ <signal name="clicked" handler="on_event_execute_button_update_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image1664">
+ <widget class="GtkImage" id="image1665">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-properties</property>
- <property name="icon-size">2</property>
+ <property name="stock">gtk-refresh</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -6023,15 +5868,12 @@ Second Chronopic to platforms.</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkNotebook" id="notebook_results_data">
+ <child>
+ <widget class="GtkHBox" id="hbox21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkNotebook" id="notebook_results_data">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
@@ -6049,7 +5891,7 @@ Second Chronopic to platforms.</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
- <property name="column_spacing">4</property>
+ <property name="column_spacing">2</property>
<property name="row_spacing">2</property>
<property name="homogeneous">True</property>
<child>
@@ -6302,7 +6144,7 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox21">
+ <widget class="GtkHBox" id="hbox30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -7030,7 +6872,7 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox30">
+ <widget class="GtkHBox" id="hbox31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -7513,7 +7355,7 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox31">
+ <widget class="GtkHBox" id="hbox37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -7726,18 +7568,17 @@ Second Chronopic to platforms.</property>
<property name="type">tab</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_this_test_buttons">
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox_this_test_buttons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
<child>
<widget class="GtkButton" id="button_delete_this_test">
<property name="visible">True</property>
@@ -7752,7 +7593,7 @@ Second Chronopic to platforms.</property>
<widget class="GtkImage" id="image_delete_this_test">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-size">2</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -7778,7 +7619,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-media-play</property>
- <property name="icon-size">2</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -7789,35 +7630,55 @@ Second Chronopic to platforms.</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Results</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index e70bc8a..7b31200 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -147,9 +147,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Box hbox_execute_test;
[Widget] Gtk.Button button_execute_test;
- [Widget] Gtk.Label label_connected_chronopics;
- [Widget] Gtk.TextView textview_message_connected_chronopics;
- [Widget] Gtk.Image image_connected_chronopics;
+ //[Widget] Gtk.Label label_connected_chronopics;
+ //[Widget] Gtk.TextView textview_message_connected_chronopics;
+ //[Widget] Gtk.Image image_connected_chronopics;
//multiChronopic
[Widget] Gtk.Button button_edit_selected_multi_chronopic;
@@ -203,7 +203,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_image_test_zoom;
[Widget] Gtk.Image image_test_zoom;
[Widget] Gtk.Label label_image_test;
- [Widget] Gtk.Box hbox_this_test_buttons;
+ [Widget] Gtk.Box vbox_this_test_buttons;
[Widget] Gtk.Button button_video_play_this_test;
[Widget] Gtk.Button button_upload_session;
@@ -514,6 +514,7 @@ public partial class ChronoJumpWindow
}
*/
+/*
private bool normalGUIOld = true; //to know if we changed state. Start as true
private void on_app1_size_allocate(object obj, SizeAllocatedArgs args) {
int width;
@@ -541,6 +542,7 @@ public partial class ChronoJumpWindow
label_current_person_title.Text=Catalog.GetString("Current");
}
}
+*/
private void putNonStandardIcons() {
Pixbuf pixbuf;
@@ -3851,6 +3853,7 @@ Console.WriteLine("X");
}
private void chronopicLabels(int cps) {
+ /*
label_connected_chronopics.Text = "<b>" + cps.ToString() + "</b>";
label_connected_chronopics.UseMarkup = true;
@@ -3865,6 +3868,7 @@ Console.WriteLine("X");
TextBuffer tb = new TextBuffer (new TextTagTable());
tb.Text = myMessage;
textview_message_connected_chronopics.Buffer = tb;
+ */
/*
* hidden to save space
@@ -4525,7 +4529,7 @@ Console.WriteLine("X");
}
private void deleted_last_test_update_widgets() {
- hbox_this_test_buttons.Sensitive = false;
+ vbox_this_test_buttons.Sensitive = false;
event_execute_clearDrawingArea();
notebook_results_data.CurrentPage = 7; //shows "deleted test"
}
@@ -5166,7 +5170,7 @@ Console.WriteLine("X");
vbox_stats.Sensitive = false;
frame_share_data.Sensitive = false;
- hbox_this_test_buttons.Sensitive = false;
+ vbox_this_test_buttons.Sensitive = false;
hbox_execute_test.Sensitive = false;
button_execute_test.Sensitive = false;
@@ -5254,7 +5258,7 @@ Console.WriteLine("X");
table_runs.Sensitive = false;
hbox_runs_interval.Sensitive = false;
hbox_pulses.Sensitive = false;
- hbox_this_test_buttons.Sensitive = false;
+ vbox_this_test_buttons.Sensitive = false;
button_upload_session.Sensitive = false;
button_activate_chronopics.Sensitive = false;
@@ -5281,7 +5285,7 @@ Console.WriteLine("X");
hbox_runs_interval.Sensitive = true;
hbox_pulses.Sensitive = true;
//hbox_multi_chronopic_buttons.Sensitive = true;
- hbox_this_test_buttons.Sensitive = true;
+ vbox_this_test_buttons.Sensitive = true;
button_upload_session.Sensitive = true;
button_activate_chronopics.Sensitive = true;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 498c078..177ea4d 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -141,10 +141,13 @@ public partial class ChronoJumpWindow
[Widget] Gtk.DrawingArea event_execute_drawingarea;
[Widget] Box event_execute_hbox_drawingarea;
+ /*
[Widget] Gtk.Box hbox_combo_graph_results_width;
[Widget] Gtk.Box hbox_combo_graph_results_height;
[Widget] Gtk.ComboBox combo_graph_results_width;
[Widget] Gtk.ComboBox combo_graph_results_height;
+ */
+
[Widget] Gtk.Alignment event_execute_alignment;
//[Widget] Gtk.Alignment event_execute_alignment_drawingarea;
//static Gdk.Pixmap event_execute_pixmap = null;
diff --git a/src/gui/run.cs b/src/gui/run.cs
index 4c28084..374f764 100644
--- a/src/gui/run.cs
+++ b/src/gui/run.cs
@@ -1034,7 +1034,7 @@ partial class ChronoJumpWindow
changeTestImage(EventType.Types.RUN.ToString(), myRunType.Name, myRunType.ImageFileName);
bool hasOptions = false;
- extra_window_runs_label_distance.Text = Catalog.GetString("Track distance\n(between platforms)");
+ extra_window_runs_label_distance.Text = Catalog.GetString("Track distance (between platforms)");
extra_window_runs_label_distance_units.Text = Catalog.GetString("meters");
if(myRunType.Distance > 0) {