diff --git a/android/KMAPro/kMAPro/src/main/assets/info/css/app-info2.css b/android/KMAPro/kMAPro/src/main/assets/info/css/app-info-a.css similarity index 95% rename from android/KMAPro/kMAPro/src/main/assets/info/css/app-info2.css rename to android/KMAPro/kMAPro/src/main/assets/info/css/app-info-a.css index 67049142c5..7f090705a4 100644 --- a/android/KMAPro/kMAPro/src/main/assets/info/css/app-info2.css +++ b/android/KMAPro/kMAPro/src/main/assets/info/css/app-info-a.css @@ -1,3 +1,4 @@ + /* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) @@ -152,7 +153,6 @@ th{ } } - /*********************** Wrapper CSS ***********************/ @@ -193,7 +193,7 @@ h2{ color: #BA2034; } -p img, img{ +p img{ margin-top: 10px !important; display: block !important; margin-left: auto !important; @@ -243,13 +243,11 @@ th{ #section2 img{ min-width: 40px; } -a{ - color: #BA2034; -} - - - - - - +/** + Removes existing max-width property settings from images in tables. + They overly shrink the images on the main Android symbol glossary. + */ +#section2 td img { + max-width: unset; +} \ No newline at end of file diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/confirm-dl-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/confirm-dl-ap.png deleted file mode 100644 index a8af9f862e..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/confirm-dl-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/confirm-dl-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/confirm-dl-at.png deleted file mode 100644 index 78fa10827f..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/confirm-dl-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-downloads-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-downloads-ap.png deleted file mode 100644 index 93a95bf426..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-downloads-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-downloads-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-downloads-at.png deleted file mode 100644 index 19da0c46ce..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-downloads-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dl-success-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dl-success-ap.png deleted file mode 100644 index 7a80f01588..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dl-success-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dl-success-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dl-success-at.png deleted file mode 100644 index d401cc0723..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dl-success-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/lang-list-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/lang-list-ap.png deleted file mode 100644 index bfa8871454..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/lang-list-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/lang-list-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/lang-list-at.png deleted file mode 100644 index 9fae99c375..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/lang-list-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings1-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings1-ap.png deleted file mode 100644 index 27eb33dde9..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings1-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings1-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings1-at.png deleted file mode 100644 index 48d2b4dd64..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings1-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings2-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings2-ap.png deleted file mode 100644 index 43a7aa0e76..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings2-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings2-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings2-at.png deleted file mode 100644 index 7aeeb3d9fd..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings2-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-delete-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-delete-ap.png deleted file mode 100644 index ec7750b165..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-delete-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-delete-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-delete-at.png deleted file mode 100644 index a5bf40d1a6..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-delete-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-list-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-list-ap.png deleted file mode 100644 index 59e5798faa..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-list-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-list-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-list-at.png deleted file mode 100644 index 01a4ecad50..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-list-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-notification-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-notification-ap.png deleted file mode 100644 index 517fd54d26..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-notification-ap.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-notification-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-notification-at.png deleted file mode 100644 index df61618b0a..0000000000 Binary files a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/uninstall-notification-at.png and /dev/null differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/backspace-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/backspace-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/backspace-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/backspace-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/backspace-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/backspace-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/backspace-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/backspace-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/browser-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/browser-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/browser-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/browser-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/close-keyman-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/close-keyman-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/close-keyman-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/close-keyman-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-dl-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-dl-ap.png new file mode 100644 index 0000000000..95100b4131 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-dl-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-dl-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-dl-at.png new file mode 100644 index 0000000000..d3f5caf0e5 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-dl-at.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-khmer-delete-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-khmer-delete-ap.png new file mode 100644 index 0000000000..d572f04a8d Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/confirm-khmer-delete-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/delete-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/delete-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/delete-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/delete-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-file-browser-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-file-browser-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-file-browser-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-file-browser-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-file-browser-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-file-browser-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-file-browser-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-file-browser-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-install1-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-install1-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-install1-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-install1-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-install1-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-install1-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-install1-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-install1-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-storage-permission-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-storage-permission-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-storage-permission-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-storage-permission-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-storage-permission-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-storage-permission-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-storage-permission-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-storage-permission-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-url-screen-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-url-screen-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-url-screen-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-url-screen-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-url-screen-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-url-screen-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-url-screen-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-url-screen-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-welcome-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-welcome-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-welcome-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-welcome-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-welcome-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-welcome-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/dist-welcome-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dist-welcome-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dl-success-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dl-success-ap.png new file mode 100644 index 0000000000..847ba5e4ee Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dl-success-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dl-success-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dl-success-at.png new file mode 100644 index 0000000000..d47af615e8 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/dl-success-at.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/font-size-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/font-size-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/font-size-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/font-size-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/get-started-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/get-started-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/get-started-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/get-started-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/globe-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/globe-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/globe-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/globe-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/globe-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/globe-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/globe-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/globe-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/hide-keyboard-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/hide-keyboard-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/hide-keyboard-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/hide-keyboard-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/hide-keyboard-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/hide-keyboard-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/hide-keyboard-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/hide-keyboard-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/info-a-gray.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/info-a-gray.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/info-a-gray.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/info-a-gray.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/info-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/info-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/info-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/info-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/keyman-storage-permission-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/keyman-storage-permission-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/keyman-storage-permission-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/keyman-storage-permission-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/keyman-storage-permission-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/keyman-storage-permission-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/keyman-storage-permission-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/keyman-storage-permission-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/khmer-settings-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/khmer-settings-ap.png new file mode 100644 index 0000000000..180b4be15d Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/khmer-settings-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/lang-list-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/lang-list-ap.png new file mode 100644 index 0000000000..0063d6f5d4 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/lang-list-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/lang-list-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/lang-list-at.png new file mode 100644 index 0000000000..8c2f64bbcc Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/lang-list-at.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/menu-icon-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/menu-icon-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/menu-icon-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/menu-icon-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/plus-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/plus-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/plus-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/plus-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/return-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/return-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/return-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/return-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/return-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/return-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/return-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/return-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-a.png new file mode 100644 index 0000000000..5754bf2ada Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-a.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-khmer-info-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-khmer-info-ap.png new file mode 100644 index 0000000000..7106bf5ab7 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-khmer-info-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-language-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-language-ap.png new file mode 100644 index 0000000000..e6b2ac4c9d Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-language-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-languages-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-languages-ap.png new file mode 100644 index 0000000000..d68babc40f Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-languages-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-two-installed-languages-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-two-installed-languages-ap.png new file mode 100644 index 0000000000..f658470549 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings-two-installed-languages-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings1-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings1-ap.png new file mode 100644 index 0000000000..ed57492ef9 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings1-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings1-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings1-at.png new file mode 100644 index 0000000000..c0b0f1bdea Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings1-at.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings2-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings2-ap.png new file mode 100644 index 0000000000..2aba1e210c Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings2-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings2-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings2-at.png new file mode 100644 index 0000000000..890ec39796 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings2-at.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings3-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings3-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings3-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings3-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings3-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings3-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings3-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings3-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings4-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings4-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings4-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings4-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings4-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings4-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings4-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings4-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings5-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings5-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings5-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings5-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings5-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings5-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings5-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings5-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings6-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings6-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings6-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings6-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings6-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings6-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings6-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings6-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings7-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings7-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings7-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings7-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings7-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings7-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/settings7-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/settings7-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/share-a.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/share-a.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/share-a.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/share-a.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/shift-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/shift-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/shift-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/shift-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/shift-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/shift-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/shift-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/shift-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/touch-hold-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/touch-hold-ap.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/touch-hold-ap.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/touch-hold-ap.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/touch-hold-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/touch-hold-at.png similarity index 100% rename from android/KMAPro/kMAPro/src/main/assets/info/img/app/11.0/touch-hold-at.png rename to android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/touch-hold-at.png diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/uninstall-notification-ap.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/uninstall-notification-ap.png new file mode 100644 index 0000000000..ef0d25689d Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/uninstall-notification-ap.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/uninstall-notification-at.png b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/uninstall-notification-at.png new file mode 100644 index 0000000000..01c6f063dd Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/assets/info/img/app/12.0/uninstall-notification-at.png differ diff --git a/android/KMAPro/kMAPro/src/main/assets/info/info.html b/android/KMAPro/kMAPro/src/main/assets/info/info.html index 93ae90477d..87c7c88ca8 100644 --- a/android/KMAPro/kMAPro/src/main/assets/info/info.html +++ b/android/KMAPro/kMAPro/src/main/assets/info/info.html @@ -8,7 +8,7 @@ diff --git a/windows/src/developer/TIKE/xml/kmw/test.css b/windows/src/developer/TIKE/xml/kmw/test.css new file mode 100644 index 0000000000..7feae12984 --- /dev/null +++ b/windows/src/developer/TIKE/xml/kmw/test.css @@ -0,0 +1,55 @@ + html, body { + margin: 0; + padding: 0; + } + + h2 { + font-family: sans-serif + } + + .install-link { + background: none repeat scroll 0 0 #CCCCCC; + border: 1px solid #444444; + border-radius: 4px; + box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.25); + display: inline-block; + color: #444444; + font-family: Sans-serif; + font-size: 10pt; + padding: 6px; + margin: 12px 2px 0 2px; + text-decoration: none; + } + + .header { + padding: 4px 8px; + background: #424248; + color: #f0f0ff; + } + + .header div { + display: inline-block; + } + + .header div h2 { + margin: 4px; + } + + .header div.float-right { + display: block; + position: absolute; + right: 0; + top: 0; + } + + .float-right a.install-link { + margin: 8px 8px 0 0 ; + } + + .clear { + clear: both; + } + + #content { + margin: 8px 16px; + } diff --git a/windows/src/developer/TIKE/xml/layoutbuilder/builder.js b/windows/src/developer/TIKE/xml/layoutbuilder/builder.js index 0c3f87333e..0bd14e7ab3 100644 --- a/windows/src/developer/TIKE/xml/layoutbuilder/builder.js +++ b/windows/src/developer/TIKE/xml/layoutbuilder/builder.js @@ -1,6 +1,6 @@ $(function () { window.builder = this; - + (function(search) { var q = search.match(/Filename=(.+)(&|$)/); if(q) { @@ -351,7 +351,7 @@ $(function () { ['',''], // 'K_?3E', // &H3E ['',''], // 'K_?3F', // &H3F ['',''], // 'K_?40', // &H40 - + ['a','A'], // 'K_A', // &H41 ['b','B'], // 'K_B', // &H42 ['c','C'], // 'K_C', // &H43 @@ -555,8 +555,8 @@ $(function () { ['',''], // 'K_?FE', // &HFE ['',''], // 'K_?FF' // &HFF ]; - - + + this.lookupKeyNames = []; for (var i = 0; i < this.standardKeyNames.length; i++) { @@ -595,49 +595,49 @@ $(function () { "NO_SCROLL_LOCK":0x2000, "VIRTUAL_KEY":0x4000*/ }; - + // Lists the combinations that we allow users to use. Some are mutually exclusive, // such as Left+Right modifiers, or chiral and non-chiral modifiers (excl. Shift) this.validModifierCombinations = [ 0, - + this.modifierCodes.LCTRL, this.modifierCodes.RCTRL, - + this.modifierCodes.LALT, this.modifierCodes.LCTRL | this.modifierCodes.LALT, - + this.modifierCodes.RALT, this.modifierCodes.RCTRL | this.modifierCodes.RALT, - + this.modifierCodes.SHIFT, - + this.modifierCodes.LCTRL | this.modifierCodes.SHIFT, this.modifierCodes.LALT | this.modifierCodes.SHIFT, this.modifierCodes.LCTRL | this.modifierCodes.LALT | this.modifierCodes.SHIFT, - + this.modifierCodes.RCTRL | this.modifierCodes.SHIFT, this.modifierCodes.RALT | this.modifierCodes.SHIFT, this.modifierCodes.RCTRL | this.modifierCodes.RALT | this.modifierCodes.SHIFT, - + this.modifierCodes.CTRL, this.modifierCodes.CTRL | this.modifierCodes.SHIFT, - + this.modifierCodes.ALT, this.modifierCodes.CTRL | this.modifierCodes.ALT, this.modifierCodes.SHIFT | this.modifierCodes.ALT, this.modifierCodes.SHIFT | this.modifierCodes.CTRL | this.modifierCodes.ALT ]; - + this.minimalModifierCombinations = [ 0, this.modifierCodes.RALT, this.modifierCodes.SHIFT, this.modifierCodes.RALT | this.modifierCodes.SHIFT ]; - + this.showAllModifierCombinations = false; - + // Add CAPS and NO_CAPS variants for all of the above (function(c, codes) { var i, n = c.length; @@ -646,7 +646,7 @@ $(function () { for(i = 0; i < n; i++) c.push(c[i] | codes.NO_CAPS); })(this.validModifierCombinations, this.modifierCodes); - + this.modifierNames = [ 'leftctrl', // 0x001 'rightctrl', // 0x002 @@ -659,7 +659,7 @@ $(function () { 'caps', // 0x100 'nocaps' // 0x200 ]; - + /** * Get kebab-cased full name of a modifier combination given a bitmask * @@ -688,7 +688,7 @@ $(function () { builder.prepareLayer(); builder.saveState(); }); - + $('#chkShowAllModifierOptions').click(function () { builder.showAllModifierCombinations = $('#chkShowAllModifierOptions')[0].checked; builder.fillModifierSelect(); @@ -731,8 +731,8 @@ $(function () { /** * Replace default key names by special font codes for modifier keys (copied from kmwosk.js) * - * @param {string} oldText - * @return {string} + * @param {string} oldText + * @return {string} **/ this.renameSpecialKey = function (oldText) { @@ -752,12 +752,12 @@ $(function () { this.fillLayerSelect(); this.fillModifierSelect(); }; - + this.fillLayerSelect = function() { $('#selLayer option').remove(); $('#selKeyNextLayer option').remove(); $('#selSubKeyNextLayer option').remove(); - + opt = document.createElement('option'); $(opt).attr('value', '').text('(none)'); $('#selKeyNextLayer').append(opt); @@ -781,15 +781,15 @@ $(function () { $('#selSubKeyNextLayer').append(opt); } }; - + this.fillModifierSelect = function() { var modifiers = this.showAllModifierCombinations ? this.validModifierCombinations : this.minimalModifierCombinations; - + var $selKeyLayerOverride = $('#selKeyLayerOverride'), $selSubKeyLayerOverride = $('#selSubKeyLayerOverride'), $addLayerList = $('#addLayerList'); - + var add = function(e, val, text) { var opt = document.createElement('option'); if(typeof text != 'undefined') { @@ -800,7 +800,7 @@ $(function () { } e.append(opt); }; - + $('#selKeyLayerOverride option').remove(); $('#selSubKeyLayerOverride option').remove(); $('#addLayerList option').remove(); @@ -808,24 +808,24 @@ $(function () { add($selKeyLayerOverride, '', '(current layer)'); add($selSubKeyLayerOverride, '', '(current layer)'); add($addLayerList, '', '(custom)'); - - + + for (var modifier = 0; modifier < modifiers.length; modifier++) { var name = this.getModifierCombinationName(modifiers[modifier]); - + add($selKeyLayerOverride, name); add($selSubKeyLayerOverride, name); add($addLayerList, name); } - + var alreadyAdded = function(modifier) { return builder.minimalModifierCombinations.indexOf(modifier) >= 0; }; - + // check all keys for modifier usage var modifierNames = []; - + for(var i = 0; i < KVKL[builder.lastPlatform].layer.length; i++) { var layer = KVKL[builder.lastPlatform].layer[i]; for(var j = 0; j < layer.row.length; j++) { @@ -844,11 +844,11 @@ $(function () { } } } - + var isUsed = function(modifierName) { return modifierNames.indexOf(modifierName) >= 0; }; - + if(!this.showAllModifierCombinations) { // Add any layer names that are already referenced for(modifier = 0; modifier < this.validModifierCombinations.length; modifier++) { @@ -869,15 +869,15 @@ $(function () { } return 0; }; - + this.isLayerIdShifted = function(id) { return (builder.getModifierCombinationFromLayerId(id) & this.modifierCodes.SHIFT) != 0; }; - + this.prepareLayer = function () { var layer = KVKL[builder.lastPlatform].layer[builder.lastLayerIndex]; - - var isLayerShifted = builder.isLayerIdShifted(layer.id); + + var isLayerShifted = builder.isLayerIdShifted(layer.id); var width = 0; // calculate the widest and rescale for (var i = 0; i < layer.row.length; i++) { @@ -967,7 +967,7 @@ $(function () { $(div).css('clear', 'both'); $('#kbd').append(div); }; - + this.getStandardKeyCap = function (id, shifted) { id = id ? id.toUpperCase() : ''; var i = this.standardKeyNames.findIndex(function(x) { return x.toUpperCase() == id }); @@ -994,7 +994,7 @@ $(function () { } $('#chkDisplayUnderlying')[0].checked = KVKL[builder.lastPlatform].displayUnderlying; - + builder.prepareLayers(); builder.selectLayer(0); } @@ -1050,7 +1050,7 @@ $(function () { if (!saveToRedo) { builder.redoStack = []; } - builder.generate(true); + builder.generate(true,false); var s = { KVKL: JSON.stringify(KVKL), platform: builder.lastPlatform, @@ -1070,7 +1070,7 @@ $(function () { builder.enableUndoControls(); builder.command('modified'); } - + this.commands = []; this.command = function (cmd) { @@ -1127,7 +1127,7 @@ $(function () { return row; }; - + this.addKey = function (position, isSubKey, sp) { var key = document.createElement('div'); var ktext = document.createElement('div'); @@ -1354,12 +1354,12 @@ $(function () { this.selectedKey = function () { return $('#kbd .selected'); } - + this.wrapChange = function(f, opt) { return function() { if(typeof opt == 'object' && opt.saveOnce) { - if (!builder.hasSavedKeyUndo) { - builder.saveUndo(); + if (!builder.hasSavedKeyUndo) { + builder.saveUndo(); builder.hasSavedKeyUndo = true; } else { builder.command('modified'); @@ -1385,7 +1385,7 @@ $(function () { builder.selectedKey().data('width', $(this).val()) .css('width', parseInt($(this).val(), 10) * this.xscale + 'px'); }, {rescale: true})); - + $('#inpKeyName').change(builder.wrapChange(function () { builder.selectedKey().data('id', $(this).val()); builder.updateKeyId(builder.selectedKey()); @@ -1727,14 +1727,14 @@ $(function () { builder.generateSubKeys(); })); - this.generate = function (display) { + this.generate = function (display, force) { var json = JSON.stringify(KVKL, null, ' '); - + if(!display) { // Save changed settings -- only when not saving undo KVKL[builder.lastPlatform].displayUnderlying = $('#chkDisplayUnderlying')[0].checked; } - + var layer = KVKL[builder.lastPlatform].layer[builder.lastLayerIndex]; layer.row = []; @@ -1758,7 +1758,9 @@ $(function () { }); var newJson = JSON.stringify(KVKL, null, ' '); - if(newJson != json) { + if(force || newJson != json) { + // When adding or deleting layers and platforms, we need to force because + // that will not result in changes to the rows. $.ajax('/app/source/file', { 'type': 'POST', 'data': { @@ -1771,7 +1773,7 @@ $(function () { }; this.post = this.generate; - + $('#wedgeAddRowAbove').click(builder.wrapChange(function () { var row = builder.addRow('above'); builder.selectKey(builder.addKey(row, false)); }, {rescale: true})); @@ -1804,16 +1806,16 @@ $(function () { builder.enableKeyControls(); })); - $('#btnGenerate').click(function () { builder.generate(); }); + $('#btnGenerate').click(function () { builder.generate(false,false); }); $('#selPlatform').change(function () { - if (builder.lastPlatform) builder.generate(); + if (builder.lastPlatform) builder.generate(false,false); builder.selectPlatform(); builder.saveState(); }); $('#selLayer').change(function () { - if (builder.lastPlatform) builder.generate(); + if (builder.lastPlatform) builder.generate(false,false); builder.selectLayer(); builder.saveState(); }); @@ -1830,7 +1832,6 @@ $(function () { buttons: { "OK": function () { builder.saveUndo(); - builder.generate(); var platform = $('#selAddPlatform').val(); KVKL[platform] = $.extend(true, {}, KVKL[builder.lastPlatform]); // copy existing platform @@ -1839,6 +1840,8 @@ $(function () { $('#selPlatform').val(platform); builder.selectPlatform(); + builder.generate(false,true); + $(this).dialog('close'); }, "Cancel": function () { @@ -1870,9 +1873,9 @@ $(function () { delete KVKL[platform]; builder.lastPlatform = null; builder.preparePlatforms(); - builder.post(); + builder.generate(false,true); }); - + $('#chkDisplayUnderlying').click(function () { builder.saveUndo(); var platform = $('#selPlatform').val(); @@ -1959,8 +1962,8 @@ $(function () { } } }); - - + + $('#addLayerName').on('input', function() { var layerName = $(this).val(); $('#addLayerList').val(layerName); @@ -1971,7 +1974,7 @@ $(function () { $('#addLayerNote').text(layerName+' is a recognised modifier-aware layer name.'); } }); - + $('#addLayerList').change(function() { var v = $(this).val(); if(v == '(custom)') { @@ -2002,14 +2005,13 @@ $(function () { } } builder.saveUndo(); - builder.generate(); var layer = $.extend(true, {}, KVKL[builder.lastPlatform].layer[builder.lastLayerIndex]); layer.id = id; var n = KVKL[builder.lastPlatform].layer.push(layer) - 1; builder.selectPlatform(); $('#selLayer').val(n); builder.selectLayer(); - builder.post(); + builder.generate(false,true); $(this).dialog('close'); }, "Cancel": function () { @@ -2027,7 +2029,7 @@ $(function () { builder.saveUndo(); KVKL[builder.lastPlatform].layer.splice(builder.lastLayerIndex, 1); builder.selectPlatform(); - builder.post(); + builder.generate(false,true); }); $('#btnEditLayer').click(function () { @@ -2102,23 +2104,23 @@ $(function () { // // Character map drag+drop and double-click insertion // - + builder.charmapDragOver = function(o) { - + // Convert X, Y to document coordinates - + let target = document.elementFromPoint(o.x, o.y); if(target === null || (target.nodeName != 'INPUT' && target.className != 'text')) { return false; } - - return true; + + return true; }; - + builder.charmapDragDrop = function(o) { // Convert X, Y to document coordinates - + if(o.x >= 0 && o.y >= 0) { var target = document.elementFromPoint(o.x, o.y); if(target === null) { @@ -2141,42 +2143,42 @@ $(function () { // Double-click insertion, so use last focused control var target = $(document.lastFocus); } - + // Focus the control and add the text target.focus(); target.val(target.val() + o.text); }; - + builder.loadingState = true; - + builder.saveState = function() { if(builder.loadingState) return; - + var state = { platform: builder.lastPlatform, layer: builder.lastLayerIndex, presentation: $('#selPlatformPresentation').val() }; - + var key = builder.selectedKey(); if(key.length > 0) { state.key = key.data('id'); } - + var subkey = builder.selectedSubKey(); if (subkey.length > 0) { state.subkey = $(subkey).data('id'); } - + $.post('/app/source/toucheditor/state', { 'Filename': builder.filename, 'State': JSON.stringify(state) }); }; - + builder.loadState = function() { - $.get('/app/source/toucheditor/state', + $.get('/app/source/toucheditor/state', { 'Filename': builder.filename }, @@ -2197,7 +2199,7 @@ $(function () { } if(data.key) { builder.selectKey($('#kbd .key').filter(function (index) { return $(this).data('id') === data.key; }).first()); - } + } if(data.subkey) { builder.selectSubKey($('#sk .key').filter(function (index) { return $(this).data('id') === data.subkey; }).first()); } @@ -2205,10 +2207,9 @@ $(function () { } ); }; - + builder.preparePlatforms(); builder.enableUndoControls(); - + builder.loadState(); }); - \ No newline at end of file diff --git a/windows/src/developer/TIKE/xml/layoutbuilder/template-basic.keyman-touch-layout b/windows/src/developer/TIKE/xml/layoutbuilder/template-basic.keyman-touch-layout index 7660d99e28..967ba6e179 100644 --- a/windows/src/developer/TIKE/xml/layoutbuilder/template-basic.keyman-touch-layout +++ b/windows/src/developer/TIKE/xml/layoutbuilder/template-basic.keyman-touch-layout @@ -115,7 +115,7 @@ {"id": "K_B","text":"B"}, {"id": "K_N","text":"N"}, {"id": "K_M","text":"M"}, - {"id": "K_PERIOD","text": ".","sk": [ + {"id": "K_PERIOD","text": ".", "layer": "default", "sk": [ {"text": ",","id": "K_COMMA", "layer": "default"}, {"text": "!","id": "K_1", "layer": "shift"}, {"text": "?","id": "K_SLASH", "layer": "shift"}, @@ -131,7 +131,7 @@ }, { "id": 4, - "key": [ + "key": [ {"id": "K_NUMLOCK","text": "*123*","width":"140","sp": "1","nextlayer": "numeric"}, {"id": "K_LOPT","text": "*Menu*","width": "120","sp": "1"}, {"id": "K_SPACE","text": "","width": "630","sp": "0"}, @@ -244,7 +244,7 @@ {"id": "K_J","text":"j"}, {"id": "K_K","text":"k"}, {"id": "K_L","text":"l"}, - {"text": "","width": "10","sp": "10"} + {"text": "","width": "10","sp": "10"} ] }, { @@ -313,7 +313,7 @@ {"id": "K_J","text":"J"}, {"id": "K_K","text":"K"}, {"id": "K_L","text":"L"}, - {"text": "","width": "10","sp": "10"} + {"text": "","width": "10","sp": "10"} ] }, { @@ -327,7 +327,7 @@ {"id": "K_B","text":"B"}, {"id": "K_N","text":"N"}, {"id": "K_M","text":"M"}, - {"id": "K_PERIOD","text": ".","sk": [ + {"id": "K_PERIOD","text": ".", "layer": "default", "sk": [ {"text": ",","id": "K_COMMA", "layer": "default"}, {"text": "!","id": "K_1", "layer": "shift"}, {"text": "?","id": "K_SLASH", "layer": "shift"}, diff --git a/windows/src/developer/TIKE/xml/project/common.js b/windows/src/developer/TIKE/xml/project/common.js new file mode 100644 index 0000000000..263d3ba322 --- /dev/null +++ b/windows/src/developer/TIKE/xml/project/common.js @@ -0,0 +1,233 @@ +var globalfocus=null, globalfocus_file=null; +var mouseisdown = null; + +function pageload() { + + var kbuttons = document.getElementsByTagName('button'); + for(var b=0; b + - + @@ -21,7 +22,7 @@ - + 1 button_ @@ -50,19 +51,19 @@ - + - + file javascript:hoverfile(''); javascript:unhoverfile(''); javascript:return file_keydown(); javascript:return file_mousedown(); - +
fileplus @@ -98,7 +99,7 @@
- +
filedetails @@ -109,13 +110,13 @@ - - - + @@ -127,14 +128,14 @@ - + - + javascript:ShowMenu('',''); @@ -142,61 +143,61 @@ - + - + - + png kmn Keyman Keyboard Source File - + png kmx Keyman Keyboard File - + png kvks Keyman On Screen Keyboard Source File - + png kvk Keyman On Screen Keyboard File - + - + png kps Keyman Package Source File - + png kmp Keyman Package File - + png model.ts Keyman Lexical Model Source File - + png tsv Keyman Lexical Model Wordlist Source File - + png model.js Keyman Lexical Model File @@ -204,38 +205,38 @@ - + msi Windows Installer File - + ttf TrueType Font File - + ico Icon File - + html HTML File - + - + - + @@ -249,5 +250,5 @@
. - + \ No newline at end of file diff --git a/windows/src/developer/TIKE/xml/project/globalwelcome.xsl b/windows/src/developer/TIKE/xml/project/globalwelcome.xsl new file mode 100644 index 0000000000..ac22124430 --- /dev/null +++ b/windows/src/developer/TIKE/xml/project/globalwelcome.xsl @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + +
+
+
+
+ +
+
+

Get Started!

+ +

Creating a keyboard or predictive text solution with Keyman Developer is easy! To get started, create or open a project.

+ +

Keyman Developer includes two kinds of projects:

+ +
    +
  • Keyboard projects: Create a keyboard layout for any platform
    • +
  • Lexical model projects: Create a predictive text model for mobile devices
    • +
+ +

The New Project wizard will guide you through creating a Basic keyboard or a Wordlist Lexical Model; these are the + recommended project types for new users.

+ +
+ + + New Project... + keyman:newproject + + + + Open Existing Project... + keyman:openproject + +
+
+ +
+
+

Recent Projects

+
+ +
+ +
+ + + true + true + + +
+
+
+
+ + + + + +
+ menu_options_ + + Open + keyman:openproject?id= + + + Open Containing Folder + keyman:opencontainingfolder?id= + + + Remove from list + keyman:removefrommru?id= + +
+ + + + + + + +
Full path:
+ + \ No newline at end of file diff --git a/windows/src/developer/TIKE/xml/project/keymandeveloper.png b/windows/src/developer/TIKE/xml/project/keymandeveloper.png new file mode 100644 index 0000000000..6bcbb8bc14 Binary files /dev/null and b/windows/src/developer/TIKE/xml/project/keymandeveloper.png differ diff --git a/windows/src/developer/TIKE/xml/project/project.css b/windows/src/developer/TIKE/xml/project/project.css index bbfa70bea0..30163b7131 100644 --- a/windows/src/developer/TIKE/xml/project/project.css +++ b/windows/src/developer/TIKE/xml/project/project.css @@ -1,42 +1,42 @@ -#pageheader { font: 16pt Tahoma; padding: 8px 8px 8px 8px; border-bottom: 2px solid #CC3846; margin: 0px 0px 0px 0px; } -#upperexpand {float: right; height: 24px; background-position: 6px 7px; background-repeat: no-repeat; font: bold 8pt Tahoma; padding: 5px 0px 0px 20px;} +#pageheader { font: 16pt "Segoe UI"; padding: 8px 8px 8px 8px; border-bottom: 2px solid #CC3846; margin: 0px 0px 0px 0px; } +#upperexpand {float: right; height: 24px; background-position: 6px 7px; background-repeat: no-repeat; font: bold 8pt "Segoe UI"; padding: 5px 0px 0px 20px;} #state { display: none; } .pagetext a { text-decoration: none; } .pagetext a:hover { text-decoration: underline; } -.page { +.page { display: none; max-height: calc(100% - 153px); /* tabs height + pageheader height */ overflow-y: auto; } -.tabbackground { - position: absolute; - bottom: 0px; - background: linear-gradient(#dedee2, #ffffff); - width: 100%; - padding-bottom: 2px; +.tabbackground { + position: absolute; + bottom: 0px; + background: linear-gradient(#dedee2, #ffffff); + width: 100%; + padding-bottom: 2px; border-top: 2px solid #CC3846; } -.tabbspacer { - float: left; - width: 30px; +.tabbspacer { + float: left; + width: 30px; } -.tabb { - top: -2px; - position: relative; - float: left; - height: 90px; - width: 90px; +.tabb { + top: -2px; + position: relative; + float: left; + height: 90px; + width: 90px; margin-left: 2px; margin-right: 2px; - text-align: center; - font: bold 10pt Tahoma; - border-top: 2px solid #CC3846; - background:none; + text-align: center; + font: bold 10pt "Segoe UI"; + border-top: 2px solid #CC3846; + background:none; color: #888888; } @@ -45,16 +45,16 @@ body.tab-1 .tabb#tabb1, body.tab-2 .tabb#tabb2, body.tab-3 .tabb#tabb3, body.tab-4 .tabb#tabb4 { - border-top: none; - width: 90px; - border-left: 2px solid #CC3846; - border-right: 2px solid #CC3846; - border-bottom: 2px solid #CC3846; + border-top: none; + width: 90px; + border-left: 2px solid #CC3846; + border-right: 2px solid #CC3846; + border-bottom: 2px solid #CC3846; margin-left: 0; margin-right: 0; - padding-top: 2px; - background: #FFFFFF; - color: #000000; + padding-top: 2px; + background: #FFFFFF; + color: #000000; } body.tab-0 .page#page-0, @@ -65,12 +65,14 @@ body.tab-4 .page#page-4 { display: block; } -html.type-lexical-model .tabb#tabb1 { +html.type-lexical-model .tabb#tabb1, +html.type-lexical-model .keyboard-specific { /* Hide keyboards tab for lexical model projects */ display: none; } -html.type-keyboard .tabb#tabb2 { +html.type-keyboard .tabb#tabb2, +html.type-keyboard .lexical-model-specific { /* Hide lexical-models tab for keyboard projects */ display: none; } @@ -96,13 +98,13 @@ table.io { table.io td { text-align: center; padding: 5px; - font: bold 8pt Tahoma; + font: bold 8pt "Segoe UI"; } table.io td.arrow { padding: 5px 20px 5px 20px; } table.io th { - font: bold 8pt Tahoma + font: bold 8pt "Segoe UI" } .pages { overflow-y: auto; padding-top: 12px; width: 100%; height: 100% } @@ -110,24 +112,24 @@ table.io th { .checkbox { background-image: url("chk_checkbox.gif");} .checked { background-image: url("chk_checked.gif"); } -.headerimage { +.headerimage { vertical-align: top; - display: table-cell; - width: 140px; - margin: 5px 20px 0px 10px; + display: table-cell; + width: 140px; + margin: 5px 20px 0px 10px; text-align: center; } .quicklinks { margin-top: 16px; } .quicklinks h3 { text-align: center } -.quicklinks ul { margin-left: 16px; padding-left: 0px; font: 8pt Tahoma; margin-top: 4px; text-align: left } +.quicklinks ul { margin-left: 16px; padding-left: 12px; font: 8pt "Segoe UI"; margin-top: 4px; text-align: left } -.pagetext { +.pagetext { vertical-align: top; - display: table-cell; - padding: 0px 20px 20px 0px; - font: 10pt Tahoma; - text-align: justify; + display: table-cell; + padding: 20px; + font: 10pt "Segoe UI"; + text-align: justify; } .pagetext ul { margin: 0px 10px 10px 16px; } @@ -136,11 +138,11 @@ table.io th { .filelist { padding: 0 10px 10px 10px; clear: all; } -.file { - margin-top: 5px; - min-height: 24px; - border: 2px solid #CEEDFB; - padding: 2px 0px 2px 2px; +.file { + margin-top: 5px; + min-height: 24px; + border: 2px solid #CEEDFB; + padding: 2px 0px 2px 2px; display: block; } @@ -148,32 +150,32 @@ table.io th { .fileexpand_empty { float: left; width: 20px; height: 24px; background-image: url("btn_expand_empty.gif"); background-position: 45% 50%; background-repeat: no-repeat; } .filecontract { background-image: url("btn_contract.gif"); } .fileicon { float: left; margin: 4px 2px 0px 0px; } -.filename { float: left; margin: 2px 0px 2px 2px; font: bold 12pt Tahoma; } -.filedescription { float: left; margin: 5px 0px 0px 10px; font: 10pt Tahoma; } +.filename { float: left; margin: 2px 0px 2px 2px; font: bold 12pt "Segoe UI"; } +.filedescription { float: left; margin: 5px 0px 0px 10px; font: 10pt "Segoe UI"; } -.filedetails { - clear: both; - display: none; - padding-left: 20px; +.filedetails { + clear: both; + display: none; + padding-left: 20px; margin-bottom: 2px; } -.filedetailtext { vertical-align: top; font: 9pt Tahoma; } +.filedetailtext { vertical-align: top; font: 9pt "Segoe UI"; } table.filedetailtext tr th { white-space: nowrap; vertical-align: top; text-align: left; padding-left: 0px; padding-right: 8px; } -.fileoptions { - float: right; +.fileoptions { + float: right; margin-right: 2px; } body { padding: 0px; margin: 0px; height: 100%; cursor: default} html { height: 100%; overflow: hidden } -p { font: 10pt Tahoma; margin: 4px 0 } +p { font: 10pt "Segoe UI"; margin: 4px 0 } p.follow { color: #ad4a28; } p.upgrade { font-weight: bold } -h2 { font: bold 12pt Tahoma; margin: 4px 0 8px 0 } -h3 { font: bold 10pt Tahoma; margin: 4px 0 } +h2 { font: bold 12pt "Segoe UI"; margin: 4px 0 8px 0 } +h3 { font: bold 10pt "Segoe UI"; margin: 4px 0 } /* Popup menu styles */ @@ -193,35 +195,78 @@ h3 { font: bold 10pt Tahoma; margin: 4px 0 } z-index: 99; } -.menu { - position: absolute; - display: block; - background: white; - visibility: hidden; - border: solid 1px #ACA899; - font: 8pt Tahoma; - padding: 0px; - background-image: url("menugrey.gif"); - background-repeat: repeat-y; +.menu { + position: absolute; + display: block; + background: white; + visibility: hidden; + border: solid 1px #ACA899; + font: 8pt "Segoe UI"; + padding: 0px; + background-image: url("menugrey.gif"); + background-repeat: repeat-y; background-position: 0 0; z-index: 100; } -k\:menuitem { - width: calc(100%-2px); - padding: 4px 4px 4px 28px; - margin: 1px; +k\:menuitem { + width: calc(100%-2px); + padding: 4px 4px 4px 28px; + margin: 1px; display: block; box-sizing: border-box; } -k\:menuitem:hover { - color: #000000; - background: #FFE3DB; - border: solid 1px #DB704F; - padding: 3 3 3 27; +k\:menuitem:hover { + color: #000000; + background: #FFE3DB; + border: solid 1px #DB704F; + padding: 3 3 3 27; } -k\:menuitem.down { - background: #DB704F; +k\:menuitem.down { + background: #DB704F; } + +/* Global Welcome elements */ + +#globalwelcome #pageheader { + padding-left: 140px; + background: #6D6C6F; + border: none; + color: #dadddc; +} + +#globalwelcome #pageheader a { + color: #dadddc; +} + +#globalwelcome #pageheader .pagetext { + display: inline-block; + padding: 20px 20px 10px 20px; +} + +#header-version, +#header-link { + text-align: right; +} + +#header-version { + margin-bottom: 0; +} + +#header-sil img { + vertical-align: top; + margin-left: 4px; +} + +#header-sil > div { + margin-top: 16px; + display: inline-block; + padding-left: 16px; + font-size: 16pt; +} + +#header-copyright { + font-size: 8pt; +} \ No newline at end of file diff --git a/windows/src/developer/TIKE/xml/project/project.js b/windows/src/developer/TIKE/xml/project/project.js index 52bc584f24..86c23284a8 100644 --- a/windows/src/developer/TIKE/xml/project/project.js +++ b/windows/src/developer/TIKE/xml/project/project.js @@ -1,8 +1,6 @@ -var globalfocus=null, globalfocus_file=null; -var mouseisdown = null; var tabselected = -1; -var state = null; var showHelp = true; +var state = null; var projectPath = (function(s) { var search = s.match(/path=(.+?)(&|$)/); @@ -16,10 +14,10 @@ function updateBodyClass() { function selecttabb(n) { tabselected = n; updateBodyClass(); - + var title=''; switch (n) { - case 0: title = 'Welcome'; break; + case 0: title = 'Information'; break; case 1: title = 'Keyboards'; break; case 2: title = 'Models'; break; case 3: title = 'Packaging'; break; @@ -38,65 +36,6 @@ function selecttabb(n) { savestate(); } -function pageload() { - for(var i = 0; i 0) selecttabb(Number(nodes[0].textContent)); - + // Show/hide help nodes = state.getElementsByTagName('showhelp'); if((nodes.length > 0) && (nodes[0].textContent == '0')) { @@ -326,7 +139,7 @@ function loadstate() { for (var i=0; i<4; i++ ) { document.getElementById('uppertext'+i).style.display = (n=='checkbox'?'none':'block'); } - } + } // Expand files nodes = state.getElementsByTagName('file'); @@ -340,56 +153,10 @@ function loadstate() { if(elem) elem.style.display = 'block'; } } - + if(tabselected == -1) { selecttabb(0); } - + loadingState = false; } - -var menudiv=null; - -function PageOffset(e) { - var r = e.getBoundingClientRect(); - return {x: r.left, y: r.top}; -} - -function ShowMenu(name,align) { - var menu = document.getElementById('menu_'+name), button = document.getElementById('button_'+name); - menudiv.innerHTML = menu.innerHTML; - var pb = PageOffset(button); - var pm = PageOffset(menu.offsetParent); - - menudiv.style.width='150px'; - menudiv.style.zIndex=100; - menudiv.style.visibility='visible'; - if(align=='right') menudiv.style.left = (pb.x+button.offsetWidth-menudiv.offsetWidth) + 'px'; - else menudiv.style.left = pb.x + 'px'; - menudiv.style.top = (pb.y+button.offsetHeight) + 'px'; - - document.getElementById('menubackground').className = 'show'; -} - -function HideMenu() { - if(event.srcElement != menudiv) { - menudiv.style.visibility='hidden'; - document.getElementById('menubackground').className = ''; - } -} - -function menuitemdown() { - var e = event.srcElement; while(e && e.tagName.toLowerCase() != 'k:menuitem') e=e.parentElement; - if(e) { - location.href=e.attributes['command'].value; - } -} - -function menusetup() { - menudiv = document.createElement('DIV'); - menudiv.className='menu'; - menudiv.addEventListener('mousedown', HideMenu, false); - document.body.appendChild(menudiv); -} - -window.addEventListener('load', menusetup, false); diff --git a/windows/src/developer/TIKE/xml/project/project.xsl b/windows/src/developer/TIKE/xml/project/project.xsl index 4c2452a6c3..bc0a8d2c73 100644 --- a/windows/src/developer/TIKE/xml/project/project.xsl +++ b/windows/src/developer/TIKE/xml/project/project.xsl @@ -21,12 +21,12 @@ - +
@@ -39,10 +39,10 @@
- Welcome - Welcome + Information + Information
- +
Keyboards Keyboards diff --git a/windows/src/developer/TIKE/xml/project/sil.png b/windows/src/developer/TIKE/xml/project/sil.png new file mode 100644 index 0000000000..08a4291d5e Binary files /dev/null and b/windows/src/developer/TIKE/xml/project/sil.png differ diff --git a/windows/src/developer/TIKE/xml/project/welcome.xsl b/windows/src/developer/TIKE/xml/project/welcome.xsl index 5333d0f092..35cc14f814 100644 --- a/windows/src/developer/TIKE/xml/project/welcome.xsl +++ b/windows/src/developer/TIKE/xml/project/welcome.xsl @@ -1,15 +1,15 @@ - +
-

Welcome

+

Information

Quick Links

- +
-

Welcome to Keyman Developer!

- +

Keyman Developer Project

+

Getting Started

- -

Creating a keyboard solution with Keyman Developer is easier than ever before. The tabs at the bottom of this Project window - illustrate the steps to creating a complete solution. Each page has help and a tutorial to assist you in learning the ins-and-outs - of Keyman Developer.

- - - + +

Creating a keyboard or lexical model solution with Keyman Developer is easier than ever before. The tabs at the bottom of + this Project window illustrate the steps to creating a complete solution. Each page has help and a tutorial to assist you in learning + the ins-and-outs of Keyman Developer.

+ + + +

Using the Project

- +

You will find the easiest way to manage the files associated with your solution is to add them to this project. A project is simply a collection of related files that can be edited by Keyman Developer, such as keyboards and packages.

- -

Keyman Developer will remember the last project you had open when you start, and recent projects can be quickly opened through + +

Keyman Developer will remember the last project you had open when you start, and recent projects can be quickly opened through the Project menu. After you first give your project a name by clicking Project menu-Save Project, any additional changes will be automatically saved.

- +

Recently edited files are associated with each project. This page lists all the files you have recently edited while working with this project, sorted by last edit date.

- +

Deselecting the Show Help checkbox at the top right of the Project window will hide this help text once you don't need it any more.

- +
@@ -64,7 +65,7 @@
- +
menu_options_ diff --git a/windows/src/developer/history.md b/windows/src/developer/history.md index 8cd364f0ec..c4e794d682 100644 --- a/windows/src/developer/history.md +++ b/windows/src/developer/history.md @@ -3,6 +3,29 @@ ## 13.0 alpha * Start version 13.0 +## 2019-07-30 12.0.41 beta +* General: Keyman Desktop 11 would crash if installed together with Keyman Developer 12. (#2148) + +## 2019-09-29 12.0.40 beta +* General: Context help was not showing correctly on startup. (#2145) + +## 2019-09-27 12.0.39 beta +* General: Introduces a Welcome screen and improves workflow for starting use of Keyman Developer. (#2134) +* General: Fix version numbers for kmlmc, kmlmp and kmlmi. (#2129) +* General: .js files now open in Keyman Developer for editing. (#2140) + +## 2019-09-25 12.0.37 beta +* Compiler: Add -lexical-model command line option for building lexical model template projects to kmconvert. (#2120) +* Debugger: Remove legacy 'Install keyboard' link in web test and cleanup look somewhat. (#2122) +* Compiler: Support colour log messages and cleanup logging. (#2128) +* Help: Fix some of the issues with Context Help, and address one specific topic - touch layout editor. (#2132) + +## 2019-09-24 12.0.36 beta +* General: File type icons were mismatched (#2112) +* Project: Shift layer in basic touch layout template had incorrect modifier for period (.) on shift layer (#2113) +* Touch layout editor: Adding or deleting a playform or layer and making no other changes would not stick (#2114) +* General: On Windows 7 and 8, in some circumstances dialog boxes could appear behind the main form (#2115) + ## 2019-09-20 12.0.34 beta * Add basic wordlist editor to Keyman Developer (#2086) diff --git a/windows/src/developer/inst/copydev.in b/windows/src/developer/inst/copydev.in index d2fa91619c..2270783b07 100644 --- a/windows/src/developer/inst/copydev.in +++ b/windows/src/developer/inst/copydev.in @@ -1,5 +1,15 @@ !include ..\..\Defines.mak +## +## In this file, $VERSION and $RELEASE will be replaced by mkver. These are not +## Make variables, but mkver variables. +## + +# In dev environments, we'll hack the tier to alpha; CI sets this for us in real builds. +!ifndef TIER +TIER=alpha +!endif + # We use different directories so that heat generates # different identifiers for the various folders KEYMAN_WIX_TEMP_XML=$(TEMP)\keyman_wix_build\xml @@ -19,24 +29,24 @@ test-releaseexists: if exist $(ROOT)\release\$VERSION\keymandeveloper*.msi echo. & echo Release $VERSION already exists. Delete it or update src\version.txt and try again & exit 1 candle: heat-cef heat-xml heat-templates heat-model-compiler - $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE kmdev.wxs + $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE kmdev.wxs $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dXmlSourceDir=$(ROOT)\src\developer\TIKE\xml xml.wxs $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dCefSourceDir=$(KEYMAN_CEF4DELPHI_ROOT) cef.wxs $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dTemplatesSourceDir=$(KEYMAN_DEVELOPER_TEMPLATES_ROOT) templates.wxs $(WIXCANDLE) -dVERSION=$VERSION -dRELEASE=$RELEASE -dModelCompilerSourceDir=$(KEYMAN_MODELCOMPILER_ROOT) kmlmc.wxs - + heat-xml: # We copy the files to a temp folder in order to exclude thumbs.db, .vs, etc from harvesting -rmdir /s/q $(KEYMAN_WIX_TEMP_XML) mkdir $(KEYMAN_WIX_TEMP_XML) xcopy $(ROOT)\src\developer\TIKE\xml\* $(KEYMAN_WIX_TEMP_XML)\ /s -del /f /s /q $(KEYMAN_WIX_TEMP_XML)\Thumbs.db - -rmdir /s/q $(KEYMAN_WIX_TEMP_XML)\app\node_modules + -rmdir /s/q $(KEYMAN_WIX_TEMP_XML)\app\node_modules -for /f %i in ('dir /a:d /s /b $(KEYMAN_WIX_TEMP_XML)\.vs') do rd /s /q %i $(WIXHEAT) dir $(KEYMAN_WIX_TEMP_XML) -o xml.wxs -ag -cg XML -dr INSTALLDIR -var var.XmlSourceDir -wx -nologo # When we candle/light build, we can grab the source files from the proper root so go ahead and delete the temp folder again -rmdir /s/q $(KEYMAN_WIX_TEMP_XML) - + heat-templates: # We copy the files to a temp folder in order to exclude .git and README.md from harvesting -rmdir /s/q $(KEYMAN_WIX_TEMP_TEMPLATES) @@ -60,12 +70,12 @@ heat-model-compiler: cd $(KEYMAN_MODELCOMPILER_ROOT) !ifdef GIT_BASH_FOR_KEYMAN - $(GIT_BASH_FOR_KEYMAN) build.sh + $(GIT_BASH_FOR_KEYMAN) build.sh -version "$VERSION" -tier "$(TIER)" !else - start /wait .\build.sh -!endif + start /wait .\build.sh -version "$VERSION" -tier "$(TIER)" +!endif # While we could use npm-bundle or similar, this gives us more control on the set of - # files we want to distribute with the Keyman Developer installer. For users on other + # files we want to distribute with the Keyman Developer installer. For users on other # operating systems, node.js is a dependency and the compiler can be installed with # `npm install @keymanapp/lexical-model-compiler`. @@ -73,7 +83,7 @@ heat-model-compiler: -rmdir /s/q $(KEYMAN_WIX_TEMP_MODELCOMPILER) mkdir $(KEYMAN_WIX_TEMP_MODELCOMPILER) xcopy $(KEYMAN_MODELCOMPILER_ROOT)\* $(KEYMAN_WIX_TEMP_MODELCOMPILER)\ /s - + # Remove files we don't want to harvest; build a product node_modules folder cd $(KEYMAN_WIX_TEMP_MODELCOMPILER) -rmdir /s/q $(KEYMAN_WIX_TEMP_MODELCOMPILER)\node_modules @@ -82,10 +92,10 @@ heat-model-compiler: # We don't need source for the compiler or the unit tests -rmdir /s/q $(KEYMAN_WIX_TEMP_MODELCOMPILER)\source -rmdir /s/q $(KEYMAN_WIX_TEMP_MODELCOMPILER)\tests - + # We don't need another binary copy of node -rmdir /s/q $(KEYMAN_WIX_TEMP_MODELCOMPILER)\node_modules\node - + # We don't need the build script -del $(KEYMAN_WIX_TEMP_MODELCOMPILER)\build.sh diff --git a/windows/src/developer/inst/kmdev.wxs b/windows/src/developer/inst/kmdev.wxs index 3cd529f1b3..0d04f65f3f 100644 --- a/windows/src/developer/inst/kmdev.wxs +++ b/windows/src/developer/inst/kmdev.wxs @@ -121,8 +121,6 @@ - - @@ -131,50 +129,38 @@ - + - + - - - - - - - - - - - - - + - + - + - - + + - - + + diff --git a/windows/src/developer/kmcomp/Keyman.Developer.System.Project.ProjectLogConsole.pas b/windows/src/developer/kmcomp/Keyman.Developer.System.Project.ProjectLogConsole.pas new file mode 100644 index 0000000000..889594b25e --- /dev/null +++ b/windows/src/developer/kmcomp/Keyman.Developer.System.Project.ProjectLogConsole.pas @@ -0,0 +1,189 @@ +unit Keyman.Developer.System.Project.ProjectLogConsole; + +interface + +uses + Keyman.Developer.System.Project.ProjectLog; + +type + TProjectLogConsole = class + strict private + class var FInstance: TProjectLogConsole; + private + hConsole: THandle; + hOutFile: THandle; + FFullySilent: Boolean; + FSilent: Boolean; + FFilename: string; + FHasWarning: Boolean; + FMessageCount: Integer; + FColor: Boolean; + procedure DetectColorMode; + public + type TColorMode = (cmDefault, cmForceColor, cmForceNoColor); + public + constructor Create(ASilent, AFullySilent: Boolean; AhOutFile: THandle; AColorMode: TColorMode); + procedure Log(AState: TProjectLogState; Filename: string; Msg: string; MsgCode, Line: Integer); overload; + procedure Log(AState: TProjectLogState; Msg: string; MsgCode, Line: Integer); overload; + class property Instance: TProjectLogConsole read FInstance; + property Filename: string read FFilename write FFilename; + property HasWarning: Boolean read FHasWarning; + end; + +function CompilerMessage(line: Integer; msgcode: LongWord; text: PAnsiChar): Integer; stdcall; // I3310 + +implementation + +uses + System.SysUtils, + Winapi.Windows, + + compile; + +const + MAX_MESSAGES = 100; + +{ TProjectLogConsole } + +procedure TProjectLogConsole.Log(AState: TProjectLogState; Filename, + Msg: string; MsgCode, Line: Integer); +var + dw: DWord; + str: string; + astr: RawByteString; +const + nlstr: array[0..2] of ansichar = (#$D, #$A, #$0); // I3310 + +const + ESC=#$1b; + ESC_BRIGHT_YELLOW=ESC+'[38;2;255;255;0m'; + ESC_RED=ESC+'[38;2;255;0;0m'; + ESC_GREEN=ESC+'[38;2;0;255;0m'; + ESC_DEFAULT=ESC+'[0m'; +begin + // TODO: Colour + if (AState = plsInfo) and FSilent then Exit; + + if AState = plsWarning then + FHasWarning := True; + + if (AState in [plsWarning, plsError, plsSuccess, plsFailure]) and FFullySilent then Exit; + + str := ''; + + if AState in [plsWarning, plsError] then + begin + Inc(FMessageCount); + if FMessageCount > MAX_MESSAGES then + Exit; + + if FMessageCount = MAX_MESSAGES then + str := Format('More than %d warnings or errors received; suppressing further messages', [MAX_MESSAGES]); + end; + + if str = '' then + + str := TProjectLog.FormatMessage(AState, Filename, msg, msgcode, line); + + if hOutfile <> 0 then + begin + astr := UTF8Encode(str); + WriteFile(hOutfile, astr, Length(astr), dw, nil); + WriteFile(hOutfile, nlstr, 2, dw, nil); + end + else + begin + if FColor then + begin + case AState of + plsInfo: write(ESC_DEFAULT); + plsWarning: write(ESC_BRIGHT_YELLOW); + plsSuccess: write(ESC_GREEN); + plsFailure, + plsFatal, + plsError: write(ESC_RED); + else write(ESC_DEFAULT); + end; + end; + writeln(str); + if FColor then + write(ESC_DEFAULT); + end; +end; + +procedure TProjectLogConsole.Log(AState: TProjectLogState; Msg: string; MsgCode, Line: Integer); +begin + Log(AState, FFilename, Msg, MsgCode, Line); +end; + +{ TLogger } + +constructor TProjectLogConsole.Create(ASilent, AFullySilent: Boolean; AhOutFile: THandle; AColorMode: TColorMode); +begin + Assert(FInstance = nil); + FInstance := Self; + inherited Create; + FSilent := ASilent; + FFullySilent := AFullySilent; + hOutFile := AhOutFile; + + case AColorMode of + cmDefault: DetectColorMode; + cmForceColor: FColor := True; + cmForceNoColor: FColor := False; + end; +end; + +procedure TProjectLogConsole.DetectColorMode; +var + mode: DWORD; +const + ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4; +begin + mode := 0; + hConsole := GetStdHandle(STD_OUTPUT_HANDLE); + if hConsole = INVALID_HANDLE_VALUE then + begin + writeln(Format('GetStdHandle failed with %d %s', [GetLastError, SysErrorMessage(GetLastError)])); + Exit; + end; + + if GetEnvironmentVariable('MSYSTEM') = 'MINGW64' then + begin + // MinGW64 test + // Use colour mode only with a non-redirected console. This test fails with pipes. + // For pipe use, explicitly use -no-color parameter + FColor := GetFileType(hConsole) = 3; + end + else + begin + // Win32 console color mode test + if not GetConsoleMode(hConsole, mode) then + Exit; + + mode := mode or ENABLE_VIRTUAL_TERMINAL_PROCESSING; + if not SetConsoleMode(hConsole, mode) then + Exit; + + FColor := True; + end; +end; + +function CompilerMessage(line: Integer; msgcode: LongWord; text: PAnsiChar): Integer; stdcall; // I3310 +var + state: TProjectLogState; +const + nlstr: array[0..2] of ansichar = (#$D, #$A, #$0); // I3310 +begin + if (msgcode = CWARN_Info) then state := plsInfo + else if (msgcode and CERR_ERROR) <> 0 then state := plsError + else if (msgcode and CERR_WARNING) <> 0 then begin state := plsWarning; end // I4706 + else if (msgcode and CERR_FATAL) <> 0 then state := plsFatal + else state := plsFatal; + + TProjectLogConsole.Instance.Log(state, string(AnsiString(text)), msgcode, line); + + Result := 1; +end; + +end. diff --git a/windows/src/developer/kmcomp/kccompilekvk.pas b/windows/src/developer/kmcomp/kccompilekvk.pas index 5bf02a3bc9..4e9e52c837 100644 --- a/windows/src/developer/kmcomp/kccompilekvk.pas +++ b/windows/src/developer/kmcomp/kccompilekvk.pas @@ -2,7 +2,7 @@ unit kccompilekvk; interface -function CompileVisualKeyboardFromKMX(FInFile, FOutFile: string; FSilent: Boolean): Boolean; +function CompileVisualKeyboardFromKMX(FInFile, FOutFile: string): Boolean; implementation @@ -10,6 +10,8 @@ uses System.Classes, System.SysUtils, + Keyman.Developer.System.Project.ProjectLog, + Keyman.Developer.System.Project.ProjectLogConsole, KeyboardParser, kmxfile, kmxfileconsts, @@ -36,7 +38,7 @@ const was a small window of time in May/June 2017 where .kvk files could be either XML or binary). *) -function CompileVisualKeyboardFromKMX(FInFile, FOutFile: string; FSilent: Boolean): Boolean; +function CompileVisualKeyboardFromKMX(FInFile, FOutFile: string): Boolean; var FKVKInputFileName, FKVKOutputFileName: string; begin @@ -62,15 +64,14 @@ begin begin // Source and destination files are different SaveToFile(FKVKOutputFileName, kvksfBinary); - if not FSilent then - writeln('Visual keyboard '+FKVKInputFileName+' successfully compiled to '+FKVKOutputFileName); + TProjectLogConsole.Instance.Log(plsSuccess, FKVKInputFileName, 'Visual keyboard '+FKVKInputFileName+' successfully compiled to '+FKVKOutputFileName, 0, 0); end else begin if LoadedFileFormat = kvksfXML then - CompilerMessage(0, CWARN_KVKFileIsInSourceFormat, '.kvk file should be binary but is an XML file') - else if not FSilent then - writeln('Visual keyboard '+FKVKInputFileName+' is valid'); + TProjectLogConsole.Instance.Log(plsWarning, FKVKInputFileName, '.kvk file should be binary but is an XML file', CWARN_KVKFileIsInSourceFormat, 0) + else + TProjectLogConsole.Instance.Log(plsInfo, FKVKInputFileName, 'Visual keyboard '+FKVKInputFileName+' is valid', 0, 0); end; finally Free; @@ -82,12 +83,12 @@ begin except on E:EFCreateError do begin - writeln(E.Message); + TProjectLogConsole.Instance.Log(plsFatal, FKVKInputFileName, E.Message, 0, 0); Exit(False); end; on E:EVisualKeyboardLoader do begin - writeln(E.Message); + TProjectLogConsole.Instance.Log(plsFatal, FKVKInputFileName, E.Message, 0, 0); Exit(False); end; end; diff --git a/windows/src/developer/kmcomp/kccompilepackage.pas b/windows/src/developer/kmcomp/kccompilepackage.pas index 82e0cb5271..3455f9165b 100644 --- a/windows/src/developer/kmcomp/kccompilepackage.pas +++ b/windows/src/developer/kmcomp/kccompilepackage.pas @@ -32,33 +32,27 @@ uses PackageInfo, kpsfile; -function DoKCCompilePackage(FileName: string; AFullySilent, ASilent, AWarnAsError, ACheckFilenameConventions, AInstaller: Boolean; const AInstallerMSI: string; AUpdateInstaller: Boolean): Boolean; // I4706 +function DoKCCompilePackage(FileName: string; AWarnAsError, ACheckFilenameConventions, AInstaller: Boolean; + const AInstallerMSI: string; AUpdateInstaller: Boolean): Boolean; // I4706 implementation uses - Keyman.Developer.System.Project.ProjectLog; + Keyman.Developer.System.Project.ProjectLog, + Keyman.Developer.System.Project.ProjectLogConsole; type TKCCompilePackage = class - FSilent: Boolean; - FFullySilent: Boolean; - FHasWarning: Boolean; pack: TKPSFile; procedure SelfMessage(Sender: TObject; msg: string; State: TProjectLogState); end; procedure TKCCompilePackage.SelfMessage(Sender: TObject; msg: string; State: TProjectLogState); // I4706 begin - case State of - plsInfo: if not FSilent then writeln(ExtractFileName(pack.FileName) + ': ' + msg); - plsWarning: begin FHasWarning := True; if not FFullySilent then writeln(ExtractFileName(pack.FileName) + ': warning: ' + msg); end; - plsError: if not FFullySilent then writeln(ExtractFileName(pack.FileName) + ': error: ' + msg); - plsFatal: if not FFullySilent then writeln(ExtractFileName(pack.FileName) + ': fatal: ' + msg); - end; + TProjectLogConsole.Instance.Log(State, pack.Filename, Msg, 0, 0); end; -function DoKCCompilePackage(FileName: string; AFullySilent, ASilent, AWarnAsError, ACheckFilenameConventions, AInstaller: Boolean; const AInstallerMSI: string; AUpdateInstaller: Boolean): Boolean; // I4706 +function DoKCCompilePackage(FileName: string; AWarnAsError, ACheckFilenameConventions, AInstaller: Boolean; const AInstallerMSI: string; AUpdateInstaller: Boolean): Boolean; // I4706 var tcp: TKCCompilePackage; pack: TKPSFile; @@ -71,7 +65,7 @@ begin GetFullPathName(PChar(FileName), 260, buf, pbuf); FileName := buf; if not FileExists(FileName) then begin - writeln(ExtractFileName(FileName) + ': fatal: Package file does not exist.'); + TProjectLogConsole.Instance.Log(plsFatal, FileName, 'Package file does not exist', 0, 0); Exit; end; pack.FileName := FileName; @@ -79,18 +73,20 @@ begin tcp := TKCCompilePackage.Create; try - tcp.FFullySilent := AFullySilent; - tcp.FSilent := ASilent; tcp.pack := pack; - Result := DoCompilePackage(pack, tcp.SelfMessage, ASilent, ACheckFilenameConventions, ChangeFileExt(pack.FileName, '.kmp')); // I4694 - if AWarnAsError and tcp.FHasWarning then Result := False; + Result := DoCompilePackage(pack, tcp.SelfMessage, False, ACheckFilenameConventions, ChangeFileExt(pack.FileName, '.kmp')); // I4694 + if AWarnAsError and TProjectLogConsole.Instance.HasWarning then Result := False; if AInstaller and Result then begin - Result := DoCompilePackageInstaller(pack, tcp.SelfMessage, ASilent, AInstallerMSI, // I4694 + Result := DoCompilePackageInstaller(pack, tcp.SelfMessage, False, AInstallerMSI, // I4694 ChangeFileExt(pack.FileName, '.exe'), '', AUpdateInstaller, True, '', '', '', False, False); - if AWarnAsError and tcp.FHasWarning then Result := False; + if AWarnAsError and TProjectLogConsole.Instance.HasWarning then Result := False; end; + + if Result + then TProjectLogConsole.Instance.Log(plsSuccess, FileName, 'Package '+FileName+' compiled successfully.', 0, 0) + else TProjectLogConsole.Instance.Log(plsFailure, FileName, 'Package '+FileName+' could not be compiled.', 0, 0); finally tcp.Free; end; diff --git a/windows/src/developer/kmcomp/kccompileproject.pas b/windows/src/developer/kmcomp/kccompileproject.pas index 10c7852414..2c401888b7 100644 --- a/windows/src/developer/kmcomp/kccompileproject.pas +++ b/windows/src/developer/kmcomp/kccompileproject.pas @@ -1,18 +1,18 @@ (* Name: kccompileproject Copyright: Copyright (C) SIL International. - Documentation: - Description: + Documentation: + Description: Create Date: 5 May 2015 Modified Date: 11 May 2015 Authors: mcdurdin - Related Files: - Dependencies: + Related Files: + Dependencies: - Bugs: - Todo: - Notes: + Bugs: + Todo: + Notes: History: 05 May 2015 - mcdurdin - I4699 - V9.0 - Compile .kpj files from kmcomp 11 May 2015 - mcdurdin - I4706 - V9.0 - Update compile logging for silent and warning-as-error cleanness 11 May 2015 - mcdurdin - I4709 - V9.0 - Use static hashing for id for project files to avoid unnecessary changes @@ -21,7 +21,7 @@ unit kccompileproject; // I4699 interface -function DoKCCompileProject(AProjectFilename: string; AFullySilent, ASilent, ADebug, AClean, AWarnAsError, ACheckFilenameConventions: Boolean; ATarget: string): Boolean; // I4706 +function DoKCCompileProject(AProjectFilename: string; ADebug, AClean, AWarnAsError, ACheckFilenameConventions: Boolean; ATarget: string): Boolean; // I4706 implementation @@ -32,6 +32,7 @@ uses Keyman.Developer.System.Project.kpsProjectFileAction, Keyman.Developer.System.Project.modelTsProjectFileAction, Keyman.Developer.System.Project.ProjectLog, + Keyman.Developer.System.Project.ProjectLogConsole, Keyman.Developer.System.Project.ProjectFile; type @@ -40,14 +41,14 @@ type FSilent: Boolean; FFullySilent: Boolean; public - procedure Log(AState: TProjectLogState; Filename: string; Msg: string); override; // I4706 + procedure Log(AState: TProjectLogState; Filename: string; Msg: string; MsgCode, Line: Integer); override; // I4706 function Save: Boolean; override; // I4709 property Silent: Boolean read FSilent write FSilent; property FullySilent: Boolean read FFullySilent write FFullySilent; end; -function DoKCCompileProject(AProjectFilename: string; AFullySilent, ASilent, ADebug, AClean, AWarnAsError, ACheckFilenameConventions: Boolean; ATarget: string): Boolean; // I4706 +function DoKCCompileProject(AProjectFilename: string; ADebug, AClean, AWarnAsError, ACheckFilenameConventions: Boolean; ATarget: string): Boolean; // I4706 var i: Integer; Found: Boolean; @@ -69,8 +70,6 @@ begin with TProjectConsole.Create(ptUnknown, AProjectFilename, False) do try Options.CheckFilenameConventions := Options.CheckFilenameConventions or ACheckFilenameConventions; // never downgrade this option - FullySilent := AFullySilent; - Silent := ASilent; for i := 0 to Files.Count - 1 do if Matches(Files[i], TkmnProjectFileAction) then begin @@ -119,27 +118,15 @@ begin end; if not Found then - writeln(ExtractFileName(AProjectFilename)+': Fatal: Target not found (or project empty)'); + TProjectLogConsole.Instance.Log(plsFatal, AProjectFileName, 'Target not found (or project empty)', 0, 0); Result := Found; end; { TProjectConsole } -procedure TProjectConsole.Log(AState: TProjectLogState; Filename, Msg: string); // I4706 +procedure TProjectConsole.Log(AState: TProjectLogState; Filename, Msg: string; MsgCode, Line: Integer); // I4706 begin - case AState of - plsInfo: - if not FSilent then - writeln(ExtractFileName(Filename)+': '+Msg); - plsWarning: - if not FFullySilent then - writeln(ExtractFileName(Filename)+': Warning: '+Msg); - plsError: - if not FFullySilent then - writeln(ExtractFileName(Filename)+': Error: '+Msg); - plsFatal: - writeln(ExtractFileName(Filename)+': Fatal error: '+Msg); - end; + TProjectLogConsole.Instance.Log(AState, Filename, Msg, MsgCode, Line); end; function TProjectConsole.Save: Boolean; // I4709 diff --git a/windows/src/developer/kmcomp/kmcomp.dpr b/windows/src/developer/kmcomp/kmcomp.dpr index c07f1f2976..f57b382ebe 100644 --- a/windows/src/developer/kmcomp/kmcomp.dpr +++ b/windows/src/developer/kmcomp/kmcomp.dpr @@ -109,7 +109,8 @@ uses Keyman.Developer.System.Project.modelTsProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas', Keyman.Developer.System.Project.modelTsProjectFileAction in '..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFileAction.pas', Keyman.Developer.System.LexicalModelCompile in '..\..\global\delphi\lexicalmodels\Keyman.Developer.System.LexicalModelCompile.pas', - Keyman.System.LexicalModelUtils in '..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas'; + Keyman.System.LexicalModelUtils in '..\..\global\delphi\lexicalmodels\Keyman.System.LexicalModelUtils.pas', + Keyman.Developer.System.Project.ProjectLogConsole in 'Keyman.Developer.System.Project.ProjectLogConsole.pas'; {$R icons.RES} {$R version.res} diff --git a/windows/src/developer/kmcomp/kmcomp.dproj b/windows/src/developer/kmcomp/kmcomp.dproj index 4d3f056377..ea4d53e458 100644 --- a/windows/src/developer/kmcomp/kmcomp.dproj +++ b/windows/src/developer/kmcomp/kmcomp.dproj @@ -212,6 +212,7 @@ + Cfg_2 Base diff --git a/windows/src/developer/kmcomp/main.pas b/windows/src/developer/kmcomp/main.pas index a362ce4fe6..5837a36cc2 100644 --- a/windows/src/developer/kmcomp/main.pas +++ b/windows/src/developer/kmcomp/main.pas @@ -38,7 +38,6 @@ unit main; // I3306 interface procedure Run; -function CompilerMessage(line: Integer; msgcode: LongWord; text: PAnsiChar): Integer; stdcall; // I3310 implementation @@ -48,6 +47,8 @@ uses Winapi.ActiveX, Winapi.Windows, + Keyman.Developer.System.Project.ProjectLog, + Keyman.Developer.System.Project.ProjectLogConsole, OnlineConstants, VersionInfo, compile, @@ -60,53 +61,12 @@ uses ValidateKeyboardInfo, MergeKeyboardInfo; -var - hOutfile: THandle; - HasWarning: Boolean = False; - MessageCount: Integer = 0; - -const - MAX_MESSAGES = 100; - -function CompileKeyboard(FInFile, FOutFile: string; FDebug, FSilent, FWarnAsError: Boolean): Boolean; forward; // I4706 - -function CompilerMessage(line: Integer; msgcode: LongWord; text: PAnsiChar): Integer; stdcall; // I3310 -var - p, str: ansistring; // I3310 - dw: DWord; -const - nlstr: array[0..2] of ansichar = (#$D, #$A, #$0); // I3310 -begin - if (msgcode = CWARN_Info) then p := 'Info' - else if (msgcode and CERR_ERROR) <> 0 then p := 'Error' - else if (msgcode and CERR_WARNING) <> 0 then begin p := 'Warning'; HasWarning := True; end // I4706 - else if (msgcode and CERR_FATAL) <> 0 then p := 'Fatal' - else p := 'Memory'; - - if(msgcode <> CWARN_Info) then - begin - Inc(MessageCount); - if MessageCount > MAX_MESSAGES then - Exit(1); - - if MessageCount = MAX_MESSAGES - then str := System.AnsiStrings.Format('%s %d: 00000000 More than %d warnings or errors received; suppressing further messages', [p, line, MAX_MESSAGES]) - else str := System.AnsiStrings.Format('%s %d: %8.8X %s', [p, line, msgcode, text]); // I3310 - end; - - if hOutfile <> 0 then - begin - WriteFile(hOutfile, str, Length(str), dw, nil); - WriteFile(hOutfile, nlstr, 2, dw, nil); - end - else - writeln(str); - - Result := 1; -end; +function CompileKeyboard(FInFile, FOutFile: string; FDebug, FWarnAsError: Boolean): Boolean; forward; // I4706 +//function CompilerMessage(line: Integer; msgcode: LongWord; text: PAnsiChar): Integer; stdcall; forward; procedure Run; var + hOutfile: THandle; FNologo, FDebug, FSilent, FError: Boolean; s, FParamTarget, FParamInfile, FParamOutfile, FParamDebugfile: string; i: Integer; @@ -127,6 +87,7 @@ var FJsonSchemaPath: string; FParamSourcePath: string; FParamHelpLink: string; + FColorMode: TProjectLogConsole.TColorMode; begin FSilent := False; FFullySilent := False; @@ -144,6 +105,7 @@ begin FMergingValidateIds := False; FParamDistribution := False; FInstallerMSI := ''; + FColorMode := cmDefault; FParamInfile := ''; FParamOutfile := ''; @@ -211,6 +173,10 @@ begin Inc(i); FParamJsonFields := ParamStr(i); end + else if s = '-color' then + FColorMode := cmForceColor + else if s = '-no-color' then + FColorMode := cmForceNoColor else if FParamInfile = '' then FParamInfile := ParamStr(i) else if FParamOutfile = '' then FParamOutfile := ParamStr(i) else if FParamDebugfile = '' then FParamDebugfile := ParamStr(i) @@ -235,7 +201,7 @@ begin writeln(''); writeln('Usage: kmcomp [-s[s]] [-nologo] [-c] [-d] [-w] [-cfc] [-v[s|d]] [-source-path path] [-schema-path path] '); writeln(' [-m] infile [-m infile] [-t target] [outfile.kmx|outfile.js [error.log]]'); // I4699 - writeln(' [-add-help-link path]'); + writeln(' [-add-help-link path] [-color|-no-color]'); writeln(' [-extract-keyboard-info field[,field...]]'); writeln(' infile can be a .kmn file (Keyboard Source, .kps file (Package Source), or .kpj (project)'); // I4699 // I4825 writeln(' if -v specified, can also be a .keyboard_info file'); @@ -243,16 +209,20 @@ begin writeln(' outfile.js write a KeymanWeb file'); writeln(' error.log write to an error log; outfile must be specified'); // I4825 writeln(''); - writeln(' -s silent; don''t print information-level messages'); - writeln(' -ss fully silent; don''t print anything (except fatal errors)'); - writeln(' -nologo don''t print the compiler description'); - writeln(' -c clean target (only for .kpj)'); - writeln(' -d include debug information'); - writeln(' -w treat warnings as errors'); - writeln(' -cfc check filename conventions'); - writeln(' -t build only the target file from the project (only for .kpj)'); // I4699 + writeln(' -s silent; don''t print information-level messages'); + writeln(' -ss fully silent; don''t print anything (except fatal errors)'); + writeln(' -nologo don''t print the compiler description'); + writeln(' -c clean target (only for .kpj)'); + writeln(' -d include debug information'); + writeln(' -w treat warnings as errors'); + writeln(' -cfc check filename conventions'); + writeln(' -t build only the target file from the project (only for .kpj)'); // I4699 writeln(' -add-help-link path to help file on https://help.keyman.com/keyboards'); writeln; + writeln(' -color If specified, forces color log messages on'); + writeln(' -no-color If specified, forces color log messages off. If neither specified,'); + writeln(' uses console mode to determine whether color should be used.'); + writeln; writeln(' JSON .keyboard_info compile targets:'); writeln(' -v[s] validate infile against source schema'); writeln(' -vd validate infile against distribution schema'); @@ -278,18 +248,20 @@ begin else hOutfile := 0; + TProjectLogConsole.Create(FSilent, FFullySilent, hOutfile, FColorMode); + if FMerging then - FError := not TMergeKeyboardInfo.Execute(FParamSourcePath, FParamInfile, FParamInfile2, FParamOutfile, FParamHelpLink, FMergingValidateIds, FSilent, @CompilerMessage) + FError := not TMergeKeyboardInfo.Execute(FParamSourcePath, FParamInfile, FParamInfile2, FParamOutfile, FParamHelpLink, FMergingValidateIds, FSilent, TProjectLogConsole.Instance.Log) else if FValidating then - FError := not TValidateKeyboardInfo.Execute(FParamInfile, FJsonSchemaPath, FParamDistribution, FSilent, @CompilerMessage) + FError := not TValidateKeyboardInfo.Execute(FParamInfile, FJsonSchemaPath, FParamDistribution, FSilent, TProjectLogConsole.Instance.Log) else if FJsonExtract then - FError := not TJsonExtractKeyboardInfo.Execute(FParamInfile, FParamJsonFields, FSilent, @CompilerMessage) + FError := not TJsonExtractKeyboardInfo.Execute(FParamInfile, FParamJsonFields, FSilent, TProjectLogConsole.Instance.Log) else if LowerCase(ExtractFileExt(FParamInfile)) = '.kpj' then // I4699 - Ferror := not DoKCCompileProject(FParamInfile, FFullySilent, FSilent, FDebug, FClean, FWarnAsError, FCheckFilenameConventions, FParamTarget) // I4706 // I4707 + Ferror := not DoKCCompileProject(FParamInfile, FDebug, FClean, FWarnAsError, FCheckFilenameConventions, FParamTarget) // I4706 // I4707 else if LowerCase(ExtractFileExt(FParamInfile)) = '.kps' then - FError := not DoKCCompilePackage(FParamInfile, FFullySilent, FSilent, FWarnAsError, FInstaller, FCheckFilenameConventions, FInstallerMSI, FUpdateInstaller) // I4706 + FError := not DoKCCompilePackage(FParamInfile, FWarnAsError, FInstaller, FCheckFilenameConventions, FInstallerMSI, FUpdateInstaller) // I4706 else - FError := not CompileKeyboard(FParamInfile, FParamOutfile, FDebug, FSilent, FWarnAsError); // I4706 + FError := not CompileKeyboard(FParamInfile, FParamOutfile, FDebug, FWarnAsError); // I4706 if hOutfile <> 0 then CloseHandle(hOutfile); finally @@ -299,8 +271,10 @@ begin if FError then Halt(1); end; -function CompileKeyboard(FInFile, FOutFile: string; FDebug, FSilent, FWarnAsError: Boolean): Boolean; // I4706 +function CompileKeyboard(FInFile, FOutFile: string; FDebug, FWarnAsError: Boolean): Boolean; // I4706 begin + TProjectLogConsole.Instance.Filename := FInFile; + if SameText(ExtractFileExt(FOutFile), '.js') then begin with TCompileKeymanWeb.Create do @@ -314,22 +288,17 @@ begin begin if FOutFile = '' then FOutFile := ChangeFileExt(FInFile, '.kmx'); Result := CompileKeyboardFile(PChar(FInFile), PChar(FOutFile), FDebug, FWarnAsError, True, @CompilerMessage) <> 0; // I4865 // I4866 - Result := Result and CompileVisualKeyboardFromKMX(FInFile, FOutFile, FSilent); + Result := Result and CompileVisualKeyboardFromKMX(FInFile, FOutFile); end; - if HasWarning and FWarnAsError then Result := False; // I4706 + if TProjectLogConsole.Instance.HasWarning and FWarnAsError then Result := False; // I4706 - if Result then - begin - if not FSilent then - writeln('Keyboard '+FInFile+' compiled, output saved as '+FOutFile+'.'); - end - else - begin - if not FSilent then - writeln('Keyboard '+FInFile+' could not be compiled.'); - end; + if Result + then TProjectLogConsole.Instance.Log(plsSuccess, FInFile, 'Keyboard '+FInFile+' compiled, output saved as '+FOutFile+'.', 0, 0) + else TProjectLogConsole.Instance.Log(plsFailure, FInFile, 'Keyboard '+FInFile+' could not be compiled.', 0, 0); end; + + end. diff --git a/windows/src/developer/kmconvert/Keyman.Developer.System.KMConvertParameters.pas b/windows/src/developer/kmconvert/Keyman.Developer.System.KMConvertParameters.pas index 4a7b47f098..046781bb3c 100644 --- a/windows/src/developer/kmconvert/Keyman.Developer.System.KMConvertParameters.pas +++ b/windows/src/developer/kmconvert/Keyman.Developer.System.KMConvertParameters.pas @@ -6,7 +6,7 @@ uses UKeymanTargets; type - TKMConvertMode = (cmImportWindows, cmTemplate); + TKMConvertMode = (cmImportWindows, cmTemplate, cmLexicalModel); TKMConvertParameters = record KLID: string; @@ -20,6 +20,8 @@ type Targets: TKeymanTargets; Mode: TKMConvertMode; NoLogo: Boolean; + + ModelIdAuthor, ModelIdLanguage, ModelIdUniq: string; private function CheckParam(name, value: string): Boolean; public @@ -49,6 +51,8 @@ begin Mode := cmImportWindows else if ModeString = 'template' then Mode := cmTemplate + else if ModeString = 'lexical-model' then + Mode := cmLexicalModel else Exit(False); @@ -80,20 +84,28 @@ begin writeln(' Imports a Windows keyboard into a new Keyman keyboard project'); writeln; writeln('kmconvert template -id [additional-options]'); - writeln(' Creates a blank keyboard project in the repository template format'); + writeln(' Creates a basic keyboard project in the repository template format'); + writeln; + writeln('kmconvert lexical-model -id-author -id-language -id-uniq [additional-options]'); + writeln(' Creates a wordlist lexical model project in the repository template format'); writeln; writeln('Parameters:'); writeln(' -nologo Don''t show the program description and copyright banner'); writeln(' -klid The KLID of the keyboard to import, per LoadKeyboardLayout'); - writeln(' -o The target folder to write the keyboard project into, defaults to "."'); writeln(' -id The id of the keyboard to create'); writeln(' (in `import-windows` mode, can be a format string)'); - writeln(' -name Name of the keyboard, e.g. "My First Keyboard", "%s Basic" '); + writeln(' -o The target folder to write the project into, defaults to "."'); + writeln(' -author Name of author of the keyboard/model, no default'); + writeln(' -name Name of the keyboard/model, e.g. "My First Keyboard", "%s Basic" '); writeln(' (format strings are only valid in `import-windows` mode)'); - writeln(' -copyright Copyright string for the keyboard, defaults to "Copyright (C)"'); - writeln(' -version Version number of the keyboard, defaults to "1.0"'); + writeln(' -copyright Copyright string for the keyboard/model, defaults to "Copyright (C)"'); + writeln(' -version Version number of the keyboard/model, defaults to "1.0"'); writeln(' -languages space-separated list of BCP 47 tags, e.g. "en-US tpi-PG"'); - writeln(' -author Name of author of the keyboard, no default'); + // Model parameters + writeln('Note: model identifiers are constructed from params: ..'); + writeln(' -id-author Identifier for author of model'); + writeln(' -id-language Single BCP 47 tag identifying primary language of model'); + writeln(' -id-uniq Unique name for the model'); end; { TKMConvertParameters } @@ -108,6 +120,11 @@ begin else if name = '-version' then Version := value else if name = '-languages' then BCP47Tags := value else if name = '-author' then Author := value + + else if name = '-id-author' then ModelIdAuthor := value + else if name = '-id-language' then ModelIdLanguage := value + else if name = '-id-uniq' then ModelIdUniq := value + else Exit(False); Result := True; end; diff --git a/windows/src/developer/kmconvert/Keyman.Developer.System.KeymanConvertMain.pas b/windows/src/developer/kmconvert/Keyman.Developer.System.KeymanConvertMain.pas index 4af8266149..62cb15c0fa 100644 --- a/windows/src/developer/kmconvert/Keyman.Developer.System.KeymanConvertMain.pas +++ b/windows/src/developer/kmconvert/Keyman.Developer.System.KeymanConvertMain.pas @@ -13,6 +13,7 @@ uses Keyman.Developer.System.KMConvertParameters, Keyman.Developer.System.ImportWindowsKeyboard, Keyman.Developer.System.KeyboardProjectTemplate, + Keyman.Developer.System.ModelProjectTemplate, KeymanVersion, VersionInfo; @@ -102,6 +103,43 @@ begin end; end; +function DoCreateModelTemplate(FParameters: TKMConvertParameters): Boolean; +var + mpt: TModelProjectTemplate; + FTargetFolder: string; + ModelID: string; +begin + ModelID := FParameters.ModelIdAuthor + '.' + FParameters.ModelIdLanguage + '.' + FParameters.ModelIdUniq; + mpt := TModelProjectTemplate.Create(FParameters.Destination, ModelID); + try + mpt.Name := FParameters.Name; + mpt.Copyright := FParameters.Copyright; + mpt.Version := FParameters.Version; + mpt.BCP47Tags := FParameters.BCP47Tags; + mpt.Author := FParameters.Author; + + FTargetFolder := ExtractFileDir(mpt.ProjectFilename); + if DirectoryExists(FTargetFolder) then + begin + writeln('ERROR: The directory "'+FTargetFolder+'" already exists.'); + Exit(False); + end; + + try + mpt.Generate; + except + on E:EModelProjectTemplate do + begin + writeln(E.Message); + Exit(False); + end; + end; + Result := True; + finally + mpt.Free; + end; +end; + procedure WriteBanner; begin writeln(SKeymanDeveloperName + ' Conversion Utility'); @@ -133,6 +171,8 @@ begin Result := DoImportWindowsKeyboard(FParameters); cmTemplate: Result := DoCreateKeyboardTemplate(FParameters); + cmLexicalModel: + Result := DoCreateModelTemplate(FParameters); end; end; diff --git a/windows/src/developer/kmconvert/kmconvert.dpr b/windows/src/developer/kmconvert/kmconvert.dpr index f67e04070b..7461fa4633 100644 --- a/windows/src/developer/kmconvert/kmconvert.dpr +++ b/windows/src/developer/kmconvert/kmconvert.dpr @@ -79,7 +79,11 @@ uses TouchLayoutUtils in '..\TIKE\oskbuilder\TouchLayoutUtils.pas', KeyboardFonts in '..\..\global\delphi\general\KeyboardFonts.pas', Keyman.System.Util.RenderLanguageIcon in '..\..\global\delphi\ui\Keyman.System.Util.RenderLanguageIcon.pas', - utilicon in '..\..\global\delphi\general\utilicon.pas'; + utilicon in '..\..\global\delphi\general\utilicon.pas', + CompileErrorCodes in '..\..\global\delphi\general\CompileErrorCodes.pas', + Keyman.Developer.System.ModelProjectTemplate in 'Keyman.Developer.System.ModelProjectTemplate.pas', + Keyman.Developer.System.Project.modelTsProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.modelTsProjectFile.pas', + Keyman.Developer.System.Project.wordlistTsvProjectFile in '..\TIKE\project\Keyman.Developer.System.Project.wordlistTsvProjectFile.pas'; {$R icons.RES} {$R version.res} diff --git a/windows/src/developer/kmconvert/kmconvert.dproj b/windows/src/developer/kmconvert/kmconvert.dproj index f5f9bf8f6f..963891d5f7 100644 --- a/windows/src/developer/kmconvert/kmconvert.dproj +++ b/windows/src/developer/kmconvert/kmconvert.dproj @@ -179,6 +179,10 @@ + + + + Cfg_2 Base diff --git a/windows/src/engine/keyman/UfrmKeymanMenu.pas b/windows/src/engine/keyman/UfrmKeymanMenu.pas index 22592e702e..1f2890732b 100644 --- a/windows/src/engine/keyman/UfrmKeymanMenu.pas +++ b/windows/src/engine/keyman/UfrmKeymanMenu.pas @@ -515,9 +515,13 @@ begin end; procedure TfrmKeymanMenu.TntFormCreate(Sender: TObject); +var + FImagePath: string; begin SetWindowLong(Handle, GWL_EXSTYLE, GetWindowLong(Handle, GWL_EXSTYLE) or WS_EX_LAYERED); - imgTitle.Picture.LoadFromFile(TKeymanPaths.KeymanDesktopInstallPath(TKeymanPaths.S_KeymanMenuTitleImage)); + FImagePath := TKeymanPaths.KeymanDesktopInstallPath(TKeymanPaths.S_KeymanMenuTitleImage); + if FileExists(FImagePath) then + imgTitle.Picture.LoadFromFile(TKeymanPaths.KeymanDesktopInstallPath(TKeymanPaths.S_KeymanMenuTitleImage)); imgTitle.AutoSize := True; //SetLayeredWindowAttributes(Handle, 0, 255, LWA_ALPHA); //UpdateLayeredWindow(Handle, 0, nil, nil, 0, diff --git a/windows/src/global/delphi/general/CompileErrorCodes.pas b/windows/src/global/delphi/general/CompileErrorCodes.pas index 3264d4a5cd..4d6c7ee988 100644 --- a/windows/src/global/delphi/general/CompileErrorCodes.pas +++ b/windows/src/global/delphi/general/CompileErrorCodes.pas @@ -59,6 +59,7 @@ const CWARN_DontMixChiralAndNonChiralModifiers = $20A3; + CWARN_TooManyErrorsOrWarnings = $20A7; implementation diff --git a/windows/src/global/delphi/general/RegistryKeys.pas b/windows/src/global/delphi/general/RegistryKeys.pas index 20bc214cce..12ece28044 100644 --- a/windows/src/global/delphi/general/RegistryKeys.pas +++ b/windows/src/global/delphi/general/RegistryKeys.pas @@ -372,9 +372,6 @@ const SRegValue_IDEOptUseOldDebugger = 'use old debugger'; // CU SRegValue_IDEOptEditorTheme = 'editor theme'; // CU - SRegValue_IDEOptShowStartupDialog = 'show startup dialog'; // CU - //SRegValue_IDEOptShowStartupHelperDialog = 'show startup helper dialog'; // CU - SRegValue_IDEOptDebuggerBreakWhenExitingLine = 'debugger break when exiting line'; // CU SRegValue_IDEOptDebuggerSingleStepAfterBreak = 'debugger single step after break'; // CU SRegValue_IDEOptDebuggerShowStoreOffset = 'debugger show store offset'; // CU diff --git a/windows/src/global/delphi/lexicalmodels/Keyman.Developer.System.LexicalModelCompile.pas b/windows/src/global/delphi/lexicalmodels/Keyman.Developer.System.LexicalModelCompile.pas index 392fe3c556..a61f8379b0 100644 --- a/windows/src/global/delphi/lexicalmodels/Keyman.Developer.System.LexicalModelCompile.pas +++ b/windows/src/global/delphi/lexicalmodels/Keyman.Developer.System.LexicalModelCompile.pas @@ -13,6 +13,7 @@ implementation uses System.Classes, System.SysUtils, + compile, utilexecute; function CompileModelFile(ProjectFile: TProjectFile; infile, outfile: string; debug: Boolean): Boolean; @@ -30,7 +31,7 @@ begin if not Result then begin ProjectFile.Project.Log(plsError, infile, - Format('Compiler failed to start with error %d: %s', [GetLastError, SysErrorMessage(GetLastError)])); + Format('Compiler failed to start with error %d: %s', [GetLastError, SysErrorMessage(GetLastError)]), CERR_ERROR, 0); end; Result := Result and (ec = 0); @@ -41,7 +42,7 @@ begin for line in s do begin // TODO: for errors and warnings - ProjectFile.Project.Log(plsInfo, infile, line); + ProjectFile.Project.Log(plsInfo, infile, line, 0, 0); end; finally s.Free; diff --git a/windows/src/global/inc/Comperr.h b/windows/src/global/inc/Comperr.h index 7cae5ad686..52bc24c554 100644 --- a/windows/src/global/inc/Comperr.h +++ b/windows/src/global/inc/Comperr.h @@ -187,6 +187,8 @@ #define CINFO_NonUnicodeFile 0x000020A6 +#define CWARN_TooManyErrorsOrWarnings 0x000020A7 + #define CERR_BufferOverflow 0x000080C0 #define CERR_Break 0x000080C1 diff --git a/windows/src/unit-tests/keyboard-package-versions/Keyman.Test.System.CompilePackageVersioningTest.pas b/windows/src/unit-tests/keyboard-package-versions/Keyman.Test.System.CompilePackageVersioningTest.pas index ede60abae9..77250e33ab 100644 --- a/windows/src/unit-tests/keyboard-package-versions/Keyman.Test.System.CompilePackageVersioningTest.pas +++ b/windows/src/unit-tests/keyboard-package-versions/Keyman.Test.System.CompilePackageVersioningTest.pas @@ -48,7 +48,7 @@ type FSilent: Boolean; FFullySilent: Boolean; public - procedure Log(AState: TProjectLogState; Filename: string; Msg: string); override; // I4706 + procedure Log(AState: TProjectLogState; Filename: string; Msg: string; MsgCode, line: Integer); override; // I4706 function Save: Boolean; override; // I4709 property Silent: Boolean read FSilent write FSilent; @@ -93,7 +93,8 @@ end; procedure TCompilePackageVersioningTest.PackageMessage(Sender: TObject; msg: string; State: TProjectLogState); const - Map: array[TProjectLogState] of TLogLevel = (TLogLevel.Information, TLogLevel.Warning, TLogLevel.Error, TLogLevel.Error); + Map: array[TProjectLogState] of TLogLevel = (TLogLevel.Information, TLogLevel.Warning, TLogLevel.Error, TLogLevel.Error, + TLogLevel.Information, TLogLevel.Error); begin Log(Map[State], msg); end; @@ -114,11 +115,13 @@ begin end; end; -procedure TProjectConsole.Log(AState: TProjectLogState; Filename, Msg: string); // I4706 +procedure TProjectConsole.Log(AState: TProjectLogState; Filename, Msg: string; MsgCode, line: Integer); // I4706 begin {$IFDEF DEBUG_PROJECT} case AState of - plsInfo: + plsInfo, + plsSuccess, + plsFailure: if not FSilent then writeln(ExtractFileName(Filename)+': '+Msg); plsWarning: