shortcuts based on current tab, toggle solution, updated colors

Author: learnbyexample

AwkExercises/README.md

@@ -34,7 +34,7 @@ $ pipx install awkexercises
 $ awkexercises
 ```
 
-As yet another alternative, you can install `textual` (see [Textual documentation](https://textual.textualize.io/getting_started/) for more details), clone this repository and run the `awk_exercises.py` file.
+As yet another alternative, you can install `textual==0.85.2` (see [Textual documentation](https://textual.textualize.io/getting_started/) for more details), clone this repository and run the `awk_exercises.py` file.
 
 Adjust the terminal dimensions for the widgets to appear properly, for example 84x25 (characters x lines). Here's a sample screenshot:
 

AwkExercises/app_guide.md

@@ -44,7 +44,7 @@ You can either click the buttons using mouse or press the key combinations liste
 * **F3** view directory
 * **Ctrl+n** go to the next question
 * **Ctrl+p** go to the previous question
-* **Ctrl+s** show reference solution box
+* **Ctrl+s** toggle reference solution box
 * **Ctrl+t** toggle the theme between **light** and **dark** modes
 * **Ctrl+c** or **Ctrl+q** quit the application
 

AwkExercises/awk_exercises.css

@@ -20,7 +20,6 @@ ContentSwitcher {
 #solution {
     width: 100%;
     padding: 0 1 0 1;
-    border: round black;
 }
 
 .container {

AwkExercises/awk_exercises.png

@@ -3,11 +3,12 @@
 from textual.containers import Horizontal, VerticalScroll, Vertical
 from textual.widgets import Footer, Label, Input, Button
 from textual.widgets import MarkdownViewer, ContentSwitcher, DirectoryTree
-from rich.markdown import Markdown
+from rich.markup import escape as rich_escape
 
 import json
 import subprocess
 import os
+import re
 from pathlib import Path
 
 SCRIPT_DIR = Path(__file__).parent.resolve()
@@ -118,6 +119,7 @@ def process_user_cmd(self):
                     self.i_cmd.styles.background = 'green'
                     self.solved = True
                     self.action_show_solution()
+                    self.show_solution = True
                 else:
                     self.i_cmd.styles.background = 'lightgray'
             self.save_progress()
@@ -131,10 +133,11 @@ def l_cmd_output_style(self, color, title, subtitle):
     def set_quest_ip_op(self):
         self.l_ref_solution_clear()
         self.solved = False
-        self.l_question.update(
-                Markdown(f'(Q:{self.q_idx+1}/{self.q_max_idx+1}) ' +
-                         self.questions[self.q_idx]['question']))
+        self.l_question.update(self.style_inline_code(
+                f'(Q:{self.q_idx+1}/{self.q_max_idx+1}) ' +
+                self.questions[self.q_idx]['question']))
         self.ref_solution = self.questions[self.q_idx]['ref_solution']
+        self.show_solution = False
 
         self.h_ip_op.remove()
         ip_files = self.questions[self.q_idx]['ip_file']
@@ -189,6 +192,7 @@ def write_progress_file(self):
             json.dump(self.user_progress, f, indent=2)
 
     def on_button_pressed(self, event):
+        self.refresh_bindings()
         name = event.button.name
         self.cs_tabs.current = name
         for b in self.b_tabs:
@@ -213,8 +217,22 @@ def l_ref_solution_clear(self):
         self.l_ref_solution.styles.border = ('none', 'green')
 
     def action_show_solution(self):
-        self.l_ref_solution.update('\n'.join(self.ref_solution))
-        self.l_ref_solution.styles.border = ('round', 'green')
+        self.show_solution ^= True
+        if self.show_solution:
+            self.l_ref_solution.update('\n'.join(self.ref_solution))
+            self.l_ref_solution.styles.border = ('round', 'green')
+        else:
+            self.l_ref_solution_clear()
+
+    def style_inline_code(self, s):
+        return re.sub(r'`([^`]+)`', r'[dark_orange3 on grey84]\1[/]',
+                      rich_escape(s))
+
+    def check_action(self, action, parameters):
+        tab = self.cs_tabs.current
+        if action in ('previous', 'next', 'show_solution') and tab != 'exercises':
+            return False
+        return True
 
     def action_previous(self):
         if self.q_idx > 0:

AwkExercises/awk_exercises.py

@@ -10,7 +10,7 @@
         ]
     },
     "2": {
-        "question": "For the input file `addr.txt`, display the first field of lines *not* containing `y`. Consider space as the field separator for this file.",
+        "question": "For the input file `addr.txt`, display the first field of lines NOT containing `y`. Consider space as the field separator for this file.",
         "ip_file": [
             "addr.txt"
         ],
@@ -181,7 +181,7 @@
         ]
     },
     "19": {
-        "question": "Display lines from `sample.txt` that satisfy both of these conditions:\n\n* `to` or `he` matched irrespective of case\n* `World` or `No` matched case sensitively",
+        "question": "Display lines from `sample.txt` that satisfy both of these conditions:\n\n\u2022 `to` or `he` matched irrespective of case\n\u2022 `World` or `No` matched case sensitively",
         "ip_file": [
             "sample.txt"
         ],
@@ -457,7 +457,7 @@
         ]
     },
     "46": {
-        "question": "For the input file `scores.csv`, add another column named **GP** which is calculated out of 100 by giving 50% weightage to Maths and 25% each for Physics and Chemistry.",
+        "question": "For the input file `scores.csv`, add another column named GP which is calculated out of 100 by giving 50% weightage to Maths and 25% each for Physics and Chemistry.",
         "ip_file": [
             "scores.csv"
         ],

AwkExercises/questions.json

@@ -31,7 +31,7 @@ $ pipx install awktutorial
 $ awktutorial
 ```
 
-As yet another alternative, you can install `textual` (see [Textual documentation](https://textual.textualize.io/getting_started/) for more details), clone this repository and run the `awk_tutorial.py` file.
+As yet another alternative, you can install `textual==0.85.2` (see [Textual documentation](https://textual.textualize.io/getting_started/) for more details), clone this repository and run the `awk_tutorial.py` file.
 
 Adjust the terminal dimensions for the widgets to appear properly, for example 84x25 (characters x lines). Here's a sample screenshot:
 

AwkTutorial/README.md

@@ -35,7 +35,7 @@ $ pipx install squaretictactoe
 $ squaretictactoe
 ```
 
-As yet another alternative, you can install `textual` (see [Textual documentation](https://textual.textualize.io/getting_started/) for more details), clone this repository and run the `square_tictactoe.py` file.
+As yet another alternative, you can install `textual==0.85.2` (see [Textual documentation](https://textual.textualize.io/getting_started/) for more details), clone this repository and run the `square_tictactoe.py` file.
 
 Terminal dimension should be at least 84x25 (characters x lines) for the game widgets to appear properly. You should get an initial screen similar to the one shown below: