[chronojump] Delete session has its own button again (at session/more)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Delete session has its own button again (at session/more)
- Date: Thu, 9 Apr 2020 08:08:07 +0000 (UTC)
commit b0b00d28be333ee29ccf997c41a0b1f95360f665
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Apr 9 10:07:39 2020 +0200
Delete session has its own button again (at session/more)
glade/app1.glade | 85 +++++++++++++++++++++++++++++++++++++++-------
src/gui/app1/chronojump.cs | 8 +++--
src/gui/app1/icons.cs | 2 ++
src/gui/app1/menu.cs | 1 +
src/gui/session/addEdit.cs | 14 +++++---
5 files changed, 90 insertions(+), 20 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index c11311c6..e6f7dbd2 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -24809,6 +24809,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27055,6 +27058,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>
@@ -27091,18 +27106,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>
@@ -34845,6 +34848,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -35435,6 +35441,61 @@ then click this button.</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>
+ <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="hbox88">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</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>
+ <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">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index d97eea84..1a4ed6ca 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -2474,8 +2474,9 @@ public partial class ChronoJumpWindow
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);
+ //disabled on edit, now has its own window
+ //sessionAddEditWin.FakeButtonDelete.Clicked -= new
EventHandler(on_delete_session_activate);
+ //sessionAddEditWin.FakeButtonDelete.Clicked += new
EventHandler(on_delete_session_activate);
}
}
@@ -2565,7 +2566,7 @@ public partial class ChronoJumpWindow
private void on_delete_session_activate (object o, EventArgs args)
{
LogB.Information("--- delete session ---");
- sessionAddEditWin.HideAndNull();
+ //sessionAddEditWin.HideAndNull(); //delete session signal does not come now from
sessionAddEditWin
if(currentSession.Name == Constants.SessionSimulatedName)
new DialogMessage(Constants.MessageTypes.INFO, Constants.SessionProtectedStr());
@@ -6962,6 +6963,7 @@ LogB.Debug("mc finished 5");
private void menuSessionSensitive(bool option)
{
button_session_edit.Sensitive = option;
+ button_session_delete.Sensitive = option;
menuitem_export_csv.Sensitive = option;
button_session_export.Sensitive = option;
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 998489ce..3d454fd0 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -37,6 +37,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_session_new2;
[Widget] Gtk.Image image_session_edit;
[Widget] Gtk.Image image_session_delete;
+ [Widget] Gtk.Image image_session_delete1;
[Widget] Gtk.Image image_session_preferences;
[Widget] Gtk.Image image_mode_encoder_capture;
[Widget] Gtk.Image image_current_person_zoom;
@@ -644,6 +645,7 @@ 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_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 eafaa126..e8d79e9d 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -63,6 +63,7 @@ public partial class ChronoJumpWindow
[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;
diff --git a/src/gui/session/addEdit.cs b/src/gui/session/addEdit.cs
index 34e97c6c..c0fab11a 100644
--- a/src/gui/session/addEdit.cs
+++ b/src/gui/session/addEdit.cs
@@ -37,7 +37,7 @@ public class SessionAddEditWindow
[Widget] Gtk.Label label_date;
[Widget] Gtk.TextView textview;
- [Widget] Gtk.Button button_delete;
+ //[Widget] Gtk.Button button_delete; //now disabled on edit window, just do it with special button on
session/more
[Widget] Gtk.Button button_accept;
[Widget] Gtk.RadioButton radiobutton_diff_sports;
@@ -74,7 +74,7 @@ public class SessionAddEditWindow
private bool textviewChanging = false;
private Session currentSession;
- private Gtk.Button fakeButtonDelete;
+ //private Gtk.Button fakeButtonDelete;
private Gtk.Button fakeButtonAccept;
GenericWindow genericWin;
@@ -93,7 +93,7 @@ public class SessionAddEditWindow
this.currentSession = currentSession;
button_accept.Sensitive = false;
- fakeButtonDelete = new Button();
+ //fakeButtonDelete = new Button();
fakeButtonAccept = new Button();
createComboSports();
@@ -113,7 +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;
+ //button_delete.Visible = false;
} else {
session_add_edit.Title = Catalog.GetString("Session Edit");
@@ -129,7 +129,7 @@ public class SessionAddEditWindow
textview.Buffer = tb;
//showSportStuffWithLoadedData();
- button_delete.Visible = true;
+ //button_delete.Visible = true;
}
textview.Buffer.Changed += new EventHandler(textviewChanged);
@@ -527,10 +527,12 @@ public class SessionAddEditWindow
}
}
+ /*
private void on_button_delete_clicked (object o, EventArgs args)
{
FakeButtonDelete.Click();
}
+ */
void on_button_cancel_clicked (object o, EventArgs args)
{
@@ -667,10 +669,12 @@ public class SessionAddEditWindow
}
}
+ /*
public Gtk.Button FakeButtonDelete
{
get { return fakeButtonDelete; }
}
+ */
public Gtk.Button FakeButtonAccept
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
