Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
danielchalmers authored Jul 15, 2024
2 parents 2578e33 + 4d3fa33 commit 409b8bb
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DesktopClock/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml">
<Application.Resources />
<Application.Resources />
</Application>
2 changes: 1 addition & 1 deletion DesktopClock/MainWindow.xaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Window x:Class="DesktopClock.MainWindow"
<Window x:Class="DesktopClock.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand Down
27 changes: 19 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,32 @@
# DesktopClock πŸ•’
# πŸ•’ DesktopClock

[![Release](https://img.shields.io/github/release/danielchalmers/DesktopClock?include_prereleases)](https://github.com/danielchalmers/DesktopClock/releases)
[![License](https://img.shields.io/github/license/danielchalmers/DesktopClock)](LICENSE)

![Animation](https://github.com/danielchalmers/DesktopClock/assets/7112040/6038fa47-3a29-4b74-8f4f-fffeb8af8d0a)

![Animation](https://github.com/danielchalmers/DesktopClock/assets/7112040/6038fa47-3a29-4b74-8f4f-fffeb8af8d0a)
![Context menu](https://user-images.githubusercontent.com/7112040/201500304-fadedaeb-fc50-47b7-9de0-80c45346c35d.png)

A configurable digital clock app for your Windows desktop that remains visible on screen so it's there whenever you need it.
A digital clock app for your Windows desktop that stays on screen, ready whenever you need it.

- Right-click to access essential options like size, time zone, format, and theme, or to create new clocks.
- Double-click to copy the time to your clipboard, and scroll while holding Ctrl to resize the clock.
- "Advanced settings" provides additional configuration options using JSON format.
- Includes a countdown mode to set a timer for any specific date.

## Discover More

Explore my other apps (Free):

With a right-click, access essential options like size, time zone, format, and theme, or make new clocks from the same menu.
Double left-click will copy the time to the clipboard, and holding Ctrl while scrolling will resize the clock.
For power users, "advanced settings" provides even more configuration choices in a familiar JSON format.
There's also a countdown mode that allows you to set a countdown to any date of your choice.
πŸ›œ[Network Monitor](https://github.com/danielchalmers/Network-Monitor) - View live network latency and bandwidth usage on your desktop with a widget like the clock.

πŸ’Ÿ[JournalApp](https://github.com/danielchalmers/JournalApp) - Write notes & keep track of your mood, medications, and more with a versatile journaling app for Android.

## Contributions

Got an idea or found a bug? Submit an [issue](https://github.com/danielchalmers/DesktopClock/issues)!

If you are gracious enough to contribute code, kindly try to align with the current formatting and keep features simple if possible.

## Credits

- [CommunityToolkit](https://github.com/CommunityToolkit/dotnet)
Expand Down

0 comments on commit 409b8bb

Please sign in to comment.