commit b317f377571f5c19cde3e2d61ccb67f75853caf0
parent 592d587e5778dfc0618c805154a9432957ab7feb
Author: rwa <apollo@rw-net.de>
Date: Sat, 8 Sep 2018 21:20:43 +0200
resolves #2
Diffstat:
4 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/WorkTimeHero/MainForm.cs b/WorkTimeHero/MainForm.cs
@@ -29,6 +29,11 @@ namespace WorkTimeHero
lblRemaining.Text = string.Format("{1,-20}{0}", wtc.RemainingWorkTime.ToString(TimeFormatter), "Verbleibend:");
lblTimeDue.Text = string.Format("{1,-20}{0}", wtc.TimeDue.ToString(TimeFormatter), "Uhrzeit:");
+ if (!dtpBreak.Enabled)
+ {
+ dtpBreak.Value = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, wtc.CurrentBreakTime.Hours, wtc.CurrentBreakTime.Minutes, 0);
+ }
+
RefreshTooltip();
RefreshIcons();
}
diff --git a/WorkTimeHero/Properties/AssemblyInfo.cs b/WorkTimeHero/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/WorkTimeHero/WorkTimeCalculator.cs b/WorkTimeHero/WorkTimeCalculator.cs
@@ -68,7 +68,7 @@ namespace WorkTimeHero
/// <summary>
/// Pausenzeit für Sollzeit
/// </summary>
- private TimeSpan PlannedBreakTime
+ public TimeSpan PlannedBreakTime
{
get
{
@@ -84,7 +84,7 @@ namespace WorkTimeHero
/// <summary>
/// aktueller Pausenabzug
/// </summary>
- private TimeSpan CurrentBreakTime
+ public TimeSpan CurrentBreakTime
{
get
{
diff --git a/WorkTimeHeroTest/WorkTimeHeroTest.csproj b/WorkTimeHeroTest/WorkTimeHeroTest.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -20,11 +20,16 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
+ <NoWin32Manifest>False</NoWin32Manifest>
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <NoStdLib>False</NoStdLib>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
+ <DebugType>Full</DebugType>
+ <Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
@@ -38,6 +43,16 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+ <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+ <BaseAddress>4194304</BaseAddress>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>