From 3e24ca4823cbd5edcd99608b6f75b6e5dc2a274f Mon Sep 17 00:00:00 2001 From: jtorjo Date: Mon, 15 Feb 2016 13:09:34 +0200 Subject: [PATCH] 1.8.2 - small fixes --- .../Properties/AssemblyInfo.cs | 4 +- src/Program.cs | 2 +- src/Properties/AssemblyInfo.cs | 4 +- src/docs/history.md | 3 ++ src/logwizardsetup/logwizardsetup.vdproj | 40 +++++++++---------- src/lw_common/Properties/AssemblyInfo.cs | 4 +- .../ui/format/column_formatter_array.cs | 9 ++++- src/lw_common/ui/log_view/log_view.cs | 2 + src/lw_common/util/settings_as_string.cs | 3 +- src/test_ui/Properties/AssemblyInfo.cs | 4 +- 10 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/LwFileAssociations/Properties/AssemblyInfo.cs b/src/LwFileAssociations/Properties/AssemblyInfo.cs index fdbb7a5..afe0c33 100644 --- a/src/LwFileAssociations/Properties/AssemblyInfo.cs +++ b/src/LwFileAssociations/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/src/Program.cs b/src/Program.cs index 94463ca..578d285 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -56,7 +56,7 @@ static class Program Application.SetCompatibleTextRenderingDefault(false); // uncomment this to test how we'd behave in release - //util.is_debug = false; + // util.is_debug = false; util.set_current_dir(); util.init_log(); diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index 910c187..fe9a916 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -50,5 +50,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/src/docs/history.md b/src/docs/history.md index eddc645..2506353 100644 --- a/src/docs/history.md +++ b/src/docs/history.md @@ -1,4 +1,7 @@ +1.8.2 +- small fixes + 1.8.1 - to release to public - ctrl-shift-b for changing number base (to be consistent with ctrl-shift-a) diff --git a/src/logwizardsetup/logwizardsetup.vdproj b/src/logwizardsetup/logwizardsetup.vdproj index 71afa26..4038abe 100644 --- a/src/logwizardsetup/logwizardsetup.vdproj +++ b/src/logwizardsetup/logwizardsetup.vdproj @@ -111,20 +111,20 @@ } "Entry" { - "MsmKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2" + "MsmKey" = "8:_C065ACDBA66E8B30899AECA33A5A051E" "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2" - "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" + "MsmKey" = "8:_C065ACDBA66E8B30899AECA33A5A051E" + "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2" - "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" + "MsmKey" = "8:_C065ACDBA66E8B30899AECA33A5A051E" + "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -178,49 +178,49 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" + "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D2E59C7D7FA78714FF03DC7638387E2D" + "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AB5E98E4180EBEAE93E1EBCD8710302C" + "OwnerKey" = "8:_D2E59C7D7FA78714FF03DC7638387E2D" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1BD61D6EEEDCF9C461BF2F745AED1697" + "OwnerKey" = "8:_AB5E98E4180EBEAE93E1EBCD8710302C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_22E505A97FF6358D681DFC3888FC73C8" + "OwnerKey" = "8:_1BD61D6EEEDCF9C461BF2F745AED1697" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_966B495A39D8FF43968A2C8EACD91BE1" + "OwnerKey" = "8:_C065ACDBA66E8B30899AECA33A5A051E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" + "OwnerKey" = "8:_22E505A97FF6358D681DFC3888FC73C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2" + "OwnerKey" = "8:_966B495A39D8FF43968A2C8EACD91BE1" "MsmSig" = "8:_UNDEFINED" } } @@ -633,14 +633,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ACC42FCA563B08AB5DBE4626477480B2" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C065ACDBA66E8B30899AECA33A5A051E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:fastJSON, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6b75a806b86095cd, processorArchitecture=MSIL" "ScatterAssemblies" { - "_ACC42FCA563B08AB5DBE4626477480B2" + "_C065ACDBA66E8B30899AECA33A5A051E" { "Name" = "8:fastJSON.dll" "Attributes" = "3:512" @@ -668,7 +668,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:lw_common, Version=1.7.41.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:lw_common, Version=1.8.2.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { "_C8B46DF279E1B4F613E1AB160AF480C8" @@ -804,15 +804,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Log Wizard Setup" - "ProductCode" = "8:{FD170EFF-8375-4CB4-A2ED-D76B3B1BB2B6}" - "PackageCode" = "8:{3CA9B165-01EF-4332-B845-B7A34DC40983}" + "ProductCode" = "8:{FDB68C27-B9B1-4573-A799-FD793A093F6B}" + "PackageCode" = "8:{3D4A56A9-6020-4883-B676-DC88B6B419AD}" "UpgradeCode" = "8:{0E5BB812-A969-415B-9362-F64234C67C4A}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.8.1" + "ProductVersion" = "8:1.8.2" "Manufacturer" = "8:John Torjo" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -1410,7 +1410,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_900BA54346A2479085BF08862BE89061" { - "SourcePath" = "8:..\\obj\\x64\\Release64\\LogWizard.exe" + "SourcePath" = "8:..\\obj\\x86\\Release\\LogWizard.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" diff --git a/src/lw_common/Properties/AssemblyInfo.cs b/src/lw_common/Properties/AssemblyInfo.cs index b0fa37d..43b033f 100644 --- a/src/lw_common/Properties/AssemblyInfo.cs +++ b/src/lw_common/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/src/lw_common/ui/format/column_formatter_array.cs b/src/lw_common/ui/format/column_formatter_array.cs index c0e4f30..8794679 100644 --- a/src/lw_common/ui/format/column_formatter_array.cs +++ b/src/lw_common/ui/format/column_formatter_array.cs @@ -37,6 +37,8 @@ namespace lw_common.ui.format { */ public class column_formatter_array { + private static log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private class formatter { // ... such as "all", "time", "msg", "ctx1", etc. public string column_type = ""; @@ -204,7 +206,12 @@ private class formatter { } // load_syntax if (result != null) - result.load_syntax(new settings_as_string(syntax), ref error); + try { + result.load_syntax(new settings_as_string(syntax), ref error); + } catch (Exception e) { + logger.Error("can't load formatter " + e.Message); + error = "Cannot load " + name + ". Invalid syntax"; + } return result; } diff --git a/src/lw_common/ui/log_view/log_view.cs b/src/lw_common/ui/log_view/log_view.cs index 623781a..114ca2b 100644 --- a/src/lw_common/ui/log_view/log_view.cs +++ b/src/lw_common/ui/log_view/log_view.cs @@ -1110,6 +1110,7 @@ public log_view(Form parent, string name) switch (change) { case filter.change_type.new_lines: case filter.change_type.changed_filter: + // ... so that we're showing the new lines instantly this.async_call(refresh); break; @@ -1124,6 +1125,7 @@ public log_view(Form parent, string name) } public void clear() { + render_.clear_format_cache("file rewritten"); filter_.clear(); refresh(); } diff --git a/src/lw_common/util/settings_as_string.cs b/src/lw_common/util/settings_as_string.cs index 4ec9a46..f0f2fef 100644 --- a/src/lw_common/util/settings_as_string.cs +++ b/src/lw_common/util/settings_as_string.cs @@ -50,7 +50,8 @@ public class settings_as_string_readonly { if (idx >= 0) { string name = line.Substring(0, idx); string value = line.Substring(idx + 1); - sett_.Add(name, value); + if (!sett_.ContainsKey(name)) + sett_.Add(name, value); } else { logger.Warn("invalid settings_as_string_readonly line, ignoring " + line); } diff --git a/src/test_ui/Properties/AssemblyInfo.cs b/src/test_ui/Properties/AssemblyInfo.cs index 4a11e7e..18947b4 100644 --- a/src/test_ui/Properties/AssemblyInfo.cs +++ b/src/test_ui/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")]