Merge pull request #167 from Code52/release/2.2

hnrkndrssn · web-flow · commit e3eed6a71f7e · 2017-07-26T17:25:24.000+10:00
Release 2.2
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.1.{build}
+version: 2.2.{build}
 configuration: Release
 skip_branch_with_pr: true
 skip_tags: true
diff --git a/src/Carnac.Logic/MessageProvider.cs b/src/Carnac.Logic/MessageProvider.cs
@@ -37,7 +37,22 @@ public IObservable<Message> GetMessageStream()
                 .Where(c => c.HasCompletedValue)
                 .SelectMany(c => c.GetMessages())
                 .Scan(new Message(), (acc, key) => Message.MergeIfNeeded(acc, key))
-                .Where(m => !settings.DetectShortcutsOnly || m.IsShortcut);
+                .Where(m =>
+                {
+                    if (settings.DetectShortcutsOnly && settings.ShowOnlyModifiers)
+                    {
+                        return m.IsShortcut && m.IsModifier;
+                    }
+                    if (settings.DetectShortcutsOnly)
+                    {
+                        return m.IsShortcut;
+                    }
+                    if (settings.ShowOnlyModifiers)
+                    {
+                        return m.IsModifier;
+                    }
+                    return true;
+                });
         }
     }
 }
diff --git a/src/Carnac.Logic/Models/Message.cs b/src/Carnac.Logic/Models/Message.cs
@@ -15,6 +15,7 @@ public sealed class Message
         readonly string shortcutName;
         readonly bool canBeMerged;
         readonly bool isShortcut;
+        readonly bool isModifier;
         readonly bool isDeleting;
         readonly DateTime lastMessage;
         readonly Message previous;
@@ -30,12 +31,13 @@ public Message(KeyPress key)
             processName = key.Process.ProcessName;
             processIcon = key.Process.ProcessIcon;
             canBeMerged = !key.HasModifierPressed;
+            isModifier = key.HasModifierPressed;
 
             keys = new ReadOnlyCollection<KeyPress>(new[] { key });
             textCollection = new ReadOnlyCollection<string>(CreateTextSequence(key).ToArray());
         }
 
-        public Message(IEnumerable<KeyPress> keys, KeyShortcut shortcut)
+        public Message(IEnumerable<KeyPress> keys, KeyShortcut shortcut, Boolean isShortcut = false)
             : this()
         {
             var allKeys = keys.ToArray();
@@ -48,7 +50,8 @@ public Message(IEnumerable<KeyPress> keys, KeyShortcut shortcut)
             processName = distinctProcessName.Single();
             processIcon = allKeys.First().Process.ProcessIcon;
             shortcutName = shortcut.Name;
-            isShortcut = true;
+            this.isShortcut = isShortcut;
+            this.isModifier = allKeys.Any(k => k.HasModifierPressed);
             canBeMerged = false;
 
             this.keys = new ReadOnlyCollection<KeyPress>(allKeys);
@@ -91,7 +94,9 @@ private Message(Message initial, bool isDeleting)
         public DateTime LastMessage { get { return lastMessage; } }
 
         public bool IsDeleting { get { return isDeleting; } }
-        
+
+        public bool IsModifier { get { return isModifier; } }
+
         public Message Merge(Message other)
         {
             return new Message(this, other);
diff --git a/src/Carnac.Logic/Models/PopupSettings.cs b/src/Carnac.Logic/Models/PopupSettings.cs
@@ -30,6 +30,9 @@ public class PopupSettings : NotifyPropertyChanged
         [NotifyProperty(AlsoNotifyFor = new[] { "ScaleTransform", "Alignment" })]
         public NotificationPlacement Placement { get; set; }
 
+        [DefaultValue(false)]
+        public bool AutoUpdate { get; set; }
+
         //Used to determine which from it's leftmost co-ord
         double left;
         public double Left
@@ -85,5 +88,6 @@ public string SortDescription
         public bool DetectShortcutsOnly { get; set; }
         public bool ShowApplicationIcon { get; set; }
         public bool SettingsConfigured { get; set; }
+        public bool ShowOnlyModifiers { get; set; }
     }
 }
