Skip to content

Convert notes to markdown format #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Phantom5800 wants to merge 30 commits into
base: main
Choose a base branch
from
Open

Convert notes to markdown format #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0af04e3
Replace GrowLabel with System.Windows.Forms.WebBrowser
Phantom5800 Dec 14, 2021
2469e77
Resize browser window functionality
Phantom5800 Dec 14, 2021
d621b98
Maintain background and text colors in browser
Phantom5800 Dec 14, 2021
a2ddfc4
Line endings
Phantom5800 Dec 14, 2021
0dfa232
Add markdig as submodule
Phantom5800 Dec 14, 2021
f464efd
Add some debug help and integrated markdig. Markdig.dll and System.Me…
Phantom5800 Dec 14, 2021
1cb0252
Add some readme additions detailing changes made on this branch
Phantom5800 Dec 15, 2021
d052a59
Update readme with dependency info
Phantom5800 Dec 15, 2021
86bf0e2
Add note in readme for current known issues
Phantom5800 Dec 15, 2021
6a97692
Line endings
Phantom5800 Dec 15, 2021
07d4312
Update post-build events to include other dependencies
Phantom5800 Dec 15, 2021
71c35d8
Add a preview to the splits text editor #2
Phantom5800 Dec 15, 2021
182f5bf
Remove the now unused GrowLabel
Phantom5800 Dec 15, 2021
a867662
Add vertical scroll bar to text editor
Phantom5800 Dec 15, 2021
d57da2f
Text Editor preview default slightly bigger than text entry
Phantom5800 Dec 15, 2021
79f4804
Use proper font in CSS
Phantom5800 Dec 15, 2021
4bbb7c3
Refresh guide text when updating font, size or colors
Phantom5800 Dec 15, 2021
a757101
Add comments for the important parts of new code
Phantom5800 Dec 15, 2021
95ad411
Remove browser size hack and various bits of dead code
Phantom5800 Dec 15, 2021
bd739d1
Add a .bat file that copies important files (including licenses) to a…
Phantom5800 Dec 15, 2021
dee657f
Fix splitting losing focus on LiveSplit in some scenarios.
Phantom5800 Dec 15, 2021
6c3abeb
Add an option to disable markdown and use pre-formatted text exclusiv…
Phantom5800 Dec 16, 2021
672c991
Fix issue where notes window could not be resized or moved under some…
Phantom5800 Dec 16, 2021
d36add4
Remove known issue from readme since it's fixed
Phantom5800 Dec 16, 2021
88a8556
Add additional CSS to force pre tags to wrap text to the next line fo…
Phantom5800 Dec 16, 2021
15bf9f3
Use C#6 style multiline format strings
Phantom5800 Dec 16, 2021
4d8befa
Fix an issue with characters that need to be html encoded
Phantom5800 Dec 16, 2021
d7675b4
Enable extensions in markdown. This is used for tables, emoji's, etc.
Phantom5800 Dec 16, 2021
6fe74dc
Fix an issue with focus being taken away from the text editor
Phantom5800 Dec 21, 2021
368be4f
Proper fix / workaround for the browser focus hack
Phantom5800 Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "markdig"]
path = src/ext/markdig
url = git@github.com:Phantom5800/markdig.git
24 changes: 24 additions & 0 deletions Package.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@echo off

if [%1]==[] goto usage

set OUT_DIR=.\official_builds\%1
mkdir %OUT_DIR%

REM copy relevant files to proper directory
xcopy src\LiveSplit %OUT_DIR%\LiveSplit /S /Y /I
xcopy .\README.md %OUT_DIR% /Y
echo F|xcopy .\LICENSE %OUT_DIR%\LICENSE_SGL.txt /Y
echo F|xcopy src\ext\markdig\license.txt %OUT_DIR%\LICENSE_Markdig.txt /Y

set ZIP_NAME=%OUT_DIR%\SpeedGuidesLive(%1).zip
echo Creating %ZIP_NAME% ...
REM actually create the zip file

goto end

:usage
echo Package.bat VERSION
pause

:end
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,11 @@ Twitch: http://twitch.tv/iNightfall

Support my developments: https://www.patreon.com/iNightGaming

If you like the app, or have some suggestions, send me a shout-out on my Twitter: https://twitter.com/inightfaller
If you like the app, or have some suggestions, send me a shout-out on my Twitter: https://twitter.com/inightfaller

## Additions by Phantom5800

