[chronojump] session load button renamed "load" (was "accept")



commit 77360d271922a4e13999688c2133bf56885c5122
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Mar 9 12:47:42 2021 +0100

    session load button renamed "load" (was "accept")

 glade/app1.glade                      |  8 ++++----
 src/gui/app1/session/loadAndImport.cs | 22 +++++++++++-----------
 src/gui/app1/session/main.cs          |  4 ++--
 src/gui/guiTests.cs                   |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 89302832..d78ed352 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -40462,22 +40462,22 @@ then click this button.</property>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkButton" id="app1s_button_accept">
+                                                          <widget class="GtkButton" id="app1s_button_load">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="can_default">True</property>
                                                             <property name="has_default">True</property>
                                                             <property 
name="receives_default">False</property>
-                                                            <signal name="clicked" 
handler="app1s_on_button_accept_clicked" swapped="no"/>
+                                                            <signal name="clicked" 
handler="app1s_on_button_load_clicked" swapped="no"/>
                                                             <child>
-                                                            <widget class="GtkEventBox" 
id="app1s_eventbox_button_accept">
+                                                            <widget class="GtkEventBox" 
id="app1s_eventbox_button_load">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <child>
                                                             <widget class="GtkLabel" id="label512">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
-                                                            <property name="label" 
translatable="yes">Accept</property>
+                                                            <property name="label" 
translatable="yes">Load</property>
                                                             </widget>
                                                             </child>
                                                             </widget>
diff --git a/src/gui/app1/session/loadAndImport.cs b/src/gui/app1/session/loadAndImport.cs
index 827efd9f..71419354 100644
--- a/src/gui/app1/session/loadAndImport.cs
+++ b/src/gui/app1/session/loadAndImport.cs
@@ -124,7 +124,7 @@ public partial class ChronoJumpWindow
                app1s_store.SetSortColumnId(1, Gtk.SortType.Descending); //date
                app1s_store.ChangeSortColumn();
 
-               app1s_button_accept.Sensitive = false;
+               app1s_button_load.Sensitive = false;
                app1s_button_import.Sensitive = false;
                app1s_entry_search_filter.CanFocus = true;
                app1s_entry_search_filter.IsFocus = true;
@@ -481,10 +481,10 @@ public partial class ChronoJumpWindow
 
                if (((TreeSelection)o).GetSelected(out model, out iter)) {
                        app1s_selected = (string)model.GetValue (iter, 0);
-                       app1s_button_accept.Sensitive = true;
+                       app1s_button_load.Sensitive = true;
                        app1s_button_import.Sensitive = true;
                } else {
-                       app1s_button_accept.Sensitive = false;
+                       app1s_button_load.Sensitive = false;
                        app1s_button_import.Sensitive = false;
                }
 
@@ -622,23 +622,23 @@ public partial class ChronoJumpWindow
                        app1s_selected = (string) model.GetValue (iter, 0);
 
                        if (app1s_type == app1s_windowType.LOAD_SESSION) {
-                               //activate on_button_accept_clicked()
-                               app1s_button_accept.Activate();
+                               //activate on_button_load_clicked()
+                               app1s_button_load.Activate();
                        } else {
                                app1s_button_import.Activate();
                        }
                }
        }
        
-       private void app1s_on_button_accept_clicked (object o, EventArgs args)
+       private void app1s_on_button_load_clicked (object o, EventArgs args)
        {
                if(app1s_selected != "-1")
                {
                        app1s_notebook_load_button_animation.CurrentPage = 1;
-                       GLib.Timeout.Add(1000, new GLib.TimeoutHandler(app1s_on_button_accept_clicked_do));
+                       GLib.Timeout.Add(1000, new GLib.TimeoutHandler(app1s_on_button_load_clicked_do));
                }
        }
-       private bool app1s_on_button_accept_clicked_do ()
+       private bool app1s_on_button_load_clicked_do ()
        {
                currentSession = SqliteSession.Select (app1s_selected);
                on_load_session_accepted();
@@ -729,9 +729,9 @@ public partial class ChronoJumpWindow
                app1s_notebook.CurrentPage = app1s_PAGE_IMPORT_START;
        }
 
-       public Button app1s_Button_accept
+       public Button app1s_Button_load
        {
-               set { app1s_button_accept = value; }
-               get { return app1s_button_accept; }
+               set { app1s_button_load = value; }
+               get { return app1s_button_load; }
        }
 }
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index 7c8e1fb9..6dff34d6 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -62,7 +62,7 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.Notebook app1s_notebook_load_button_animation;
        [Widget] Gtk.HButtonBox app1s_hbuttonbox_page2_import;
        [Widget] Gtk.EventBox app1s_eventbox_button_cancel;
-       [Widget] Gtk.EventBox app1s_eventbox_button_accept;
+       [Widget] Gtk.EventBox app1s_eventbox_button_load;
        [Widget] Gtk.EventBox app1s_eventbox_button_back;
        [Widget] Gtk.EventBox app1s_eventbox_button_import;
 
@@ -181,7 +181,7 @@ public partial class ChronoJumpWindow
                UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_close0, UtilGtk.YELLOW, 
UtilGtk.YELLOW_LIGHT);
                UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_cancel1, UtilGtk.YELLOW, 
UtilGtk.YELLOW_LIGHT);
                UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_cancel, UtilGtk.YELLOW, 
UtilGtk.YELLOW_LIGHT);
-               UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_accept, UtilGtk.YELLOW, 
UtilGtk.YELLOW_LIGHT);
+               UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_load, UtilGtk.YELLOW, 
UtilGtk.YELLOW_LIGHT);
                UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_back, UtilGtk.YELLOW, 
UtilGtk.YELLOW_LIGHT);
                UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_import_confirm_back, 
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
                UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_import_confirm_accept, 
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
diff --git a/src/gui/guiTests.cs b/src/gui/guiTests.cs
index ad964225..5395a818 100644
--- a/src/gui/guiTests.cs
+++ b/src/gui/guiTests.cs
@@ -495,7 +495,7 @@ public partial class ChronoJumpWindow
                        return;
                }
 
-               app1s_Button_accept.Click();
+               app1s_Button_load.Click();
                
                LogB.TestEnd("chronojumpWindowTestsLoadSession");
        }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]