[chronojump] code clean



commit c38c46a60101dd9e7adc473dceb50d18276b6876
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Apr 14 13:29:16 2020 +0200

    code clean

 src/gui/app1/chronojump.cs | 11 ++++++-----
 src/gui/networks.cs        |  8 ++++----
 src/gui/sendLog.cs         |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 94f53821..826ef2ef 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -479,6 +479,7 @@ public partial class ChronoJumpWindow
        
        private string progVersion;
        private string progName;
+       private enum notebook_start_pages { PROGRAM, SENDLOG, NETWORKSPROBLEMS, EXITCONFIRM }
        private enum notebook_sup_pages { START, CONTACTS, ENCODER, SESSION }
        private enum notebook_analyze_pages { STATISTICS, JUMPSPROFILE, JUMPSDJOPTIMALFALL, 
JUMPSWEIGHTFVPROFILE, JUMPSEVOLUTION, SPRINT, FORCESENSOR, RACEENCODER }
 
@@ -567,7 +568,7 @@ public partial class ChronoJumpWindow
                        notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.START);
                else {
                        show_send_log(sendLogMessage, preferences.crashLogLanguage);
-                       notebook_start.CurrentPage = 1; //send log
+                       notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.SENDLOG);
                }
 
                if(showCameraStop)
@@ -2246,12 +2247,12 @@ public partial class ChronoJumpWindow
                        on_quit2_activate(new object(), new EventArgs());
                
                */
-               notebook_start.CurrentPage = 3;
+               notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.EXITCONFIRM);
        }
 
        private void on_button_exit_cancel_clicked (object o, EventArgs args)
        {
-               notebook_start.CurrentPage = 0;
+               notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
        }
        private void on_button_exit_confirm_clicked (object o, EventArgs args)
        {
@@ -3124,7 +3125,7 @@ public partial class ChronoJumpWindow
 
 
                //show the program
-               notebook_start.CurrentPage = 0;
+               notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
 
                //show persons
                if( currentSession != null && ! configChronojump.PersonWinHide) {
@@ -7328,7 +7329,7 @@ LogB.Debug("mc finished 5");
        {
                chronopicRegisterUpdate(false);
                if(chronopicRegister.NumConnectedOfType(ChronopicRegisterPort.Types.ENCODER) > 0)
-                       notebook_start.CurrentPage = 0;
+                       notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
        }
 
        //trying to fix when an OSX disconnects and reconnects same chronopic (and it has captured)
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index bf65f222..01d6dcc0 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -1049,11 +1049,11 @@ public partial class ChronoJumpWindow
        {
                if(missing) {
                        hbox_encoder_disconnected.Visible = true;
-                       notebook_start.CurrentPage = 2; //networks problems
+                       notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.NETWORKSPROBLEMS);
                }
                else {
                        hbox_encoder_disconnected.Visible = false;
-                       notebook_start.CurrentPage = 0; //program
+                       notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
                }
        }
 
@@ -1070,11 +1070,11 @@ public partial class ChronoJumpWindow
                         */
                        hbox_encoder_disconnected.Visible = false;
 
-                       notebook_start.CurrentPage = 2; //networks problems
+                       notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.NETWORKSPROBLEMS);
                }
                else {
                        hbox_RFID_disconnected.Visible = false;
-                       notebook_start.CurrentPage = 0; //program
+                       notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
                }
        }
 
diff --git a/src/gui/sendLog.cs b/src/gui/sendLog.cs
index d3965568..1c1a3095 100644
--- a/src/gui/sendLog.cs
+++ b/src/gui/sendLog.cs
@@ -130,7 +130,7 @@ public partial class ChronoJumpWindow
 
        private void on_button_open_chronojump_clicked(object o, EventArgs args)
        {
-               notebook_start.CurrentPage = 0;
+               notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
                notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.START);
                new ChronojumpLogo (drawingarea_chronojump_logo, viewport_chronojump_logo, 
preferences.logoAnimatedShow);
        }


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