[chronojump] More on new menu
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] More on new menu
- Date: Thu, 19 Mar 2020 15:40:50 +0000 (UTC)
commit 555a0fa18a572d27fd5ee1ae0391ba0c9da2e5f1
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 19 16:40:07 2020 +0100
More on new menu
glade/app1.glade | 28 ++++++++++------------------
src/gui/app1/chronojump.cs | 8 ++++++--
src/gui/app1/chronojumpPersons.cs | 2 +-
3 files changed, 17 insertions(+), 21 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 1b349758..990d6fd0 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -902,6 +902,7 @@
<widget class="GtkNotebook" id="notebook_session_person">
<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="GtkAlignment" id="alignment14">
@@ -1223,7 +1224,7 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_recuperate_person2">
+ <widget class="GtkButton"
id="button_edit_session">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -1232,6 +1233,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Load
person</property>
<property name="relief">half</property>
+ <signal name="clicked"
handler="on_edit_session_activate" swapped="no"/>
<child>
<widget class="GtkHBox" id="hbox373">
<property name="visible">True</property>
@@ -1271,7 +1273,7 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_recuperate_persons_from_session2">
+ <widget class="GtkButton"
id="button_delete_session">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -1280,6 +1282,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Load
persons from other session</property>
<property name="relief">half</property>
+ <signal name="clicked"
handler="on_delete_session_activate" swapped="no"/>
<child>
<widget class="GtkHBox" id="hbox374">
<property name="visible">True</property>
@@ -1764,6 +1767,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_menuitem_manual_activate" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -1772,29 +1776,17 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_menu_help_formulas">
- <property name="label"
translatable="yes">Formulas</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton"
id="button_menu_help_accelerators">
<property name="label"
translatable="yes">Accelerators</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_menuitem_accelerators_activate" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -1803,11 +1795,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_about1_activate" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -1852,7 +1845,6 @@
</child>
<child>
<widget class="GtkViewport" id="viewport_persons">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkVBox" id="vbox_persons">
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 7ba2f416..8ee27161 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -204,6 +204,8 @@ public partial class ChronoJumpWindow
//menu session
[Widget] Gtk.MenuItem menuitem_edit_session;
[Widget] Gtk.MenuItem menuitem_delete_session;
+ [Widget] Gtk.Button button_edit_session;
+ [Widget] Gtk.Button button_delete_session;
[Widget] Gtk.MenuItem menuitem_export_csv;
[Widget] Gtk.MenuItem menuitem_encoder_session_overview;
[Widget] Gtk.MenuItem menuitem_forceSensor_session_overview;
@@ -7260,8 +7262,10 @@ LogB.Debug("mc finished 5");
private void menuSessionSensitive(bool option)
{
- menuitem_edit_session.Sensitive = option;
- menuitem_delete_session.Sensitive = option;
+ //menuitem_edit_session.Sensitive = option;
+ //menuitem_delete_session.Sensitive = option;
+ button_edit_session.Sensitive = option;
+ button_delete_session.Sensitive = option;
menuitem_export_csv.Sensitive = option;
//menuitem_export_xml.Sensitive = option; not implemented yet
menuitem_encoder_session_overview.Sensitive = option;
diff --git a/src/gui/app1/chronojumpPersons.cs b/src/gui/app1/chronojumpPersons.cs
index 71557392..91e34786 100644
--- a/src/gui/app1/chronojumpPersons.cs
+++ b/src/gui/app1/chronojumpPersons.cs
@@ -30,7 +30,7 @@ public partial class ChronoJumpWindow
private void showPersonsOnTop (bool onTop)
{
- notebook_session_person.Visible = ! onTop;
+ viewport_persons.Visible = currentSession != null && ! onTop;
hbox_top_person.Visible = onTop;
hbox_top_person_encoder.Visible = onTop;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
