Skip to content

Commit 96507bc

Browse files
neimex23neimex23
committed
Merge remote-tracking branch 'upstream/master' into legacy
2 parents e760b9b + a2da83b commit 96507bc

25 files changed

Lines changed: 202 additions & 429 deletions

‎.gitattributes‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Sources/HitCounter.template diff text working-tree-encoding=UTF-16LE-BOM eol=CRLF
2-
Sources/HitCounterManagerInit.xml diff text working-tree-encoding=UTF-16LE-BOM eol=CRLF
3-
*.html diff=html text working-tree-encoding=UTF-16LE-BOM eol=CRLF
4-
*.css diff=css text working-tree-encoding=UTF-16LE-BOM eol=CRLF
5-
*.js diff text working-tree-encoding=UTF-16LE-BOM eol=CRLF
1+
Sources/HitCounter.template diff text eol=CRLF
2+
Sources/HitCounterManagerInit.xml diff text eol=CRLF
3+
*.html diff=html text eol=CRLF
4+
*.css diff=css text eol=CRLF
5+
*.js diff text eol=CRLF
66
*.xml diff text

‎Designs/HitCounterGui.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html>
33
<head>
44
<!--
55
MIT License
66
7-
Copyright (c) 2019-2024 Peter Kirmeier
7+
Copyright (c) 2019-2025 Peter Kirmeier
88
99
Permission is hereby granted, free of charge, to any person obtaining a copy
1010
of this software and associated documentation files (the "Software"), to deal
@@ -355,7 +355,7 @@
355355
{
356356
new_tbl +=
357357
'<tr>' +
358-
'<td class="' + majorclass + ' bottom left">Time:</td>' + // Time
358+
'<td class="' + majorclass + ' bottom right">Time:</td>' + // Time
359359
'<td colspan="' + hit_cols + '" class="' + majorclass + ' bottom timestamp"><span id="time_total_footer">' + IntToTimeStr(total_time_current, true) + '</span></td>' + // Total Time (Footer)
360360
'<td colspan="' + (max_cols-1-hit_cols) + '" class="' + majorclass + ' bottom">&nbsp;</td>' + // Filler
361361
'</tr>';
@@ -364,7 +364,7 @@
364364
{
365365
new_tbl +=
366366
'<tr class="' + (d.high_contrast ? 'even' : '') + '">' +
367-
'<td colspan="' + max_cols + '" class="bottom timestamp left">Time: <span id="time_total_footer">' + IntToTimeStr(total_time_current, true) + '</span></td>' + // Total Time (Footer)
367+
'<td colspan="' + max_cols + '" class="bottom timestamp right">Time: <span id="time_total_footer">' + IntToTimeStr(total_time_current, true) + '</span></td>' + // Total Time (Footer)
368368
'</tr>';
369369
}
370370
}

‎Designs/javascript.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
//MIT License
1+
//MIT License
22

3-
//Copyright (c) 2018-2024 Peter Kirmeier
3+
//Copyright (c) 2018-2025 Peter Kirmeier
44

55
//Permission is hereby granted, free of charge, to any person obtaining a copy
66
//of this software and associated documentation files (the "Software"), to deal
@@ -131,7 +131,8 @@ function Watchdog()
131131
'<li>Start <b>msedge.exe</b> with command line option <b>--profile-directory=Default --allow-file-access-from-files</b></li></ul></li>' +
132132
'<li><u>Opera</u>:<br/>' +
133133
'<ul><li>Shutdown all running instances of the browser (kill the processes) making sure startup parameters are loaded properly int the next step.</li>' +
134-
'<li>Start <b>launcher.exe</b> with command line option <b>--allow-file-access-from-files</b></li></ul></li>' +
134+
'<li>Older versions: Start <b>launcher.exe</b> with command line option <b>--allow-file-access-from-files</b></li>' +
135+
'<li>Newer versions: Start <b>opera.exe</b> with command line option <b>--allow-file-access-from-files</b></li></ul></li>' +
135136
'<li><u>Firefox</u>:<br/>' +
136137
'<ul><li>Change the security policy in the browser settings <b>"about:config" -&gt; "security.fileuri.strict_origin_policy" -&gt; false</b>.<br/>' +
137138
'But keep in mind that this is a global settings, which means you should enable this only for offline/trusted websites!</li></ul></li>' +