diff --git a/src/Carnac.Logic/ShortcutAccumulator.cs b/src/Carnac.Logic/ShortcutAccumulator.cs
@@ -88,7 +88,7 @@ void ShortcutCompleted(KeyShortcut shortcut)
             if (HasCompletedValue)
                 throw new InvalidOperationException();
 
-            messages = new[] { new Message(Keys, shortcut) };
+            messages = new[] { new Message(Keys, shortcut, true) };
             HasCompletedValue = true;
         }
 
diff --git a/src/Carnac.Logic/Win32Methods.cs b/src/Carnac.Logic/Win32Methods.cs
@@ -16,6 +16,7 @@ public static class Win32Methods
         public const int WM_SYSKEYUP = 261;
         public const int WM_SYSKEYDOWN = 260;
         public const int WS_EX_TRANSPARENT = 0x00000020;
+        public const int WS_EX_TOOLWINDOW = 0x00000080;
         public  const int GWL_EXSTYLE = (-20);
 
         //
@@ -40,10 +41,10 @@ public static class Win32Methods
         [DllImport("user32.dll")]
         static extern int SetWindowLong(IntPtr hwnd, int index, int newStyle);
 
-        public static void SetWindowExTransparent(IntPtr hwnd)
+        public static void SetWindowExTransparentAndNotInWindowList(IntPtr hwnd)
         {
             var extendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-            SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle | WS_EX_TRANSPARENT);
+            SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle | WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW);
         }
     }
 }
diff --git a/src/Carnac/App.xaml.cs b/src/Carnac/App.xaml.cs
@@ -53,22 +53,25 @@ protected override void OnStartup(StartupEventArgs e)
             carnac.Start();
 
 #if !DEBUG
-            Observable
-                .Timer(TimeSpan.FromMinutes(5))
-                .Subscribe(async x =>
-                {
-                    try
+            if (settings.AutoUpdate)
+            {
+                Observable
+                    .Timer(TimeSpan.FromMinutes(5))
+                    .Subscribe(async x =>
                     {
-                        using (var mgr = UpdateManager.GitHubUpdateManager(carnacUpdateUrl))
+                        try
                         {
-                            await mgr.Result.UpdateApp();
+                            using (var mgr = UpdateManager.GitHubUpdateManager(carnacUpdateUrl))
+                            {
+                                await mgr.Result.UpdateApp();
+                            }
                         }
-        }
-                    catch
-                    {
-                        // Do something useful with the exception
-                    }
-                });
+                        catch
+                        {
+                            // Do something useful with the exception
+                        }
+                    });
+            }
 #endif
 
             base.OnStartup(e);
diff --git a/src/Carnac/UI/KeyShowView.xaml.cs b/src/Carnac/UI/KeyShowView.xaml.cs
@@ -20,8 +20,7 @@ protected override void OnSourceInitialized(EventArgs e)
             base.OnSourceInitialized(e);
 
             var hwnd = new WindowInteropHelper(this).Handle;
-            Win32Methods.SetWindowExTransparent(hwnd);
-
+            Win32Methods.SetWindowExTransparentAndNotInWindowList(hwnd);
             var timer = new Timer(100);
             timer.Elapsed +=
                 (s, x) =>
@@ -83,7 +82,7 @@ public static readonly int
 
         private void WindowLoaded(object sender, RoutedEventArgs e)
         {
-            
+
         }
 
         void SettingsLeftChanged(object sender, EventArgs e)
diff --git a/src/Carnac/UI/PreferencesView.xaml b/src/Carnac/UI/PreferencesView.xaml
@@ -7,7 +7,7 @@
                       xmlns:utilities="clr-namespace:Carnac.Utilities"
                       xmlns:carnac="clr-namespace:Carnac"
                       x:Class="Carnac.UI.PreferencesView"
-                      Width="610" Height="420" Icon="../icon.ico" 
+                      Width="610" Height="420" Icon="../icon.ico"
                       Foreground="{DynamicResource BlackBrush}"
                       d:DataContext="{d:DesignInstance ui:PreferencesViewModel}" mc:Ignorable="d"
                       ShowTitleBar="False" ShowMinButton="False" ShowMaxRestoreButton="False"
@@ -25,7 +25,7 @@
                 <ResourceDictionary
                     Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            
+
             <DataTemplate x:Key="ColourPickerTemplate">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Stretch"
                                 d:DataContext="{d:DesignInstance ui:AvailableColor}">
