diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | nxdialog/Makefile.am | 21 | ||||
| -rw-r--r-- | nxdialog/README.md | 23 | ||||
| l--------- | nxdialog/VERSION | 1 | ||||
| -rw-r--r-- | nxdialog/bin/Makefile.am | 3 | ||||
| -rwxr-xr-x | nxdialog/bin/nxdialog (renamed from nxdialog/nxdialog) | 0 | ||||
| -rw-r--r-- | nxdialog/configure.ac | 22 | ||||
| -rw-r--r-- | nxdialog/man/Makefile.am | 5 | ||||
| -rw-r--r-- | nxdialog/man/nxdialog.1 | 72 |
9 files changed, 155 insertions, 0 deletions
@@ -170,6 +170,9 @@ build-full: build-env # build nxproxy fifth cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE} + # "build" nxdialog last + cd nxdialog && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE} + build: if ! test -d nx-X11; then \ ${MAKE} build-lite; \ @@ -247,6 +250,9 @@ install-full: $(MAKE) -C nx-X11/lib install + # install the nxdialog executable and its man page + $(MAKE) -C nxdialog install + uninstall: $(MAKE) uninstall-lite [ ! -d nx-X11 ] || $(MAKE) uninstall-full @@ -269,3 +275,5 @@ uninstall-full: $(RM_DIR_REC) $(DESTDIR)$(NXLIBDIR) $(RM_DIR_REC) $(DESTDIR)$(INCLUDEDIR)/nx + + test -f nxdialog/Makefile && ${MAKE} -C nxdialog "$@" diff --git a/nxdialog/Makefile.am b/nxdialog/Makefile.am new file mode 100644 index 000000000..e444af1fa --- /dev/null +++ b/nxdialog/Makefile.am @@ -0,0 +1,21 @@ +NULL = + +SUBDIRS = bin man + +ACLOCAL_AMFLAGS = -I m4 + +MAINTAINERCLEANFILES = \ + $(srcdir)/autom4te.cache/* \ + $(srcdir)/build-aux/* \ + $(srcdir)/Makefile.in \ + $(srcdir)/man/Makefile.in \ + $(srcdir)/src/Makefile.in \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/config.h.in \ + $(srcdir)/config.h.in~ \ + $(srcdir)/config.guess \ + $(srcdir)/config.sub \ + $(srcdir)/configure \ + $(NULL) + +DISTCLEANFILES=$(MAINTAINERCLEANFILES) diff --git a/nxdialog/README.md b/nxdialog/README.md new file mode 100644 index 000000000..68422b1f6 --- /dev/null +++ b/nxdialog/README.md @@ -0,0 +1,23 @@ +# NX Dialog Helper Tool + +The ``nxdialog`` script can be executed with Python 2.6.x (or higher) and +Python 3.4.x (or higher) alike. + +## Runtime Dependencies + +Required Python modules: + + * argparse + * gi + +Required GIR namespaces: + + * Gtk + * Gdk + * GdkX11 + +See the man page for more details. + +## License + +The ``nxdialog`` script and related files have been licensed under GPLv2+. diff --git a/nxdialog/VERSION b/nxdialog/VERSION new file mode 120000 index 000000000..6ff19de4b --- /dev/null +++ b/nxdialog/VERSION @@ -0,0 +1 @@ +../VERSION
\ No newline at end of file diff --git a/nxdialog/bin/Makefile.am b/nxdialog/bin/Makefile.am new file mode 100644 index 000000000..fa1942a19 --- /dev/null +++ b/nxdialog/bin/Makefile.am @@ -0,0 +1,3 @@ +NULL = + +dist_bin_SCRIPTS = nxdialog diff --git a/nxdialog/nxdialog b/nxdialog/bin/nxdialog index e7ca10aad..e7ca10aad 100755 --- a/nxdialog/nxdialog +++ b/nxdialog/bin/nxdialog diff --git a/nxdialog/configure.ac b/nxdialog/configure.ac new file mode 100644 index 000000000..bc8e81b84 --- /dev/null +++ b/nxdialog/configure.ac @@ -0,0 +1,22 @@ +dnl *************************************************************************** +dnl *** configure.ac for nxdialog *** +dnl *************************************************************************** + +m4_define([nxdialog_version], m4_esyscmd([tr -d '\n' < VERSION])) + +# Initialize Autoconf +AC_PREREQ(2.60) + +AC_INIT([NX Dialog], [nxdialog_version], [https://github.com/ArcticaProject/nx-libs/issues]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_PREFIX_DEFAULT([/usr/local]) + +AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2]) + +AC_CONFIG_FILES([ +Makefile +bin/Makefile +man/Makefile +]) + +AC_OUTPUT diff --git a/nxdialog/man/Makefile.am b/nxdialog/man/Makefile.am new file mode 100644 index 000000000..a862b1e7a --- /dev/null +++ b/nxdialog/man/Makefile.am @@ -0,0 +1,5 @@ +NULL = + +dist_man_MANS = \ + nxdialog.1 \ + $(NULL) diff --git a/nxdialog/man/nxdialog.1 b/nxdialog/man/nxdialog.1 new file mode 100644 index 000000000..636d59f8d --- /dev/null +++ b/nxdialog/man/nxdialog.1 @@ -0,0 +1,72 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH nxdialog 1 "Jan 2019" "Version 3.5.99.18" "NX Dialog" +.SH NAME +nxdialog \- NX Dialog Helper +.SH SYNOPSIS +'nh +.fi +.ad l +\fBnxdialog\fR \fI[-h] [--dialog DIALOG_TYPE] [--message TEXT] + [--caption CAPTION] [--display DISPLAY] [--parent AGENTPID] + [--window WINDOW] [--class DLGCLASS] [--local] + [--allowmultiple]\fR + +.SH DESCRIPTION +\fBnxdialog\fR is a GUI helper that can be used with nxagent to provide +user interaction on certain events inside nxagent. It adds graphical +widgets (menus, dialog boxes, etc.) to nxagent that allow a smarter user +interaction with the agent. +.PP +\fBnxagent\fR is not using \fBnxdialog\fR by default, set the +\fI$NX_CLIENT\fR environment variable to make the \fBnxdialog\fR path known to +\fBnxagent\fR. +.PP +If you want to disable \fBnxdialog\fR usage in \fBnxagent\fR, then make +sure that the \fI$NX_CLIENT\fR environment variable is unset. +.PP +.SH COMMAND LINE OPTIONS +.TP 8 +.B \-h, \-\-help +Show this help message and exit. +.TP 8 +.B --dialog DIALOG_TYPE +Type of dialog to show, one of "yesno", "ok", "error", "panic", "quit", "pulldown", "yesnosuspend". +.TP 8 +.B --message \fITEXT\fR +Message text to display in the dialog. +.TP 8 +.B --caption CAPTION +Window title of the dialog. +.TP 8 +.B --display DISPLAY +X11 display where the dialog should be shown (default: \fI$DISPLAY\fR). +.TP 8 +.B --parent AGENTPID +PID of the nxagent. The agent PID can be 0 for testing \fBnxdialog\fR. +.TP 8 +.B --window WINDOW +X11 id of window where to embed the pulldown dialog type. +.TP 8 +.B --class DLGCLASS +Class of the message (info, warning, error) default: info) [currently unimplemented]. +.TP 8 +.B --local +Specify that proxy mode is used [currently unimplemented]. +.TP 8 +.B --allowmultiple +Allow launching more than one dialog with the same message [currently unimplemented]. + +.SH AUTHOR +The \fBnxdialog\fR application has been derived from Google's +NeatX client application by Ulrich Sibiller <uli42@gmx.de>. +.PP +This manual has been written by Mike Gabriel +<mike.gabriel@das\-netzwerkteam.de> for the X2Go Project +(https://wiki.x2go.org) and the Arctica Project +(https://arctica-project.org). |