From 3543f60c7d7b395a372370b5190a9482a236fae1 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Thu, 8 Sep 2016 10:17:21 +0200 Subject: [PATCH 01/12] Update TODO --- TODO | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TODO b/TODO index fc46fdb1..3bc97072 100644 --- a/TODO +++ b/TODO @@ -21,6 +21,12 @@ ToDos in Priority order: - implement commands attributes_curr_char toggle_highlighted_mode + generic list command (convert clipboard management) + next item + pref item + curr item + first item + last item - implement onScreenChange commands read highlighted text mode From 47551d1a912ef8aea03fb0d4f3cd7a310e0886b0 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Thu, 8 Sep 2016 10:18:50 +0200 Subject: [PATCH 02/12] Update TODO --- TODO | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 3bc97072..0306f557 100644 --- a/TODO +++ b/TODO @@ -46,7 +46,8 @@ https://wiki.gnome.org/Attic/LSR/ScratchPad/Braille/BrlAPI - menue for settings configuration #storm - translateable -- implement speechdriver generic (say) +- implement speechdriver generic +- implement sounddriver generic (use current sox and make it configurable) -------------DONE-------------------------------- - move from VCS to VCSA and parese the Attributes http://linux.die.net/man/4/vcsa From 8fc6873e13eb15127e6d6251508cb189c6a6ea05 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Thu, 8 Sep 2016 16:43:21 +0200 Subject: [PATCH 03/12] Update TODO --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 0306f557..253140b4 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,7 @@ ToDos in Priority order: - Known Bugs gstreamer sounddriver doesnt work + next word wrapping sometimes skips a word on beginn of line - try to consume shortcuts grab keyboard exclusive [x] From bc437b82c8a99082c1231b9599040a104a44a860 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Fri, 9 Sep 2016 17:01:16 -0400 Subject: [PATCH 04/12] Added keybind for review to top --- config/keyboard/test.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf index 9c8df0b4..d30152c0 100644 --- a/config/keyboard/test.conf +++ b/config/keyboard/test.conf @@ -1,6 +1,6 @@ 1-KEY_LEFTCTRL=shut_up 1-FENRIR,1-KEY_RIGHTCTRL=shut_up -#=review_top +1-FENRIR,1key-KP_PLUS=review_top 1-FENRIR,1-KEY_KP8=curr_line 1-FENRIR,1-KEY_KP7=prev_line 1-FENRIR,1-KEY_KP9=next_line From dcb81db877897cfe86b5ac9fd01d399432b0479d Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Fri, 9 Sep 2016 17:07:57 -0400 Subject: [PATCH 05/12] Added keybind for review to top --- config/keyboard/test.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf index d30152c0..96357bbf 100644 --- a/config/keyboard/test.conf +++ b/config/keyboard/test.conf @@ -1,6 +1,6 @@ 1-KEY_LEFTCTRL=shut_up 1-FENRIR,1-KEY_RIGHTCTRL=shut_up -1-FENRIR,1key-KP_PLUS=review_top +1-FENRIR,1-key-KP_PLUS=review_top 1-FENRIR,1-KEY_KP8=curr_line 1-FENRIR,1-KEY_KP7=prev_line 1-FENRIR,1-KEY_KP9=next_line From 6e1fba595f760e9f5297422f5d2bd780ad1b1f7e Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Fri, 9 Sep 2016 17:20:18 -0400 Subject: [PATCH 06/12] Added keybind for review to top --- config/keyboard/test.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf index 96357bbf..1a8c7146 100644 --- a/config/keyboard/test.conf +++ b/config/keyboard/test.conf @@ -1,6 +1,6 @@ 1-KEY_LEFTCTRL=shut_up 1-FENRIR,1-KEY_RIGHTCTRL=shut_up -1-FENRIR,1-key-KP_PLUS=review_top +1-FENRIR,1-KEY_KP_PLUS=review_top 1-FENRIR,1-KEY_KP8=curr_line 1-FENRIR,1-KEY_KP7=prev_line 1-FENRIR,1-KEY_KP9=next_line From 828c6f9873b5e041b93ad2ed2179423ec4106bf8 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Fri, 9 Sep 2016 17:30:04 -0400 Subject: [PATCH 07/12] Added keybind for review to top --- config/keyboard/test.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf index 1a8c7146..815585ef 100644 --- a/config/keyboard/test.conf +++ b/config/keyboard/test.conf @@ -1,6 +1,6 @@ 1-KEY_LEFTCTRL=shut_up 1-FENRIR,1-KEY_RIGHTCTRL=shut_up -1-FENRIR,1-KEY_KP_PLUS=review_top +1-FENRIR,1-KEY_KPPLUS=review_top 1-FENRIR,1-KEY_KP8=curr_line 1-FENRIR,1-KEY_KP7=prev_line 1-FENRIR,1-KEY_KP9=next_line From 4bd64bf4fa5a01384aebe7b27cfc2a754b259433 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 11 Sep 2016 16:43:13 -0400 Subject: [PATCH 08/12] Added review currsor to bottom command. in test as FENRIR+KPENTER. --- config/keyboard/test.conf | 1 + .../commands/commands/review_bottom.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/fenrir-package/commands/commands/review_bottom.py diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf index 815585ef..7cd2cd96 100644 --- a/config/keyboard/test.conf +++ b/config/keyboard/test.conf @@ -1,5 +1,6 @@ 1-KEY_LEFTCTRL=shut_up 1-FENRIR,1-KEY_RIGHTCTRL=shut_up +1-FENRIR,1-KEY_KPENTER=review_BOTTOM 1-FENRIR,1-KEY_KPPLUS=review_top 1-FENRIR,1-KEY_KP8=curr_line 1-FENRIR,1-KEY_KP7=prev_line diff --git a/src/fenrir-package/commands/commands/review_bottom.py b/src/fenrir-package/commands/commands/review_bottom.py new file mode 100644 index 00000000..dc2d7560 --- /dev/null +++ b/src/fenrir-package/commands/commands/review_bottom.py @@ -0,0 +1,15 @@ +#!/bin/python +from utils import char_utils + +class command(): + def __init__(self): + pass + def run(self, environment): + environment['screenData']['newCursorReview'] = {'x':environment [screenData][columns],'y':0} + + environment['runtime']['outputManager'].presentText(environment, "Bottom", interrupt=True) + return environment + def setCallback(self, callback): + pass + def shutdown(self): + pass From a752e91b22514113d57efd4da60b1920ebf9f6c9 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 11 Sep 2016 17:27:37 -0400 Subject: [PATCH 09/12] still broken, but closer to move cursor to bottom. --- config/keyboard/test.conf | 2 +- src/fenrir-package/commands/commands/review_bottom.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf index 7cd2cd96..2d22e33b 100644 --- a/config/keyboard/test.conf +++ b/config/keyboard/test.conf @@ -1,6 +1,6 @@ 1-KEY_LEFTCTRL=shut_up 1-FENRIR,1-KEY_RIGHTCTRL=shut_up -1-FENRIR,1-KEY_KPENTER=review_BOTTOM +1-FENRIR,1-KEY_KPENTER=review_bottom 1-FENRIR,1-KEY_KPPLUS=review_top 1-FENRIR,1-KEY_KP8=curr_line 1-FENRIR,1-KEY_KP7=prev_line diff --git a/src/fenrir-package/commands/commands/review_bottom.py b/src/fenrir-package/commands/commands/review_bottom.py index dc2d7560..04b14b55 100644 --- a/src/fenrir-package/commands/commands/review_bottom.py +++ b/src/fenrir-package/commands/commands/review_bottom.py @@ -1,11 +1,10 @@ #!/bin/python -from utils import char_utils class command(): def __init__(self): pass def run(self, environment): - environment['screenData']['newCursorReview'] = {'x':environment [screenData][columns],'y':0} + environment['screenData']['newCursorReview'] = {'x':0,'y':environment[screenData][lines]} environment['runtime']['outputManager'].presentText(environment, "Bottom", interrupt=True) return environment From 9be14fd00ac8ef1d471d2f574b9e9b6d3502da23 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Mon, 12 Sep 2016 16:40:35 +0200 Subject: [PATCH 10/12] Update review_bottom.py --- src/fenrir-package/commands/commands/review_bottom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fenrir-package/commands/commands/review_bottom.py b/src/fenrir-package/commands/commands/review_bottom.py index 04b14b55..b213e5b1 100644 --- a/src/fenrir-package/commands/commands/review_bottom.py +++ b/src/fenrir-package/commands/commands/review_bottom.py @@ -4,8 +4,8 @@ class command(): def __init__(self): pass def run(self, environment): - environment['screenData']['newCursorReview'] = {'x':0,'y':environment[screenData][lines]} - + environment['screenData']['newCursorReview']['x'] = environment['screenData']['lines'] + environment['screenData']['newCursorReview']['y'] = 0 environment['runtime']['outputManager'].presentText(environment, "Bottom", interrupt=True) return environment def setCallback(self, callback): From fb46e6deaa03b503e384aad238c1cdf489878836 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Mon, 12 Sep 2016 16:59:30 +0200 Subject: [PATCH 11/12] Update review_bottom.py --- src/fenrir-package/commands/commands/review_bottom.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fenrir-package/commands/commands/review_bottom.py b/src/fenrir-package/commands/commands/review_bottom.py index b213e5b1..58555633 100644 --- a/src/fenrir-package/commands/commands/review_bottom.py +++ b/src/fenrir-package/commands/commands/review_bottom.py @@ -4,6 +4,7 @@ class command(): def __init__(self): pass def run(self, environment): + environment['screenData']['newCursorReview'] = {} environment['screenData']['newCursorReview']['x'] = environment['screenData']['lines'] environment['screenData']['newCursorReview']['y'] = 0 environment['runtime']['outputManager'].presentText(environment, "Bottom", interrupt=True) From 5703bb9e7cec51e5422013aece6bbeb391b41aea Mon Sep 17 00:00:00 2001 From: chrys Date: Mon, 12 Sep 2016 21:53:33 +0200 Subject: [PATCH 12/12] fix review bottom --- src/fenrir-package/commands/commands/review_bottom.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/fenrir-package/commands/commands/review_bottom.py b/src/fenrir-package/commands/commands/review_bottom.py index 58555633..f03a70ef 100644 --- a/src/fenrir-package/commands/commands/review_bottom.py +++ b/src/fenrir-package/commands/commands/review_bottom.py @@ -4,9 +4,7 @@ class command(): def __init__(self): pass def run(self, environment): - environment['screenData']['newCursorReview'] = {} - environment['screenData']['newCursorReview']['x'] = environment['screenData']['lines'] - environment['screenData']['newCursorReview']['y'] = 0 + environment['screenData']['newCursorReview'] = { 'x': 0, 'y':environment['screenData']['lines']} environment['runtime']['outputManager'].presentText(environment, "Bottom", interrupt=True) return environment def setCallback(self, callback):