[chronojump] delete session moved to edit session
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] delete session moved to edit session
- Date: Thu, 26 Mar 2020 12:10:28 +0000 (UTC)
commit ba40f6ef22b8e08fab12e783ac37a741ed32266c
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 26 13:08:35 2020 +0100
delete session moved to edit session
glade/app1.glade | 126 ++++++++-----------------------------------
glade/session_add_edit.glade | 19 ++++++-
src/gui/app1/chronojump.cs | 8 +--
src/gui/app1/icons.cs | 2 -
src/gui/app1/menu.cs | 6 ---
src/gui/app1/menu_tiny.cs | 4 --
src/gui/session/addEdit.cs | 15 ++++++
7 files changed, 60 insertions(+), 120 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 8a3b7a3d..21a0a409 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -948,37 +948,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkButton" id="button_menu_session_delete1">
- <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>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Delete
session</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_delete_session_activate" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_delete1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_session_delete1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -1705,61 +1674,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_menu_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>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Delete session</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_delete_session_activate" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_delete">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox374">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_session_delete2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-open</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_delete">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Delete</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</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">3</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -9112,8 +9026,8 @@ EncoderInertialCapture</property>
<property name="height_request">20</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <signal name="expose_event"
handler="on_event_execute_drawingarea_run_simple_double_contacts_expose_event" swapped="no"/>
<signal name="configure_event"
handler="on_event_execute_drawingarea_run_simple_double_contacts_configure_event" swapped="no"/>
+ <signal name="expose_event"
handler="on_event_execute_drawingarea_run_simple_double_contacts_expose_event" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -9591,8 +9505,8 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <signal name="expose_event"
handler="on_event_execute_drawingarea_expose_event" swapped="no"/>
<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>
@@ -12016,8 +11930,8 @@ EncoderInertialCapture</property>
<widget class="GtkDrawingArea"
id="force_capture_drawingarea">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <signal name="expose_event"
handler="on_force_capture_drawingarea_expose_event" swapped="no"/>
<signal name="configure_event"
handler="on_force_capture_drawingarea_configure_event" swapped="no"/>
+ <signal name="expose_event"
handler="on_force_capture_drawingarea_expose_event" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -23416,8 +23330,8 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<signal name="button_press_event"
handler="on_force_sensor_ai_drawingarea_button_press_event" swapped="no"/>
- <signal name="expose_event"
handler="on_force_sensor_ai_drawingarea_expose_event" swapped="no"/>
<signal name="configure_event"
handler="on_force_sensor_ai_drawingarea_configure_event" swapped="no"/>
+ <signal name="expose_event"
handler="on_force_sensor_ai_drawingarea_expose_event" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -24936,6 +24850,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27250,6 +27167,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>
@@ -27286,18 +27215,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>
@@ -29960,8 +29877,8 @@ then click this button.</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <signal name="expose_event"
handler="on_encoder_capture_signal_drawingarea_expose_event" swapped="no"/>
<signal name="configure_event"
handler="on_encoder_capture_signal_drawingarea_configure_event" swapped="no"/>
+ <signal name="expose_event"
handler="on_encoder_capture_signal_drawingarea_expose_event" swapped="no"/>
</widget>
</child>
<child>
@@ -34806,6 +34723,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/glade/session_add_edit.glade b/glade/session_add_edit.glade
index f4bea5cf..ec13552b 100644
--- a/glade/session_add_edit.glade
+++ b/glade/session_add_edit.glade
@@ -565,7 +565,6 @@
<widget class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="layout_style">spread</property>
<child>
<widget class="GtkButton" id="button_cancel">
<property name="label">gtk-cancel</property>
@@ -583,6 +582,22 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton" id="button_delete">
+ <property name="label">gtk-delete</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_delete_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </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_accept">
<property name="label">gtk-ok</property>
@@ -597,7 +612,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 2811b38e..176b7cd7 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -2442,6 +2442,9 @@ public partial class ChronoJumpWindow
sessionAddEditWin = SessionAddEditWindow.Show(app1, currentSession);
sessionAddEditWin.FakeButtonAccept.Clicked -= new
EventHandler(on_edit_session_accepted);
sessionAddEditWin.FakeButtonAccept.Clicked += new
EventHandler(on_edit_session_accepted);
+
+ sessionAddEditWin.FakeButtonDelete.Clicked -= new
EventHandler(on_delete_session_activate);
+ sessionAddEditWin.FakeButtonDelete.Clicked += new
EventHandler(on_delete_session_activate);
}
}
@@ -2525,10 +2528,11 @@ public partial class ChronoJumpWindow
chronojumpWindowTestsNext();
}
-
+
private void on_delete_session_activate (object o, EventArgs args)
{
LogB.Information("--- delete session ---");
+ sessionAddEditWin.HideAndNull();
if(currentSession.Name == Constants.SessionSimulatedName)
new DialogMessage(Constants.MessageTypes.INFO, Constants.SessionProtectedStr());
@@ -7309,9 +7313,7 @@ LogB.Debug("mc finished 5");
//menuitem_edit_session.Sensitive = option;
//menuitem_delete_session.Sensitive = option;
button_menu_session_edit.Sensitive = option; //menu
- button_menu_session_delete.Sensitive = option; //menu
button_menu_session_edit1.Sensitive = option; //menu_tiny
- button_menu_session_delete1.Sensitive = option; //menu_tiny
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/icons.cs b/src/gui/app1/icons.cs
index a529133c..42a59c00 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -650,8 +650,6 @@ public partial class ChronoJumpWindow
image_run_type_delete_simple.Pixbuf = pixbuf;
image_run_type_delete_intervallic.Pixbuf = pixbuf;
image_session_delete.Pixbuf = pixbuf;
- image_session_delete1.Pixbuf = pixbuf;
- image_session_delete2.Pixbuf = pixbuf;
image_encoder_exercise_delete.Pixbuf = pixbuf;
image_force_sensor_exercise_delete.Pixbuf = pixbuf;
image_run_encoder_exercise_delete.Pixbuf = pixbuf;
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index c3a01534..891e8b18 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -51,7 +51,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_session_new;
[Widget] Gtk.EventBox eventbox_button_menu_session_load;
[Widget] Gtk.EventBox eventbox_button_menu_session_edit;
- [Widget] Gtk.EventBox eventbox_button_menu_session_delete;
[Widget] Gtk.EventBox eventbox_button_menu_preferences;
[Widget] Gtk.EventBox eventbox_check_menu_encoder;
[Widget] Gtk.EventBox eventbox_check_menu_help;
@@ -70,7 +69,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_menu_session_new;
[Widget] Gtk.Button button_menu_session_load;
[Widget] Gtk.Button button_menu_session_edit;
- [Widget] Gtk.Button button_menu_session_delete;
[Widget] Gtk.Button button_menu_preferences;
[Widget] Gtk.Button button_menu_help_documents;
[Widget] Gtk.Button button_menu_help_accelerators;
@@ -83,7 +81,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_session_new3;
[Widget] Gtk.Image image_session_load2;
[Widget] Gtk.Image image_session_edit2;
- [Widget] Gtk.Image image_session_delete2;
[Widget] Gtk.Image image_button_show_modes;
[Widget] Gtk.Image image_menu_preferences;
[Widget] Gtk.Image image_menu_help;
@@ -136,7 +133,6 @@ public partial class ChronoJumpWindow
l.Add(button_menu_session_new);
l.Add(button_menu_session_load);
l.Add(button_menu_session_edit);
- l.Add(button_menu_session_delete);
l.Add(button_menu_help_documents);
l.Add(button_menu_help_accelerators);
l.Add(button_menu_help_about);
@@ -173,7 +169,6 @@ public partial class ChronoJumpWindow
image_session_new3.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_session_load2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_session_edit2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
- image_session_delete2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_button_show_modes.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_menu_preferences.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_menu_help.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
@@ -210,7 +205,6 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_new,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_load,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_edit,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_delete,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_documents,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_accelerators,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_about, UtilGtk.YELLOW_LIGHT);
diff --git a/src/gui/app1/menu_tiny.cs b/src/gui/app1/menu_tiny.cs
index 76a54400..85d6f71c 100644
--- a/src/gui/app1/menu_tiny.cs
+++ b/src/gui/app1/menu_tiny.cs
@@ -37,7 +37,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_session_new1;
[Widget] Gtk.EventBox eventbox_button_menu_session_load1;
[Widget] Gtk.EventBox eventbox_button_menu_session_edit1;
- [Widget] Gtk.EventBox eventbox_button_menu_session_delete1;
[Widget] Gtk.EventBox eventbox_button_menu_preferences1;
[Widget] Gtk.EventBox eventbox_check_menu_help1;
[Widget] Gtk.EventBox eventbox_button_menu_help_documents1;
@@ -50,13 +49,11 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Alignment alignment_menu_person_options1;
[Widget] Gtk.Alignment alignment_menu_help_options1;
[Widget] Gtk.Button button_menu_session_edit1;
- [Widget] Gtk.Button button_menu_session_delete1;
[Widget] Gtk.Image image_menu_folders1;
[Widget] Gtk.Image image_session_new1;
[Widget] Gtk.Image image_session_load1;
[Widget] Gtk.Image image_session_edit1;
- [Widget] Gtk.Image image_session_delete1;
[Widget] Gtk.Image image_button_show_modes1;
[Widget] Gtk.Image image_menu_preferences1;
[Widget] Gtk.Image image_menu_help1;
@@ -91,7 +88,6 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_new1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_load1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_edit1,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_delete1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_documents1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_accelerators1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_about1,
UtilGtk.YELLOW_LIGHT);
diff --git a/src/gui/session/addEdit.cs b/src/gui/session/addEdit.cs
index bc059873..34e97c6c 100644
--- a/src/gui/session/addEdit.cs
+++ b/src/gui/session/addEdit.cs
@@ -37,6 +37,7 @@ public class SessionAddEditWindow
[Widget] Gtk.Label label_date;
[Widget] Gtk.TextView textview;
+ [Widget] Gtk.Button button_delete;
[Widget] Gtk.Button button_accept;
[Widget] Gtk.RadioButton radiobutton_diff_sports;
@@ -73,6 +74,7 @@ public class SessionAddEditWindow
private bool textviewChanging = false;
private Session currentSession;
+ private Gtk.Button fakeButtonDelete;
private Gtk.Button fakeButtonAccept;
GenericWindow genericWin;
@@ -91,6 +93,7 @@ public class SessionAddEditWindow
this.currentSession = currentSession;
button_accept.Sensitive = false;
+ fakeButtonDelete = new Button();
fakeButtonAccept = new Button();
createComboSports();
@@ -110,6 +113,7 @@ public class SessionAddEditWindow
session_add_edit.Title = Catalog.GetString("New Session");
dateTime = DateTime.Today;
label_date.Text = dateTime.ToLongDateString();
+ button_delete.Visible = false;
} else {
session_add_edit.Title = Catalog.GetString("Session Edit");
@@ -125,6 +129,7 @@ public class SessionAddEditWindow
textview.Buffer = tb;
//showSportStuffWithLoadedData();
+ button_delete.Visible = true;
}
textview.Buffer.Changed += new EventHandler(textviewChanged);
@@ -522,6 +527,11 @@ public class SessionAddEditWindow
}
}
+ private void on_button_delete_clicked (object o, EventArgs args)
+ {
+ FakeButtonDelete.Click();
+ }
+
void on_button_cancel_clicked (object o, EventArgs args)
{
SessionAddEditWindowBox.session_add_edit.Hide();
@@ -657,6 +667,11 @@ public class SessionAddEditWindow
}
}
+ public Gtk.Button FakeButtonDelete
+ {
+ get { return fakeButtonDelete; }
+ }
+
public Gtk.Button FakeButtonAccept
{
get { return fakeButtonAccept; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
