commit 05fd0c89278c58f3c221e56dcb82be2275665c59
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 14 16:59:33 2020 +0200
Session more "this session" stuff together
glade/app1.glade | 215 ++++++++++++++++++++++++++++++-------------
src/gui/app1/chronojump.cs | 10 +-
src/gui/app1/menu.cs | 4 +-
src/gui/app1/session/main.cs | 10 ++
4 files changed, 166 insertions(+), 73 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 8f2bca8c..4b2861b3 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -24381,6 +24381,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27145,18 +27148,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>
@@ -27193,6 +27184,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>
@@ -35041,6 +35044,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -35565,21 +35571,41 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">20</property>
- <property name="spacing">50</property>
+ <property name="spacing">40</property>
+ <child>
+ <widget class="GtkFrame"
id="frame_session_more_this_session">
+ <property name="visible">True</property>
+ <property name="sensitive">False</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>
+ <child>
+ <widget class="GtkAlignment" id="alignment36">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">16</property>
+ <property name="bottom_padding">16</property>
+ <property name="left_padding">16</property>
+ <property name="right_padding">16</property>
<child>
<widget class="GtkVBox" id="vbox192">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox7">
+ <widget class="GtkHBox" id="hbox420">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkVBox" id="vbox217">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">150</property>
+ <property name="spacing">16</property>
<child>
<widget class="GtkButton"
id="button_session_edit">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
@@ -35626,15 +35652,14 @@ then click this button.</property>
</child>
</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>
<child>
<widget class="GtkButton"
id="button_session_delete">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
@@ -35689,28 +35714,21 @@ then click this button.</property>
</widget>
<packing>
<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">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox397">
+ <widget class="GtkVBox" id="vbox78">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox196">
+ <widget class="GtkVBox" id="vbox219">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">50</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkButton"
id="button_menu_session_import">
+ <widget class="GtkButton"
id="button_session_export">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -35718,18 +35736,18 @@ then click this button.</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Import / Export</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_button_import_chronojump_session" swapped="no"/>
+ <signal name="clicked"
handler="on_export_session_accepted" swapped="no"/>
<child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_import">
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_export">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox399">
+ <widget class="GtkHBox" id="hbox408">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage"
id="image_session_import">
+ <widget class="GtkImage"
id="image_session_export">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
@@ -35741,10 +35759,10 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_session_overview3">
+ <widget class="GtkLabel"
id="label_session_overview4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Import
from another database</property>
+ <property name="label" translatable="yes">Export
to CSV</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -35764,12 +35782,96 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox78">
+ <widget class="GtkLabel" id="label465">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="label" translatable="yes">Jumps
and races with photocells</property>
+ </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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</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">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
<child>
- <widget class="GtkButton"
id="button_session_export">
+ <widget class="GtkHBox" id="hbox419">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label372">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">This
session:</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="GtkLabel"
id="label_session_more_session_name">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="type">label_item</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="GtkHBox" id="hbox397">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox196">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">40</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_import">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -35777,18 +35879,18 @@ then click this button.</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Import / Export</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_export_session_accepted" swapped="no"/>
+ <signal name="clicked"
handler="on_button_import_chronojump_session" swapped="no"/>
<child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_export">
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_import">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox408">
+ <widget class="GtkHBox" id="hbox399">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage"
id="image_session_export">
+ <widget class="GtkImage"
id="image_session_import">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
@@ -35800,10 +35902,10 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_session_overview4">
+ <widget class="GtkLabel"
id="label_session_overview3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Export
to CSV</property>
+ <property name="label" translatable="yes">Import
a session from another database</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -35823,24 +35925,7 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label465">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Jumps
and races with photocells</property>
- </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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
</widget>
<packing>
@@ -37750,8 +37835,8 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 7ad19609..f86310fd 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -2459,6 +2459,7 @@ public partial class ChronoJumpWindow
private void on_edit_session_accepted ()
{
setApp1Title(currentSession.Name, current_menuitem_mode);
+ app1s_label_session_set_name();
if(createdStatsWin) {
stats_win_initializeSession();
@@ -2546,10 +2547,12 @@ public partial class ChronoJumpWindow
private void closeSession()
{
- setApp1Title("", current_menuitem_mode);
definedSession = false;
currentSession = null;
sensitiveGuiNoSession();
+
+ setApp1Title("", current_menuitem_mode);
+ app1s_label_session_set_name();
}
private void reloadSession()
@@ -6913,10 +6916,7 @@ LogB.Debug("mc finished 5");
private void menuSessionSensitive(bool option)
{
- button_session_edit.Sensitive = option;
- button_session_delete.Sensitive = option;
-
- button_session_export.Sensitive = option;
+ frame_session_more_this_session.Sensitive = option;
}
private void menuPersonSelectedSensitive(bool option)
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index e49d7d51..e53d8c13 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -65,9 +65,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Alignment alignment_menu_help_options;
[Widget] Gtk.Button button_show_modes;
- [Widget] Gtk.Button button_session_edit;
- [Widget] Gtk.Button button_session_delete;
- [Widget] Gtk.Button button_session_export;
[Widget] Gtk.Button button_menu_session_new;
[Widget] Gtk.Button button_menu_session_load;
@@ -324,6 +321,7 @@ public partial class ChronoJumpWindow
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.SESSION);
app1s_notebook.CurrentPage = Convert.ToInt32(app1s_PAGE_MODES);
+ app1s_label_session_set_name();
}
/* if import started we need to reload at the end
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index 18b73b08..81f749d0 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -30,6 +30,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook app1s_notebook;
//notebook tab 0
+ [Widget] Gtk.Frame frame_session_more_this_session;
+ [Widget] Gtk.Label label_session_more_session_name;
[Widget] Gtk.EventBox app1s_eventbox_button_close0;
//notebook tab 1
@@ -124,4 +126,12 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_delete_close, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
}
+ private void app1s_label_session_set_name()
+ {
+ if(currentSession == null)
+ label_session_more_session_name.Text = "";
+ else
+ label_session_more_session_name.Text = currentSession.Name;
+ }
+
}