‎Designs/stylesheet.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*MIT License
1+
/*MIT License
22
3-
//Copyright (c) 2018-2024 Peter Kirmeier
3+
//Copyright (c) 2018-2025 Peter Kirmeier
44
55
//Permission is hereby granted, free of charge, to any person obtaining a copy
66
//of this software and associated documentation files (the "Software"), to deal

‎Designs/stylesheet_pink.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*MIT License
1+
/*MIT License
22
3-
//Copyright (c) 2018-2024 Peter Kirmeier
3+
//Copyright (c) 2018-2025 Peter Kirmeier
44
55
//Permission is hereby granted, free of charge, to any person obtaining a copy
66
//of this software and associated documentation files (the "Software"), to deal

‎HitCounterManagerMono.csproj‎

Lines changed: 33 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,22 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{FE772261-BA6A-4296-A06F-72400FE505C6}</ProjectGuid>
3+
<TargetFramework>net48</TargetFramework>
84
<OutputType>WinExe</OutputType>
95
<AppDesignerFolder>Sources</AppDesignerFolder>
106
<RootNamespace>HitCounterManager</RootNamespace>
117
<AssemblyName>HitCounterManager</AssemblyName>
12-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<TargetFrameworkProfile />
168
<LangVersion>latest</LangVersion>
17-
<WarningLevel>4</WarningLevel>
18-
<ErrorReport>prompt</ErrorReport>
19-
<Prefer32Bit>false</Prefer32Bit>
20-
<NoWarn>$(NoWarn);IDE1006</NoWarn> <!-- Allow lower case names from some Symbols for legacy reasons -->
21-
</PropertyGroup>
22-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23-
<PlatformTarget>AnyCPU</PlatformTarget>
24-
<DebugSymbols>true</DebugSymbols>
25-
<DebugType>full</DebugType>
26-
<Optimize>false</Optimize>
27-
<OutputPath>bin\DebugMono\</OutputPath>
28-
<IntermediateOutputPath>obj\DebugMono\</IntermediateOutputPath>
29-
<DefineConstants>TRACE;DEBUG;OS_ANY</DefineConstants>
30-
<CustomCommands>
31-
<CustomCommands>
32-
<Command>
33-
<type>AfterBuild</type>
34-
<command>PostBuild.sh "$(ProjectDir)" "$(TargetDir)" "$(TargetDir)PortablePackage\"</command>
35-
<workingdir>${SolutionDir}</workingdir>
36-
<externalConsole>True</externalConsole>
37-
</Command>
38-
</CustomCommands>
39-
</CustomCommands>
40-
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
41-
</PropertyGroup>
42-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43-
<PlatformTarget>AnyCPU</PlatformTarget>
44-
<Optimize>true</Optimize>
45-
<OutputPath>bin\ReleaseMono\</OutputPath>
46-
<IntermediateOutputPath>obj\ReleaseMono\</IntermediateOutputPath>
9+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10+
<UseWindowsForms>true</UseWindowsForms>
11+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
12+
<StartupObject>HitCounterManager.Program</StartupObject>
13+
<ApplicationIcon>Images\FireIcon.ico</ApplicationIcon>
14+
<SignManifests>false</SignManifests>
15+
<EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
16+
<ManifestCertificateThumbprint>AFEB66923E96C5BD6415DE3BD63BA1B8054737B4</ManifestCertificateThumbprint>
17+
<ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timstamp.dll</ManifestTimestampUrl>
18+
<OutputPath>bin\$(Configuration)Mono\</OutputPath>
19+
<IntermediateOutputPath>obj\$(Configuration)Mono\</IntermediateOutputPath>
4720
<DefineConstants>TRACE;OS_ANY</DefineConstants>
4821
<CustomCommands>
4922
<CustomCommands>
@@ -56,103 +29,38 @@
5629
</CustomCommands>
5730
</CustomCommands>
5831
</PropertyGroup>
59-
<PropertyGroup>
60-
<StartupObject>HitCounterManager.Program</StartupObject>
61-
</PropertyGroup>
62-
<PropertyGroup>
63-
<ApplicationIcon>Images\FireIcon.ico</ApplicationIcon>
64-
</PropertyGroup>
65-
<PropertyGroup>
66-
<SignManifests>false</SignManifests>
67-
</PropertyGroup>
68-
<PropertyGroup>
69-
<ManifestCertificateThumbprint>AFEB66923E96C5BD6415DE3BD63BA1B8054737B4</ManifestCertificateThumbprint>
70-
</PropertyGroup>
71-
<PropertyGroup>
72-
<ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timstamp.dll</ManifestTimestampUrl>
73-
</PropertyGroup>
74-
<PropertyGroup>
75-
<SignAssembly>false</SignAssembly>
32+
33+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
34+
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
35+
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
7636
</PropertyGroup>
37+
7738
<ItemGroup>
78-
<Compile Include="Sources\ProfilesControl.cs">
39+
<EmbeddedResource Include="Images\FireIcon.ico" />
40+
41+
<Compile Update="Sources\ProfilesControl.cs">
7942
<SubType>UserControl</SubType>
8043
</Compile>
81-
<Compile Include="Sources\ProfilesControl.Designer.cs">
82-
<DependentUpon>ProfilesControl.cs</DependentUpon>
83-
</Compile>
84-
<Compile Include="Sources\ProfileTabControl.cs">
44+
<Compile Update="Sources\ProfileTabControl.cs">
8545
<SubType>Component</SubType>
8646
</Compile>
87-
<Compile Include="Sources\ProfileViewControl.cs">
47+
<Compile Update="Sources\ProfileViewControl.cs">
8848
<SubType>UserControl</SubType>
8949
</Compile>
90-
<Compile Include="Sources\ProfileViewControl.Designer.cs">
91-
<DependentUpon>ProfileViewControl.cs</DependentUpon>
92-
</Compile>
93-
<Compile Include="Sources\About.cs">
50+
51+
<Compile Update="Sources\About.cs">
9452
<SubType>Form</SubType>
9553
</Compile>
96-
<Compile Include="Sources\About.Designer.cs">
97-
<DependentUpon>About.cs</DependentUpon>
98-
</Compile>
99-
<Compile Include="Sources\AppConfig.cs" />
100-
<Compile Include="Sources\Form1.cs">
54+
<Compile Update="Sources\Form1.cs">
10155
<SubType>Form</SubType>
10256
</Compile>
103-
<Compile Include="Sources\Form1.Designer.cs">
104-
<DependentUpon>Form1.cs</DependentUpon>
105-
</Compile>
106-
<Compile Include="Sources\JsonParser.cs" />
107-
<Compile Include="Sources\Main.cs" />
108-
<Compile Include="Sources\OsLayerAny.cs" />
109-
<Compile Include="Sources\OsLayerWindows.cs" />
110-
<Compile Include="Sources\OutModule.cs" />
111-
<Compile Include="Sources\AutoSplitterCoreModule.cs" />
112-
<Compile Include="Sources\Profiles.cs" />
113-
<Compile Include="Sources\Resources.Designer.cs">
114-
<AutoGen>True</AutoGen>
115-
<DesignTime>True</DesignTime>
116-
<DependentUpon>Resources.resx</DependentUpon>
117-
</Compile>
118-
<Compile Include="Sources\SaveModule.cs" />
119-
<Compile Include="Sources\Settings.cs">
57+
<Compile Update="Sources\Settings.cs">
12058
<SubType>Form</SubType>
12159
</Compile>
122-
<Compile Include="Sources\Settings.Designer.cs">
123-
<DependentUpon>Settings.cs</DependentUpon>
124-
</Compile>
125-
<Compile Include="Sources\Shortcuts.cs" />
126-
<Compile Include="Sources\AssemblyInfo.cs" />
127-
<Compile Include="Sources\Update.cs" />
128-
</ItemGroup>
129-
<ItemGroup>
130-
<Reference Include="System" />
131-
<Reference Include="System.Data" />
132-
<Reference Include="System.Drawing" />
133-
<Reference Include="System.Windows.Forms" />
134-
<Reference Include="System.Xml" />
135-
</ItemGroup>
136-
<ItemGroup>
137-
<EmbeddedResource Include="Sources\ProfileViewControl.resx">
138-
<DependentUpon>ProfileViewControl.cs</DependentUpon>
60+
<EmbeddedResource Update="Sources\About.resx">
61+
<SubType>Designer</SubType>
13962
</EmbeddedResource>
140-
<EmbeddedResource Include="Sources\About.resx">
141-
<DependentUpon>About.cs</DependentUpon>
142-
</EmbeddedResource>
143-
<EmbeddedResource Include="Sources\Form1.resx">
144-
<DependentUpon>Form1.cs</DependentUpon>
145-
</EmbeddedResource>
146-
<EmbeddedResource Include="Images\FireIcon.ico" />
147-
<EmbeddedResource Include="Sources\Resources.resx">
148-
<Generator>ResXFileCodeGenerator</Generator>
149-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
150-
</EmbeddedResource>
151-
<EmbeddedResource Include="Sources\Settings.resx">
152-
<DependentUpon>Settings.cs</DependentUpon>
153-
</EmbeddedResource>
154-
</ItemGroup>
155-
<ItemGroup>
63+
15664
<Content Include="Designs\HitCounterGui.html" />
15765
<Content Include="Designs\img_bar.png" />
15866
<Content Include="Designs\img_check.png" />
@@ -164,46 +72,7 @@
16472
<Content Include="Sources\HitCounter.html" />
16573
<Content Include="Sources\HitCounter.template" />
16674
<Content Include="Sources\HitCounterManagerInit.xml" />
167-
<None Include="Images\20p_logo_black.png" />
168-
<None Include="Images\icons8-about-20.png" />
169-
<None Include="Images\icons8-add-20.png" />
170-
<None Include="Images\icons8-add-list-20.png" />
171-
<None Include="Images\icons8-attack-32.png" />
172-
<None Include="Images\icons8-cloud-20.png" />
173-
<None Include="Images\icons8-copy-20.png" />
174-
<None Include="Images\icons8-counter-20.png" />
175-
<None Include="Images\icons8-delete-list-20.png" />
176-
<None Include="Images\icons8-double-down-20.png" />
177-
<None Include="Images\icons8-double-up-20.png" />
178-
<None Include="Images\icons8-edit-20.png" />
179-
<None Include="Images\icons8-lock-20.png" />
180-
<None Include="Images\icons8-padlock-20.png" />
181-
<None Include="Images\icons8-pin-20.png" />
182-
<None Include="Images\icons8-repeat-one-32.png" />
183-
<None Include="Images\icons8-save-20.png" />
184-
<None Include="Images\icons8-scroll-down-20.png" />
185-
<None Include="Images\icons8-scroll-up-20.png" />
186-
<None Include="Images\icons8-search-in-browser-20.png" />
187-
<None Include="Images\icons8-settings-20.png" />
188-
<None Include="Images\icons8-sleep-32.png" />
189-
<None Include="Images\icons8-staircase-32.png" />
190-
<None Include="Images\icons8-taschenlampe-20.png" />
191-
<None Include="Images\icons8-time-32.png" />
192-
<None Include="Images\icons8-trash-20.png" />
193-
<None Include="Images\icons8-trophy-32.png" />
194-
<None Include="Images\icons8-watch-your-step-32.png" />
195-
<None Include="Images\icons8-website-20.png" />
196-
<None Include="Sources\App.config" />
75+
76+
<Compile Remove="Sources\JsonWriter.cs" />
19777
</ItemGroup>
198-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
199-
<PropertyGroup>
200-
<PostBuildEvent />
201-
</PropertyGroup>
202-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
203-
Other similar extension points exist, see Microsoft.Common.targets.
204-
<Target Name="BeforeBuild">
205-
</Target>
206-
<Target Name="AfterBuild">
207-
</Target>
208-
-->
209-
</Project>
78+
</Project>

0 commit comments

Comments
 (0)