: "(ﾉಥ益ಥ）ﾉ ┻━┻" # ANGRY TABLE FLIP
diff --git a/src/wincompose/rules/WinCompose.txt b/src/wincompose/rules/WinCompose.txt
index c9edbd90..72769b5d 100644
--- a/src/wincompose/rules/WinCompose.txt
+++ b/src/wincompose/rules/WinCompose.txt
@@ -41,8 +41,6 @@
: "( ͡° ͜ʖ ͡°)" # Lenny face
: "¯\\_(ツ)_/¯" # Shrug face
- : "Hello World"
-
: "🏴" # Bretagne flag (gwenn-ha-du)
: "🏴" # Bretagne flag (gwenn-ha-du)
: "🏴" # Catalogne flag (senyera)
diff --git a/src/wincompose/sequences/Category.cs b/src/wincompose/sequences/Category.cs
index 36a8e395..3b9198e9 100644
--- a/src/wincompose/sequences/Category.cs
+++ b/src/wincompose/sequences/Category.cs
@@ -1,4 +1,4 @@
-//
+//
// WinCompose — a compose key for Windows — http://wincompose.info/
//
// Copyright © 2013—2021 Sam Hocevar
@@ -96,17 +96,19 @@ private static IEnumerable GetAllCategories()
{
var list = new List();
- const BindingFlags flags = BindingFlags.Static | BindingFlags.Public;
- Regex r = new Regex(@"^U([a-fA-F0-9]*)_U([a-fA-F0-9]*)$");
- foreach (var property in typeof(unicode.Block).GetProperties(flags))
+ using (var reader = new GZipResourceStream("Blocks.txt.gz"))
{
- Match m = r.Match(property.Name);
- if (m.Success)
+ Regex r = new Regex(@"^([a-fA-F0-9]*)\.\.([a-fA-F0-9]*); ([A-Za-z0-9 \-]*)$");
+ for (string l = reader.ReadLine(); l != null; l = reader.ReadLine())
{
- var name = (string)property.GetValue(null, null);
- var start = Convert.ToInt32(m.Groups[1].Value, 16);
- var end = Convert.ToInt32(m.Groups[2].Value, 16);
- list.Add(new CodepointCategory() { Name = name, RangeStart = start, RangeEnd = end });
+ Match m = r.Match(l);
+ if (m.Success)
+ {
+ var start = Convert.ToInt32(m.Groups[1].Value, 16);
+ var end = Convert.ToInt32(m.Groups[2].Value, 16);
+ var name = (string)m.Groups[3].Value;
+ list.Add(new CodepointCategory() { Name = name, RangeStart = start, RangeEnd = end });
+ }
}
}
@@ -114,4 +116,4 @@ private static IEnumerable GetAllCategories()
return list;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/wincompose/settings/Settings.cs b/src/wincompose/settings/Settings.cs
index d4da9e61..f1b53801 100644
--- a/src/wincompose/settings/Settings.cs
+++ b/src/wincompose/settings/Settings.cs
@@ -13,6 +13,7 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
using System.IO;
@@ -21,15 +22,18 @@
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
+using System.Windows;
using System.Xml;
+using Wpf.Ui;
+using Wpf.Ui.Appearance;
namespace WinCompose
{
- public static class Settings
+ public static class Settings
{
private class EntryLocation : Attribute
{
- public EntryLocation(string section, string key)
+ public EntryLocation(string section , string key)
{
Section = section;
Key = key;
@@ -40,15 +44,15 @@ public EntryLocation(string section, string key)
static Settings()
{
- m_ini_file = new IniFile(Path.Combine(Utils.AppDataDir, "settings.ini"));
+ m_ini_file = new IniFile(Path.Combine(Utils.AppDataDir , "settings.ini"));
// Add a save handler to our EntryLocation attributes
foreach (var v in typeof(Settings).GetProperties())
{
- foreach (EntryLocation attr in v.GetCustomAttributes(typeof(EntryLocation), true))
+ foreach (EntryLocation attr in v.GetCustomAttributes(typeof(EntryLocation) , true))
{
- var entry = v.GetValue(null, null) as SettingsEntry;
- entry.ValueChanged += () => ThreadPool.QueueUserWorkItem(_ => m_ini_file.SaveEntry(entry.ToString(), attr.Section, attr.Key));
+ var entry = v.GetValue(null , null) as SettingsEntry;
+ entry.ValueChanged += () => ThreadPool.QueueUserWorkItem(_ => m_ini_file.SaveEntry(entry.ToString() , attr.Section , attr.Key));
}
}
@@ -59,70 +63,77 @@ static Settings()
// Refresh the window properties when this value changes
IgnoreRegex.ValueChanged += () => KeyboardLayout.Window.Refresh();
+
+ //Reload theme
+ ThemeMode.ValueChanged += () => SetTheme();
}
// The application version; trim the build number if it is zero
public static string Version
- => Regex.Replace(Assembly.GetExecutingAssembly().GetName().Version.ToString(), "[.]0$", "");
+ => Regex.Replace(Assembly.GetExecutingAssembly().GetName().Version.ToString() , "[.]0$" , "");
- [EntryLocation("global", "language")]
+ [EntryLocation("global" , "language")]
public static SettingsEntry Language { get; } = new SettingsEntry("");
- [EntryLocation("global", "autolaunch")]
+ [EntryLocation("global" , "autolaunch")]
public static SettingsEntry AutoLaunch { get; } = new SettingsEntry(true);
- [EntryLocation("global", "run_elevated")]
+ [EntryLocation("global" , "run_elevated")]
public static SettingsEntry RunElevated { get; } = new SettingsEntry(true);
- [EntryLocation("global", "check_updates")]
+ [EntryLocation("global" , "check_updates")]
public static SettingsEntry CheckUpdates { get; } = new SettingsEntry(true);
+ [EntryLocation("global" , "theme_mode")]
+ public static SettingsEntry ThemeMode { get; } = new SettingsEntry("");
+ [EntryLocation("tweaks" , "disable_icon")]
+ public static SettingsEntry DisableIcon { get; } = new SettingsEntry(false);
- [EntryLocation("composing", "compose_key")]
+ [EntryLocation("composing" , "compose_key")]
public static SettingsEntry ComposeKeys { get; } = new SettingsEntry(new KeySequence());
- [EntryLocation("composing", "led_key")]
+ [EntryLocation("composing" , "led_key")]
public static SettingsEntry LedKey { get; } = new SettingsEntry(new KeySequence());
- [EntryLocation("composing", "reset_delay")]
+ [EntryLocation("composing" , "reset_delay")]
public static SettingsEntry ResetTimeout { get; } = new SettingsEntry(-1);
- [EntryLocation("composing", "use_xorg_rules")]
+ [EntryLocation("composing" , "use_xorg_rules")]
public static SettingsEntry UseXorgRules { get; } = new SettingsEntry(true);
- [EntryLocation("composing", "use_xcompose_rules")]
+ [EntryLocation("composing" , "use_xcompose_rules")]
public static SettingsEntry UseXComposeRules { get; } = new SettingsEntry(true);
- [EntryLocation("composing", "use_emoji_rules")]
+ [EntryLocation("composing" , "use_emoji_rules")]
public static SettingsEntry UseEmojiRules { get; } = new SettingsEntry(true);
- [EntryLocation("composing", "unicode_input")]
+ [EntryLocation("composing" , "unicode_input")]
public static SettingsEntry UnicodeInput { get; } = new SettingsEntry(true);
- [EntryLocation("composing", "case_insensitive")]
+ [EntryLocation("composing" , "case_insensitive")]
public static SettingsEntry CaseInsensitive { get; } = new SettingsEntry(false);
- [EntryLocation("composing", "discard_on_invalid")]
+ [EntryLocation("composing" , "discard_on_invalid")]
public static SettingsEntry DiscardOnInvalid { get; } = new SettingsEntry(false);
- [EntryLocation("composing", "swap_on_invalid")]
+ [EntryLocation("composing" , "swap_on_invalid")]
public static SettingsEntry SwapOnInvalid { get; } = new SettingsEntry(false);
- [EntryLocation("composing", "beep_on_invalid")]
+ [EntryLocation("composing" , "beep_on_invalid")]
public static SettingsEntry BeepOnInvalid { get; } = new SettingsEntry(false);
- [EntryLocation("composing", "keep_original_key")]
+ [EntryLocation("composing" , "keep_original_key")]
public static SettingsEntry KeepOriginalKey { get; } = new SettingsEntry(false);
- [EntryLocation("composing", "always_compose")]
+ [EntryLocation("composing" , "always_compose")]
public static SettingsEntry AlwaysCompose { get; } = new SettingsEntry(false);
- [EntryLocation("tweaks", "insert_zwsp")]
+ [EntryLocation("tweaks" , "insert_zwsp")]
public static SettingsEntry InsertZwsp { get; } = new SettingsEntry(false);
- [EntryLocation("tweaks", "emulate_capslock")]
+ [EntryLocation("tweaks" , "emulate_capslock")]
public static SettingsEntry EmulateCapsLock { get; } = new SettingsEntry(false);
- [EntryLocation("tweaks", "shift_disables_capslock")]
+ [EntryLocation("tweaks" , "shift_disables_capslock")]
public static SettingsEntry ShiftDisablesCapsLock { get; } = new SettingsEntry(false);
- [EntryLocation("tweaks", "must_hold_capslock")]
+ [EntryLocation("tweaks" , "must_hold_capslock")]
public static SettingsEntry MustHoldCapsLock { get; } = new SettingsEntry(false);
- [EntryLocation("tweaks", "capslock_capitalizes")]
+ [EntryLocation("tweaks" , "capslock_capitalizes")]
public static SettingsEntry CapsLockCapitalizes { get; } = new SettingsEntry(false);
- [EntryLocation("tweaks", "allow_injected")]
+ [EntryLocation("tweaks" , "allow_injected")]
public static SettingsEntry AllowInjected { get; } = new SettingsEntry(false);
- [EntryLocation("tweaks", "keep_icon_visible")]
- public static SettingsEntry KeepIconVisible { get; } = new SettingsEntry(false);
- [EntryLocation("tweaks", "disable_icon")]
- public static SettingsEntry DisableIcon { get; } = new SettingsEntry(false);
- [EntryLocation("advanced", "ignore_regex")]
+
+ [EntryLocation("advanced" , "ignore_regex")]
public static SettingsEntry IgnoreRegex { get; } = new SettingsEntry("");
public static IEnumerable ValidComposeKeys => m_valid_compose_keys;
- public static Dictionary ValidLanguages => m_valid_languages;
+ public static Dictionary ValidLanguages => m_valid_languages;
+
+ public static List Themes => m_themes;
+ private static readonly List m_themes = new List {"Light", "Dark"};
public static IList ValidLedKeys { get; } = new List
{
@@ -267,6 +278,25 @@ public static void LoadSequences()
m_sequences.LoadFile(Path.Combine(Utils.UserDir, ".XCompose.txt"));
}
+ public static void SetTheme()
+ {
+ Debug.WriteLine("Loading Theme:" + ThemeMode.Value.ToString());
+ if (ThemeMode.Value == "Light")
+ {
+
+ ApplicationThemeManager.Apply(ApplicationTheme.Light);
+
+
+ //Debug.WriteLine(Wpf.Ui.UiApplication.Current.Resources.MergedDictionaries);
+ }
+ else if (ThemeMode.Value == "Dark")
+ {
+ ApplicationThemeManager.Apply(ApplicationTheme.Dark);
+ //Debug.WriteLine(Wpf.Ui.UiApplication.Current.Resources.MergedDictionaries);
+ }
+ Application.Current.Resources.MergedDictionaries[0].Source = Wpf.Ui.UiApplication.Current.Resources.MergedDictionaries[0].Source;
+ }
+
///
/// Find the preferred application for .txt files and launch it to
/// open .XCompose. If the file does not exist, try .XCompose.txt
@@ -428,6 +458,8 @@ private static Dictionary GetSupportedLanguages()
}
private static NLog.ILogger Logger = NLog.LogManager.GetCurrentClassLogger();
+
+ //public static event PropertyChangedEventHandler PropertyChanged;
}
}
diff --git a/src/wincompose/ui/AboutBox.xaml b/src/wincompose/ui/AboutBox.xaml
index cfc7befa..fae88844 100644
--- a/src/wincompose/ui/AboutBox.xaml
+++ b/src/wincompose/ui/AboutBox.xaml
@@ -22,7 +22,10 @@
WindowStartupLocation="CenterScreen"
ResizeMode="NoResize"
Icon="/WinCompose;component/res/key_compose.png"
- Height="500" Width="500">
+ Height="500" Width="500"
+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+ WindowCornerPreference="Round"
+ ExtendsContentIntoTitleBar="True">
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
diff --git a/src/wincompose/ui/BaseWindow.cs b/src/wincompose/ui/BaseWindow.cs
index cfb35b9f..3854f3e9 100644
--- a/src/wincompose/ui/BaseWindow.cs
+++ b/src/wincompose/ui/BaseWindow.cs
@@ -14,7 +14,7 @@
namespace WinCompose
{
- public class BaseWindow : Window
+ public class BaseWindow : Wpf.Ui.Controls.FluentWindow
{
static BaseWindow()
{
diff --git a/src/wincompose/ui/DebugWindow.xaml b/src/wincompose/ui/DebugWindow.xaml
index 1b05142d..5a11754b 100644
--- a/src/wincompose/ui/DebugWindow.xaml
+++ b/src/wincompose/ui/DebugWindow.xaml
@@ -28,8 +28,6 @@
Icon="/WinCompose;component/res/key_compose.png"
ShowInTaskbar="False"
Topmost="True"
- Background="White"
- BorderBrush="Black"
Width="800" Height="800">
diff --git a/src/wincompose/ui/KeySelector.xaml b/src/wincompose/ui/KeySelector.xaml
index 4587ae04..3cb59991 100644
--- a/src/wincompose/ui/KeySelector.xaml
+++ b/src/wincompose/ui/KeySelector.xaml
@@ -15,19 +15,18 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:i18n="clr-namespace:WinCompose.i18n;assembly=language"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:wc="clr-namespace:WinCompose"
- ShowInTaskbar="False" AllowsTransparency="True"
- WindowStartupLocation="CenterScreen" WindowStyle="None"
- Topmost="True" WindowState="Maximized" ResizeMode="NoResize"
- Icon="/WinCompose;component/res/key_compose.png">
-
-
-
-
+
-
+
-
+
diff --git a/src/wincompose/ui/KeySelector.xaml.cs b/src/wincompose/ui/KeySelector.xaml.cs
index c85a700b..08d5ccc6 100644
--- a/src/wincompose/ui/KeySelector.xaml.cs
+++ b/src/wincompose/ui/KeySelector.xaml.cs
@@ -48,7 +48,6 @@ private void KeyCaptured(Key k)
private void CancelClicked(object sender, System.Windows.RoutedEventArgs e)
{
- Key = null;
Close();
}
}
diff --git a/src/wincompose/ui/NotificationIcon.xaml b/src/wincompose/ui/NotificationIcon.xaml
index 51a5cf84..a4415cad 100644
--- a/src/wincompose/ui/NotificationIcon.xaml
+++ b/src/wincompose/ui/NotificationIcon.xaml
@@ -12,14 +12,18 @@
-->
+ 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"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:tb="http://www.hardcodet.net/taskbar"
+ xmlns:wc="clr-namespace:WinCompose"
+ xmlns:i18n="clr-namespace:WinCompose.i18n;assembly=language"
+ xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
+ DataContext="{Binding RelativeSource={RelativeSource Self}}"
+ x:Name="wcToolTip"
+ IconSource="/ui/key_compose.png"
+ ToolTipText="{Binding Currenttooltip}">
@@ -40,14 +44,12 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+ HorizontalAlignment="Center"/>
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ ContentTemplate="{StaticResource SearchTextTemplate}" Margin="10 4" DockPanel.Dock="Top" VerticalAlignment="Top" />
+
+
-
-
-
-
-
+
+
-
+
-
-
+
@@ -257,26 +273,25 @@
-
+
+
+
+
+
-
-
-
-
+ Foreground="CornflowerBlue" FontSize="12"/>
+ Foreground="DarkCyan" FontStyle="Italic" HorizontalAlignment="Right" Margin="10,0" FontSize="12"/>
-
+
-
+
-
+ xmlns:system="clr-namespace:System;assembly=mscorlib"
+ mc:Ignorable="d"
+ Width="400" Height="500" Title="{x:Static i18n:Text.Options}"
+ Icon="/WinCompose;component/res/icon_settings.png" ResizeMode="NoResize"
+ WindowStartupLocation="CenterScreen" SizeToContent="Height" WindowCornerPreference="Round"
+ ExtendsContentIntoTitleBar="True">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -69,337 +71,344 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+ ToolTipService.ToolTip="{x:Static i18n:Text.AutoLaunchToolTip}" >
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- ÅḄ₡Đ🐹🏠♥…
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
+
-
-
-
+
+
-
-
+
-
-
-
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
-
-
+
-
+
+
-
-
-
-
+
+
+
-
+
-
-
+
-
diff --git a/src/wincompose/ui/SettingsWindow.xaml.cs b/src/wincompose/ui/SettingsWindow.xaml.cs
index 3fcd9e4a..89018003 100644
--- a/src/wincompose/ui/SettingsWindow.xaml.cs
+++ b/src/wincompose/ui/SettingsWindow.xaml.cs
@@ -14,6 +14,7 @@
using System.Windows;
using System.ComponentModel;
using System.Windows.Input;
+using Wpf.Ui.Appearance;
namespace WinCompose
{
@@ -26,11 +27,17 @@ public SettingsWindow()
{
DataContext = new SettingsWindowViewModel();
InitializeComponent();
+ Settings.ThemeMode.ValueChanged += UpdateBackground;
}
private void OnCloseCommandExecuted(object Sender, ExecutedRoutedEventArgs e)
{
Hide();
}
+
+ private void UpdateBackground()
+ {
+ WindowBackgroundManager.UpdateBackground(this, ApplicationThemeManager.GetAppTheme(), Wpf.Ui.Controls.WindowBackdropType.None);
+ }
}
}
diff --git a/src/wincompose/ui/SettingsWindowViewModel.cs b/src/wincompose/ui/SettingsWindowViewModel.cs
index 25effba3..c25ff0c3 100644
--- a/src/wincompose/ui/SettingsWindowViewModel.cs
+++ b/src/wincompose/ui/SettingsWindowViewModel.cs
@@ -24,6 +24,7 @@ public class SettingsWindowViewModel : ViewModelBase
private DelegateCommand m_close_command;
private DelegateCommand m_edit_command;
private KeySelector m_key_selector;
+ private string m_theme_mode;
private string m_selected_language;
private string m_close_button_text;
private Visibility m_warn_message_visibility;
@@ -33,6 +34,7 @@ public SettingsWindowViewModel()
m_close_command = new DelegateCommand(OnCloseCommandExecuted);
m_edit_command = new DelegateCommand(OnEditCommandExecuted);
m_selected_language = Settings.Language.Value;
+ m_theme_mode = Settings.ThemeMode.Value;
m_close_button_text = Text.Close;
m_warn_message_visibility = Visibility.Collapsed;
}
@@ -54,6 +56,11 @@ public string SelectedLanguage
get => m_selected_language;
set => SetValue(ref m_selected_language, value, nameof(SelectedLanguage));
}
+ public string SelectedTheme
+ {
+ get => m_theme_mode;
+ set => SetValue(ref m_theme_mode , value , nameof(SelectedTheme));
+ }
public Key SelectedLedKey
{
@@ -131,6 +138,10 @@ protected override void OnPropertyChanged(string propertyName)
CloseButtonText = Text.Restart;
CloseButtonCommand = new DelegateCommand(OnRestartCommandExecuted);
}
+ if (propertyName == nameof(SelectedTheme))
+ {
+ Settings.ThemeMode.Value = SelectedTheme;
+ }
}
private void OnCloseCommandExecuted(object parameter)
diff --git a/src/wincompose/ui/icon_normal.ico b/src/wincompose/ui/icon_normal.ico
new file mode 100644
index 00000000..c9f209b6
Binary files /dev/null and b/src/wincompose/ui/icon_normal.ico differ
diff --git a/src/wincompose/ui/key_compose.png b/src/wincompose/ui/key_compose.png
new file mode 100644
index 00000000..636cab61
Binary files /dev/null and b/src/wincompose/ui/key_compose.png differ
diff --git a/src/wincompose/wincompose.csproj b/src/wincompose/wincompose.csproj
index 5a9dc9c6..c8e181a2 100644
--- a/src/wincompose/wincompose.csproj
+++ b/src/wincompose/wincompose.csproj
@@ -8,14 +8,13 @@
WinExe
WinCompose
WinCompose.Program
- net40
- false
- false
- false
+ net481
true
$(DefaultItemExcludes);gitversion.json;**\*.swp;**\*~;
+ 0.9.15.1
+ 0.9.15.1
@@ -34,26 +33,19 @@
]]>
-
+
+