@@ -56,7 +56,7 @@
                     <StackPanel Margin="10,0,0,0" Orientation="Vertical">
                         <carnac:PositionOnMonitorSelector />
                         <ui:PreferencesField Header="Top Offset">
-                            <Slider Value="{Binding Settings.TopOffset}" IsSnapToTickEnabled="True" 
+                            <Slider Value="{Binding Settings.TopOffset}" IsSnapToTickEnabled="True"
                                 LargeChange="10"
                             Maximum="{Binding SelectedScreen.Height}" Minimum="0" SmallChange="1" TickFrequency="20" />
                             <ui:PreferencesField.SecondaryControl>
@@ -84,6 +84,10 @@
                                 <TextBox Foreground="White" Text="{Binding Settings.RightOffset}" />
                             </ui:PreferencesField.SecondaryControl>
                         </ui:PreferencesField>
+                        <Separator Height="10" Margin="0"/>
+                         <ui:PreferencesField Header="Auto Update">
+                             <CheckBox IsChecked="{Binding Settings.AutoUpdate}" Content="auto check updates from GitHub (need to restart this program)" />
+                         </ui:PreferencesField>
                     </StackPanel>
                     <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.Row="1" Margin="5">
                         <Button Width="150" Margin="0 0 5 0" Content="Reset to Defaults" Command="{Binding ResetToDefaultsCommand}" />
@@ -138,9 +142,12 @@
                         </ui:PreferencesField>
 
                         <ui:PreferencesField Header="Shortcuts Only">
-                            <CheckBox IsChecked="{Binding Settings.DetectShortcutsOnly}" />
+                            <CheckBox IsChecked="{Binding Settings.DetectShortcutsOnly}" Content="shows only keys which are listed in keymaps folder" />
                         </ui:PreferencesField>
-                        <ui:PreferencesField Header="Show Application Icon">
+						<ui:PreferencesField Header="Show Only Modifiers">
+							<CheckBox IsChecked="{Binding Settings.ShowOnlyModifiers}" Content="shows only keys which have ctrl, shift, alt or windows" />
+						</ui:PreferencesField>
+						<ui:PreferencesField Header="Show Application Icon">
                             <CheckBox IsChecked="{Binding Settings.ShowApplicationIcon}" />
                         </ui:PreferencesField>
                     </StackPanel>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: 2.1.{build}`
	`1`	`+version: 2.2.{build}`
`2`	`2`	`configuration: Release`
`3`	`3`	`skip_branch_with_pr: true`
`4`	`4`	`skip_tags: true`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void ShortcutCompleted(KeyShortcut shortcut)`
`88`	`88`	`if (HasCompletedValue)`
`89`	`89`	`throw new InvalidOperationException();`
`90`	`90`
`91`		`- messages = new[] { new Message(Keys, shortcut) };`
	`91`	`+ messages = new[] { new Message(Keys, shortcut, true) };`
`92`	`92`	`HasCompletedValue = true;`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public static class Win32Methods`
`16`	`16`	`public const int WM_SYSKEYUP = 261;`
`17`	`17`	`public const int WM_SYSKEYDOWN = 260;`
`18`	`18`	`public const int WS_EX_TRANSPARENT = 0x00000020;`
	`19`	`+ public const int WS_EX_TOOLWINDOW = 0x00000080;`
`19`	`20`	`public const int GWL_EXSTYLE = (-20);`
`20`	`21`
`21`	`22`	`//`
`@@ -40,10 +41,10 @@ public static class Win32Methods`
`40`	`41`	`[DllImport("user32.dll")]`
`41`	`42`	`static extern int SetWindowLong(IntPtr hwnd, int index, int newStyle);`
`42`	`43`
`43`		`- public static void SetWindowExTransparent(IntPtr hwnd)`
	`44`	`+ public static void SetWindowExTransparentAndNotInWindowList(IntPtr hwnd)`
`44`	`45`	`{`
`45`	`46`	`var extendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);`
`46`		`- SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle \| WS_EX_TRANSPARENT);`
	`47`	`+ SetWindowLong(hwnd, GWL_EXSTYLE, extendedStyle \| WS_EX_TRANSPARENT \| WS_EX_TOOLWINDOW);`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`}`