Skip to content

Commit

Permalink
Release v1.0
Browse files Browse the repository at this point in the history
-Created installer
-Bug fixes
  • Loading branch information
snem1216 committed Feb 26, 2020
1 parent b272e7a commit 7d40a65
Show file tree
Hide file tree
Showing 16 changed files with 1,138 additions and 94 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Reviving a project from a few years ago. Displays system information such as RAM capacity, network card info, hostname on your desktop screen.

## Features coming soon:
- Configuration file support
- Periodic information re-loading
- Configuration UI with previewing
32 changes: 32 additions & 0 deletions SysInfo.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,52 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SysInfo", "SysInfo\SysInfo.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SysInfo_Lib", "SysInfo_Lib\SysInfo_Lib.csproj", "{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "SysInfo_Setup", "SysInfo_Setup\SysInfo_Setup.vdproj", "{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4D67D050-4C87-421C-9793-93159F63DDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Debug|x64.ActiveCfg = Debug|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Debug|x64.Build.0 = Debug|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Debug|x86.ActiveCfg = Debug|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Debug|x86.Build.0 = Debug|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Release|Any CPU.Build.0 = Release|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Release|x64.ActiveCfg = Release|x64
{4D67D050-4C87-421C-9793-93159F63DDB1}.Release|x64.Build.0 = Release|x64
{4D67D050-4C87-421C-9793-93159F63DDB1}.Release|x86.ActiveCfg = Release|Any CPU
{4D67D050-4C87-421C-9793-93159F63DDB1}.Release|x86.Build.0 = Release|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Debug|x64.ActiveCfg = Debug|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Debug|x64.Build.0 = Debug|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Debug|x86.ActiveCfg = Debug|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Debug|x86.Build.0 = Debug|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Release|Any CPU.Build.0 = Release|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Release|x64.ActiveCfg = Release|x64
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Release|x64.Build.0 = Release|x64
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Release|x86.ActiveCfg = Release|Any CPU
{A6AA9DE8-4C44-4E89-BB05-77882D7A99DB}.Release|x86.Build.0 = Release|Any CPU
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Debug|Any CPU.ActiveCfg = Debug
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Debug|x64.ActiveCfg = Debug
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Debug|x64.Build.0 = Debug
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Debug|x86.ActiveCfg = Debug
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Debug|x86.Build.0 = Debug
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Release|Any CPU.ActiveCfg = Release
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Release|x64.ActiveCfg = Release
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Release|x64.Build.0 = Release
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Release|x86.ActiveCfg = Release
{418BD8E9-AFF1-47B7-9A59-1EA040C97B2D}.Release|x86.Build.0 = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
8 changes: 4 additions & 4 deletions SysInfo/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>

<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
</configuration>
1 change: 0 additions & 1 deletion SysInfo/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Data;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;

namespace SysInfo
Expand Down
23 changes: 19 additions & 4 deletions SysInfo/CONFIG_LOADER.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml;

namespace SysInfo
Expand All @@ -14,9 +13,9 @@ public class CONFIG_LOADER
private static Dictionary<string, string> DefaultConfig = new Dictionary<string, string>
{
{ "TextColor","#fff" },
{ "TextSize", "12" },
{ "TextSize", "14" },
{ "TextFont", "Consolas" },
{ "VerticalLocation", "Top" },
{ "VerticalLocation", "Bottom" },
{ "HorizontalLocation", "Right" },
{ "AlwaysOnTop", "False" },
{ "ShowUsername", "True" },
Expand All @@ -25,8 +24,16 @@ public class CONFIG_LOADER
{ "ShowRAM", "True" },
{ "DriveInfo", "Verbose" },
{ "NetInfo", "Compact" }

};
private static void WriteDefaultConfFile(string path)
{
string contents = "";
foreach(string key in DefaultConfig.Keys)
{
contents += key + "=" + DefaultConfig[key] + "\n";
}
System.IO.File.WriteAllText(path, contents);
}
public static Dictionary<string, string> GetConf(string ConfigFilePath = "sysinfo-settings.conf")
{
// Use the default configuration, and modify it as settings are passed in
Expand Down Expand Up @@ -59,6 +66,14 @@ public static Dictionary<string, string> GetConf(string ConfigFilePath = "sysinf
{
// Use default configuration
Console.WriteLine("Could not find " + ConfigFilePath);
try
{
WriteDefaultConfFile(ConfigFilePath);
}
catch
{
Console.WriteLine("Failed to write default config");
}
return DefaultConfig;
}
}
Expand Down
1 change: 0 additions & 1 deletion SysInfo/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Net;
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
Expand Down
6 changes: 3 additions & 3 deletions SysInfo/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SysInfo")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("Provide easily accessible system stats on the desktop.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("Steve Nemeti")]
[assembly: AssemblyProduct("SysInfo")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyCopyright("Copyright © Steve Nemeti 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
44 changes: 18 additions & 26 deletions SysInfo/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 9 additions & 13 deletions SysInfo/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 25 additions & 4 deletions SysInfo/SysInfo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
<OutputType>WinExe</OutputType>
<RootNamespace>SysInfo</RootNamespace>
<AssemblyName>SysInfo</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -25,6 +26,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -34,8 +36,29 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<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>8.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</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>8.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -94,13 +117,11 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Include="sysinfo-settings.conf" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Resource Include="sysinfo-conf.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SysInfo_Lib\SysInfo_Lib.csproj">
<Project>{a6aa9de8-4c44-4e89-bb05-77882d7a99db}</Project>
Expand Down
9 changes: 0 additions & 9 deletions SysInfo/sysinfo-conf.xml

This file was deleted.

12 changes: 12 additions & 0 deletions SysInfo/sysinfo-settings.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
TextColor=White
TextSize=14
TextFont=Consolas
VerticalLocation=Bottom
HorizontalLocation=Right
AlwaysOnTop=False
ShowUsername=True
ShowHostname=True
ShowOS=True
ShowRAM=True
DriveInfo=Verbose
NetInfo=Compact
8 changes: 4 additions & 4 deletions SysInfo_Lib/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SysInfo_Lib2")]
[assembly: AssemblyTitle("SysInfo_Lib")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SysInfo_Lib2")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyCompany("Steven Nemeti")]
[assembly: AssemblyProduct("SysInfo_Lib")]
[assembly: AssemblyCopyright("Copyright © Steven Nemeti 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
Loading

0 comments on commit 7d40a65

Please sign in to comment.