Skip to content

Commit c8acf1e

Browse files
authored
Merge pull request #3533 from jimklimov/issue-3514
Add `nutauth.conf` support to NUT-Monitor (Python GUI)
2 parents 1e02b38 + 4884cb5 commit c8acf1e

16 files changed

Lines changed: 837 additions & 81 deletions

File tree

NEWS.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,11 @@ https://github.com/networkupstools/nut/milestone/13
259259
* Fixed both Python 2 and 3 variants to handle automatic client reconnection
260260
(e.g. after system suspend/resume, network interruption, or NUT server
261261
restart). [issue #3509, PR #3523]
262+
* Added support for `nutauth.conf` files as source of configuration about
263+
default/server/user access credentials and SSL setup. [#issue #3514]
264+
* Fixed TAB/SHIFT-TAB focus change order through login page. [PR #3533]
265+
* Updated formal version of all three client variants to `2.1.0`. [#3514,
266+
#3509]
262267

263268
- `upssched` client/tool updates:
264269
* Added a `clean_exit()` handler similar to that in `upsmon`. [PR #3499]

docs/man/NUT-Monitor.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ which can also issue commands to the driver (like linkman:upscmd[8]) and
5252
set supported variables (like linkman:upsrw[8]) -- propagated to the device,
5353
where applicable.
5454

55+
The linkman:nutauth.conf[5] files are supported for both SSL setup and for
56+
suggestion of credentials (default or based on host and port match -- in
57+
real time as those fields are being edited), highlighted with a gray-yellow
58+
background for clarity, as long as the credential fields were not edited
59+
manually.
60+
5561
The Python UI client can be used on a system different from the NUT data
5662
server (the one connected to the actual UPS by communications media and
5763
running the NUT driver(s)), and may be using a different OS platform

scripts/python/app/NUT-Monitor-py2gtk2.in

Lines changed: 253 additions & 9 deletions
Large diffs are not rendered by default.

scripts/python/app/NUT-Monitor-py3qt5.in

Lines changed: 258 additions & 23 deletions
Large diffs are not rendered by default.

scripts/python/app/NUT-Monitor-py3qt6.in

Lines changed: 250 additions & 17 deletions
Large diffs are not rendered by default.

scripts/python/app/locale/NUT-Monitor.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ msgid "GUI to manage devices connected to a NUT server.\n"
370370
msgstr ""
371371

372372
#: gui-1.3.glade.h:46
373-
msgid "<h1>NUT-Monitor 2.0.3</h1>\n"
373+
msgid "<h1>NUT-Monitor 2.1.0</h1>\n"
374374
"<p>GUI to manage devices connected to a NUT server.<br/>\n"
375375
"Provided with NUT version @PACKAGE_VERSION@.</p>\n"
376376
"<p style=\" font-size:8pt;\">Copyright (C) 2010 David Goncalves<br/>\n"
0 Bytes
Binary file not shown.

scripts/python/app/locale/fr/fr.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ msgstr "Interface pour gérer les onduleurs connectés à un serveur NUT.\n"
396396
"@NUT_WEBSITE_BASE@\n"
397397

398398
#: gui-1.3.glade.h:46
399-
msgid "<h1>NUT-Monitor 2.0.3</h1>\n"
399+
msgid "<h1>NUT-Monitor 2.1.0</h1>\n"
400400
"<p>GUI to manage devices connected to a NUT server.<br/>\n"
401401
"Provided with NUT version @PACKAGE_VERSION@.</p>\n"
402402
"<p style=\" font-size:8pt;\">Copyright (C) 2010 David Goncalves<br/>\n"
@@ -407,7 +407,7 @@ msgid "<h1>NUT-Monitor 2.0.3</h1>\n"
407407
"<p>For more information about the GUI please visit<br/>\n"
408408
"the author's web-site:</p>\n"
409409
"<p><a href=\"https://www.lestat.st/en/informatique/projets/nut-monitor\">https://www.lestat.st</a></p>"
410-
msgstr "<h1>NUT-Monitor 2.0.3</h1>\n"
410+
msgstr "<h1>NUT-Monitor 2.1.0</h1>\n"
411411
"<p>Interface pour gérer les onduleurs connectés à un serveur NUT.<br/>\n"
412412
"Fourni avec la version @PACKAGE_VERSION@ du NUT.</p>\n"
413413
"<p style=\" font-size:8pt;\">Copyright (C) 2010 David Goncalves<br/>\n"
0 Bytes
Binary file not shown.

scripts/python/app/locale/it/it.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ msgstr "Interfaccia grafica per gestire dispositivi connessi a un server di NUT.
396396
"@NUT_WEBSITE_BASE@\n"
397397

398398
#: gui-1.3.glade.h:46
399-
msgid "<h1>NUT-Monitor 2.0.3</h1>\n"
399+
msgid "<h1>NUT-Monitor 2.1.0</h1>\n"
400400
"<p>GUI to manage devices connected to a NUT server.<br/>\n"
401401
"Provided with NUT version @PACKAGE_VERSION@.</p>\n"
402402
"<p style=\" font-size:8pt;\">Copyright (C) 2010 David Goncalves<br/>\n"
@@ -407,7 +407,7 @@ msgid "<h1>NUT-Monitor 2.0.3</h1>\n"
407407
"<p>For more information about the GUI please visit<br/>\n"
408408
"the author's web-site:</p>\n"
409409
"<p><a href=\"https://www.lestat.st/en/informatique/projets/nut-monitor\">https://www.lestat.st</a></p>"
410-
msgstr "<h1>NUT-Monitor 2.0.3</h1>\n"
410+
msgstr "<h1>NUT-Monitor 2.1.0</h1>\n"
411411
"Interfaccia grafica per gestire dispositivi connessi a un server di NUT.<br/>\n"
412412
"Fornito con la versione @PACKAGE_VERSION@ del NUT.</p>\n"
413413
"<p style=\" font-size:8pt;\">Copyright (C) 2010 David Goncalves<br/>\n"

0 commit comments

Comments
 (0)