commit 3e631cb35e7177e238d88ebccd3bd1daa66c87b2
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jul 23 13:46:36 2021 +0200
menu session top aligned with main frame, and with session load/import (top & bottom)
glade/app1.glade | 534 ++++++++++++++++++++++++++-------------------------
src/gui/app1/menu.cs | 17 ++
2 files changed, 294 insertions(+), 257 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 1e20b5ab7..1d70f6d1c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -440,7 +440,6 @@
<widget class="GtkAlignment" id="alignment_session_persons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">4</property>
<property name="bottom_padding">4</property>
<property name="left_padding">3</property>
<property name="right_padding">1</property>
@@ -763,7 +762,7 @@
</widget>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkHBox" id="hbox_above_frame_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -25778,6 +25777,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -32089,18 +32091,6 @@ 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>
@@ -32137,6 +32127,18 @@ 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>
@@ -41368,6 +41370,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -41856,7 +41861,6 @@ then click this button.</property>
<widget class="GtkAlignment" id="alignment_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">4</property>
<property name="bottom_padding">4</property>
<property name="left_padding">2</property>
<property name="right_padding">4</property>
@@ -43067,44 +43071,47 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_session_load_or_import_select">
+ <widget class="GtkAlignment"
id="alignment_vbox_session_load_or_import_select">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">4</property>
- <property name="spacing">12</property>
<child>
- <widget class="GtkFrame" id="frame20">
+ <widget class="GtkVBox"
id="vbox_session_load_or_import_select">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">1</property>
- <property name="shadow_type">in</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkViewport" id="viewport17">
+ <widget class="GtkFrame" id="frame20">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">4</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkVBox" id="vbox183">
+ <widget class="GtkViewport" id="viewport17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
- <property name="spacing">12</property>
+ <property name="border_width">4</property>
<child>
- <widget class="GtkLabel"
id="app1s_file_path_import">
+ <widget class="GtkVBox" id="vbox183">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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>
+ </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">
+ </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>
@@ -43418,15 +43425,15 @@ then click this button.</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>
- </child>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwin_session_load">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow"
id="scrolledwin_session_load">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="hscrollbar_policy">automatic</property>
@@ -43439,140 +43446,144 @@ then click this button.</property>
<signal name="row_activated"
handler="app1s_on_row_double_clicked" swapped="no"/>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox418">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="app1s_hbox_frame_load">
+ <widget class="GtkHBox" id="hbox418">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_session_load3_blue">
+ <widget class="GtkHBox" id="app1s_hbox_frame_load">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_load3_blue">
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="image_session_load3_yellow">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_session_load3_yellow">
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="app1s_label_load">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="app1s_label_load">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</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="GtkHBox" id="app1s_hbox_frame_import">
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_session_import1_blue">
+ <widget class="GtkHBox"
id="app1s_hbox_frame_import">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_import1_blue">
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="image_session_import1_yellow">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_session_import1_yellow">
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="app1s_label_import">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="app1s_label_import">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</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>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">True</property>
+ <property name="fill">True</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="app1s_notebook_load_button_animation">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
<child>
- <widget class="GtkHBox" id="hbox125">
+ <widget class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">80</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox18">
+ <widget class="GtkNotebook"
id="app1s_notebook_load_button_animation">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">50</property>
- <property name="layout_style">start</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
<child>
- <widget class="GtkButton" id="app1s_button_edit">
+ <widget class="GtkHBox" id="hbox125">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">80</property>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">50</property>
+ <property name="layout_style">start</property>
+ <child>
+ <widget class="GtkButton" id="app1s_button_edit">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -43615,15 +43626,15 @@ then click this button.</property>
</child>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="app1s_button_delete">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_delete">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -43666,28 +43677,28 @@ then click this button.</property>
</child>
</widget>
</child>
- </widget>
- <packing>
+ </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">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox"
id="app1s_hbuttonbox_page2_load">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">50</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="app1s_button_cancel">
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox"
id="app1s_hbuttonbox_page2_load">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">50</property>
+ <property name="layout_style">end</property>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_cancel">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -43731,15 +43742,15 @@ then click this button.</property>
</child>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="app1s_button_load">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="app1s_button_load">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -43783,26 +43794,26 @@ then click this button.</property>
</child>
</widget>
</child>
- </widget>
- <packing>
+ </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>
- <child>
- <widget class="GtkHBox" id="hbox_sessions_raspberry">
- <property name="can_focus">False</property>
- <property name="spacing">16</property>
- <child>
- <widget class="GtkButton"
id="button_sessions_raspberry_up">
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_sessions_raspberry">
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkButton"
id="button_sessions_raspberry_up">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -43815,15 +43826,15 @@ then click this button.</property>
<property name="arrow_type">up</property>
</widget>
</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="GtkButton"
id="button_sessions_raspberry_down">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_sessions_raspberry_down">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -43836,109 +43847,109 @@ then click this button.</property>
<property name="arrow_type">down</property>
</widget>
</child>
- </widget>
- <packing>
+ </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">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label468">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">page
1</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label470">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Loading …</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label469">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">page
2</property>
+ </widget>
+ <packing>
<property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label468">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
1</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label470">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Loading
…</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label469">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
2</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</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="GtkHButtonBox"
id="app1s_hbuttonbox_page2_import">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="app1s_button_back">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked"
handler="app1s_on_button_back_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
<child>
- <widget class="GtkEventBox"
id="app1s_eventbox_button_back">
+ <widget class="GtkHButtonBox"
id="app1s_hbuttonbox_page2_import">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
<child>
- <widget class="GtkLabel" id="label513">
+ <widget class="GtkButton" id="app1s_button_back">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property
name="receives_default">False</property>
+ <signal name="clicked"
handler="app1s_on_button_back_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_back">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label513">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Back</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="app1s_button_import">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked"
handler="app1s_on_button_import_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="app1s_eventbox_button_import">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox387">
+ <widget class="GtkButton" id="app1s_button_import">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property
name="receives_default">False</property>
+ <signal name="clicked"
handler="app1s_on_button_import_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox387">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -43966,9 +43977,23 @@ then click this button.</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ </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>
@@ -43978,11 +44003,6 @@ then click this button.</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</widget>
<packing>
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index bd0026efb..7c98db499 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -104,6 +104,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_menu_news;
[Widget] Gtk.Image image_menu_quit;
+ //for vertical align
+ [Widget] Gtk.HBox hbox_above_frame_session;
+ [Widget] Gtk.Alignment alignment_vbox_session_load_or_import_select;
+
private void initialize_menu_or_menu_tiny()
{
if(preferences.personWinHide)
@@ -212,6 +216,19 @@ public partial class ChronoJumpWindow
image_logo_encoder_transp.Visible = false;
// radio_show_menu_and_persons_adjust_height(false);
}
+
+ GLib.Timeout.Add(200, new GLib.TimeoutHandler(menuTopAlign));
+ }
+
+ private bool menuTopAlign()
+ {
+ uint alignTop = (uint) (notebook_capture_analyze.Allocation.Y
+ -hbox_above_frame_session.SizeRequest().Height);
+
+ alignment_session_persons.TopPadding = alignTop;
+ alignment_vbox_session_load_or_import_select.TopPadding = alignTop;
+
+ return false;
}
/*