From f22b0b4db3be0b6b51bca2e39433a754e0aa124f Mon Sep 17 00:00:00 2001
From: SeeLook <945374+SeeLook@users.noreply.github.com>
Date: Mon, 1 Feb 2016 11:50:11 +0100
Subject: [PATCH] Prepared 1.2A.4 to out

---
 CMakeLists.txt               |  2 +-
 TODO                         |  5 +++--
 changes                      | 13 ++++++++++++-
 src/libs/core/nootkaconfig.h |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ead431aa9..29186701f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(Nootka_VERSION_MAJOR  "1")
 SET(Nootka_VERSION_MINOR  "3")
 SET(Nootka_VERSION_PATCH  "0-alpha")
 
-set(Nootka_ANDROID_VERSION "1.2A.3-beta1")
+set(Nootka_ANDROID_VERSION "1.2A.4-beta2")
 
 SET(Nootka_VERSION       "${Nootka_VERSION_MAJOR}.${Nootka_VERSION_MINOR}")
 SET(Nootka_VERSION_FULL  "${Nootka_VERSION}.${Nootka_VERSION_PATCH}")
diff --git a/TODO b/TODO
index 93db78947..7e9651df7 100644
--- a/TODO
+++ b/TODO
@@ -36,13 +36,14 @@ ANDROID:
     - resetting options closes Nootka but does not launch it again
     - played sound is sometimes distorted (when note starts playing)
     - no level/exam icon in file manager, not all file managers support opening Nootka files
-    - correct animation of note does not finish - note head remains bigger (animations takes more time than before)
-    
+
 - when no guitar preview - staff lines are too big
 - keep scroll bar of score always off - it appears when switching single/multi
 - Help QTextBrowser has QScroller but it works only with two-touch move, but TlevelPreview works good
 - HOME button would be switching available menus
 - handle BACK button to destroy visible menu and/or prevent to close exam
+- duration of animation of note correction was decreased to 200ms to work properly under Android,
+  but it would be better to signal when it is finished and perform some routines in main score after that
 ============================================================================
 - TexamExecutor has many, many un-wrapped strings, many ""
 
diff --git a/changes b/changes
index 2f69daeb3..80721d177 100644
--- a/changes
+++ b/changes
@@ -1,8 +1,19 @@
 1.2A.4 beta2
     ANDROID
-     - added quick icon to clear score with single move
+     - improved main menu
     BUGS FIXES
      - fixed crash when re-enabling input/output settings
+     - fixed note scaling during correction animation
+     - other glitches repaired
+
+1.2.4
+     - reduced memory consumption of pitch detection process
+     - Ported 1.2 branch to Mac Os
+    BUGS FIXES
+     - Fixed crash when note name tip was invoked from temporary, auto added note segment
+     - Default color of enharmonic notes/names is set properly and approved when changed
+     - Resizing issues - fingerboard never goes out of a view
+     - other small fixes
 
 1.2A.3 beta1
      - added touch interface, adjusted GUI layout to it
diff --git a/src/libs/core/nootkaconfig.h b/src/libs/core/nootkaconfig.h
index 564647604..5c490fd54 100644
--- a/src/libs/core/nootkaconfig.h
+++ b/src/libs/core/nootkaconfig.h
@@ -1,5 +1,5 @@
 #if defined (Q_OS_ANDROID)
-  #define NOOTKA_VERSION "1.2A.3-beta1"
+  #define NOOTKA_VERSION "1.2A.4-beta2"
 #else
   #define NOOTKA_VERSION "1.3.0-alpha"
 #endif
-- 
GitLab