/[RomCheater]/trunk/RomCheater.RVAScratchPad/Form1.cs
ViewVC logotype

Diff of /trunk/RomCheater.RVAScratchPad/Form1.cs

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/RomCheater.RVAScratchPad/Form1.cs	2013/06/20 20:04:53	755
+++ trunk/RomCheater.RVAScratchPad/Form1.cs	2014/09/16 20:18:12	853
@@ -1,4 +1,5 @@
-´╗┐using System;
+´╗┐#define FORCE_DISABLE_PROFILER_LOGLEVEL // when define will forcibly disable the profiler loglevel
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -12,6 +13,7 @@
 using RomCheater.PluginFramework.Core;
 using RomCheater.Core;
 using RomCheater.UserSettingsSupport;
+using Enterprise.Logging;
 
 namespace RomCheater.RVAScratchPad
 {
@@ -26,6 +28,7 @@
         IUserControlPlugin RVACalcPlugin = null;
         IUserControlPlugin ScratchPadPlugin = null;
 
+        private LogLevel logging_level = LogLevel.kLogLevel_All;
         private DeserializeDockContent m_deserializeDockContent;
         //private FloatingLogWindow m_LogWindow = new FloatingLogWindow();
         //private FloatingWebBrowser m_wb = new FloatingWebBrowser();
@@ -47,24 +50,40 @@
         public Form1(bool no_console_redirect)
         {
             InitializeComponent();
+            this.Icon = Core.Properties.Resources.romcheater_icon;
             SettingsSubscriber = new SettingSubscriber();
             SettingsSubscriber.AddSubscriber(this, RomCheater.Properties.Settings.Default);              
-            load_loggerflags();
+            //load_loggerflags();
             SetupDocks();
             //LoggerInstance = m_LogWindow.Logwriter;
-            LoggerInstance = new LogWriter(!no_console_redirect);
-            LoggerInstance.CreateNewLog(false);
-            logger.ForceLog.Info.WriteLine("LoggingFlags = 0x{0:x4} ({1})", logger.GetLoggingFlags().Value, logger.GetLoggingFlags().Name);
+            LoggerInstance = new LogWriter();
+            load_loggerflags();
             load_plugins();
-            if (no_console_redirect)
-                LoggerInstance.RedirectConsoleOutput = false;           
+            //if (no_console_redirect)
+            //    LoggerInstance.RedirectConsoleOutput = false;           
         }
         private void load_loggerflags()
         {
-            logger.SetLoggingFlags(Logging.Properties.Settings.Default.LoggingFlags);
+            bool upgraded_flags = Logging.Properties.Settings.Default.UpgradedLogLevel;
+            if (!upgraded_flags)
+            {
+                logging_level = new LoggingFlagsConverter(Logging.Properties.Settings.Default.LoggingFlags).ConvertFlags();
+                Logging.Properties.Settings.Default.UpgradedLogLevel = true;
+                Logging.Properties.Settings.Default.gLogLoggingFlags = (uint)logging_level;
+                Logging.Properties.Settings.Default.Save();
+            }
+            logging_level = (LogLevel)Logging.Properties.Settings.Default.gLogLoggingFlags;
 #if FORCE_ALL_LOGGING_FLAGS
-            logger.SetLoggingFlags(loggerflags.ALL);
+      logging_level = LogLevel.kLogLevel_All;
 #endif
+#if FORCE_DISABLE_PROFILER_LOGLEVEL
+             logging_level = logging_level & ~LogLevel.kLogLevel_Profiler;
+             logging_level = logging_level & ~LogLevel.kLogLevel_VerboseProfiler;
+#endif
+             gLog.CreateLog(LoggingConstants.AppFullLogPath, true, logging_level, new EventHandler<LoggerOnFlushEventArgs>(Log_OnFlush), LoggerInstance.Log);
+        }
+        private void Log_OnFlush(object sender, LoggerOnFlushEventArgs e)
+        {
         }
         private void load_plugins() { load_plugins(false); }
         private void load_plugins_silent() { load_plugins(true); }
@@ -248,7 +267,7 @@
 
         private void Form1_Shown(object sender, EventArgs e)
         {
-            ////dockPanel.SuspendLayout(true);
+            dockPanel.SuspendLayout(true);
             ////ShowDocks();
             string configFile = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), DockPanelConfig);
             if (File.Exists(configFile))
@@ -260,11 +279,11 @@
                 }
                 catch (Exception)
                 {
-                    this.Controls.Remove(dockPanel);
-                    dockPanel = new DockPanel();
-                    dockPanel.Dock = DockStyle.Fill;
-                    dockPanel.DocumentStyle = DocumentStyle.DockingWindow;
-                    this.Controls.Add(dockPanel);
+                    //this.Controls.Remove(dockPanel);
+                    //dockPanel = new DockPanel();
+                    //dockPanel.Dock = DockStyle.Fill;
+                    //dockPanel.DocumentStyle = DocumentStyle.DockingWindow;
+                    //this.Controls.Add(dockPanel);
                     ShowDocks();
                 }
             }
@@ -275,7 +294,7 @@
 
             if (RVACalcPlugin != null)
                 RVACalcPlugin.Activate();
-            ////dockPanel.ResumeLayout(true, true);
+            dockPanel.ResumeLayout(true, true);
         }
 
         private void mnuItemExit_Click(object sender, EventArgs e)

 

  ViewVC Help
Powered by ViewVC 1.1.22