Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #345

Merged
merged 2 commits into from
Dec 10, 2023
Merged

Development #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c1f22d
Change window name from editor to files 1
estebanways Dec 10, 2023
279d9ce
Merge pull request #344 from mydroidandi/fb/estebanways
estebanways Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions assets/docs/User's Guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,19 @@ The window 1, "Commbase", contains 4 panes:

- Pane 4. It is the Commbase terminal or simply a user terminal that can be focused, used, and cleaned from the application.

The window 2, Editor", contains a single pane.
The window 2, "Timer", contains a single pane.

The window 3, "Timer", contains a single pane.
The window 3, "Server 1", contains a single pane.

The window 4, "Server 1", contains a single pane.
The window 3, "Server 1", contains a single pane that is disabled by default in the configuration file.

The window 5, "Files 1", contains a single pane.

The extra windows from 2 to 4 can be disabled or enabled as a group or separately, by changing their settings in the configuration file **config/app.conf**.

To show or hide these windows, you can change the values assigned to the next default configuration variables:

`TMUX_EXTRA_WINDOWS_ON`, `TMUX_EXTRA_WINDOW_EDITOR_ON`, `TMUX_EXTRA_WINDOW_TIMER_ON`, `TMUX_EXTRA_WINDOW_SERVER1_ON`, and `TMUX_EXTRA_WINDOW_SERVER2_ON`.
`TMUX_EXTRA_WINDOWS_ON`, `TMUX_EXTRA_WINDOW_TIMER_ON`, `TMUX_EXTRA_WINDOW_SERVER1_ON`, and `TMUX_EXTRA_WINDOW_SERVER2_ON`, `TMUX_EXTRA_WINDOW_FILES1_ON`.

You will find information about the variables in the section **5 Default Configuration Variables**.

Expand Down Expand Up @@ -711,11 +713,6 @@ The default version of the file **app.conf** contains the next values:
- `True` (Default): Set to True, it activates the extra windows feature in the Commbase tmux session.
- `False`: Set to False, it deactivates the extra windows feature in the Commbase tmux session.

- **TMUX_EXTRA_WINDOW_EDITOR_ON**:
- Possible values:
- `True` (Default): Set to True, it activates the extra window Editor in the Commbase tmux session.
- `False`: Set to False, it deactivates the extra window Editor in the Commbase tmux session.

- **TMUX_EXTRA_WINDOW_TIMER_ON**:
- Possible values:
- `True` (Default): Set to True, it activates the extra window Timer in the Commbase tmux session.
Expand All @@ -731,6 +728,11 @@ The default version of the file **app.conf** contains the next values:
- `False` (Default): Set to False, it deactivates the extra window Server 2 in the Commbase tmux session.
- `True`: Set to True, it activates the extra window Server 2 in the Commbase tmux session.

- **TMUX_EXTRA_WINDOW_FILES1_ON**:
- Possible values:
- `True` (Default): Set to True, it activates the extra window Files 1 in the Commbase tmux session.
- `False`: Set to False, it deactivates the extra window Files 1 in the Commbase tmux session.

