endmee

mykesXD · Jan 5, 2023 · f18bd76 · f18bd76
1 parent 10a2028
commit f18bd76
Show file tree

Hide file tree

Showing 62 changed files with 254 additions and 164 deletions.
diff --git a/.vs/KeyRemap/v16/.suo b/.vs/KeyRemap/v16/.suo
diff --git a/KeyRemap/AddPage.xaml b/KeyRemap/AddPage.xaml
@@ -199,7 +199,7 @@
         <Rectangle xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key1}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
-                    x:Name="Key1" RadiusX="10" RadiusY="10" Height="70" Width="70" Fill="#FF292C31" Canvas.Left="15" Canvas.Top="89" Stroke="#FF34373B" MouseLeftButtonDown="Key1_MouseLeftButtonDown" Cursor="Hand"/>
+                    x:Name="Key1" RadiusX="10" RadiusY="10" Height="70" Width="74" Fill="#FF292C31" Canvas.Left="13" Canvas.Top="89" Stroke="#FF34373B" MouseLeftButtonDown="Key1_MouseLeftButtonDown" Cursor="Hand"/>
         <Viewbox xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key1}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
@@ -228,11 +228,11 @@
         <Rectangle xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key2}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
-                    x:Name="Key2" RadiusX="10" RadiusY="10" Height="70" Width="70" Fill="#FF292C31" Canvas.Left="100" Canvas.Top="89" MouseLeftButtonDown="Key2_MouseLeftButtonDown" Stroke="#FF34373B" Cursor="Hand"/>
+                    x:Name="Key2" RadiusX="10" RadiusY="10" Height="70" Width="74" Fill="#FF292C31" Canvas.Left="98" Canvas.Top="89" MouseLeftButtonDown="Key2_MouseLeftButtonDown" Stroke="#FF34373B" Cursor="Hand"/>
         <Viewbox xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key2}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
-                    Height="30" Canvas.Left="100" Canvas.Top="107" Width="71">
+                    Height="30" Canvas.Left="100" Canvas.Top="107" Width="70">
             <TextBlock FontFamily="{StaticResource SourceCodePro-Bold}" x:Name="Key2Text" IsHitTestVisible="False" TextWrapping="Wrap" Text=" "  FontSize="18" Foreground="White" Canvas.Left="49" Canvas.Top="114"/>
         </Viewbox>
         <ListBox FontFamily="{StaticResource SourceCodePro-Regular}" FontSize="14" x:Name="Key2DropDown" Visibility="Hidden" BorderThickness="1,0,1,1" ScrollViewer.HorizontalScrollBarVisibility="Disabled"  Height="94" Canvas.Left="100" Canvas.Top="149" Width="70" BorderBrush="#FF34373B" Background="#FF292C31" Foreground="White" SelectionChanged="Key2DropDown_SelectionChanged">
@@ -253,7 +253,7 @@
         <Viewbox xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key3}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
-                    Height="30" Canvas.Left="192" Canvas.Top="107" Width="92">
+                    Height="30" Canvas.Left="189" Canvas.Top="107" Width="92">
             <TextBlock FontFamily="{StaticResource SourceCodePro-Bold}" x:Name="Key3Text" IsHitTestVisible="False" TextWrapping="Wrap"  TextAlignment="Center" Text=" " HorizontalAlignment="Center" VerticalAlignment="Center"  FontSize="20" Foreground="White" Canvas.Left="241" Canvas.Top="110"/>
         </Viewbox>
         <ListBox FontFamily="{StaticResource SourceCodePro-Regular}" FontSize="14" Name="Key3DropDown" Visibility="Hidden" BorderThickness="1,0,1,1" ScrollViewer.HorizontalScrollBarVisibility="Disabled"  Height="229" Canvas.Left="185" Canvas.Top="149" Width="100" BorderBrush="#FF34373B" Background="#FF292C31" Foreground="White" SelectionChanged="Key3DropDown_SelectionChanged">
@@ -270,11 +270,11 @@
         <Rectangle xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key4}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
-                    x:Name="Key4" RadiusX="10" RadiusY="10" Height="70" Width="70" Fill="#FF292C31" Canvas.Left="372" Canvas.Top="89" MouseLeftButtonDown="Key4_MouseLeftButtonDown" Stroke="#FF34373B" Cursor="Hand"/>
+                    x:Name="Key4" RadiusX="10" RadiusY="10" Height="70" Width="74" Fill="#FF292C31" Canvas.Left="372" Canvas.Top="89" MouseLeftButtonDown="Key4_MouseLeftButtonDown" Stroke="#FF34373B" Cursor="Hand"/>
         <Viewbox xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key4}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
-                    Height="30" Canvas.Left="372" Canvas.Top="107" Width="70">
+                    Height="30" Canvas.Left="374" Canvas.Top="107" Width="70">
             <TextBlock FontFamily="{StaticResource SourceCodePro-Bold}" x:Name="Key4Text" IsHitTestVisible="False" TextWrapping="Wrap" Text=" "  FontSize="18" Foreground="White" Canvas.Left="49" Canvas.Top="114"/>
         </Viewbox>
         <ListBox FontFamily="{StaticResource SourceCodePro-Regular}" x:Name="Key4DropDown" Visibility="Hidden" BorderThickness="1,0,1,1" ScrollViewer.HorizontalScrollBarVisibility="Disabled"  Height="94" Canvas.Left="372" Canvas.Top="149" Width="70" BorderBrush="#FF34373B" Background="#FF292C31" Foreground="White" SelectionChanged="Key4DropDown_SelectionChanged">
@@ -291,11 +291,11 @@
         <Rectangle xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key5}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
-                    x:Name="Key5" RadiusX="10" RadiusY="10" Height="70" Width="70" Fill="#FF292C31" Canvas.Left="458" Canvas.Top="89" MouseLeftButtonDown="Key5_MouseLeftButtonDown" Stroke="#FF34373B" Cursor="Hand"/>
+                    x:Name="Key5" RadiusX="10" RadiusY="10" Height="70" Width="74" Fill="#FF292C31" Canvas.Left="458" Canvas.Top="89" MouseLeftButtonDown="Key5_MouseLeftButtonDown" Stroke="#FF34373B" Cursor="Hand"/>
         <Viewbox xf:Animations.CombinedBinding="{Binding IsMouseOver, ElementName=Key5}"
                     xf:Animations.Primary="{xf:Animate BasedOn={StaticResource Expand}, Event=None}"
                     xf:Animations.Secondary="{xf:Animate BasedOn={StaticResource Contract}, Event=None}"
-                    Height="30" Canvas.Left="458" Canvas.Top="107" Width="70">
+                    Height="30" Canvas.Left="460" Canvas.Top="107" Width="70">
             <TextBlock FontFamily="{StaticResource SourceCodePro-Bold}" x:Name="Key5Text" IsHitTestVisible="False" TextWrapping="Wrap" Text=" "  FontSize="18" Foreground="White" Canvas.Left="49" Canvas.Top="114"/>
         </Viewbox>
         <ListBox FontFamily="{StaticResource SourceCodePro-Regular}" FontSize="14" x:Name="Key5DropDown" Visibility="Hidden" BorderThickness="1,0,1,1" ScrollViewer.HorizontalScrollBarVisibility="Disabled"  Height="94" Canvas.Left="458" Canvas.Top="149" Width="70" BorderBrush="#FF34373B" Background="#FF292C31" Foreground="White" SelectionChanged="Key5DropDown_SelectionChanged">

