[chronojump] configChronojump manages UseVideo and SessionMode



commit d5cef2c03ec8a7c751f7986d695c829d80aff0cb
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Jan 26 16:14:41 2017 +0100

    configChronojump manages UseVideo and SessionMode

 src/gui/chronojump.cs |    6 +++---
 src/gui/encoder.cs    |    2 +-
 src/gui/networks.cs   |   34 ++++++++++++++--------------------
 3 files changed, 18 insertions(+), 24 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index c12e743..73bf1d3 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2676,7 +2676,7 @@ public partial class ChronoJumpWindow
        private void person_add_single () {
                personAddModifyWin = PersonAddModifyWindow.Show(app1, 
                                currentSession, new Person(-1), 
-                               preferences.digitsNumber, checkbutton_video, useVideo
+                               preferences.digitsNumber, checkbutton_video, configChronojump.UseVideo
                                );
                //-1 means we are adding a new person
                //if we were modifying it will be it's uniqueID
@@ -2767,7 +2767,7 @@ public partial class ChronoJumpWindow
                LogB.Information("modify person");
 
                personAddModifyWin = PersonAddModifyWindow.Show(app1, currentSession, currentPerson, 
-                               preferences.digitsNumber, checkbutton_video, useVideo
+                               preferences.digitsNumber, checkbutton_video, configChronojump.UseVideo
                                ); 
                personAddModifyWin.FakeButtonAccept.Clicked += new 
EventHandler(on_edit_current_person_accepted);
        }
@@ -3169,7 +3169,7 @@ public partial class ChronoJumpWindow
 
                //make main_menu visible because it's not visible at startup.
                //but don't show if session == UNIQUE
-               if(! sessionIsUnique)
+               if(configChronojump.SessionMode == Config.SessionModeEnum.STANDARD)
                        main_menu.Visible = true;
 
                if(m != Constants.Menuitem_modes.POWERGRAVITATORY && m != 
Constants.Menuitem_modes.POWERINERTIAL)
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index c591749..6373948 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4716,7 +4716,7 @@ public partial class ChronoJumpWindow
                                //image_encoder_width = 
UtilGtk.WidgetWidth(viewport_image_encoder_capture)-5; 
                                //make graph half width of Chronojump window
                                //but if video is disabled, then make it wider because thegraph will be much 
taller
-                               if(useVideo)
+                               if(configChronojump.UseVideo)
                                        image_encoder_width = Convert.ToInt32(UtilGtk.WidgetWidth(app1) / 2);
                                else
                                        image_encoder_width = Convert.ToInt32(UtilGtk.WidgetWidth(app1));
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index ea6ea1e..d7f683e 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -57,20 +57,16 @@ public partial class ChronoJumpWindow
        //shown when menu is hidden
        [Widget] Gtk.HBox hbox_menu_and_preferences_outside_menu;
 
-
-       //variables used on gui/chronojump.cs
-       private bool useVideo = true;
-       private bool sessionIsUnique = false;
-
        private enum linuxTypeEnum { NOTLINUX, LINUX, RASPBERRY, NETWORKS }
        private bool encoderUpdateTreeViewWhileCapturing = true;
                
+       Config configChronojump;
        private void configInit() 
        {
                //trying new Config class
-               Config config = new Config();
-               config.Read();
-               LogB.Information("Config:\n" + config.ToString());
+               configChronojump = new Config();
+               configChronojump.Read();
+               LogB.Information("Config:\n" + configChronojump.ToString());
                        
                /*
                 * TODO: do an else to any option
@@ -80,9 +76,9 @@ public partial class ChronoJumpWindow
                 * But note this has to be executed only if it has changed!!
                 */
 
-               if(config.Maximized)
+               if(configChronojump.Maximized)
                        app1.Maximize();
-               if(config.CustomButtons) {
+               if(configChronojump.CustomButtons) {
                        
                        //---- capture tab ----
                        
@@ -101,18 +97,17 @@ public partial class ChronoJumpWindow
                        hbox_encoder_analyze_signal_or_curves.HeightRequest = 40;
                        button_encoder_analyze.SetSizeRequest(120,40);
                }
-               if(! config.UseVideo) {
-                       useVideo = false;
+               if(! configChronojump.UseVideo) {
                        alignment_video_encoder.Visible = false;
                }
                
                //show only power
-               if(config.OnlyEncoderGravitatory)
+               if(configChronojump.OnlyEncoderGravitatory)
                        select_menuitem_mode_toggled(Constants.Menuitem_modes.POWERGRAVITATORY);
-               else if(config.OnlyEncoderInertial)
+               else if(configChronojump.OnlyEncoderInertial)
                        select_menuitem_mode_toggled(Constants.Menuitem_modes.POWERINERTIAL);
                
-               if(config.EncoderCaptureShowOnlyBars)
+               if(configChronojump.EncoderCaptureShowOnlyBars)
                {
                        //attention: this makes encoder_capture_signal_drawingarea == null
                        vpaned_encoder_capture_video_and_set_graph.Visible = false;
@@ -134,21 +129,20 @@ public partial class ChronoJumpWindow
                        */
                }
                
-               encoderUpdateTreeViewWhileCapturing = config.EncoderUpdateTreeViewWhileCapturing;
+               encoderUpdateTreeViewWhileCapturing = configChronojump.EncoderUpdateTreeViewWhileCapturing;
                
-               if(config.PersonWinHide) {
+               if(configChronojump.PersonWinHide) {
                        //vbox_persons.Visible = false;
                        notebook_session_person.Visible = false;
                        hbox_encoder_person.Visible = true;
                }
                
-               if(config.EncoderAnalyzeHide) {
+               if(configChronojump.EncoderAnalyzeHide) {
                        hbox_encoder_sup_capture_analyze_two_buttons.Visible = false;
                }
 
-               if(config.SessionMode == Config.SessionModeEnum.UNIQUE) 
+               if(configChronojump.SessionMode == Config.SessionModeEnum.UNIQUE)
                {
-                       sessionIsUnique = true;
                        main_menu.Visible = false;
                        hbox_menu_and_preferences_outside_menu.Visible = true;
 


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