Merge branch 'master' into tables

AAClause · May 12, 2024 · e6a99fa · e6a99fa
2 parents 9cbb910 + dbe41ff
commit e6a99fa
Show file tree

Hide file tree

Showing 27 changed files with 13,391 additions and 2,718 deletions.
diff --git a/.github/workflows/build_addon.yml b/.github/workflows/build_addon.yml
@@ -0,0 +1,64 @@
+name: build addon
+
+on:
+  push:
+    tags: ["*"]
+    # To build on main/master branch, uncomment the following line:
+    # branches: [ main , master ]
+
+  pull_request:
+    branches: [ main, master ]
+
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - run: echo -e "pre-commit\nscons\nmarkdown">requirements.txt
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.9
+        cache: 'pip'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip wheel
+        pip install -r requirements.txt
+        sudo apt-get update  -y
+        sudo apt-get install -y gettext
+
+    - name: Code checks
+      run: export SKIP=no-commit-to-branch; pre-commit run --all
+
+    - name: building addon
+      run: scons
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: packaged_addon
+        path: ./*.nvda-addon
+
+  upload_release:
+    runs-on: ubuntu-latest
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    needs: ["build"]
+    steps:
+    - uses: actions/checkout@v3
+    - name: download releases files
+      uses: actions/download-artifact@v3
+    - name: Display structure of downloaded files
+      run: ls -R
+
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: packaged_addon/*.nvda-addon
+        fail_on_unmatched_files: true
+        prerelease: ${{ contains(github.ref, '-') }}
diff --git a/.gitignore b/.gitignore
@@ -2,23 +2,10 @@ addon/doc/*.css
 addon/doc/en/
 *_docHandler.py
 *.html
+manifest.ini
 *.mo
 *.pot
-*.pyc
+*.py[co]
 *.nvda-addon
 .sconsign.dblite
-*.conf
-*.log
-*.old
-*.pyo
-*.tmp
-build/
-logs/
-tests/
-tmp/
-desktop.ini
-/*.rar
-/*.zip
-test*
-*.lnk
-manifest.ini
+/[0-9]*.[0-9]*.[0-9]*.json
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,7 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-ast
+      - id: check-case-conflict
+      - id: check-yaml
diff --git a/addon/globalPlugins/brailleExtender/Profiles/baum/default/profile.ini b/addon/globalPlugins/brailleExtender/Profiles/baum/default/profile.ini
@@ -40,7 +40,7 @@
 	volumeMinus = b10+b1+b2+b6
 	toggleVolume = b10+b2+b5+b7
 	toggleSpeech = b10+b1+b3+b4, d6+d5+d2
-	toggleAttribra = b10+b1+b7+b8
+	toggleTextAttributes = b10+b1+b7+b8
 	toggleSpeechScrollFocusMode = b10+b2+b3+b4+b7
 	toggleLockBrailleKeyboard = b10+b1+b3+b7, b9+b1+b3+b7
 	toggleLockModifiers = b10+b1+b3+b4+b7
@@ -65,6 +65,7 @@
 	undefinedCharsDesc = b1+b3+b6+b7+b10
 	toggleRoutingCursorsEditFields = b10+b1+b5+b7
 	toggleSpeechHistoryMode = b10+b1+b2+b5+b7
+	toggleReportAlignments = b1+b2+b3+b7+b8+b10
 
 [keyboardLayouts]
 	[[l1]]

diff --git a/addon/globalPlugins/brailleExtender/Profiles/brailliantB/default/profile.ini b/addon/globalPlugins/brailleExtender/Profiles/brailliantB/default/profile.ini
@@ -33,7 +33,7 @@
 	volumeMinus = space+dot1+dot2+dot6
 	toggleVolume = space+dot2+dot5+dot7
 	toggleSpeech = space+dot1+dot3+dot4, c6+c5+c2
-	toggleAttribra = space+dot1+dot7+dot8
+	toggleTextAttributes = space+dot1+dot7+dot8
 	toggleSpeechScrollFocusMode = space+dot2+dot3+dot4+dot7
 	toggleLockBrailleKeyboard = space+dot1+dot3+dot7
 	toggleLockModifiers = space+dot1+dot3+dot4+dot7
@@ -57,6 +57,7 @@
 	undefinedCharsDesc = space+dot1+dot3+dot6+dot7
 	toggleRoutingCursorsEditFields = space+dot1+dot5+dot7
 	toggleSpeechHistoryMode = space+dot1+dot2+dot5+dot7
+	toggleReportAlignments = space+dot1+dot2+dot3+dot7+dot8
 
 [rotor]
 	nextEltRotor = right

diff --git a/addon/globalPlugins/brailleExtender/Profiles/eurobraille/default/profile.ini b/addon/globalPlugins/brailleExtender/Profiles/eurobraille/default/profile.ini
@@ -33,7 +33,7 @@
 	volumeMinus = space+dot1+dot2+dot6
 	toggleVolume = space+dot2+dot5+dot7
 	toggleSpeech = space+dot1+dot3+dot4
-	toggleAttribra = space+dot1+dot7+dot8
+	toggleTextAttributes = space+dot1+dot7+dot8
 	toggleSpeechScrollFocusMode = space+dot2+dot3+dot4+dot7
 	toggleLockBrailleKeyboard = space+dot1+dot3+dot7
 	toggleLockModifiers = space+dot1+dot3+dot4+dot7
@@ -57,6 +57,7 @@
 	undefinedCharsDesc = space+dot1+dot3+dot6+dot7
 	toggleRoutingCursorsEditFields = space+dot1+dot5+dot7
 	toggleSpeechHistoryMode = space+dot1+dot2+dot5+dot7
+	toggleReportAlignments = space+dot1+dot2+dot3+dot7+dot8
 
 [rotor]
 	nextEltRotor = joystick2Right

diff --git a/addon/globalPlugins/brailleExtender/Profiles/freedomscientific/default/profile.ini b/addon/globalPlugins/brailleExtender/Profiles/freedomscientific/default/profile.ini
@@ -33,7 +33,7 @@
 	volumeMinus = braillespacebar+dot1+dot2+dot6
 	toggleVolume = braillespacebar+dot2+dot5+dot7
 	toggleSpeech = braillespacebar+dot1+dot3+dot4
-	toggleAttribra = braillespacebar+dot1+dot7+dot8
+	toggleTextAttributes = braillespacebar+dot1+dot7+dot8
 	toggleSpeechScrollFocusMode = braillespacebar+dot2+dot3+dot4+dot7
 	toggleLockBrailleKeyboard = braillespacebar+dot1+dot3+dot7
 	toggleLockModifiers = braillespacebar+dot1+dot3+dot4+dot7
@@ -57,6 +57,7 @@
 	undefinedCharsDesc = braillespacebar+dot1+dot3+dot6+dot7
 	toggleRoutingCursorsEditFields = braillespacebar+dot1+dot5+dot7
 	toggleSpeechHistoryMode = braillespacebar+dot1+dot2+dot5+dot7
+	toggleReportAlignments = braillespacebar+dot1+dot2+dot3+dot7+dot8
 
 [rotor]
 	nextEltRotor = leftwizwheeldown