change default shortkey if no config found

geovens · May 13, 2017 · f8bf916 · f8bf916
1 parent 0075f51
commit f8bf916
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 build
 release
 bin/crash.txt
-bin
 
 *.pdb
 *.exp

diff --git a/bin/Color Assistant.exe b/bin/Color Assistant.exe
diff --git a/bin/Color Assistant.exe.config b/bin/Color Assistant.exe.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+    <supportedRuntime version="v2.0.50727"/></startup>
+</configuration>
diff --git a/bin/config.ini b/bin/config.ini
@@ -0,0 +1,10 @@
+
+----------
+[Settings]
+
+# The hotkey to start picking
+# e.g.
+# HotKey = None
+# HotKey = Control + Alt + Shift + Win + X
+HotKey = Control + Alt + C
+
diff --git a/bin/icon.ico b/bin/icon.ico
diff --git a/src/Root.cs b/src/Root.cs
@@ -173,7 +173,7 @@ public void SetDefaultConfig()
 			Hotkey_Alt = true;
 			Hotkey_Shift = false;
 			Hotkey_Win = false;
-			Hotkey = 'G';
+			Hotkey = 'C';
 
 			WhiteTrayIcon = false;
 		}

diff --git a/src/gInk.csproj b/src/gInk.csproj
@@ -138,61 +138,19 @@
   <ItemGroup>
     <None Include="exit.png" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="garbage.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="undo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="eraser.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="eraseract.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="eraserinact.png" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="check.png" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="cursorblue.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="cursorred.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="cursoryellow.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="cursorgreen.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="highlighter1.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="pencil1.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="highlighter_act.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="pencil_act.png" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="buttonback.png" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\icon.ico" />
     <None Include="pointer_act.png" />
     <None Include="pointer.png" />
-    <None Include="snap.png" />
     <None Include="dock.png" />
     <None Include="dockback.png" />
     <Content Include="icon.ico" />
-    <Content Include="icon_red.ico" />
-    <None Include="icon_white.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     build
     release
     bin/crash.txt
-    bin
     *.pdb
     *.exp
@@ Expand Down @@