From 996728390559f9e1156ae8ea0296c71855ffb252 Mon Sep 17 00:00:00 2001 From: Tim Sinaeve Date: Tue, 3 Aug 2021 17:59:51 +0200 Subject: [PATCH] Added settings.texteditor.json. Fixed loading of colors for texteditor. --- Bin/Win32/Colors/Blue.json | 159 ----------------- Bin/Win32/Colors/Classic.json | 156 ----------------- Bin/Win32/Colors/Default.json | 160 ------------------ Bin/Win32/Colors/Monokai.json | 157 ----------------- Bin/Win32/Colors/Ocean.json | 160 ------------------ Bin/Win32/Colors/Purple.json | 159 ----------------- Bin/Win32/Colors/Twilight.json | 157 ----------------- Bin/Win32/Colors/Visual Studio [TM].json | 154 ----------------- Bin/Win32/settings.json | 8 +- LogViewer.Dashboard.View.pas | 45 ++--- LogViewer.MessageList.View.pas | 2 +- LogViewer.dproj | 4 +- LogViewer.res | Bin 151252 -> 151252 bytes settings.json | 8 +- .../tsColors.json => settings.texteditor.json | 4 +- 15 files changed, 37 insertions(+), 1296 deletions(-) delete mode 100644 Bin/Win32/Colors/Blue.json delete mode 100644 Bin/Win32/Colors/Classic.json delete mode 100644 Bin/Win32/Colors/Default.json delete mode 100644 Bin/Win32/Colors/Monokai.json delete mode 100644 Bin/Win32/Colors/Ocean.json delete mode 100644 Bin/Win32/Colors/Purple.json delete mode 100644 Bin/Win32/Colors/Twilight.json delete mode 100644 Bin/Win32/Colors/Visual Studio [TM].json rename Bin/Win32/Colors/tsColors.json => settings.texteditor.json (98%) diff --git a/Bin/Win32/Colors/Blue.json b/Bin/Win32/Colors/Blue.json deleted file mode 100644 index 0904447..0000000 --- a/Bin/Win32/Colors/Blue.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "Colors":{ - "Info":{ - "General":{ - "Version":"1.3", - "Date":"09.01.2016" - }, - "Author":{ - "Name":"Lasse Rautiainen", - "Mail":"lasse@bonecode.com" - } - }, - "Editor":{ - "Colors":{ - "Background":"clWindow", - "ActiveLineBackground":"$00E6FAFF", - "CodeFoldingActiveLineBackground":"$00E6FAFF", - "CodeFoldingBackground":"clWhite", - "CodeFoldingCollapsedLine":"$00CC9999", - "CodeFoldingFoldingLine":"$00CC9999", - "CodeFoldingFoldingLineHighlight":"$00CC9999", - "CodeFoldingIndent":"$00CC9999", - "CodeFoldingIndentHighlight":"$00CC9999", - "CodeFoldingHintBackground":"clWindow", - "CodeFoldingHintBorder":"$00CC9999", - "CodeFoldingHintText":"clNone", - "CompletionProposalBackground":"clWindow", - "CompletionProposalForeground":"clWindowText", - "CompletionProposalSelectedBackground":"clHighlight", - "CompletionProposalSelectedText":"clHighlightText", - "LeftMarginActiveLineBackground":"$00E6FAFF", - "LeftMarginBackground":"clWhite", - "LeftMarginBorder":"clWhite", - "LeftMarginLineNumberLine":"$00CC9999", - "LeftMarginLineNumbers":"$00CC9999", - "LeftMarginLineStateModified":"clYellow", - "LeftMarginLineStateNormal":"clLime", - "LeftMarginBookmarkPanel":"clWhite", - "MatchingPairMatched":"clAqua", - "MatchingPairUnderline":"$00CC9999", - "MatchingPairUnmatched":"clYellow", - "MinimapBookmark":"$00999999", - "MinimapVisibleLines":"$00E6FAFF", - "RightMargin":"clSilver", - "RightMovingEdge":"clSilver", - "SearchHighlighterBackground":"$0078AAFF", - "SearchHighlighterForeground":"clWindowText", - "SearchMapActiveLine":"$00F0F0F0", - "SearchMapBackground":"$00F4F4F4", - "SearchMapForeground":"$0078AAFF", - "SelectionBackground":"$00A56D53", - "SelectionForeground":"clHighlightText", - "WordWrapIndicatorArrow": "$00333333", - "WordWrapIndicatorLines": "$009f6f2f" - }, - "Fonts":{ - "LineNumbers":"Consolas", - "Text":"Consolas", - "Minimap":"Consolas", - "CodeFoldingHint":"Consolas", - "CompletionProposal":"Consolas" - }, - "FontSizes":{ - "LineNumbers":"8", - "Text":"9", - "Minimap":"1", - "CodeFoldingHint":"8", - "CompletionProposal":"8" - } - }, - "Elements":[ - { - "Name":"Editor", - "Foreground":"$00333333", - "Background":"clWindow" - }, - { - "Name":"Comment", - "Foreground":"$00999999", - "Background":"clWindow", - "Style":"Italic" - }, - { - "Name":"String", - "Foreground":"$005049d4", - "Background":"clWindow" - }, - { - "Name":"Directive", - "Foreground":"$00999900", - "Background":"clWindow" - }, - { - "Name":"Character", - "Foreground":"$00cf9f4f", - "Background":"clWindow" - }, - { - "Name":"ReservedWord", - "Foreground":"$009f6f2f", - "Background":"clWindow", - "Style":"Bold" - }, - { - "Name":"Symbol", - "Foreground":"clNavy", - "Background":"clWindow" - }, - { - "Name":"Number", - "Foreground":"$00AAAA33", - "Background":"clWindow" - }, - { - "Name":"HexNumber", - "Foreground":"$00AAAA33", - "Background":"clWindow" - }, - { - "Name":"HighlightedBlock", - "Foreground":"clBlack", - "Background":"$00f9f7f7" - }, - { - "Name":"HighlightedBlockSymbol", - "Foreground":"clNavy", - "Background":"$00f9f7f7" - }, - { - "Name":"AssemblerComment", - "Foreground":"$00999999", - "Background":"$00f9f7f7", - "Style":"Italic" - }, - { - "Name":"AssemblerReservedWord", - "Foreground":"$009f6f2f", - "Background":"$00f9f7f7", - "Style":"Bold" - }, - { - "Name":"Attribute", - "Foreground":"$00cf9f4f", - "Background":"clWindow" - }, - { - "Name":"Method", - "Foreground":"$009f6f2f", - "Background":"clWindow", - "Style":"Bold" - }, - { - "Name":"MethodName", - "Foreground":"$00333333", - "Background":"clWindow" - } - ] - } -} diff --git a/Bin/Win32/Colors/Classic.json b/Bin/Win32/Colors/Classic.json deleted file mode 100644 index ce559c2..0000000 --- a/Bin/Win32/Colors/Classic.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "Colors":{ - "Info":{ - "General":{ - "Version":"1.0", - "Date":"17.10.2015" - }, - "Author":{ - "Name":"Lasse Rautiainen", - "Mail":"lasse@bonecode.com" - } - }, - "Editor":{ - "Colors":{ - "Background":"clNavy", - "ActiveLineBackground":"$009F0000", - "CodeFoldingActiveLineBackground":"$009F0000", - "CodeFoldingBackground":"clNavy", - "CodeFoldingCollapsedLine":"clSilver", - "CodeFoldingFoldingLine":"clSilver", - "CodeFoldingFoldingLineHighlight":"clSilver", - "CodeFoldingIndent":"clSilver", - "CodeFoldingIndentHighlight":"clSilver", - "CodeFoldingHintBackground":"clNavy", - "CodeFoldingHintBorder":"clSilver", - "CodeFoldingHintText":"clYellow", - "CompletionProposalBackground":"clNavy", - "CompletionProposalForeground":"clYellow", - "CompletionProposalSelectedBackground":"clSilver", - "CompletionProposalSelectedText":"clNavy", - "LeftMarginActiveLineBackground":"$009F0000", - "LeftMarginBackground":"clNavy", - "LeftMarginBorder":"clNavy", - "LeftMarginLineNumberLine":"clSilver", - "LeftMarginLineNumbers":"clSilver", - "LeftMarginLineStateModified":"clYellow", - "LeftMarginLineStateNormal":"clLime", - "LeftMarginBookmarkPanel":"clNavy", - "MatchingPairMatched":"$00808080", - "MatchingPairUnderline":"clSilver", - "MatchingPairUnmatched":"clYellow", - "MinimapBookmark":"clSilver", - "MinimapVisibleLines":"$009F0000", - "RightMargin":"clSilver", - "RightMovingEdge":"clSilver", - "SearchHighlighterBackground":"clBlack", - "SearchHighlighterForeground":"$00FCFDCD", - "SearchMapActiveLine":"$00F0F0F0", - "SearchMapBackground":"$00660000", - "SearchMapForeground":"clYellow", - "SelectionBackground":"clSilver", - "SelectionForeground":"clNavy", - "WordWrapIndicatorArrow": "clSilver", - "WordWrapIndicatorLines": "clWhite" - }, - "Fonts":{ - "LineNumbers":"Courier New", - "Text":"Courier New", - "Minimap":"Courier New", - "CodeFoldingHint":"Courier New", - "CompletionProposal":"Courier New" - }, - "FontSizes":{ - "LineNumbers":"8", - "Text":"9", - "Minimap":"1", - "CodeFoldingHint":"8", - "CompletionProposal":"8" - } - }, - "Elements":[ - { - "Name":"Editor", - "Foreground":"clYellow", - "Background":"clNavy" - }, - { - "Name":"Comment", - "Foreground":"clSilver", - "Background":"clNavy", - "Style":"Italic" - }, - { - "Name":"String", - "Foreground":"clAqua", - "Background":"clNavy" - }, - { - "Name":"Directive", - "Foreground":"clSilver", - "Background":"clNavy" - }, - { - "Name":"Character", - "Foreground":"clLime", - "Background":"clNavy" - }, - { - "Name":"ReservedWord", - "Foreground":"clWhite", - "Background":"clNavy" - }, - { - "Name":"Symbol", - "Foreground":"clLime", - "Background":"clNavy" - }, - { - "Name":"Number", - "Foreground":"clFuchsia", - "Background":"clNavy" - }, - { - "Name":"HexNumber", - "Foreground":"clFuchsia", - "Background":"clNavy" - }, - { - "Name":"HighlightedBlock", - "Foreground":"clLime", - "Background":"clNavy" - }, - { - "Name":"HighlightedBlockSymbol", - "Foreground":"clLime", - "Background":"clNavy" - }, - { - "Name":"AssemblerComment", - "Foreground":"clSilver", - "Background":"clNavy", - "Style":"Italic" - }, - { - "Name":"AssemblerReservedWord", - "Foreground":"clWhite", - "Background":"clNavy" - }, - { - "Name":"Attribute", - "Foreground":"clYellow", - "Background":"clWindow" - }, - { - "Name":"Method", - "Foreground":"clWhite", - "Background":"clNavy" - }, - { - "Name":"MethodName", - "Foreground":"clYellow", - "Background":"clNavy" - } - ] - } -} diff --git a/Bin/Win32/Colors/Default.json b/Bin/Win32/Colors/Default.json deleted file mode 100644 index e576354..0000000 --- a/Bin/Win32/Colors/Default.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "Colors": { - "Info": { - "General": { - "Version": "1.0", - "Date": "17.10.2015" - }, - "Author": { - "Name": "Lasse Rautiainen", - "Mail": "lasse@bonecode.com", - "Email": "" - } - }, - "Editor": { - "Colors": { - "Background": "clWhite", - "ActiveLineBackground": "clYellow", - "CodeFoldingActiveLineBackground": "$00E6FAFF", - "CodeFoldingBackground": "clWhite", - "CodeFoldingCollapsedLine": "$00CC9999", - "CodeFoldingFoldingLineHighlight": "$00CC9999", - "CodeFoldingFoldingLine": "$00CC9999", - "CodeFoldingIndent": "$00CC9999", - "CodeFoldingIndentHighlight": "$00CC9999", - "CodeFoldingHintBackground": "clWindow", - "CodeFoldingHintBorder": "$00CC9999", - "CodeFoldingHintText": "clWindowText", - "CompletionProposalBackground": "clWindow", - "CompletionProposalForeground": "clWindowText", - "CompletionProposalSelectedBackground": "clHighlight", - "CompletionProposalSelectedText": "clHighlightText", - "LeftMarginActiveLineBackground": "$00E6FAFF", - "LeftMarginBackground": "clWhite", - "LeftMarginBorder": "clWhite", - "LeftMarginLineNumberLine": "$00CC9999", - "LeftMarginLineNumbers": "$00CC9999", - "LeftMarginLineStateModified": "clYellow", - "LeftMarginLineStateNormal": "clLime", - "LeftMarginBookmarkPanel": "clWhite", - "MatchingPairMatched": "clAqua", - "MatchingPairUnderline": "$00CC9999", - "MatchingPairUnmatched": "clYellow", - "MinimapBookmark": "clGreen", - "MinimapVisibleLines": "$00E6FAFF", - "RightMargin": "clSilver", - "RightMovingEdge": "clSilver", - "SearchHighlighterBackground": "$0078AAFF", - "SearchHighlighterForeground": "clWindowText", - "SearchMapActiveLine": "$00F0F0F0", - "SearchMapBackground": "$00F4F4F4", - "SearchMapForeground": "$0078AAFF", - "SelectionBackground": "$00A56D53", - "SelectionForeground": "clHighlightText", - "WordWrapIndicatorArrow": "clNavy", - "WordWrapIndicatorLines": "clBlack" - }, - "Fonts": { - "LineNumbers": "Courier New", - "Text": "Courier New", - "Minimap": "Courier New", - "CodeFoldingHint": "Arial", - "CompletionProposal": "Courier New" - }, - "FontSizes": { - "LineNumbers": "8", - "Text": "9", - "Minimap": "1", - "CodeFoldingHint": "8", - "CompletionProposal": "8" - } - }, - "Elements": [ - { - "Name": "Editor", - "Foreground": "clWindowText", - "Background": "clWindow" - }, - { - "Name": "Comment", - "Foreground": "clGreen", - "Background": "clWindow", - "Style": "Italic" - }, - { - "Name": "String", - "Foreground": "clBlue", - "Background": "clWindow" - }, - { - "Name": "Directive", - "Foreground": "clTeal", - "Background": "clWindow" - }, - { - "Name": "Character", - "Foreground": "clPurple", - "Background": "clWindow" - }, - { - "Name": "ReservedWord", - "Foreground": "clNavy", - "Background": "clWindow", - "Style": "Bold" - }, - { - "Name": "Symbol", - "Foreground": "clNavy", - "Background": "clWindow" - }, - { - "Name": "Number", - "Foreground": "clBlue", - "Background": "clWindow" - }, - { - "Name": "HexNumber", - "Foreground": "clBlue", - "Background": "clWindow" - }, - { - "Name": "HighlightedBlock", - "Foreground": "clBlack", - "Background": "$00EEFFFF" - }, - { - "Name": "HighlightedBlockSymbol", - "Foreground": "clNavy", - "Background": "$00EEFFFF" - }, - { - "Name": "AssemblerComment", - "Foreground": "clGreen", - "Background": "$00EEFFFF", - "Style": "Italic" - }, - { - "Name": "AssemblerReservedWord", - "Foreground": "clNavy", - "Background": "$00EEFFFF", - "Style": "Bold" - }, - { - "Name": "Attribute", - "Foreground": "clMaroon", - "Background": "clWindow" - }, - { - "Name": "Method", - "Foreground": "clNavy", - "Background": "clWindow", - "Style": "Bold" - }, - { - "Name": "MethodName", - "Foreground": "clWindowText", - "Background": "clWindow" - } - ] - } -} diff --git a/Bin/Win32/Colors/Monokai.json b/Bin/Win32/Colors/Monokai.json deleted file mode 100644 index 461a40f..0000000 --- a/Bin/Win32/Colors/Monokai.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "Colors":{ - "Info":{ - "General":{ - "Version":"1.0", - "Date":"17.10.2015" - }, - "Author":{ - "Name":"Lasse Rautiainen", - "Mail":"lasse@bonecode.com" - } - }, - "Editor":{ - "Colors":{ - "Background":"$00222827", - "ActiveLineBackground":"$00222827", - "CodeFoldingActiveLineBackground":"$00323D3E", - "CodeFoldingBackground":"$00222827", - "CodeFoldingCollapsedLine":"$009F9F9F", - "CodeFoldingFoldingLine":"$009F9F9F", - "CodeFoldingFoldingLineHighlight":"$009F9F9F", - "CodeFoldingIndent":"$00414746", - "CodeFoldingIndentHighlight":"$00414746", - "CodeFoldingHintBackground":"$00222827", - "CodeFoldingHintBorder":"$00414746", - "CodeFoldingHintText":"$00F8F8F2", - "CompletionProposalBackground":"$00222827", - "CompletionProposalForeground":"$00F8F8F2", - "CompletionProposalSelectedBackground":"$003E4849", - "CompletionProposalSelectedText":"clHighlightText", - "LeftMarginActiveLineBackground":"$00323D3E", - "LeftMarginBackground":"$00222827", - "LeftMarginBorder":"$00222827", - "LeftMarginLineNumberLine":"$009F9F9F", - "LeftMarginLineNumbers":"$009F9F9F", - "LeftMarginLineStateModified":"$0074DBE6", - "LeftMarginLineStateNormal":"$002EE2A6", - "LeftMarginBookmarkPanel":"$00222827", - "MatchingPairMatched":"$007226F9", - "MatchingPairUnderline":"$00414746", - "MatchingPairUnmatched":"clYellow", - "MinimapBookmark":"$005E7175", - "MinimapVisibleLines":"$003E4849", - "RightMargin":"clSilver", - "RightMovingEdge":"clSilver", - "SearchHighlighterBackground":"$003E4849", - "SearchHighlighterForeground":"clNone", - "SearchMapActiveLine":"$00F0F0F0", - "SearchMapBackground":"$00F4F4F4", - "SearchMapForeground":"$0078AAFF", - "SelectionBackground":"$003E4849", - "SelectionForeground":"clNone", - "WordWrapIndicatorArrow": "$00F8F8F2", - "WordWrapIndicatorLines": "$007226F9" - }, - "Fonts":{ - "LineNumbers":"Consolas", - "Text":"Consolas", - "Minimap":"Consolas", - "CodeFoldingHint":"Consolas", - "CompletionProposal":"Consolas" - }, - "FontSizes":{ - "LineNumbers":"9", - "Text":"9", - "Minimap":"1", - "CodeFoldingHint":"8", - "CompletionProposal":"8" - } - }, - "Elements":[ - { - "Name":"Editor", - "Foreground":"$00F8F8F2", - "Background":"$00222827" - }, - { - "Name":"Comment", - "Foreground":"$005E7175", - "Background":"$00222827" - }, - { - "Name":"String", - "Foreground":"$0074DBE6", - "Background":"$00222827" - }, - { - "Name":"Directive", - "Foreground":"$005E7175", - "Background":"$00222827" - }, - { - "Name":"Character", - "Foreground":"$00F8F8F2", - "Background":"$00222827" - }, - { - "Name":"ReservedWord", - "Foreground":"$007226F9", - "Background":"$00222827", - "Style":"Bold" - }, - { - "Name":"Symbol", - "Foreground":"$00F2F8F8", - "Background":"$00222827" - }, - { - "Name":"Number", - "Foreground":"$00FF81AE", - "Background":"$00222827" - }, - { - "Name":"HexNumber", - "Foreground":"$00FF81AE", - "Background":"$00222827" - }, - { - "Name":"HighlightedBlock", - "Foreground":"$00EFD966", - "Background":"$00222827" - }, - { - "Name":"HighlightedBlockSymbol", - "Foreground":"$00F2F8F8", - "Background":"$00222827" - }, - { - "Name":"AssemblerComment", - "Foreground":"$0075715E", - "Background":"$00222827" - }, - { - "Name":"AssemblerReservedWord", - "Foreground":"$00F92672", - "Background":"$00222827", - "Style":"Bold" - }, - { - "Name":"Attribute", - "Foreground":"$002AE27F", - "Background":"$00222827" - }, - { - "Name":"Method", - "Foreground":"$00EFD966", - "Background":"$00222827", - "Style":"Italic" - }, - { - "Name":"MethodName", - "Foreground":"$002AE27F", - "Background":"$00222827" - } - ] - } -} diff --git a/Bin/Win32/Colors/Ocean.json b/Bin/Win32/Colors/Ocean.json deleted file mode 100644 index 2c7b4dd..0000000 --- a/Bin/Win32/Colors/Ocean.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "Colors":{ - "Info":{ - "General":{ - "Version":"1.0", - "Date":"17.10.2015" - }, - "Author":{ - "Name":"Lasse Rautiainen", - "Mail":"lasse@bonecode.com" - } - }, - "Editor":{ - "Colors":{ - "Background":"clAqua", - "ActiveLineBackground":"$00CCFFCC", - "CodeFoldingActiveLineBackground":"$00CCFFCC", - "CodeFoldingBackground":"clAqua", - "CodeFoldingCollapsedLine":"clTeal", - "CodeFoldingFoldingLine":"clTeal", - "CodeFoldingFoldingLineHighlight":"clTeal", - "CodeFoldingIndent":"clTeal", - "CodeFoldingIndentHighlight":"clTeal", - "CodeFoldingHintBackground":"clAqua", - "CodeFoldingHintBorder":"clTeal", - "CodeFoldingHintText":"clBlack", - "CompletionProposalBackground":"clAqua", - "CompletionProposalForeground":"clBlack", - "CompletionProposalSelectedBackground":"clBlue", - "CompletionProposalSelectedText":"clAqua", - "LeftMarginActiveLineBackground":"$00CCFFCC", - "LeftMarginBackground":"clAqua", - "LeftMarginBorder":"clAqua", - "LeftMarginLineNumberLine":"clTeal", - "LeftMarginLineNumbers":"clTeal", - "LeftMarginLineStateModified":"clYellow", - "LeftMarginLineStateNormal":"clLime", - "LeftMarginBookmarkPanel":"clAqua", - "MatchingPairMatched":"clWhite", - "MatchingPairUnderline":"clTeal", - "MatchingPairUnmatched":"clYellow", - "MinimapBookmark":"clTeal", - "MinimapVisibleLines":"$00CCFFCC", - "RightMargin":"clSilver", - "RightMovingEdge":"clSilver", - "SearchHighlighterBackground":"$00FCFDCD", - "SearchHighlighterForeground":"clBlack", - "SearchMapActiveLine":"$00F0F0F0", - "SearchMapBackground":"$00F4F400", - "SearchMapForeground":"clYellow", - "SelectionBackground":"clBlue", - "SelectionForeground":"clAqua", - "WordWrapIndicatorArrow": "clBlue", - "WordWrapIndicatorLines": "clBlack" - }, - "Fonts":{ - "LineNumbers":"Courier New", - "Text":"Courier New", - "Minimap":"Courier New", - "CodeFoldingHint":"Courier New", - "CompletionProposal":"Courier New" - }, - "FontSizes":{ - "LineNumbers":"8", - "Text":"9", - "Minimap":"1", - "CodeFoldingHint":"8", - "CompletionProposal":"8" - } - }, - "Elements":[ - { - "Name":"Editor", - "Foreground":"clBlue", - "Background":"clAqua" - }, - { - "Name":"Comment", - "Foreground":"clTeal", - "Background":"clAqua", - "Style":"Italic" - }, - { - "Name":"String", - "Foreground":"clPurple", - "Background":"clAqua" - }, - { - "Name":"Directive", - "Foreground":"clBlack", - "Background":"clAqua", - "Style":"Italic" - }, - { - "Name":"Character", - "Foreground":"clBlack", - "Background":"clAqua" - }, - { - "Name":"ReservedWord", - "Foreground":"clBlack", - "Background":"clAqua", - "Style":"Bold" - }, - { - "Name":"Symbol", - "Foreground":"clBlack", - "Background":"clAqua" - }, - { - "Name":"Number", - "Foreground":"clOlive", - "Background":"clAqua" - }, - { - "Name":"HexNumber", - "Foreground":"clOlive", - "Background":"clAqua" - }, - { - "Name":"HighlightedBlock", - "Foreground":"clBlue", - "Background":"clAqua" - }, - { - "Name":"HighlightedBlockSymbol", - "Foreground":"clBlack", - "Background":"clAqua" - }, - { - "Name":"AssemblerComment", - "Foreground":"clTeal", - "Background":"clAqua", - "Style":"Italic" - }, - { - "Name":"AssemblerReservedWord", - "Foreground":"clBlack", - "Background":"clAqua", - "Style":"Bold" - }, - { - "Name":"Attribute", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"Method", - "Foreground":"clBlack", - "Background":"clAqua", - "Style":"Bold" - }, - { - "Name":"MethodName", - "Foreground":"clBlue", - "Background":"clAqua" - } - ] - } -} diff --git a/Bin/Win32/Colors/Purple.json b/Bin/Win32/Colors/Purple.json deleted file mode 100644 index d515139..0000000 --- a/Bin/Win32/Colors/Purple.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "Colors":{ - "Info":{ - "General":{ - "Version":"1.0", - "Date":"17.10.2015" - }, - "Author":{ - "Name":"Lasse Rautiainen", - "Mail":"lasse@bonecode.com" - } - }, - "Editor":{ - "Colors":{ - "Background":"clWindow", - "ActiveLineBackground":"$00E6FAFF", - "CodeFoldingActiveLineBackground":"$00E6FAFF", - "CodeFoldingBackground":"clWhite", - "CodeFoldingCollapsedLine":"$00CC9999", - "CodeFoldingFoldingLine":"$00CC9999", - "CodeFoldingFoldingLineHighlight":"$00CC9999", - "CodeFoldingIndent":"$00CC9999", - "CodeFoldingIndentHighlight":"$00CC9999", - "CodeFoldingHintBackground":"clWindow", - "CodeFoldingHintBorder":"$00CC9999", - "CodeFoldingHintText":"clNone", - "CompletionProposalBackground":"clWindow", - "CompletionProposalForeground":"clWindowText", - "CompletionProposalSelectedBackground":"clHighlight", - "CompletionProposalSelectedText":"clHighlightText", - "LeftMarginActiveLineBackground":"$00E6FAFF", - "LeftMarginBackground":"clWhite", - "LeftMarginBorder":"clWhite", - "LeftMarginLineNumberLine":"$00CC9999", - "LeftMarginLineNumbers":"$00CC9999", - "LeftMarginLineStateModified":"clYellow", - "LeftMarginLineStateNormal":"clLime", - "LeftMarginBookmarkPanel":"clWhite", - "MatchingPairMatched":"clAqua", - "MatchingPairUnderline":"$00CC9999", - "MatchingPairUnmatched":"clYellow", - "MinimapBookmark":"$00999999", - "MinimapVisibleLines":"$00E6FAFF", - "RightMargin":"clSilver", - "RightMovingEdge":"clSilver", - "SearchHighlighterBackground":"$0078AAFF", - "SearchHighlighterForeground":"clWindowText", - "SearchMapActiveLine":"$00F0F0F0", - "SearchMapBackground":"$00F4F4F4", - "SearchMapForeground":"$0078AAFF", - "SelectionBackground":"$00A56D53", - "SelectionForeground":"clHighlightText", - "WordWrapIndicatorArrow": "$00333333", - "WordWrapIndicatorLines": "$009f6f2f" - }, - "Fonts":{ - "LineNumbers":"Consolas", - "Text":"Consolas", - "Minimap":"Consolas", - "CodeFoldingHint":"Consolas", - "CompletionProposal":"Consolas" - }, - "FontSizes":{ - "LineNumbers":"8", - "Text":"9", - "Minimap":"1", - "CodeFoldingHint":"8", - "CompletionProposal":"8" - } - }, - "Elements":[ - { - "Name":"Editor", - "Foreground":"$00333333", - "Background":"clWindow" - }, - { - "Name":"Comment", - "Foreground":"$00999999", - "Background":"clWindow", - "Style":"Italic" - }, - { - "Name":"String", - "Foreground":"$005049d4", - "Background":"clWindow" - }, - { - "Name":"Directive", - "Foreground":"$00999900", - "Background":"clWindow" - }, - { - "Name":"Character", - "Foreground":"$00cf9f4f", - "Background":"clWindow" - }, - { - "Name":"ReservedWord", - "Foreground":"$009f6f2f", - "Background":"clWindow", - "Style":"Bold" - }, - { - "Name":"Symbol", - "Foreground":"clNavy", - "Background":"clWindow" - }, - { - "Name":"Number", - "Foreground":"$00AAAA33", - "Background":"clWindow" - }, - { - "Name":"HexNumber", - "Foreground":"$00AAAA33", - "Background":"clWindow" - }, - { - "Name":"HighlightedBlock", - "Foreground":"clBlack", - "Background":"$00f9f7f7" - }, - { - "Name":"HighlightedBlockSymbol", - "Foreground":"clNavy", - "Background":"$00f9f7f7" - }, - { - "Name":"AssemblerComment", - "Foreground":"$00999999", - "Background":"$00f9f7f7", - "Style":"Italic" - }, - { - "Name":"AssemblerReservedWord", - "Foreground":"$009f6f2f", - "Background":"$00f9f7f7", - "Style":"Bold" - }, - { - "Name":"Attribute", - "Foreground":"$00cf9f4f", - "Background":"clWindow" - }, - { - "Name":"Method", - "Foreground":"$009f6f2f", - "Background":"clWindow", - "Style":"Bold" - }, - { - "Name":"MethodName", - "Foreground":"$00333333", - "Background":"clWindow" - } - ] - } -} diff --git a/Bin/Win32/Colors/Twilight.json b/Bin/Win32/Colors/Twilight.json deleted file mode 100644 index 2c3c53d..0000000 --- a/Bin/Win32/Colors/Twilight.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "Colors":{ - "Info":{ - "General":{ - "Version":"1.0", - "Date":"17.10.2015" - }, - "Author":{ - "Name":"Lasse Rautiainen", - "Mail":"lasse@bonecode.com" - } - }, - "Editor":{ - "Colors":{ - "Background":"clBlack", - "ActiveLineBackground":"$00505050", - "CodeFoldingActiveLineBackground":"$00505050", - "CodeFoldingBackground":"clBlack", - "CodeFoldingCollapsedLine":"clLime", - "CodeFoldingFoldingLine":"clLime", - "CodeFoldingFoldingLineHighlight":"clLime", - "CodeFoldingIndent":"clLime", - "CodeFoldingIndentHighlight":"clLime", - "CodeFoldingHintBackground":"clBlack", - "CodeFoldingHintBorder":"clLime", - "CodeFoldingHintText":"clWhite", - "CompletionProposalBackground":"clBlack", - "CompletionProposalForeground":"clWhite", - "CompletionProposalSelectedBackground":"clBlue", - "CompletionProposalSelectedText":"clWhite", - "LeftMarginActiveLineBackground":"$00505050", - "LeftMarginBackground":"clBlack", - "LeftMarginBorder":"clBlack", - "LeftMarginLineNumberLine":"clLime", - "LeftMarginLineNumbers":"clLime", - "LeftMarginLineStateModified":"clYellow", - "LeftMarginLineStateNormal":"clLime", - "LeftMarginBookmarkPanel":"clBlack", - "MatchingPairMatched":"clAqua", - "MatchingPairUnderline":"clLime", - "MatchingPairUnmatched":"clYellow", - "MinimapBookmark":"clLime", - "MinimapVisibleLines":"$00505050", - "RightMargin":"clSilver", - "RightMovingEdge":"clSilver", - "SearchHighlighterBackground":"$00FCFDCD", - "SearchHighlighterForeground":"clBlack", - "SearchMapActiveLine":"$00F0F0F0", - "SearchMapBackground":"$001A1A1A", - "SearchMapForeground":"clYellow", - "SelectionBackground":"clBlue", - "SelectionForeground":"clWhite", - "WordWrapIndicatorArrow": "clWhite", - "WordWrapIndicatorLines": "clAqua" - }, - "Fonts":{ - "LineNumbers":"Courier New", - "Text":"Courier New", - "Minimap":"Courier New", - "CodeFoldingHint":"Courier New", - "CompletionProposal":"Courier New" - }, - "FontSizes":{ - "LineNumbers":"8", - "Text":"9", - "Minimap":"1", - "CodeFoldingHint":"8", - "CompletionProposal":"8" - } - }, - "Elements":[ - { - "Name":"Editor", - "Foreground":"clWhite", - "Background":"clBlack" - }, - { - "Name":"Comment", - "Foreground":"clLime", - "Background":"clBlack", - "Style":"Italic" - }, - { - "Name":"String", - "Foreground":"clYellow", - "Background":"clBlack" - }, - { - "Name":"Directive", - "Foreground":"clGreen", - "Background":"clWhite", - "Style":"Italic" - }, - { - "Name":"Character", - "Foreground":"clYellow", - "Background":"clBlack" - }, - { - "Name":"ReservedWord", - "Foreground":"clAqua", - "Background":"clBlack" - }, - { - "Name":"Symbol", - "Foreground":"clSilver", - "Background":"clBlack" - }, - { - "Name":"Number", - "Foreground":"clFuchsia", - "Background":"clBlack" - }, - { - "Name":"HexNumber", - "Foreground":"clFuchsia", - "Background":"clBlack" - }, - { - "Name":"HighlightedBlock", - "Foreground":"clLime", - "Background":"clBlack" - }, - { - "Name":"HighlightedBlockSymbol", - "Foreground":"clSilver", - "Background":"clBlack" - }, - { - "Name":"AssemblerComment", - "Foreground":"clLime", - "Background":"clBlack", - "Style":"Italic" - }, - { - "Name":"AssemblerReservedWord", - "Foreground":"clAqua", - "Background":"clBlack" - }, - { - "Name":"Attribute", - "Foreground":"clWhite", - "Background":"clWindow" - }, - { - "Name":"Method", - "Foreground":"clAqua", - "Background":"clBlack" - }, - { - "Name":"MethodName", - "Foreground":"clWhite", - "Background":"clBlack" - } - ] - } -} diff --git a/Bin/Win32/Colors/Visual Studio [TM].json b/Bin/Win32/Colors/Visual Studio [TM].json deleted file mode 100644 index e939cf0..0000000 --- a/Bin/Win32/Colors/Visual Studio [TM].json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "Colors":{ - "Info":{ - "General":{ - "Version":"1.0", - "Date":"17.10.2015" - }, - "Author":{ - "Name":"Lasse Rautiainen", - "Mail":"lasse@bonecode.com" - } - }, - "Editor":{ - "Colors":{ - "Background":"clWindow", - "ActiveLineBackground":"$00F0FFFF", - "CodeFoldingActiveLineBackground":"$00F0FFFF", - "CodeFoldingBackground":"clWindow", - "CodeFoldingCollapsedLine":"clGray", - "CodeFoldingFoldingLine":"clGray", - "CodeFoldingFoldingLineHighlight":"clGray", - "CodeFoldingIndent":"clGray", - "CodeFoldingIndentHighlight":"clGray", - "CodeFoldingHintBackground":"clWindow", - "CodeFoldingHintBorder":"clGray", - "CodeFoldingHintText":"clNone", - "CompletionProposalBackground":"clWindow", - "CompletionProposalForeground":"clWindowText", - "CompletionProposalSelectedBackground":"clHighlight", - "CompletionProposalSelectedText":"clHighlightText", - "LeftMarginActiveLineBackground":"$00F0FFFF", - "LeftMarginBackground":"clWindow", - "LeftMarginBorder":"clWindow", - "LeftMarginLineNumberLine":"clGray", - "LeftMarginLineNumbers":"clGray", - "LeftMarginLineStateModified":"clYellow", - "LeftMarginLineStateNormal":"clLime", - "LeftMarginBookmarkPanel":"clWindow", - "MatchingPairMatched":"clAqua", - "MatchingPairUnderline":"clGray", - "MatchingPairUnmatched":"clYellow", - "MinimapBookmark":"clGreen", - "MinimapVisibleLines":"$00F0FFFF", - "RightMargin":"clSilver", - "RightMovingEdge":"clSilver", - "SearchHighlighterBackground":"clBlack", - "SearchHighlighterForeground":"clWhite", - "SearchMapActiveLine":"clHighlight", - "SearchMapBackground":"$00F4F4F4", - "SearchMapForeground":"clBlack", - "SelectionBackground":"clHighlight", - "SelectionForeground":"clHighlightText", - "WordWrapIndicatorArrow": "clWindowText", - "WordWrapIndicatorLines": "clBlue" - }, - "Fonts":{ - "LineNumbers":"Courier New", - "Text":"Courier New", - "Minimap":"Courier New", - "CodeFoldingHint":"Courier New", - "CompletionProposal":"Courier New" - }, - "FontSizes":{ - "LineNumbers":"8", - "Text":"9", - "Minimap":"1", - "CodeFoldingHint":"8", - "CompletionProposal":"8" - } - }, - "Elements":[ - { - "Name":"Editor", - "Foreground":"clWindowText", - "Background":"clWindow" - }, - { - "Name":"Comment", - "Foreground":"clGreen", - "Background":"clWindow" - }, - { - "Name":"String", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"Directive", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"Character", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"ReservedWord", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"Symbol", - "Foreground":"clBlack", - "Background":"clWindow" - }, - { - "Name":"Number", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"HexNumber", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"HighlightedBlock", - "Foreground":"clBlack", - "Background":"clWindow" - }, - { - "Name":"HighlightedBlockSymbol", - "Foreground":"clBlack", - "Background":"clWindow" - }, - { - "Name":"AssemblerComment", - "Foreground":"clGreen", - "Background":"clWindow" - }, - { - "Name":"AssemblerReservedWord", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"Attribute", - "Foreground":"clMaroon", - "Background":"clWindow" - }, - { - "Name":"Method", - "Foreground":"clBlue", - "Background":"clWindow" - }, - { - "Name":"MethodName", - "Foreground":"clWindowText", - "Background":"clWindow" - } - ] - } -} diff --git a/Bin/Win32/settings.json b/Bin/Win32/settings.json index b34cc6c..7161ee0 100644 --- a/Bin/Win32/settings.json +++ b/Bin/Win32/settings.json @@ -2,10 +2,10 @@ "DebugMode": false, "EmitLogMessages": true, "FormSettings": { - "Left": 721, - "Top": 208, - "Width": 1282, - "Height": 891, + "Left": 544, + "Top": 195, + "Width": 1760, + "Height": 1014, "FormStyle": 0, "WindowState": 0 }, diff --git a/LogViewer.Dashboard.View.pas b/LogViewer.Dashboard.View.pas index f3df7a5..d809be4 100644 --- a/LogViewer.Dashboard.View.pas +++ b/LogViewer.Dashboard.View.pas @@ -695,26 +695,27 @@ procedure TfrmDashboard.FTreeViewPaintText(Sender: TBaseVirtualTree; procedure TfrmDashboard.FWinipcReceiverSubscriberListChanged(Sender: TObject; const AKey: UInt32; Action: TCollectionChangedAction); var - LDelete : TDashboardNode; + LNode : TDashboardNode; LSubscriber : ISubscriber; begin - LDelete := nil; + LNode := nil; if Action = caRemoved then begin - for LDelete in FWinipcNode do + for LNode in FWinipcNode do begin - if LDelete.Data.Subscriber.SourceId = AKey then + if LNode.Data.Subscriber.SourceId = AKey then Break; end; - if Assigned(LDelete) then + if Assigned(LNode) then begin - FTreeView.DeleteNode(LDelete.VNode); + FTreeView.DeleteNode(LNode.VNode); end; end else if Action = caAdded then begin LSubscriber := FWinipcReceiver.SubscriberList[AKey]; - AddNode(FWinipcNode, nil, LSubscriber); + LNode := AddNode(FWinipcNode, nil, LSubscriber); + LNode.Selected := True; LSubscriber.OnChange.Add(FSubscriberChange); end; end; @@ -722,26 +723,27 @@ procedure TfrmDashboard.FWinipcReceiverSubscriberListChanged(Sender: TObject; procedure TfrmDashboard.FWinodsReceiverSubscriberListChanged(Sender: TObject; const AKey: UInt32; Action: TCollectionChangedAction); var - LDelete : TDashboardNode; + LNode : TDashboardNode; LSubscriber : ISubscriber; begin - LDelete := nil; + LNode := nil; if Action = caRemoved then begin - for LDelete in FWinodsNode do + for LNode in FWinodsNode do begin - if LDelete.Data.Subscriber.SourceId = AKey then + if LNode.Data.Subscriber.SourceId = AKey then Break; end; - if Assigned(LDelete) then + if Assigned(LNode) then begin - FTreeView.DeleteNode(LDelete.VNode); + FTreeView.DeleteNode(LNode.VNode); end; end else if Action = caAdded then begin LSubscriber := FWinodsReceiver.SubscriberList[AKey]; - AddNode(FWinodsNode, nil, LSubscriber); + LNode := AddNode(FWinodsNode, nil, LSubscriber); + LNode.Selected := True; LSubscriber.OnChange.Add(FSubscriberChange); end; end; @@ -749,26 +751,27 @@ procedure TfrmDashboard.FWinodsReceiverSubscriberListChanged(Sender: TObject; procedure TfrmDashboard.FZmqReceiverSubscriberListChanged(Sender: TObject; const AKey: UInt32; Action: TCollectionChangedAction); var - LDelete : TDashboardNode; + LNode : TDashboardNode; LSubscriber : ISubscriber; begin - LDelete := nil; + LNode := nil; if Action = caRemoved then begin - for LDelete in FZmqNode do + for LNode in FZmqNode do begin - if LDelete.Data.Subscriber.SourceId = AKey then + if LNode.Data.Subscriber.SourceId = AKey then Break; end; - if Assigned(LDelete) then + if Assigned(LNode) then begin - FTreeView.DeleteNode(LDelete.VNode); + FTreeView.DeleteNode(LNode.VNode); end; end else if Action = caAdded then begin LSubscriber := FZmqReceiver.SubscriberList[AKey]; - AddNode(FZmqNode, nil, LSubscriber); + LNode := AddNode(FZmqNode, nil, LSubscriber); + LNode.Selected := True; LSubscriber.OnChange.Add(FSubscriberChange); end; end; diff --git a/LogViewer.MessageList.View.pas b/LogViewer.MessageList.View.pas index 3e1cf65..772d7b6 100644 --- a/LogViewer.MessageList.View.pas +++ b/LogViewer.MessageList.View.pas @@ -512,6 +512,7 @@ procedure TfrmMessageList.CreateEditor; pnlTextViewer, Manager.EditorManager ); + EditorView.Editor.Highlighter.Colors.LoadFromFile('settings.texteditor.json'); EditorView.Settings.EditorOptions.WordWrapEnabled := False; // WordWrap can cause AV's end; @@ -2214,7 +2215,6 @@ procedure TfrmMessageList.UpdateActions; begin Actions.UpdateActions; end; - Logger.IncCounter('UPDA'); FUpdate := False; end; inherited UpdateActions; diff --git a/LogViewer.dproj b/LogViewer.dproj index cf0eeb4..1890e1c 100644 --- a/LogViewer.dproj +++ b/LogViewer.dproj @@ -99,7 +99,7 @@ true - CompanyName=Tim Sinaeve;FileDescription=LogViewer;FileVersion=1.9.9.390;ProductName=LogViewer;ProductVersion=1.9.9;LegalCopyright=2013 - 2021 (c) Tim Sinaeve;OriginalFilename=LogViewer.exe + CompanyName=Tim Sinaeve;FileDescription=LogViewer;FileVersion=1.9.9.392;ProductName=LogViewer;ProductVersion=1.9.9;LegalCopyright=2013 - 2021 (c) Tim Sinaeve;OriginalFilename=LogViewer.exe true true true @@ -110,7 +110,7 @@ true true PerMonitor - 390 + 392 diff --git a/LogViewer.res b/LogViewer.res index fa79a2cbef9e43f877b2916e688fb8f37820e9bc..45e46a3476c9d38528824bd658c0977060500a00 100644 GIT binary patch delta 29 lcmcaIm-EV8&Iu)q9UDv885xb5YZ=>X85y_NGBSnx0syE<3B>>a delta 29 lcmcaIm-EV8&Iu)qZ5vD385s?lYZ=>X85y_NGBSnx0syE53BdpW diff --git a/settings.json b/settings.json index 4a871e7..e205b92 100644 --- a/settings.json +++ b/settings.json @@ -41,7 +41,7 @@ }, "FileSystemSettings": { "Enabled": false, - "PathNames": "test.txt=tcp://localhost:5555\r\nC:\\Tools\\doublecmd\\doublecmd_2019-11-06.log=tcp://localhost:5556\r\n" + "PathNames": "" }, "DisplayValuesSettings": { "Id": { @@ -207,7 +207,7 @@ "Level": 1 }, { - "Alias": "Olijf", + "Alias": "", "Color": 32896, "Level": 2 }, @@ -222,7 +222,7 @@ "Level": 4 }, { - "Alias": "vsvcsvs", + "Alias": "", "Color": 65535, "Level": 5 }, @@ -267,7 +267,7 @@ "Level": 13 }, { - "Alias": "halle", + "Alias": "", "Color": 65535, "Level": 14 }, diff --git a/Bin/Win32/Colors/tsColors.json b/settings.texteditor.json similarity index 98% rename from Bin/Win32/Colors/tsColors.json rename to settings.texteditor.json index 5bb1854..5157651 100644 --- a/Bin/Win32/Colors/tsColors.json +++ b/settings.texteditor.json @@ -9,7 +9,7 @@ "Name": "Tim Sinaeve", "Mail": "", "Email": "tim.sinaeve@gmail.com" - } + } }, "Editor": { "Colors": { @@ -135,7 +135,7 @@ { "Name": "AssemblerComment", "Foreground": "clGray", - "Background": "clWindow" + "Background": "clWindow" }, { "Name": "AssemblerReservedWord",