[chronojump] Delete test type (jumpsSimple, jumpsRj, runs, runsI) much better with notebook (no 3 window opened)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Delete test type (jumpsSimple, jumpsRj, runs, runsI) much better with notebook (no 3 window opened)
- Date: Tue, 11 May 2021 16:20:50 +0000 (UTC)
commit f5775abda503ae326607efb9ef4e8cdc20160d5b
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue May 11 18:18:07 2021 +0200
Delete test type (jumpsSimple, jumpsRj, runs, runsI) much better with notebook (no 3 window opened)
glade/jumps_runs_more.glade | 415 ++++++++++++++++++++++++++++++++++----------
src/gui/event.cs | 42 +++--
2 files changed, 358 insertions(+), 99 deletions(-)
---
diff --git a/glade/jumps_runs_more.glade b/glade/jumps_runs_more.glade
index 59b8e9c4..a3cf25ef 100644
--- a/glade/jumps_runs_more.glade
+++ b/glade/jumps_runs_more.glade
@@ -18,144 +18,381 @@
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <widget class="GtkNotebook" id="notebook">
<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="can_focus">True</property>
+ <property name="show_tabs">False</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow12">
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">4</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkTreeView" id="treeview_more">
+ <widget class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="enable_search">False</property>
- <signal name="row_activated" handler="on_row_double_clicked" swapped="no"/>
+ <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="GtkScrolledWindow" id="scrolledwindow12">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">4</property>
+ <child>
+ <widget class="GtkTreeView" id="treeview_more">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="enable_search">False</property>
+ <signal name="row_activated" handler="on_row_double_clicked" swapped="no"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</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="GtkHButtonBox" id="hbuttonbox16">
+ <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>
+ <property name="visible">True</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_cancel_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_accept">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</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_accept_clicked" swapped="no"/>
+ </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_close">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_delete_type">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_delete_type_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_delete">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-delete</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_delete_type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Delete type</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
</child>
<child>
- <placeholder/>
- <packing>
- <property name="type">label_item</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="GtkHButtonBox" id="hbuttonbox16">
- <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>
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</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_cancel_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
+ <property name="can_focus">False</property>
+ <property name="label">tests</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_accept">
- <property name="label">gtk-ok</property>
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</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_accept_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkLabel" id="label_delete_confirm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_delete_confirm_name">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button_delete_confirm_accept">
+ <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="on_button_delete_confirm_accept_clicked"
swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_delete1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-delete</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_delete_type1">
+ <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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">16</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">16</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton" id="button_delete_confirm_cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</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_confirm_cancel_clicked"
swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </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>
<child>
- <widget class="GtkButton" id="button_close">
- <property name="label">gtk-close</property>
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
+ <property name="can_focus">False</property>
+ <property name="label">delete confirm</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_delete_type">
+ <widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_delete_type_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkLabel" id="label_delete_cannot">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">16</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage" id="image1">
+ <widget class="GtkButton" id="button_close1">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-delete</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label_delete_type">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Delete type</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</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>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">delete cannot</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
diff --git a/src/gui/event.cs b/src/gui/event.cs
index 0a93a72c..dbf4c67a 100644
--- a/src/gui/event.cs
+++ b/src/gui/event.cs
@@ -592,14 +592,24 @@ public class EditEventWindow
public class EventMoreWindow
{
- protected TreeStore store;
+ [Widget] protected Gtk.Notebook notebook;
[Widget] protected Gtk.TreeView treeview_more;
[Widget] protected Gtk.Button button_accept;
[Widget] protected Gtk.Button button_delete_type;
[Widget] protected Gtk.Button button_cancel;
[Widget] protected Gtk.Button button_close;
+ [Widget] protected Gtk.Button button_close1;
+ [Widget] protected Gtk.Label label_delete_confirm;
+ [Widget] protected Gtk.Label label_delete_confirm_name;
+ [Widget] protected Gtk.Label label_delete_cannot;
+ [Widget] protected Gtk.Image image_delete;
+ [Widget] protected Gtk.Image image_delete1;
protected Gtk.Window parent;
+ protected enum notebookPages { TESTS, DELETECONFIRM, DELETECANNOT };
+
+ protected TreeStore store;
+
protected string selectedEventType;
protected string selectedEventName;
protected string selectedDescription;
@@ -637,6 +647,10 @@ public class EventMoreWindow
button_delete_type.Visible = ! testOrDelete;
button_close.Visible = ! testOrDelete;
+ Pixbuf pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_delete.png");
+ image_delete.Pixbuf = pixbuf;
+ image_delete1.Pixbuf = pixbuf;
+
button_accept.Sensitive = false;
button_delete_type.Sensitive = false;
@@ -695,15 +709,17 @@ public class EventMoreWindow
}
//if exist tell user to edit or delete them
- if(tests.Length > 0)
- new DialogMessage(Constants.MessageTypes.WARNING,
- Catalog.GetString("There are tests of that type on database on
sessions:") + "\n" +
+ if(tests.Length > 0)
+ {
+ notebook.Page = Convert.ToInt32(notebookPages.DELETECANNOT);
+ label_delete_cannot.Text = Catalog.GetString("There are tests of that type on
database on sessions:") + "\n\n" +
Util.ArrayListToSingleString(sessionValuesArray, "\n") + "\n\n" +
- Catalog.GetString("please first edit or delete them."));
- else {
- ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Are you sure you
want to delete this test type?"), "",
- selectedEventName);
- confirmWin.Button_accept.Clicked += new EventHandler(on_button_delete_type_accepted);
+ Catalog.GetString("please first edit or delete them.");
+ } else {
+ notebook.Page = Convert.ToInt32(notebookPages.DELETECONFIRM);
+ label_delete_confirm.Text = Catalog.GetString("Are you sure you want to delete this
test type?");
+ label_delete_confirm_name.Text = "<b>" + selectedEventName + "</b>";
+ label_delete_confirm_name.UseMarkup = true;
}
}
@@ -711,7 +727,12 @@ public class EventMoreWindow
protected virtual void deleteTestLine() {
}
- protected void on_button_delete_type_accepted (object o, EventArgs args)
+ protected void on_button_delete_confirm_cancel_clicked (object o, EventArgs args)
+ {
+ notebook.Page = Convert.ToInt32(notebookPages.TESTS);
+ }
+
+ protected void on_button_delete_confirm_accept_clicked (object o, EventArgs args)
{
deleteTestLine();
@@ -723,6 +744,7 @@ public class EventMoreWindow
store.Remove(ref iter);
button_delete_type.Sensitive = false;
+ notebook.Page = Convert.ToInt32(notebookPages.TESTS);
}
///this should be abstract
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