diff --git a/KeyRemap/AddPage.xaml.cs b/KeyRemap/AddPage.xaml.cs
@@ -57,18 +57,21 @@ public AddPage()
                 try
                 {
                     var p = Process.GetProcessById((int)procId).MainModule.FileVersionInfo.FileDescription;
-                    if (p == "")
+                    if (p == null && !processNameList.Contains(title))
                     {
                         processNameList.Add(title);
                     }
                     else
                     {
-                        processNameList.Add(p);
+                        if (!processNameList.Contains(p))
+                        {
+                            processNameList.Add(p);
+                        }
                     }
                     using (System.Drawing.Icon ico = System.Drawing.Icon.ExtractAssociatedIcon(Process.GetProcessById((int)procId).MainModule.FileName))
                     {
-                        processIcon.Add(ico.ToBitmap());
                         processIconList.Add(new ImageBrush(Imaging.CreateBitmapSourceFromHIcon(ico.Handle, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions())));
+                        processIcon.Add(Util.BitmapFromSource(Imaging.CreateBitmapSourceFromHIcon(ico.Handle, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions())));
                     }
                 }
                 catch

diff --git a/KeyRemap/App.xaml.cs b/KeyRemap/App.xaml.cs
@@ -31,6 +31,7 @@ protected override void OnStartup(StartupEventArgs e)
         }
         private void Open(object sender, EventArgs e)
         {
+            MainWindow.ShowInTaskbar = true;
             MainWindow.Show();
             MainWindow.WindowState = WindowState.Normal;
             MainWindow.Activate();

diff --git a/KeyRemap/MainPage.xaml b/KeyRemap/MainPage.xaml
@@ -172,8 +172,8 @@
         </Rectangle>
         <Rectangle Name="BodyBackground" RadiusX="10" RadiusY="10" Height="409" VerticalAlignment="Top" Fill="#FF1E2126" Stroke="#FF292C31" Canvas.Left="20" Canvas.Top="113" Grid.ColumnSpan="3" Grid.RowSpan="3" Width="619" MouseLeftButtonDown="BodyBackground_MouseLeftButtonDown"/>
         <Canvas Name="Handle" Height="39" Width="660" MouseLeftButtonDown="Handle_MouseLeftButtonDown" Background="Black" Opacity="0"/>
-        <ScrollViewer Name="ScrollView" Height="103" Canvas.Left="23" Canvas.Top="121" Width="629">
-            <Canvas Name ="ScrollContainer" Height="93">
+        <ScrollViewer Focusable="False" Name="ScrollView" Height="388" Canvas.Left="23" Canvas.Top="121" Width="629">
+            <Canvas Name ="ScrollContainer" Height="373" >
                 <Grid Name="BodyContainer" Height="87" Width="602" Canvas.Left="7" Canvas.Top="6">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="60"/>

diff --git a/KeyRemap/MainPage.xaml.cs b/KeyRemap/MainPage.xaml.cs
@@ -94,21 +94,15 @@ public MainPage()
                 try
                 {
                     var p = Process.GetProcessById((int)procId).MainModule.FileVersionInfo.FileDescription;
-                    if (p == "")
+                    if (p == null && !processNameList.Contains(title))
                     {
                         processNameList.Add(title);
                     }
                     else
                     {
-                        processNameList.Add(p);
-                        try
-                        {
-                            Console.WriteLine(Process.GetProcessById((int)procId).MainModule.FileName);
-                            Console.WriteLine(p);
-                        }
-                        catch
+                        if (!processNameList.Contains(p))
                         {
-                            Console.WriteLine("{0},FAIL", p);
+                            processNameList.Add(p);
                         }
                     }
                     using (System.Drawing.Icon ico = System.Drawing.Icon.ExtractAssociatedIcon(Process.GetProcessById((int)procId).MainModule.FileName))
@@ -230,6 +224,7 @@ private static string GetTitle(IntPtr handle, int length = 128)
 
         public void CloseButton_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
+            MainWindow.mainWindowInstance.ShowInTaskbar = false;
             MainWindow.mainWindowInstance.Hide();
             MainWindow.mainWindowInstance.WindowState = WindowState.Minimized;
         }

diff --git a/KeyRemap/MainWindow.xaml.cs b/KeyRemap/MainWindow.xaml.cs
@@ -1,13 +1,27 @@
-using System.Windows;
+using System;
+using System.Linq;
+using System.Windows;
 namespace KeyRemap
 {
     public partial class MainWindow : Window
     {
         public static MainWindow mainWindowInstance;
+        public string[] args;
         public MainWindow()
         {
             InitializeComponent();
             mainWindowInstance = this;
+            args = Environment.GetCommandLineArgs();
+            if (args.Count() > 1)
+            {
+                if (args[1] == "-startup")
+                {
+                    this.Hide();
+                    this.ShowInTaskbar = false;
+                    WindowStyle = WindowStyle.None;
+                    WindowState = WindowState.Minimized;
+                }
+            }
         }
         private void KeyRemapWindow_Loaded(object sender, RoutedEventArgs e)
         {

diff --git a/KeyRemap/Row.cs b/KeyRemap/Row.cs
@@ -176,13 +176,11 @@ public void Create()
             MainPage.mainPageInstance.BodyContainer.Children.Add(keyLabel);
             MainPage.mainPageInstance.BodyContainer.Children.Add(arrow);
             MainPage.mainPageInstance.BodyContainer.Children.Add(keyLabel2);
-            if(MainPage.mainPageInstance.rows >= 1)
+            if(MainPage.mainPageInstance.rows >= 6)
             {
-                MainPage.mainPageInstance.ScrollView.Height += 60;
                 MainPage.mainPageInstance.ScrollContainer.Height += 60;
-                //MainPage.mainPageInstance.BodyBackground.Height += 60;
-                MainPage.mainPageInstance.BodyContainer.Height += 60;
             }
+            MainPage.mainPageInstance.BodyContainer.Height += 60;
             MainPage.mainPageInstance.rows += 1;
         }
     }

diff --git a/KeyRemap/SettingsPage.xaml b/KeyRemap/SettingsPage.xaml
@@ -84,7 +84,7 @@
             </Style.Triggers>
         </Style>
     </Page.Resources>
-    <Grid Name="SettingsContainer" 
+    <Grid Name="SettingsContainer" Focusable="False" 
           XamlFlair:Animations.PrimaryBinding="{Binding BinderSettingsOpened, UpdateSourceTrigger=PropertyChanged}"
           XamlFlair:Animations.Primary="{XamlFlair:Animate BasedOn={StaticResource FadeIn}, Duration=500, Event=None}">
         <TextBlock FontFamily="{StaticResource SourceCodePro-Bold}" FontStyle="Normal" TextAlignment="Center" TextTrimming="CharacterEllipsis" x:Name="RunLabel" TextWrapping="Wrap" Text="RUN ON START-UP"  FontSize="18" Foreground="White" FontWeight="Bold" Margin="94,99,454,383"/>

diff --git a/KeyRemap/SettingsPage.xaml.cs b/KeyRemap/SettingsPage.xaml.cs
@@ -38,6 +38,7 @@ private void ApplyButton_MouseLeftButtonDown(object sender, MouseButtonEventArgs
                 IWshShortcut shortcut = (IWshShortcut)shell.CreateShortcut(shortcutAddress);
                 shortcut.Description = "Shortcut for MKeyRemap";
                 shortcut.IconLocation = Environment.CurrentDirectory + @"\MKeyRemap.exe, 0";
+                shortcut.Arguments = "-startup";
                 shortcut.TargetPath = Environment.CurrentDirectory + @"\MKeyRemap.exe";
                 shortcut.WorkingDirectory = Environment.CurrentDirectory;
                 shortcut.Save();

diff --git a/KeyRemap/bin/Debug/MKeyRemap.exe b/KeyRemap/bin/Debug/MKeyRemap.exe
diff --git a/KeyRemap/bin/Debug/MKeyRemap.pdb b/KeyRemap/bin/Debug/MKeyRemap.pdb
diff --git a/KeyRemap/bin/Release/MKeyRemap.exe b/KeyRemap/bin/Release/MKeyRemap.exe
diff --git a/KeyRemap/bin/Release/MKeyRemap.pdb b/KeyRemap/bin/Release/MKeyRemap.pdb
diff --git a/KeyRemap/obj/Debug/AddPage.baml b/KeyRemap/obj/Debug/AddPage.baml