From 3742a7fb4031b58bd6813dbf5c0d5cb9ed7069b0 Mon Sep 17 00:00:00 2001 From: gilgongo Date: Sat, 22 Jan 2022 11:05:08 +0000 Subject: [PATCH 1/2] Add as per #682 --- assets/img/de-screenshots/server-active.inc | 1 + assets/img/de-screenshots/server-inactive.inc | 1 + assets/img/en-screenshots/server-active.inc | 1 + assets/img/en-screenshots/server-inactive.inc | 1 + assets/img/en-screenshots/server-window-options.inc | 2 +- assets/img/en-screenshots/server-window-setup.inc | 2 +- assets/img/en-screenshots/settings-profile.inc | 2 +- assets/img/es-screenshots/server-active.inc | 1 + assets/img/es-screenshots/server-inactive.inc | 1 + assets/img/fr-screenshots/server-active.inc | 1 + assets/img/fr-screenshots/server-inactive.inc | 1 + assets/img/nl-screenshots/server-active.inc | 1 + assets/img/nl-screenshots/server-inactive.inc | 1 + assets/img/pt-screenshots/server-active.inc | 1 + assets/img/pt-screenshots/server-inactive.inc | 1 + wiki/en/Running-a-Server.md | 8 ++++++++ wiki/en/Software-Manual.md | 4 ++++ 17 files changed, 27 insertions(+), 3 deletions(-) create mode 120000 assets/img/de-screenshots/server-active.inc create mode 120000 assets/img/de-screenshots/server-inactive.inc create mode 100644 assets/img/en-screenshots/server-active.inc create mode 100644 assets/img/en-screenshots/server-inactive.inc create mode 120000 assets/img/es-screenshots/server-active.inc create mode 120000 assets/img/es-screenshots/server-inactive.inc create mode 120000 assets/img/fr-screenshots/server-active.inc create mode 120000 assets/img/fr-screenshots/server-inactive.inc create mode 120000 assets/img/nl-screenshots/server-active.inc create mode 120000 assets/img/nl-screenshots/server-inactive.inc create mode 120000 assets/img/pt-screenshots/server-active.inc create mode 120000 assets/img/pt-screenshots/server-inactive.inc diff --git a/assets/img/de-screenshots/server-active.inc b/assets/img/de-screenshots/server-active.inc new file mode 120000 index 000000000..040c5522e --- /dev/null +++ b/assets/img/de-screenshots/server-active.inc @@ -0,0 +1 @@ +../en-screenshots/server-active.inc \ No newline at end of file diff --git a/assets/img/de-screenshots/server-inactive.inc b/assets/img/de-screenshots/server-inactive.inc new file mode 120000 index 000000000..a721dddfe --- /dev/null +++ b/assets/img/de-screenshots/server-inactive.inc @@ -0,0 +1 @@ +../en-screenshots/server-inactive.inc \ No newline at end of file diff --git a/assets/img/en-screenshots/server-active.inc b/assets/img/en-screenshots/server-active.inc new file mode 100644 index 000000000..fd0ae7ae8 --- /dev/null +++ b/assets/img/en-screenshots/server-active.inc @@ -0,0 +1 @@ +https://raw.githubusercontent.com/jamulussoftware/jamulus/master/src/res/servertrayiconactive.png diff --git a/assets/img/en-screenshots/server-inactive.inc b/assets/img/en-screenshots/server-inactive.inc new file mode 100644 index 000000000..167f467d0 --- /dev/null +++ b/assets/img/en-screenshots/server-inactive.inc @@ -0,0 +1 @@ +https://raw.githubusercontent.com/jamulussoftware/jamulus/master/src/res/servertrayiconinactive.png diff --git a/assets/img/en-screenshots/server-window-options.inc b/assets/img/en-screenshots/server-window-options.inc index 5448f0792..4c9e3f087 100644 --- a/assets/img/en-screenshots/server-window-options.inc +++ b/assets/img/en-screenshots/server-window-options.inc @@ -1 +1 @@ -https://user-images.githubusercontent.com/4561747/147836204-f9db1f64-4f82-4bf5-af57-018111d1359d.png +https://user-images.githubusercontent.com/4561747/150634900-fdd609d2-2105-44b0-a081-ba7a5fa1faa8.png diff --git a/assets/img/en-screenshots/server-window-setup.inc b/assets/img/en-screenshots/server-window-setup.inc index c792386b5..720a0f35e 100644 --- a/assets/img/en-screenshots/server-window-setup.inc +++ b/assets/img/en-screenshots/server-window-setup.inc @@ -1 +1 @@ -https://user-images.githubusercontent.com/4561747/147836247-e150ab49-7d29-49cc-a8aa-24236d0e56ab.png +https://user-images.githubusercontent.com/4561747/150634883-e2788c8c-b7e0-4f32-9d4e-7bc7224e37b8.png diff --git a/assets/img/en-screenshots/settings-profile.inc b/assets/img/en-screenshots/settings-profile.inc index e6e99159c..260a7d364 100644 --- a/assets/img/en-screenshots/settings-profile.inc +++ b/assets/img/en-screenshots/settings-profile.inc @@ -1 +1 @@ -https://user-images.githubusercontent.com/4561747/147836382-e978fa15-93e1-46a9-834d-5038bd614c89.png +https://user-images.githubusercontent.com/4561747/150635632-df083c6e-94d2-4ab8-a81c-18c7cc0c158d.png diff --git a/assets/img/es-screenshots/server-active.inc b/assets/img/es-screenshots/server-active.inc new file mode 120000 index 000000000..040c5522e --- /dev/null +++ b/assets/img/es-screenshots/server-active.inc @@ -0,0 +1 @@ +../en-screenshots/server-active.inc \ No newline at end of file diff --git a/assets/img/es-screenshots/server-inactive.inc b/assets/img/es-screenshots/server-inactive.inc new file mode 120000 index 000000000..a721dddfe --- /dev/null +++ b/assets/img/es-screenshots/server-inactive.inc @@ -0,0 +1 @@ +../en-screenshots/server-inactive.inc \ No newline at end of file diff --git a/assets/img/fr-screenshots/server-active.inc b/assets/img/fr-screenshots/server-active.inc new file mode 120000 index 000000000..040c5522e --- /dev/null +++ b/assets/img/fr-screenshots/server-active.inc @@ -0,0 +1 @@ +../en-screenshots/server-active.inc \ No newline at end of file diff --git a/assets/img/fr-screenshots/server-inactive.inc b/assets/img/fr-screenshots/server-inactive.inc new file mode 120000 index 000000000..a721dddfe --- /dev/null +++ b/assets/img/fr-screenshots/server-inactive.inc @@ -0,0 +1 @@ +../en-screenshots/server-inactive.inc \ No newline at end of file diff --git a/assets/img/nl-screenshots/server-active.inc b/assets/img/nl-screenshots/server-active.inc new file mode 120000 index 000000000..040c5522e --- /dev/null +++ b/assets/img/nl-screenshots/server-active.inc @@ -0,0 +1 @@ +../en-screenshots/server-active.inc \ No newline at end of file diff --git a/assets/img/nl-screenshots/server-inactive.inc b/assets/img/nl-screenshots/server-inactive.inc new file mode 120000 index 000000000..a721dddfe --- /dev/null +++ b/assets/img/nl-screenshots/server-inactive.inc @@ -0,0 +1 @@ +../en-screenshots/server-inactive.inc \ No newline at end of file diff --git a/assets/img/pt-screenshots/server-active.inc b/assets/img/pt-screenshots/server-active.inc new file mode 120000 index 000000000..040c5522e --- /dev/null +++ b/assets/img/pt-screenshots/server-active.inc @@ -0,0 +1 @@ +../en-screenshots/server-active.inc \ No newline at end of file diff --git a/assets/img/pt-screenshots/server-inactive.inc b/assets/img/pt-screenshots/server-inactive.inc new file mode 120000 index 000000000..a721dddfe --- /dev/null +++ b/assets/img/pt-screenshots/server-inactive.inc @@ -0,0 +1 @@ +../en-screenshots/server-inactive.inc \ No newline at end of file diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md index c4c6c90a9..fa54645e1 100644 --- a/wiki/en/Running-a-Server.md +++ b/wiki/en/Running-a-Server.md @@ -194,6 +194,14 @@ Leave this field empty unless you need to list your server on a [private Directo **Windows users** - If you want the server to start automatically on system start, enable the corresponding check box. +### Server status icon + +When the Server is running, the operating system will show an icon in the system tray or status area to represent whether the Server is active: + +
Image of the Jamulus Server icon
The Server is empty + +
Image of the Jamulus Server icon
The Server is occupied + # Running a Private Server diff --git a/wiki/en/Software-Manual.md b/wiki/en/Software-Manual.md index c472b0c20..97d90308e 100644 --- a/wiki/en/Software-Manual.md +++ b/wiki/en/Software-Manual.md @@ -138,6 +138,10 @@ If you set an instrument and/or country, icons for these selections will also be This applies a skin to the main window, some of which are designed to accommodate larger ensembles. +### Meter style + +This changes the visual style of the audio meter indication, independently of the chosen skin. + ### Mixer rows This sets the number of rows displayed in the server audio mixer, for use with larger ensembles. From 03805e4f07b7627ab08a6a07fa2376bfc06b55b7 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sat, 22 Jan 2022 11:13:09 +0000 Subject: [PATCH 2/2] Remove "indication" --- wiki/en/Software-Manual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/Software-Manual.md b/wiki/en/Software-Manual.md index 97d90308e..7afdd0ab3 100644 --- a/wiki/en/Software-Manual.md +++ b/wiki/en/Software-Manual.md @@ -140,7 +140,7 @@ This applies a skin to the main window, some of which are designed to accommodat ### Meter style -This changes the visual style of the audio meter indication, independently of the chosen skin. +This changes the visual style of the audio meters, independently of the chosen skin. ### Mixer rows