From ae859ad36d2197c26694fd4774b550fdee418e51 Mon Sep 17 00:00:00 2001
From: subalterngames <subalterngames@gmail.com>
Date: Thu, 4 Jan 2024 08:50:44 -0500
Subject: [PATCH] Updated default qwerty note input bindings

---
 Cargo.lock      | 14 +++++++-------
 Cargo.toml      |  6 +++---
 changelog.md    |  4 ++++
 data/config.ini | 10 +++++-----
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8731a776..b5884cd7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "audio"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "chrono",
  "common",
@@ -238,7 +238,7 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "cacophony"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "audio",
  "clap",
@@ -396,7 +396,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "clap",
  "directories",
@@ -1008,7 +1008,7 @@ dependencies = [
 
 [[package]]
 name = "input"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "clap",
  "common",
@@ -1034,7 +1034,7 @@ dependencies = [
 
 [[package]]
 name = "io"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "audio",
  "common",
@@ -1880,7 +1880,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "render"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "audio",
  "colorgrad",
@@ -2211,7 +2211,7 @@ dependencies = [
 
 [[package]]
 name = "text"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "common",
  "csv",
diff --git a/Cargo.toml b/Cargo.toml
index 068892bb..079cc7ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["audio", "common", "input", "io", "render", "text"]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Esther Alter <subalterngames@gmail.com>"]
 description = "A minimalist and ergonomic MIDI sequencer"
 documentation = "https://github.com/subalterngames/cacophony"
@@ -86,7 +86,7 @@ speech_dispatcher_0_9 = ["text/speech_dispatcher_0_9"]
 
 [package]
 name = "cacophony"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Esther Alter <subalterngames@gmail.com>"]
 description = "A minimalist and ergonomic MIDI sequencer"
 documentation = "https://github.com/subalterngames/cacophony"
@@ -122,7 +122,7 @@ path = "text"
 name = "Cacophony"
 identifier = "com.subalterngames.cacophony"
 icon = ["icon/32.png", "icon/64.png", "icon/128.png", "icon/256.png"]
-version = "0.2.0"
+version = "0.2.1"
 resources = ["data/*"]
 copyright = "Copyright (c) Subaltern Games LLC 2023. All rights reserved."
 short_description = "A minimalist and ergonomic MIDI sequencer."
diff --git a/changelog.md b/changelog.md
index 48d949a1..2862d7e4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -12,6 +12,10 @@ These are the optimizations:
 
 This update doesn't have any new features or bug fixes. In the future, I'm going to reserve major releases (0.x.0) for big new features, but I had to rewrite so much of Cacophony's code, and the results are such a big improvement, that I'm making this a major release anyway.
 
+## 0.2.1
+
+I replaced the default qwerty bindings for note input with a more "standard" layout. This information is stored in config.ini, so if you want the update, make sure to delete Documents/cacophony/config.ini if it exists (Cacophony will use the default data/config.ini instead).
+
 # 0.1.x
 
 ## 0.1.4
diff --git a/data/config.ini b/data/config.ini
index 81f4660b..89245431 100644
--- a/data/config.ini
+++ b/data/config.ini
@@ -210,16 +210,16 @@ CloseLinksPanel = {"keys": ["Escape"]}
 
 # Qwerty note input.
 C = {"keys": ["A"]}
-CSharp = {"keys": ["Q"]}
+CSharp = {"keys": ["W"]}
 D = {"keys": ["S"]}
-DSharp = {"keys": ["W"]}
+DSharp = {"keys": ["E"]}
 E = {"keys": ["D"]}
 F = {"keys": ["F"]}
-FSharp = {"keys": ["R"]}
+FSharp = {"keys": ["T"]}
 G = {"keys": ["G"]}
-GSharp = {"keys": ["T"]}
+GSharp = {"keys": ["Y"]}
 A = {"keys": ["H"]}
-ASharp = {"keys": ["Y"]}
+ASharp = {"keys": ["U"]}
 B = {"keys": ["J"]}
 OctaveUp = {"keys": ["Z"]}
 OctaveDown = {"keys": ["X"]}