- **TERMINAL_RED_BACKGROUND_COLOR_CODE_START**:
- Possible values:
- `1;41m`: This value enables bold or bright text in terminal emulators and set the background color to red.
Expand Down
4 changes: 2 additions & 2 deletions config/app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ VIDEO_CAPTURE_DEVICE_02_INDEX="1"
STT_ENGINE_STRING="$PYTHON_ENV_VERSION $COMMBASE_APP_DIR/bundles/built-in/broker/commbase-stt-vosk-p/commbase_stt_vosk_p.py"
TTS_ENGINE_STRING="$PYTHON_ENV_VERSION $COMMBASE_APP_DIR/bundles/built-in/broker/commbase-tts-pyttsx3/commbase_tts_pyttsx3.py --rate 150 --voice-index 17"
TMUX_EXTRA_WINDOWS_ON="True"
TMUX_EXTRA_WINDOW_EDITOR_ON="True"
TMUX_EXTRA_WINDOW_TIMER_ON="True"
TMUX_EXTRA_WINDOW_SERVER1_ON="True"
TMUX_EXTRA_WINDOW_SERVER2_ON="False"
TMUX_EXTRA_WINDOW_FILES1_ON="True"
TERMINAL_RED_BACKGROUND_COLOR_CODE_START="1;41m"
TERMINAL_GREEN_BACKGROUND_COLOR_CODE_START="1;42m"
TERMINAL_YELLOW_BACKGROUND_COLOR_CODE_START="1;43m"
Expand Down Expand Up @@ -80,4 +80,4 @@ SOUND_PENDING_TASKS_REMINDER="$COMMBASE_APP_DIR/bundles/built-in/broker/libcommb
PENDING_TASKS_VERIFICATION_FREQUENCY_IN_SECS="3600"
EXTERNAL_STORAGE_DRIVE_01_TAG="WD1"
EXTERNAL_STORAGE_DRIVE_02_TAG="WD2"
DEV_PROJECT_DIRECTORY_NAME="YOUR_DEV_PROJECT_DIRECTORY_NAME_HERE"
DEV_PROJECT_DIRECTORY_NAME="YOUR_DEV_PROJECT_DIRECTORY_NAME_HERE"
2 changes: 1 addition & 1 deletion data/.controller_message.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"message": "well we're moving all we got the here"}
{"message": "that are still alive"}
2 changes: 1 addition & 1 deletion data/.previous_result_message.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"message": "well we're moving all we got the here"}
{"message": "that are still alive"}
2 changes: 1 addition & 1 deletion data/.result_message.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"message": "well we're moving all we got the here"}
{"message": "that are still alive"}
4 changes: 2 additions & 2 deletions scripts/utilities/reset_app.conf/app.conf.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ VIDEO_CAPTURE_DEVICE_02_INDEX="1"
STT_ENGINE_STRING="$PYTHON_ENV_VERSION $COMMBASE_APP_DIR/bundles/built-in/broker/commbase-stt-vosk-p/commbase_stt_vosk_p.py"
TTS_ENGINE_STRING="$PYTHON_ENV_VERSION $COMMBASE_APP_DIR/bundles/built-in/broker/commbase-tts-pyttsx3/commbase_tts_pyttsx3.py --rate 150 --voice-index 17"
TMUX_EXTRA_WINDOWS_ON="True"
TMUX_EXTRA_WINDOW_EDITOR_ON="True"
TMUX_EXTRA_WINDOW_TIMER_ON="True"
TMUX_EXTRA_WINDOW_SERVER1_ON="True"
TMUX_EXTRA_WINDOW_SERVER2_ON="False"
TMUX_EXTRA_WINDOW_FILES1_ON="True"
TERMINAL_RED_BACKGROUND_COLOR_CODE_START="1;41m"
TERMINAL_GREEN_BACKGROUND_COLOR_CODE_START="1;42m"
TERMINAL_YELLOW_BACKGROUND_COLOR_CODE_START="1;43m"
Expand Down Expand Up @@ -80,4 +80,4 @@ SOUND_PENDING_TASKS_REMINDER="$COMMBASE_APP_DIR/bundles/built-in/broker/libcommb
PENDING_TASKS_VERIFICATION_FREQUENCY_IN_SECS="3600"
EXTERNAL_STORAGE_DRIVE_01_TAG="WD1"
EXTERNAL_STORAGE_DRIVE_02_TAG="WD2"
DEV_PROJECT_DIRECTORY_NAME="YOUR_DEV_PROJECT_DIRECTORY_NAME_HERE"
DEV_PROJECT_DIRECTORY_NAME="YOUR_DEV_PROJECT_DIRECTORY_NAME_HERE"
34 changes: 17 additions & 17 deletions src/app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,30 +102,30 @@ app() {
# In this section, activate/deactivate or add custom extra windows

if [ "$TMUX_EXTRA_WINDOWS_ON" = "True" ]; then
if [ "$TMUX_EXTRA_WINDOW_EDITOR_ON" = "True" ]; then
# Window 1
# Auto-create a new window 1 for a file manager or text editor
tmux new-window -t Commbase-0:2 -n "Files" && tmux send-keys " conda activate $CONDA_ENV_NAME_IF_EXISTS ; clear" C-m && sleep $time;
#tmux select-window -t 2 && tmux send-keys "vifm" C-m
fi

if [ "$TMUX_EXTRA_WINDOW_TIMER_ON" = "True" ]; then
# Window 2
# Auto-create a new window 2 for a countdown timer of 25 mins and start it
tmux new-window -t Commbase-0:3 -n "Timer" && tmux send-keys " conda activate $CONDA_ENV_NAME_IF_EXISTS ; clear" C-m && sleep $time;
tmux select-window -t 3 && tmux send-keys " bash $COMMBASE_APP_DIR/src/default/broker/skill_scripts/bash/t/timers/skill_script_set_a_timer_of_1_to_129_minutes/skill_script_set_a_timer_of_1_to_129_minutes -m 25" C-m;
# Window 1
# Auto-create a new window 1 for a countdown timer of 25 mins and start it
tmux new-window -t Commbase-0:2 -n "Timer" && tmux send-keys " conda activate $CONDA_ENV_NAME_IF_EXISTS ; clear" C-m && sleep $time;
tmux select-window -t 2 && tmux send-keys " bash $COMMBASE_APP_DIR/src/default/broker/skill_scripts/bash/t/timers/skill_script_set_a_timer_of_1_to_129_minutes/skill_script_set_a_timer_of_1_to_129_minutes -m 25" C-m;
fi

if [ "$TMUX_EXTRA_WINDOW_SERVER1_ON" = "True" ];then
# Window 2
# Auto-create a new window 2 for a ssh connection to a server 1
tmux new-window -t Commbase-0:3 -n "Server 1" && tmux send-keys " conda activate $CONDA_ENV_NAME_IF_EXISTS ; clear" C-m && sleep $time;
fi

if [ "$TMUX_EXTRA_WINDOW_SERVER2_ON" = "True" ];then
# Window 3
# Auto-create a new window 3 for a ssh connection to a server 1
tmux new-window -t Commbase-0:4 -n "Server 1" && tmux send-keys " conda activate $CONDA_ENV_NAME_IF_EXISTS ; clear" C-m && sleep $time;
tmux new-window -t Commbase-0:4 -n "Server 2" && tmux send-keys " conda activate $CONDA_ENV_NAME_IF_EXISTS ; clear" C-m && sleep $time;
fi
if [ "$TMUX_EXTRA_WINDOW_SERVER2_ON" = "True" ];then

if [ "$TMUX_EXTRA_WINDOW_FILES1_ON" = "True" ]; then
# Window 4
# Auto-create a new window for a ssh connection to a server 2
tmux new-window -t Commbase-0:5 -n "Server 2" && tmux send-keys " conda activate $CONDA_ENV_NAME_IF_EXISTS ; clear" C-m && sleep $time;
# Auto-create a new window 4 for a directory/file manager or text editor
tmux new-window -t Commbase-0:5 -n "Files 1" && tmux send-keys " conda activate $CONDA_ENV_NAME_IF_EXISTS ; clear" C-m && sleep $time;
#tmux select-window -t 2 && tmux send-keys "vifm" C-m
fi
fi

Expand Down
Loading