commit e4da710ee17034ffebc9695dfe6eabce76e19337
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jun 1 10:58:42 2022 +0200
Load session top controls as table to have modes in a row (like 2.2.2 menu)
glade/app1.glade | 233 +++++++++++++++++++++++--------------------------------
1 file changed, 98 insertions(+), 135 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index b88d9dfd0..b46fa257a 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -25861,6 +25861,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -32267,6 +32270,18 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -32303,18 +32318,6 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -41691,6 +41694,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -43440,45 +43446,13 @@ then click this button.</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkLabel"
id="app1s_file_path_import">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="ellipsize">middle</property>
- <property name="max_width_chars">60</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox"
id="app1s_hbox_load_controls">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">25</property>
- <child>
- <widget class="GtkVBox" id="vbox208">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkHBox" id="hbox240">
+ <widget class="GtkTable" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label443">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Search
filter</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">25</property>
+ <property name="row_spacing">6</property>
<child>
<widget class="GtkHBox" id="app1s_hbox_manage">
<property name="visible">True</property>
@@ -43491,8 +43465,8 @@ then click this button.</property>
<property name="label"
translatable="yes">Tags</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -43519,25 +43493,27 @@ then click this button.</property>
<signal name="clicked"
handler="on_app1s_button_manage_tags_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label443">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">1</property>
+ <property name="label" translatable="yes">Search
filter</property>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
<widget class="GtkEntry"
id="app1s_entry_search_filter">
@@ -43552,40 +43528,38 @@ then click this button.</property>
<signal name="changed"
handler="app1s_on_entry_search_filter_changed" swapped="no"/>
</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>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox254">
+ <widget class="GtkHBox" id="hbox115">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkTable" id="table20">
+ <widget class="GtkLabel" id="label575">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">2</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">View</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_jumps">
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_persons">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
<child>
- <widget class="GtkImage"
id="app1s_image_show_data_jumps">
+ <widget class="GtkImage"
id="app1s_image_show_data_persons">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -43593,21 +43567,20 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_force_sensor">
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_jumps">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
<child>
- <widget class="GtkImage"
id="app1s_image_show_data_force_sensor">
+ <widget class="GtkImage"
id="app1s_image_show_data_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -43615,28 +43588,25 @@ then click this button.</property>
</child>
</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">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_encoder">
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_runs">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox500">
+ <widget class="GtkHBox" id="hbox405">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage"
id="app1s_image_show_data_encoder_grav">
+ <widget class="GtkImage"
id="app1s_image_show_data_runs">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -43648,7 +43618,7 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="app1s_image_show_data_encoder_inertial">
+ <widget class="GtkImage"
id="app1s_image_show_data_run_encoder">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -43663,36 +43633,20 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label575">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">View</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_persons">
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_force_sensor">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
<child>
- <widget class="GtkImage"
id="app1s_image_show_data_persons">
+ <widget class="GtkImage"
id="app1s_image_show_data_force_sensor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -43700,26 +43654,25 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_runs">
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_encoder">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox405">
+ <widget class="GtkHBox" id="hbox500">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage"
id="app1s_image_show_data_runs">
+ <widget class="GtkImage"
id="app1s_image_show_data_encoder_grav">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -43731,7 +43684,7 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="app1s_image_show_data_run_encoder">
+ <widget class="GtkImage"
id="app1s_image_show_data_encoder_inertial">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -43746,27 +43699,34 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <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">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel"
id="app1s_file_path_import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="ellipsize">middle</property>
+ <property name="max_width_chars">60</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -49711,6 +49671,9 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>