- Notes are now markdown formatted.
- Editor window provides a preview of markdown formatting.
- Images are supported (currently needs a full path and does not support resizing in markdown).
- In addition to SpeedGuidesLive.dll, Markdig.dll and System.Memory.dll, System.Runtime.CompilerServices.Unsafe.dll need to be copied over to LiveSplit as well.
265 changes: 147 additions & 118 deletions src/LiveSplit.SpeedGuidesLive/LiveSplit.SpeedGuidesLive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,119 +1,148 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B38A7FC8-7917-4F07-869E-BCEDAE6BA1C5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LiveSplit.SpeedGuidesLive</RootNamespace>
<AssemblyName>SpeedGuidesLive</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="LiveSplit.Core">
<HintPath>..\ext\libs\LiveSplit.Core.dll</HintPath>
</Reference>
<Reference Include="LiveSplit.Splits">
<HintPath>..\ext\libs\LiveSplit.Splits.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="UpdateManager, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ext\libs\UpdateManager.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="src\NoScrollPanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="src\SGLGuide.cs" />
<Compile Include="src\SGLGuideEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\SGLGuideEditor.Designer.cs">
<DependentUpon>SGLGuideEditor.cs</DependentUpon>
</Compile>
<Compile Include="src\SGLGuideWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\SGLGuideWindow.Designer.cs">
<DependentUpon>SGLGuideWindow.cs</DependentUpon>
</Compile>
<Compile Include="src\SGLComponent.cs" />
<Compile Include="src\SGLFactory.cs" />
<Compile Include="src\SGLSettings.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="src\SGLSettings.designer.cs">
<DependentUpon>SGLSettings.cs</DependentUpon>
</Compile>
<Compile Include="src\GrowLabel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="src\SGLTextEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\SGLTextEditor.Designer.cs">
<DependentUpon>SGLTextEditor.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="src\SGLGuideEditor.resx">
<DependentUpon>SGLGuideEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\SGLGuideWindow.resx">
<DependentUpon>SGLGuideWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\SGLSettings.resx">
<DependentUpon>SGLSettings.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\SGLTextEditor.resx">
<DependentUpon>SGLTextEditor.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /Y "$(TargetPath)" "$(SolutionDir)..\LiveSplit\Components\"</PostBuildEvent>
</PropertyGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B38A7FC8-7917-4F07-869E-BCEDAE6BA1C5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LiveSplit.SpeedGuidesLive</RootNamespace>
<AssemblyName>SpeedGuidesLive</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="LiveSplit.Core">
<HintPath>..\ext\libs\LiveSplit.Core.dll</HintPath>
</Reference>
<Reference Include="LiveSplit.Splits">
<HintPath>..\ext\libs\LiveSplit.Splits.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="UpdateManager, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ext\libs\UpdateManager.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="src\NoScrollPanel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="src\SGLGuide.cs" />
<Compile Include="src\SGLGuideEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\SGLGuideEditor.Designer.cs">
<DependentUpon>SGLGuideEditor.cs</DependentUpon>
</Compile>
<Compile Include="src\SGLGuideWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\SGLGuideWindow.Designer.cs">
<DependentUpon>SGLGuideWindow.cs</DependentUpon>
</Compile>
<Compile Include="src\SGLComponent.cs" />
<Compile Include="src\SGLFactory.cs" />
<Compile Include="src\SGLSettings.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="src\SGLSettings.designer.cs">
<DependentUpon>SGLSettings.cs</DependentUpon>
</Compile>
<Compile Include="src\SGLTextEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\SGLTextEditor.Designer.cs">
<DependentUpon>SGLTextEditor.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="src\SGLGuideEditor.resx">
<DependentUpon>SGLGuideEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\SGLGuideWindow.resx">
<DependentUpon>SGLGuideWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\SGLSettings.resx">
<DependentUpon>SGLSettings.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="src\SGLTextEditor.resx">
<DependentUpon>SGLTextEditor.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ext\markdig\src\Markdig\Markdig.csproj">
<Project>{2bc64bef-90d6-479c-a1ec-a2541c803b9a}</Project>
<Name>Markdig</Name>
<EmbedInteropTypes>False</EmbedInteropTypes>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /Y "$(TargetPath)" "$(SolutionDir)..\LiveSplit\Components\"
xcopy /Y "$(TargetDir)\Markdig.dll" "$(SolutionDir)..\LiveSplit\Components\"
xcopy /Y "$(TargetDir)\System.*.dll" "$(SolutionDir)..\LiveSplit\Components\"</PostBuildEvent>
</PropertyGroup>
</Project>
31 changes: 31 additions & 0 deletions src/LiveSplit.SpeedGuidesLive/LiveSplit.SpeedGuidesLive.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31829.152
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiveSplit.SpeedGuidesLive", "LiveSplit.SpeedGuidesLive.csproj", "{B38A7FC8-7917-4F07-869E-BCEDAE6BA1C5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Markdig", "..\ext\markdig\src\Markdig\Markdig.csproj", "{2BC64BEF-90D6-479C-A1EC-A2541C803B9A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B38A7FC8-7917-4F07-869E-BCEDAE6BA1C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B38A7FC8-7917-4F07-869E-BCEDAE6BA1C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B38A7FC8-7917-4F07-869E-BCEDAE6BA1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B38A7FC8-7917-4F07-869E-BCEDAE6BA1C5}.Release|Any CPU.Build.0 = Release|Any CPU
{2BC64BEF-90D6-479C-A1EC-A2541C803B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2BC64BEF-90D6-479C-A1EC-A2541C803B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2BC64BEF-90D6-479C-A1EC-A2541C803B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2BC64BEF-90D6-479C-A1EC-A2541C803B9A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0CABDE45-EB20-4EBC-B7DC-C95889670309}
EndGlobalSection
EndGlobal
Loading