From d428cceef3c9e41c7bdc1afac8f8cfb2380b5e02 Mon Sep 17 00:00:00 2001
From: Subin Siby <mail@subinsb.com>
Date: Mon, 15 Nov 2021 02:50:55 +0530
Subject: [PATCH] Miscellaneous small changes (#6)

* Add hindi
* Update govarnam (no significant change)
* Show message on init
* Make ShortcutRecorder dependency as submodule for easier building
* Link to install instructions
---
 .github/README.md              | 4 +++-
 .gitmodules                    | 5 ++++-
 GoVarnam/govarnam              | 2 +-
 GoVarnam/schemes               | 2 +-
 GoVarnam/update_assets.py      | 2 +-
 Input Source/AppDelegate.swift | 3 +++
 Installation/build             | 4 ++--
 ShortcutRecorder               | 1 +
 8 files changed, 16 insertions(+), 7 deletions(-)
 create mode 160000 ShortcutRecorder

diff --git a/.github/README.md b/.github/README.md
index 85a1b34..540e8a9 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -26,10 +26,12 @@ Resources that helped in making IME on macOS (ordered by most important to the l
 
 Download `VarnamIME.pkg` installer from Releases. Double click to open the installer. You might need to explicitly allow installer to run from security settings.
 
+The installation instructions is same as LipikaIME's. See it here: https://github.com/ratreya/lipika-ime/wiki#installation
+
 ## Building
 
 * Make sure XCode is installed
-* Clone
+* Clone and do `git submodule update --init`
 * `cd Installation && ./build`
 * Run the newly built `VarnamIME.pkg` installer
 
diff --git a/.gitmodules b/.gitmodules
index d537bf4..16e72d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
 [submodule "GoVarnam/govarnam"]
 	path = GoVarnam/govarnam
-	url = git@github.com:varnamproject/govarnam.git
+	url = https://github.com/varnamproject/govarnam.git
 [submodule "GoVarnam/schemes"]
 	path = GoVarnam/schemes
 	url = https://github.com/varnamproject/schemes.git
+[submodule "ShortcutRecorder"]
+	path = ShortcutRecorder
+	url = https://github.com/Kentzo/ShortcutRecorder.git
diff --git a/GoVarnam/govarnam b/GoVarnam/govarnam
index c754284..98b9175 160000
--- a/GoVarnam/govarnam
+++ b/GoVarnam/govarnam
@@ -1 +1 @@
-Subproject commit c7542849d1a11a78fab66874bd6496a92aba3076
+Subproject commit 98b91758a38121d451ea4587a3d7acc7401bfc8a
diff --git a/GoVarnam/schemes b/GoVarnam/schemes
index 0fd013a..f41c038 160000
--- a/GoVarnam/schemes
+++ b/GoVarnam/schemes
@@ -1 +1 @@
-Subproject commit 0fd013ada3ee8c27952badbebf0993c8e686bcf7
+Subproject commit f41c038b0cd63b6ec4d78cf1b31046dcfddd7819
diff --git a/GoVarnam/update_assets.py b/GoVarnam/update_assets.py
index 27ca4bc..1a7fafc 100755
--- a/GoVarnam/update_assets.py
+++ b/GoVarnam/update_assets.py
@@ -43,5 +43,5 @@ def copyScheme(schemeID):
         json.dump(packsInfo, f, ensure_ascii=False)
 
 # For now just Malayalam, Kannada for govarnam-macOS
-for schemeID in ["ml", "kn"]:
+for schemeID in ["ml", "kn", "hi"]:
     copyScheme(schemeID)
diff --git a/Input Source/AppDelegate.swift b/Input Source/AppDelegate.swift
index d5f3c9a..8407a1d 100644
--- a/Input Source/AppDelegate.swift	
+++ b/Input Source/AppDelegate.swift	
@@ -47,6 +47,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                 exit(0)
             }
         }
+        print("Initing...")
         
         guard let connectionName = Bundle.main.infoDictionary?["InputMethodConnectionName"] as? String else {
             fatalError("Unable to get Connection Name from Info dictionary!")
@@ -64,6 +65,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Use kIMKSingleRowSteppingCandidatePanel for horizontal
         candidatesWindow = IMKCandidates(server: server, panelType: kIMKSingleColumnScrollingCandidatePanel)
         candidatesWindow.setAttributes([IMKCandidatesSendServerKeyEventFirst: NSNumber(booleanLiteral: true)])
+        
+        print("Inited")
     }
 
     func applicationWillTerminate(_ aNotification: Notification) {
diff --git a/Installation/build b/Installation/build
index c2be6c4..5e2af0a 100755
--- a/Installation/build
+++ b/Installation/build
@@ -84,9 +84,9 @@ build_varnam_ime() {
 }
 
 build_shortcut_recorder() {
-    xcodebuild -project ../../ShortcutRecorder/ShortcutRecorder.xcodeproj -scheme "ShortcutRecorder.framework" -configuration Release clean build || exit 1
+    xcodebuild -project ../ShortcutRecorder/ShortcutRecorder.xcodeproj -scheme "ShortcutRecorder.framework" -configuration Release clean build || exit 1
     rm -rf ../Application/ShortcutRecorder.framework
-    cp -R ../../ShortcutRecorder/build/Release/ShortcutRecorder.framework ../Application/ || exit 1
+    cp -R ../ShortcutRecorder/build/Release/ShortcutRecorder.framework ../Application/ || exit 1
 }
 
 build_varnam_app() {
diff --git a/ShortcutRecorder b/ShortcutRecorder
new file mode 160000
index 0000000..07b0650
--- /dev/null
+++ b/ShortcutRecorder
@@ -0,0 +1 @@
+Subproject commit 07b065085e172d85b7b5a0f3cc05f6ed47ad5af1