x2go-commits December 2012

x2go-commits@lists.x2go.org

1 participants
182 discussions

nx-libs.git - master (branch) updated: redist-client/3.5.0.16-32-g352751e
by git-admin＠x2go.org 16 Dec '12

16 Dec '12

The branch, master has been updated via 352751ef9e0d9d652a7f0ae2403c647c9053dcb1 (commit) from f2011a718adfab50d050abd282cfc04c8c534f75 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 352751ef9e0d9d652a7f0ae2403c647c9053dcb1 Author: Reinhard Tartler <siretart(a)tauware.de> Date: Sat Dec 15 15:05:33 2012 +0100 simplify clean rule in debian/rules ----------------------------------------------------------------------- Summary of changes: debian/rules | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index 3104e40..b9df940 100755 --- a/debian/rules +++ b/debian/rules @@ -16,15 +16,11 @@ override_dh_auto_clean: LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean override_dh_clean: - rm -f nx-X11/changelog - rm -f nxcomp/changelog - rm -f nxcompext/changelog - rm -f nxcompshad/changelog + rm -f nx*/configure + rm -f nx*/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog - rm -f nxproxy/changelog rm -f Makefile - rm -f nx*/configure dh_clean override_dh_auto_build: hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

python-x2go.git - master (branch) updated: 0.2.1.0-2-ga30ff31
by git-admin＠x2go.org 15 Dec '12

15 Dec '12

The branch, master has been updated via a30ff312cbb337dec2cb03f248d2e347910ad688 (commit) from b47b28ff3c27d2dc75a5c18281867c2119790cc0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a30ff312cbb337dec2cb03f248d2e347910ad688 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 16 00:16:26 2012 +0100 Make sure that internal calls to _X2goClient__list_sessions are not overridden by other method definitions in classes that inherit from X2goClient class. (Closes: #89). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2go/client.py | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 55b7597..1b366e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ python-x2go (0.2.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.1.1): - - Continue development... + - Make sure that internal calls to _X2goClient__list_sessions are not + overridden by other method definitions in classes that inherit from + X2goClient class. (Closes: #89). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Dec 2012 13:32:30 +0100 diff --git a/x2go/client.py b/x2go/client.py index c1e5358..0e37573 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1529,9 +1529,9 @@ class X2goClient(object): raise x2go_exceptions.X2goClientException('don\'t know which session to resume') if session_uuid is None: session_uuid = self.session_registry.get_session_of_session_name(session_name=session_name, return_object=False) - return self.session_registry(session_uuid).resume(session_list=self.list_sessions(session_uuid=session_uuid), **sessionopts) + return self.session_registry(session_uuid).resume(session_list=self._X2goClient__list_sessions(session_uuid=session_uuid), **sessionopts) else: - return self.session_registry(session_uuid).resume(session_name=session_name, session_list=self.list_sessions(session_uuid=session_uuid), **sessionopts) + return self.session_registry(session_uuid).resume(session_name=session_name, session_list=self._X2goClient__list_sessions(session_uuid=session_uuid), **sessionopts) except x2go_exceptions.X2goControlSessionException: profile_name = self.get_session_profile_name(session_uuid) self.HOOK_on_control_session_death(profile_name) @@ -2459,9 +2459,9 @@ class X2goClient(object): session.clean_sessions(destroy_terminals=_destroy_terminals, published_applications=published_applications) __clean_sessions = clean_sessions - def list_sessions(self, session_uuid=None, - profile_name=None, profile_id=None, - no_cache=False, refresh_cache=False, + def list_sessions(self, session_uuid=None, + profile_name=None, profile_id=None, + no_cache=False, refresh_cache=False, update_sessionregistry=True, register_sessions=False, raw=False): @@ -2873,10 +2873,10 @@ class X2goClient(object): session_uuids = self.client_registered_sessions_of_profile_name(profile_name, return_objects=False) if session_uuids: if session_list is None: - session_list = self.list_sessions(session_uuids[0], - update_sessionregistry=False, - register_sessions=False, - ) + session_list = self._X2goClient__list_sessions(session_uuids[0], + update_sessionregistry=False, + register_sessions=False, + ) try: self.session_registry.update_status(profile_name=profile_name, session_list=session_list) except x2go_exceptions.X2goControlSessionException: @@ -2893,7 +2893,7 @@ class X2goClient(object): @type session_uuid: C{str} """ - session_list = self.list_sessions(session_uuid, update_sessionregistry=False, register_sessions=False) + session_list = self._X2goClient__list_sessions(session_uuid, update_sessionregistry=False, register_sessions=False) if session_list: self.session_registry.update_status(session_uuid=session_uuid, session_list=session_list) __update_sessionregistry_status_by_session_uuid = update_sessionregistry_status_by_session_uuid @@ -3013,10 +3013,10 @@ class X2goClient(object): """ if profile_name not in self.client_connected_profiles(return_profile_names=True): return - session_list = self.list_sessions(profile_name=profile_name, - update_sessionregistry=False, - register_sessions=False, - ) + session_list = self._X2goClient__list_sessions(profile_name=profile_name, + update_sessionregistry=False, + register_sessions=False, + ) try: self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register, skip_pubapp_sessions=skip_pubapp_sessions) except x2go_exceptions.X2goControlSessionException, e: hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.16-31-gf2011a7
by git-admin＠x2go.org 15 Dec '12

15 Dec '12

The branch, master has been updated via f2011a718adfab50d050abd282cfc04c8c534f75 (commit) from 08d568a2c0a4845c92358a710d22d74804d38ef3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f2011a718adfab50d050abd282cfc04c8c534f75 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Dec 16 00:00:09 2012 +0100 add closure for #87 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5a30f5a..05063f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,8 +36,9 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low + Rely on shlibs instead of hardcoded dependencies. + Drop xbitmaps from Build-Depends. + Move xfonts-base over to Recommends. - * update 031_nx-X11_parallel-make.full.patch. Add an explicit dependency - from the NX libX11.so to the nxcomp libraries. Unbreaks parallel builds + * Update 031_nx-X11_parallel-make.full.patch. Add an explicit dependency + from the NX libX11.so to the nxcomp libraries. Unbreaks parallel builds. + (Closes: #87). -- Reinhard Tartler <siretart(a)tauware.de> Sat, 15 Dec 2012 14:29:12 +0100 hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.16-30-g08d568a
by git-admin＠x2go.org 15 Dec '12

15 Dec '12

The branch, master has been updated via 08d568a2c0a4845c92358a710d22d74804d38ef3 (commit) via d123923a501758cace37fc2138feff5751b0a25b (commit) from 0ef5ea2eb63cda1b4e40fd1c7eb1f32cb80e4071 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 08d568a2c0a4845c92358a710d22d74804d38ef3 Author: Reinhard Tartler <siretart(a)tauware.de> Date: Sat Dec 15 14:29:41 2012 +0100 reenable parallel builds commit d123923a501758cace37fc2138feff5751b0a25b Author: Reinhard Tartler <siretart(a)tauware.de> Date: Sat Dec 15 14:29:25 2012 +0100 update 031_nx-X11_parallel-make.full.patch. Add an explicit dependency from the NX libX11.so to the nxcomp libraries. Unbreaks parallel builds. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +- debian/patches/031_nx-X11_parallel-make.full.patch | 40 ++++++++++++-------- debian/rules | 2 +- 3 files changed, 28 insertions(+), 18 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9b2a432..5a30f5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,8 +36,10 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low + Rely on shlibs instead of hardcoded dependencies. + Drop xbitmaps from Build-Depends. + Move xfonts-base over to Recommends. + * update 031_nx-X11_parallel-make.full.patch. Add an explicit dependency + from the NX libX11.so to the nxcomp libraries. Unbreaks parallel builds - -- Reinhard Tartler <siretart(a)tauware.de> Sun, 09 Dec 2012 09:38:58 +0100 + -- Reinhard Tartler <siretart(a)tauware.de> Sat, 15 Dec 2012 14:29:12 +0100 nx-libs (2:3.5.0.16-0) unstable; urgency=low diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch index 049b213..1bacd1a 100644 --- a/debian/patches/031_nx-X11_parallel-make.full.patch +++ b/debian/patches/031_nx-X11_parallel-make.full.patch @@ -21,7 +21,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- a/nx-X11/Makefile +++ b/nx-X11/Makefile -@@ -32,8 +32,8 @@ +@@ -32,8 +32,8 @@ VERSSRC = $(CONFIGSRC)/util/printver.c VERSPROG = $(CONFIGSRC)/util/printver.exe all: @@ -32,7 +32,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 all-initial: @echo Please use make World, or on NT use nmake World.Win32. -@@ -57,8 +57,8 @@ +@@ -57,8 +57,8 @@ World: @date @echo "" @if [ -f xmakefile ]; then \ @@ -43,7 +43,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 $(RM) xmakefile; \ fi @if [ ! -f $(IRULESRC)/host.def ]; then \ -@@ -84,14 +84,14 @@ +@@ -84,14 +84,14 @@ World: # fi cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean $(MAKE) $(MFLAGS) Makefile.boot @@ -65,7 +65,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 @echo "" @date @echo "" -@@ -154,15 +154,15 @@ +@@ -154,15 +154,15 @@ World.Win32: -if exist xmakefile.bak del xmakefile.bak -if exist xmakefile ren xmakefile xmakefile.bak $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) @@ -87,7 +87,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 @echo : @echo : @echo Full build of $(RELEASE) complete. -@@ -198,38 +198,38 @@ +@@ -198,38 +198,38 @@ World.OS2: # a copy of every rule that might be invoked at top level clean: @@ -143,7 +143,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 + ${MAKE} ${MAKE_OPTS} $@ --- a/nx-X11/config/imake/Makefile.ini +++ b/nx-X11/config/imake/Makefile.ini -@@ -21,7 +21,6 @@ +@@ -21,7 +21,6 @@ IMAKEMDEP_CROSSCOMPILE = -DCROSSCOMPILE_ SHELL = /bin/sh RM = rm -f MV = mv @@ -153,7 +153,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 NPROC = 1 --- a/nx-X11/extras/Mesa/Makefile +++ b/nx-X11/extras/Mesa/Makefile -@@ -12,7 +12,7 @@ +@@ -12,7 +12,7 @@ default: $(TOP)/configs/current doxygen: @@ -174,7 +174,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 CURRENT_DIR=. --- a/nx-X11/extras/drm/linux-core/Makefile +++ b/nx-X11/extras/drm/linux-core/Makefile -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ endif all: modules modules: includes @@ -183,7 +183,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ifeq ($(HEADERFROMBOOT),1) -@@ -246,7 +246,7 @@ +@@ -246,7 +246,7 @@ clean cleandir: rm -rf $(CLEANFILES) $(MODULE_LIST):: @@ -194,7 +194,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- a/nx-X11/extras/drm/linux/Makefile +++ b/nx-X11/extras/drm/linux/Makefile -@@ -184,7 +184,7 @@ +@@ -184,7 +184,7 @@ endif all: modules modules: includes @@ -203,7 +203,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 ifeq ($(HEADERFROMBOOT),1) -@@ -254,7 +254,7 @@ +@@ -254,7 +254,7 @@ clean cleandir: rm -rf $(CLEANFILES) $(MODULE_LIST):: @@ -214,7 +214,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- a/nx-X11/extras/ttf2pt1/Makefile +++ b/nx-X11/extras/ttf2pt1/Makefile -@@ -158,8 +158,8 @@ +@@ -158,8 +158,8 @@ mans: $(MANS) clean: rm -f t1asm ttf2pt1 *.o app/RPM/Makefile app/RPM/*.spec *.core core.* core @@ -227,7 +227,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 rm -f $(DOCS) $(MANS) --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile -@@ -1161,21 +1161,17 @@ +@@ -1161,25 +1161,23 @@ $(NX_XCOMPEXTCONFIGTARGET): #ifdef SunArchitecture $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) @@ -246,16 +246,24 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 - make + ${MAKE} -C $(NX_XCOMPLIBDIR) - $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) +-$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) - cd ../../../nxcompext && \ - make ++$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV) + ${MAKE} -C ../../../nxcompext #endif +-depend:: $(NX_XCOMPLIBTARGET) ++depend:: ++ ++lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET) + + all:: $(NX_XCOMPLIBTARGET) + --- a/nx-X11/lib/X11/Imakefile.NX.original +++ b/nx-X11/lib/X11/Imakefile.NX.original -@@ -1159,21 +1159,17 @@ +@@ -1159,21 +1159,17 @@ $(NX_XCOMPEXTCONFIGTARGET): #ifdef SunArchitecture $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) @@ -283,7 +291,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile -@@ -1045,11 +1045,11 @@ +@@ -1045,11 +1045,11 @@ $(NX_XSHADOWCONFIGTARGET): #ifdef SunArchitecture $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) cd $(NX_XSHADOWLIBDIR) && \ diff --git a/debian/rules b/debian/rules index 5e8abfa..3104e40 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ override_dh_auto_build: cp -a nx-X11/programs/nxauth/CHANGELOG nx-X11/programs/nxauth/changelog cp -a nxproxy/CHANGELOG nxproxy/changelog ln -s debian/Makefile.nx-libs Makefile - LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt + LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel debian/post-build-nx.sh override_dh_auto_install: hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-106-g9cc8393
by git-admin＠x2go.org 14 Dec '12

14 Dec '12

The branch, master has been updated via 9cc83938d56d8fb177111674d8ac21fdfb4b8421 (commit) from 381bbae19c69112d37ed7fbef28f32c87ea1f17b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9cc83938d56d8fb177111674d8ac21fdfb4b8421 Author: Orion Poplawski <orion(a)nwra.com> Date: Fri Dec 14 17:10:45 2012 +0100 Use new script x2gopath in Perl::API. (Closes: #86). ----------------------------------------------------------------------- Summary of changes: X2Go/Server/DB.pm | 2 +- X2Go/Server/DB/PostgreSQL.pm | 2 +- debian/changelog | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index 45f1ec9..c9a83a1 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -44,7 +44,7 @@ setlogmask( LOG_UPTO(loglevel()) ); my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); my $Config = new Config::Simple(syntax=>'ini'); -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; +my $x2go_lib_path=`x2gopath libexec`; $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql"; my $backend=$Config->param("backend"); diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index 2400f60..72ba833 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -61,7 +61,7 @@ sub init_db if ( ! ( $dbuser and $dbpass ) ) { my $Config = new Config::Simple(syntax=>'ini'); - my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; + my $x2go_lib_path=`x2gopath libexec`; $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql"; my $backend=$Config->param("backend"); diff --git a/debian/changelog b/debian/changelog index 07c485f..51e295c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,10 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low * Move code in pre/post+inst/rm scripts around (from x2goserver package to libx2go-server-db-perl and x2goserver-common). + [ Orion Poplawski ] + * New upstream version (3.2.0.0): + - Use new script x2gopath in Perl::API. (Closes: #86). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200 x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goclient.git - master (branch) updated: 3.99.3.0-23-g7964d40
by git-admin＠x2go.org 14 Dec '12

14 Dec '12

The branch, master has been updated via 7964d406668eb557ad45a0bef5cb9b51e93fc69c (commit) from d1cb960e424ea576ea99f0e036264712670ffba7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7964d406668eb557ad45a0bef5cb9b51e93fc69c Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Fri Dec 14 14:51:09 2012 +0100 Add OpenSSL license exception ----------------------------------------------------------------------- Summary of changes: README.OpenSSL-Exception | 12 ++++++++++++ debian/changelog | 1 + 2 files changed, 13 insertions(+) create mode 100644 README.OpenSSL-Exception The diff of changes is: diff --git a/README.OpenSSL-Exception b/README.OpenSSL-Exception new file mode 100644 index 0000000..817daf5 --- /dev/null +++ b/README.OpenSSL-Exception @@ -0,0 +1,12 @@ + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the + * OpenSSL library under certain conditions as described in each + * individual source file, and distribute linked combinations + * including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * file(s) with this exception, you may extend this exception to your + * version of the file(s), but you are not obligated to do so. If you + * do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source + * files in the program, then also delete it here. diff --git a/debian/changelog b/debian/changelog index 520c235..acd3a05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low minimize to systray. (Closes upstream issue #73). - Update license headers - Add "author" entry in UI files + - Add OpenSSL license exception [ Ricardo Diaz ] * New upstream version (3.99.3.1): hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.3.0-22-gd1cb960
by git-admin＠x2go.org 14 Dec '12

14 Dec '12

The branch, master has been updated via d1cb960e424ea576ea99f0e036264712670ffba7 (commit) via 8418860c23c6079f9a49b2bcb1ba7d3712c6d1d9 (commit) from dffc0d788cfc8098b6118a657e4d8b2810936690 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d1cb960e424ea576ea99f0e036264712670ffba7 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Fri Dec 14 14:41:04 2012 +0100 Add "author" entry in UI files commit 8418860c23c6079f9a49b2bcb1ba7d3712c6d1d9 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Fri Dec 14 14:30:20 2012 +0100 Update license headers ----------------------------------------------------------------------- Summary of changes: LDAPSession.cpp | 17 +++++ LDAPSession.h | 29 ++++---- LICENSE | 18 +++-- SVGFrame.cpp | 17 +++++ SVGFrame.h | 17 +++++ appdialog.cpp | 7 +- appdialog.h | 35 +++++---- appdialog.ui | 4 +- brokerpassdialog.ui | 3 +- brokerpassdlg.cpp | 34 +++++---- brokerpassdlg.h | 34 +++++---- clicklineedit.cpp | 28 +++++--- clicklineedit.h | 28 +++++--- configdialog.cpp | 28 +++++--- configdialog.h | 28 +++++--- configwidget.cpp | 28 +++++--- configwidget.h | 28 +++++--- connectionwidget.cpp | 28 +++++--- connectionwidget.h | 28 +++++--- contest.cpp | 34 +++++---- contest.h | 34 +++++---- contest.ui | 5 +- cupsprint.cpp | 28 +++++--- cupsprint.h | 28 +++++--- cupsprintersettingsdialog.cpp | 28 +++++--- cupsprintersettingsdialog.h | 28 +++++--- cupsprintsettingsdialog.ui | 156 +++++++++++++++++++++-------------------- cupsprintwidget.cpp | 28 +++++--- cupsprintwidget.h | 28 +++++--- cupsprintwidget.ui | 96 ++++++++++++------------- debian/changelog | 2 + editconnectiondialog.cpp | 28 +++++--- editconnectiondialog.h | 27 ++++--- exportdialog.cpp | 28 +++++--- exportdialog.h | 28 +++++--- httpbrokerclient.cpp | 28 +++++--- httpbrokerclient.h | 28 +++++--- imgframe.cpp | 28 +++++--- imgframe.h | 28 +++++--- ongetpass.cpp | 36 +++++----- ongetpass.h | 27 ++++--- onmainwindow.cpp | 7 +- onmainwindow.h | 35 +++++---- onmainwindow_privat.h | 36 +++++----- printdialog.cpp | 28 +++++--- printdialog.h | 28 +++++--- printdialog.ui | 30 ++++---- printercmddialog.cpp | 28 +++++--- printercmddialog.h | 28 +++++--- printercmddialog.ui | 88 +++++++++++------------ printprocess.cpp | 28 +++++--- printprocess.h | 28 +++++--- printwidget.cpp | 28 +++++--- printwidget.h | 28 +++++--- printwidget.ui | 148 +++++++++++++++++++------------------- sessionbutton.cpp | 28 +++++--- sessionbutton.h | 28 +++++--- sessionmanagedialog.cpp | 28 +++++--- sessionmanagedialog.h | 28 +++++--- sessionwidget.cpp | 28 +++++--- sessionwidget.h | 28 +++++--- settingswidget.cpp | 28 +++++--- settingswidget.h | 28 +++++--- sharewidget.cpp | 28 +++++--- sharewidget.h | 28 +++++--- sshmasterconnection.cpp | 37 +++++----- sshmasterconnection.h | 36 +++++----- sshprocess.cpp | 36 +++++----- sshprocess.h | 36 +++++----- userbutton.cpp | 36 +++++----- userbutton.h | 36 +++++----- version.h | 17 +++++ wapi.cpp | 17 +++++ wapi.h | 17 +++++ x2goclient.cpp | 36 +++++----- x2goclientconfig.h | 17 +++++ x2gologdebug.cpp | 28 +++++--- x2gologdebug.h | 28 +++++--- x2gosettings.cpp | 28 +++++--- x2gosettings.h | 28 ++++---- xsettingsui.ui | 3 +- xsettingswidget.cpp | 34 +++++---- xsettingswidget.h | 34 +++++---- 83 files changed, 1460 insertions(+), 1112 deletions(-) The diff of changes is: diff --git a/LDAPSession.cpp b/LDAPSession.cpp index 30972c9..83ceba3 100644 --- a/LDAPSession.cpp +++ b/LDAPSession.cpp @@ -1,3 +1,20 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "LDAPSession.h" #include "x2goclientconfig.h" #ifdef USELDAP diff --git a/LDAPSession.h b/LDAPSession.h index 82c4152..765bae0 100644 --- a/LDAPSession.h +++ b/LDAPSession.h @@ -1,15 +1,20 @@ -// -// -// C++ Interface: $MODULE$ -// -// Description: -// -// -// Author: Oleksandr Shneyder AKA nCryer <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006-2010 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef LDAPSESSION_H #define LDAPSESSION_H #define LDAP_DEPRECATED 1 diff --git a/LICENSE b/LICENSE index 0479009..f6026f7 100644 --- a/LICENSE +++ b/LICENSE @@ -5,18 +5,16 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the -Free Software Foundation, Inc., -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. Copyright (C) 2005-2012 Oleksandr Shneyder -oleksandr.shneyder(a)obviously-nice.de +o.shneyder(a)phoca-gmbh.de Copyright (C) 2005-2012 Heinz-Markus Graesing heinz-m.graesing(a)obviously-nice.de diff --git a/SVGFrame.cpp b/SVGFrame.cpp index f559adb..dc427ac 100644 --- a/SVGFrame.cpp +++ b/SVGFrame.cpp @@ -1,3 +1,20 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "SVGFrame.h" #include "x2goclientconfig.h" diff --git a/SVGFrame.h b/SVGFrame.h index 07f345e..7bfcf2a 100644 --- a/SVGFrame.h +++ b/SVGFrame.h @@ -1,3 +1,20 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef SVGFRAME_H #define SVGFRAME_H #include "x2goclientconfig.h" diff --git a/appdialog.cpp b/appdialog.cpp index ebab99d..db17457 100644 --- a/appdialog.cpp +++ b/appdialog.cpp @@ -1,21 +1,18 @@ /************************************************************************** * Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder(a)obviously-nice.de * +* o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * -* * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ #include "appdialog.h" #include "onmainwindow.h" diff --git a/appdialog.h b/appdialog.h index 9fb7bd6..663a846 100644 --- a/appdialog.h +++ b/appdialog.h @@ -1,22 +1,19 @@ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef APPDIALOG_H #define APPDIALOG_H diff --git a/appdialog.ui b/appdialog.ui index 703c9f4..ba78952 100644 --- a/appdialog.ui +++ b/appdialog.ui @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>AppDialog</class> <widget class="QDialog" name="AppDialog"> <property name="geometry"> @@ -42,9 +43,6 @@ <attribute name="headerVisible"> <bool>false</bool> </attribute> - <attribute name="headerVisible"> - <bool>false</bool> - </attribute> <column> <property name="text"> <string notr="true">1</string> diff --git a/brokerpassdialog.ui b/brokerpassdialog.ui index 333a577..e7c2449 100644 --- a/brokerpassdialog.ui +++ b/brokerpassdialog.ui @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>BrokerPassDialogUi</class> <widget class="QDialog" name="BrokerPassDialogUi"> <property name="geometry"> @@ -7,7 +8,7 @@ <x>0</x> <y>0</y> <width>311</width> - <height>160</height> + <height>176</height> </rect> </property> <property name="windowTitle"> diff --git a/brokerpassdlg.cpp b/brokerpassdlg.cpp index 7d7432b..152e2cb 100644 --- a/brokerpassdlg.cpp +++ b/brokerpassdlg.cpp @@ -1,21 +1,19 @@ -/* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2005-2012 Oleksandr Shneyder - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -*/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #include "brokerpassdlg.h" #include <QPushButton> diff --git a/brokerpassdlg.h b/brokerpassdlg.h index 6123171..08e5066 100644 --- a/brokerpassdlg.h +++ b/brokerpassdlg.h @@ -1,21 +1,19 @@ -/* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2005-2012 Oleksandr Shneyder - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -*/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef BROKERPASSDLG_H #define BROKERPASSDLG_H diff --git a/clicklineedit.cpp b/clicklineedit.cpp index 4b7f412..84c94d9 100644 --- a/clicklineedit.cpp +++ b/clicklineedit.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: clicklineedit -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "clicklineedit.h" #include "x2gologdebug.h" diff --git a/clicklineedit.h b/clicklineedit.h index 968f38f..758bb82 100644 --- a/clicklineedit.h +++ b/clicklineedit.h @@ -1,14 +1,20 @@ -// -// C++ Interface: clicklineedit -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef CLICKLINEEDIT_H #define CLICKLINEEDIT_H diff --git a/configdialog.cpp b/configdialog.cpp index e8e2a43..1bdaf78 100644 --- a/configdialog.cpp +++ b/configdialog.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: configdialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006-2012 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include <QLineEdit> #include <QCheckBox> #include <QSpinBox> diff --git a/configdialog.h b/configdialog.h index 092001c..33177bc 100644 --- a/configdialog.h +++ b/configdialog.h @@ -1,14 +1,20 @@ -// -// C++ Interface: configdialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef CONFIGDIALOG_H #define CONFIGDIALOG_H #include "x2goclientconfig.h" diff --git a/configwidget.cpp b/configwidget.cpp index 3223397..8b2842c 100644 --- a/configwidget.cpp +++ b/configwidget.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: configwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "configwidget.h" #include "onmainwindow.h" diff --git a/configwidget.h b/configwidget.h index 152e886..e2a5d9f 100644 --- a/configwidget.h +++ b/configwidget.h @@ -1,14 +1,20 @@ -// -// C++ Interface: configwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef CONFIGWIDGET_H #define CONFIGWIDGET_H diff --git a/connectionwidget.cpp b/connectionwidget.cpp index 787a933..91eb1b6 100644 --- a/connectionwidget.cpp +++ b/connectionwidget.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: connectionwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "connectionwidget.h" #include <QPushButton> diff --git a/connectionwidget.h b/connectionwidget.h index 7fee66e..c112fe6 100644 --- a/connectionwidget.h +++ b/connectionwidget.h @@ -1,14 +1,20 @@ -// -// C++ Interface: connectionwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef CONNECTIONWIDGET_H #define CONNECTIONWIDGET_H diff --git a/contest.cpp b/contest.cpp index cefab6b..ececd35 100644 --- a/contest.cpp +++ b/contest.cpp @@ -1,21 +1,19 @@ -/* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2005-2012 Oleksandr Shneyder - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -*/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #include "contest.h" #include "x2gologdebug.h" diff --git a/contest.h b/contest.h index e345148..7c76a90 100644 --- a/contest.h +++ b/contest.h @@ -1,21 +1,19 @@ -/* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2005-2012 Oleksandr Shneyder - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -*/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef CONTEST_H #define CONTEST_H diff --git a/contest.ui b/contest.ui index 70d0cd1..9ffaf1c 100644 --- a/contest.ui +++ b/contest.ui @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>ConTest</class> <widget class="QDialog" name="ConTest"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>291</width> - <height>147</height> + <width>336</width> + <height>161</height> </rect> </property> <property name="windowTitle"> diff --git a/cupsprint.cpp b/cupsprint.cpp index 31ad462..2acae68 100644 --- a/cupsprint.cpp +++ b/cupsprint.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: cupsprint -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "cupsprint.h" #ifndef Q_OS_WIN #include "x2gologdebug.h" diff --git a/cupsprint.h b/cupsprint.h index 85eb2b4..21fabe5 100644 --- a/cupsprint.h +++ b/cupsprint.h @@ -1,14 +1,20 @@ -// -// C++ Interface: cupsprint -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef CUPSPRINT_H #define CUPSPRINT_H #include "x2goclientconfig.h" diff --git a/cupsprintersettingsdialog.cpp b/cupsprintersettingsdialog.cpp index 0ccebe1..8edaa67 100644 --- a/cupsprintersettingsdialog.cpp +++ b/cupsprintersettingsdialog.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: cupsprintersettingsdialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "cupsprintersettingsdialog.h" #include "cupsprint.h" #ifndef Q_OS_WIN diff --git a/cupsprintersettingsdialog.h b/cupsprintersettingsdialog.h index a9e767f..f052b7c 100644 --- a/cupsprintersettingsdialog.h +++ b/cupsprintersettingsdialog.h @@ -1,14 +1,20 @@ -// -// C++ Interface: cupsprintersettingsdialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef CUPSPRINTERSETTINGSDIALOG_H #define CUPSPRINTERSETTINGSDIALOG_H #include "x2goclientconfig.h" diff --git a/cupsprintsettingsdialog.ui b/cupsprintsettingsdialog.ui index 56ba452..98598e1 100644 --- a/cupsprintsettingsdialog.ui +++ b/cupsprintsettingsdialog.ui @@ -1,89 +1,91 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>CupsPrinterSettingsDialog</class> - <widget class="QDialog" name="CupsPrinterSettingsDialog" > - <property name="geometry" > + <widget class="QDialog" name="CupsPrinterSettingsDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>408</width> - <height>532</height> + <width>503</width> + <height>551</height> </rect> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Minimum" hsizetype="Preferred" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Dialog</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QTabWidget" name="tabWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Minimum" hsizetype="Expanding" > + <widget class="QTabWidget" name="tabWidget"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="currentIndex" > + <property name="currentIndex"> <number>0</number> </property> - <widget class="QWidget" name="tabGeneral" > - <attribute name="title" > + <widget class="QWidget" name="tabGeneral"> + <attribute name="title"> <string>General</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Page size:</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QComboBox" name="cbPageSize" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <item row="0" column="1"> + <widget class="QComboBox" name="cbPageSize"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Paper type:</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QComboBox" name="cbMediaType" /> + <item row="1" column="1"> + <widget class="QComboBox" name="cbMediaType"/> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Paper source:</string> </property> </widget> </item> - <item row="2" column="1" > - <widget class="QComboBox" name="cbInputSlot" /> + <item row="2" column="1"> + <widget class="QComboBox" name="cbInputSlot"/> </item> </layout> </item> <item> - <spacer name="horizontalSpacer_2" > - <property name="orientation" > + <spacer name="horizontalSpacer_2"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -94,28 +96,28 @@ </layout> </item> <item> - <widget class="QGroupBox" name="gbDuplex" > - <property name="title" > + <widget class="QGroupBox" name="gbDuplex"> + <property name="title"> <string>Duplex Printing</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QRadioButton" name="rbNone" > - <property name="text" > + <widget class="QRadioButton" name="rbNone"> + <property name="text"> <string>None</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="rbLong" > - <property name="text" > + <widget class="QRadioButton" name="rbLong"> + <property name="text"> <string>Long side</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="rbShort" > - <property name="text" > + <widget class="QRadioButton" name="rbShort"> + <property name="text"> <string>Short side</string> </property> </widget> @@ -124,11 +126,11 @@ </widget> </item> <item> - <spacer name="verticalSpacer" > - <property name="orientation" > + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>211</height> @@ -138,70 +140,70 @@ </item> </layout> </widget> - <widget class="QWidget" name="tabDriver" > - <attribute name="title" > + <widget class="QWidget" name="tabDriver"> + <attribute name="title"> <string>Driver settings</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_5" > + <layout class="QVBoxLayout" name="verticalLayout_5"> <item> - <widget class="QSplitter" name="splitter" > - <property name="enabled" > + <widget class="QSplitter" name="splitter"> + <property name="enabled"> <bool>true</bool> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="childrenCollapsible" > + <property name="childrenCollapsible"> <bool>false</bool> </property> - <widget class="QTreeWidget" name="ppdTree" > - <property name="rootIsDecorated" > + <widget class="QTreeWidget" name="ppdTree"> + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="animated" > + <property name="animated"> <bool>true</bool> </property> - <property name="allColumnsShowFocus" > + <property name="allColumnsShowFocus"> <bool>true</bool> </property> - <property name="headerHidden" > + <property name="headerHidden"> <bool>true</bool> </property> - <property name="expandsOnDoubleClick" > + <property name="expandsOnDoubleClick"> <bool>false</bool> </property> <column> - <property name="text" > + <property name="text"> <string>Option</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Value</string> </property> </column> </widget> - <widget class="QGroupBox" name="gbOptions" > - <property name="title" > + <widget class="QGroupBox" name="gbOptions"> + <property name="title"> <string>No option selected</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_4" > + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <widget class="QTreeWidget" name="optionsTree" > - <property name="rootIsDecorated" > + <widget class="QTreeWidget" name="optionsTree"> + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="itemsExpandable" > + <property name="itemsExpandable"> <bool>false</bool> </property> - <property name="headerHidden" > + <property name="headerHidden"> <bool>true</bool> </property> - <property name="expandsOnDoubleClick" > + <property name="expandsOnDoubleClick"> <bool>false</bool> </property> <column> - <property name="text" > + <property name="text"> <string>text</string> </property> </column> @@ -216,11 +218,11 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="standardButtons" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set> </property> - <property name="centerButtons" > + <property name="centerButtons"> <bool>false</bool> </property> </widget> diff --git a/cupsprintwidget.cpp b/cupsprintwidget.cpp index c39d0ec..dd91a19 100644 --- a/cupsprintwidget.cpp +++ b/cupsprintwidget.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: cupsprintwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "cupsprint.h" #include "cupsprintwidget.h" #ifndef Q_OS_WIN diff --git a/cupsprintwidget.h b/cupsprintwidget.h index 2ec3049..415e1b2 100644 --- a/cupsprintwidget.h +++ b/cupsprintwidget.h @@ -1,14 +1,20 @@ -// -// C++ Interface: cupsprintwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef CUPSPRINTWIDGET_H #define CUPSPRINTWIDGET_H diff --git a/cupsprintwidget.ui b/cupsprintwidget.ui index 226738e..fc23981 100644 --- a/cupsprintwidget.ui +++ b/cupsprintwidget.ui @@ -1,7 +1,9 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>CUPSPrintWidget</class> - <widget class="QWidget" name="CUPSPrintWidget" > - <property name="geometry" > + <widget class="QWidget" name="CUPSPrintWidget"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,106 +11,106 @@ <height>292</height> </rect> </property> - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Maximum" > + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Form</string> </property> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Name:</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QComboBox" name="cbPrinters" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > + <item row="0" column="1"> + <widget class="QComboBox" name="cbPrinters"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QPushButton" name="pbProps" > - <property name="text" > + <item row="0" column="2"> + <widget class="QPushButton" name="pbProps"> + <property name="text"> <string>Properties</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> <string>State:</string> </property> </widget> </item> - <item row="1" column="1" colspan="2" > - <widget class="QLabel" name="lState" > - <property name="text" > + <item row="1" column="1" colspan="2"> + <widget class="QLabel" name="lState"> + <property name="text"> <string/> </property> </widget> </item> - <item row="2" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Accepting jobs:</string> </property> </widget> </item> - <item row="2" column="1" colspan="2" > - <widget class="QLabel" name="lJAccept" > - <property name="text" > + <item row="2" column="1" colspan="2"> + <widget class="QLabel" name="lJAccept"> + <property name="text"> <string/> </property> </widget> </item> - <item row="3" column="0" > - <widget class="QLabel" name="label_4" > - <property name="text" > + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> <string>Type:</string> </property> </widget> </item> - <item row="3" column="1" colspan="2" > - <widget class="QLabel" name="lType" > - <property name="text" > + <item row="3" column="1" colspan="2"> + <widget class="QLabel" name="lType"> + <property name="text"> <string/> </property> </widget> </item> - <item row="4" column="0" > - <widget class="QLabel" name="label_5" > - <property name="text" > + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> <string>Location:</string> </property> </widget> </item> - <item row="4" column="1" colspan="2" > - <widget class="QLabel" name="lLocation" > - <property name="text" > + <item row="4" column="1" colspan="2"> + <widget class="QLabel" name="lLocation"> + <property name="text"> <string/> </property> </widget> </item> - <item row="5" column="0" > - <widget class="QLabel" name="label_6" > - <property name="text" > + <item row="5" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> <string>Comment:</string> </property> </widget> </item> - <item row="5" column="1" colspan="2" > - <widget class="QLabel" name="lComment" > - <property name="text" > + <item row="5" column="1" colspan="2"> + <widget class="QLabel" name="lComment"> + <property name="text"> <string/> </property> </widget> diff --git a/debian/changelog b/debian/changelog index a68e3db..520c235 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low - Make sure x2goclient closes if broker has no sessions. Fixes appearing session profile dialog if client is configured to minimize to systray. (Closes upstream issue #73). + - Update license headers + - Add "author" entry in UI files [ Ricardo Diaz ] * New upstream version (3.99.3.1): diff --git a/editconnectiondialog.cpp b/editconnectiondialog.cpp index 66ae84a..bf10491 100644 --- a/editconnectiondialog.cpp +++ b/editconnectiondialog.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: editconnectiondialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "editconnectiondialog.h" #include "x2goclientconfig.h" #include "x2gologdebug.h" diff --git a/editconnectiondialog.h b/editconnectiondialog.h index c90730f..146b9f7 100644 --- a/editconnectiondialog.h +++ b/editconnectiondialog.h @@ -1,14 +1,19 @@ -// -// C++ Interface: editconnectiondialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef EDITCONNECTIONDIALOG_H #define EDITCONNECTIONDIALOG_H diff --git a/exportdialog.cpp b/exportdialog.cpp index 5932a4e..53329f0 100644 --- a/exportdialog.cpp +++ b/exportdialog.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: exportdialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "x2goclientconfig.h" #include "exportdialog.h" #include "editconnectiondialog.h" diff --git a/exportdialog.h b/exportdialog.h index d5e531e..018fdb3 100644 --- a/exportdialog.h +++ b/exportdialog.h @@ -1,14 +1,20 @@ -// -// C++ Interface: exportdialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef EXPORTDIALOG_H #define EXPORTDIALOG_H diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index f994891..f473a96 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: httpbrokerclient -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2010 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "httpbrokerclient.h" #include <QUrl> #include <QHttp> diff --git a/httpbrokerclient.h b/httpbrokerclient.h index 725989b..78218dc 100644 --- a/httpbrokerclient.h +++ b/httpbrokerclient.h @@ -1,14 +1,20 @@ -// -// C++ Interface: httpbrokerclient -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2010 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef HTTPBROKERCLIENT_H #define HTTPBROKERCLIENT_H #include "x2goclientconfig.h" diff --git a/imgframe.cpp b/imgframe.cpp index c2632bc..594ab9a 100644 --- a/imgframe.cpp +++ b/imgframe.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: imgframe -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "imgframe.h" #include "x2goclientconfig.h" diff --git a/imgframe.h b/imgframe.h index 81f3651..d83fc6b 100644 --- a/imgframe.h +++ b/imgframe.h @@ -1,14 +1,20 @@ -// -// C++ Interface: imgframe -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef IMGFRAME_H #define IMGFRAME_H diff --git a/ongetpass.cpp b/ongetpass.cpp index ef548d6..11a7307 100644 --- a/ongetpass.cpp +++ b/ongetpass.cpp @@ -1,23 +1,19 @@ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/ongetpass.h b/ongetpass.h index ad68a21..3d0b9d8 100644 --- a/ongetpass.h +++ b/ongetpass.h @@ -1,14 +1,19 @@ -// -// C++ Header File -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2010 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef ONGETPASS_H #define ONGETPASS_H diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 842afc5..db72c4a 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1,21 +1,18 @@ /************************************************************************** * Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder(a)obviously-nice.de * +* o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * -* * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ #include "onmainwindow_privat.h" diff --git a/onmainwindow.h b/onmainwindow.h index 550aa12..c275445 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -1,23 +1,20 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ #ifndef ONMAINWINDOW_H #define ONMAINWINDOW_H diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index f1a7e4d..e98b062 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -1,22 +1,20 @@ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef ONMAINWINDOWPRIVAT_H #define ONMAINWINDOWPRIVAT_H diff --git a/printdialog.cpp b/printdialog.cpp index a16036b..0bebc72 100644 --- a/printdialog.cpp +++ b/printdialog.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: printdialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "printdialog.h" #include <QPushButton> #include "printwidget.h" diff --git a/printdialog.h b/printdialog.h index d1dbc04..022a085 100644 --- a/printdialog.h +++ b/printdialog.h @@ -1,14 +1,20 @@ -// -// C++ Interface: printdialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef PRINTDIALOG_H #define PRINTDIALOG_H diff --git a/printdialog.ui b/printdialog.ui index 284d2dd..4f52e41 100644 --- a/printdialog.ui +++ b/printdialog.ui @@ -1,10 +1,12 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>PrintDialog</class> - <widget class="QDialog" name="PrintDialog" > - <property name="windowModality" > + <widget class="QDialog" name="PrintDialog"> + <property name="windowModality"> <enum>Qt::NonModal</enum> </property> - <property name="geometry" > + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -12,20 +14,20 @@ <height>300</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Print - X2Go client</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="Line" name="line" > - <property name="orientation" > + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="standardButtons" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> @@ -40,11 +42,11 @@ <receiver>PrintDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>199</x> <y>277</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>199</x> <y>149</y> </hint> @@ -56,11 +58,11 @@ <receiver>PrintDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>199</x> <y>277</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>199</x> <y>149</y> </hint> diff --git a/printercmddialog.cpp b/printercmddialog.cpp index c29f90e..036209e 100644 --- a/printercmddialog.cpp +++ b/printercmddialog.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: printercmddialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "printercmddialog.h" #include "x2goclientconfig.h" #ifdef Q_OS_WIN diff --git a/printercmddialog.h b/printercmddialog.h index 399fd3d..319ba72 100644 --- a/printercmddialog.h +++ b/printercmddialog.h @@ -1,14 +1,20 @@ -// -// C++ Interface: printercmddialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef PRINTERCMDDIALOG_H #define PRINTERCMDDIALOG_H diff --git a/printercmddialog.ui b/printercmddialog.ui index b1cf24b..6a7df66 100644 --- a/printercmddialog.ui +++ b/printercmddialog.ui @@ -1,7 +1,9 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>PrinterCmdDialog</class> - <widget class="QDialog" name="PrinterCmdDialog" > - <property name="geometry" > + <widget class="QDialog" name="PrinterCmdDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,67 +11,67 @@ <height>542</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Printer command</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_4" > + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>Command</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>Please enter your customized or individual printing command. Examples: kprinter lpr -P hp_laserjet</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QLineEdit" name="leCmd" /> + <widget class="QLineEdit" name="leCmd"/> </item> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Output format</string> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QLabel" name="label_2" > - <property name="text" > + <widget class="QLabel" name="label_2"> + <property name="text"> <string>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</string> </property> - <property name="textFormat" > + <property name="textFormat"> <enum>Qt::PlainText</enum> </property> - <property name="scaledContents" > + <property name="scaledContents"> <bool>false</bool> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QRadioButton" name="rbPDF" > - <property name="text" > + <widget class="QRadioButton" name="rbPDF"> + <property name="text"> <string>PDF</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="rbPS" > - <property name="text" > + <widget class="QRadioButton" name="rbPS"> + <property name="text"> <string>PS</string> </property> </widget> @@ -81,37 +83,37 @@ lpr -P hp_laserjet</string> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> <string>Data structure</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QLabel" name="label_3" > - <property name="text" > + <widget class="QLabel" name="label_3"> + <property name="text"> <string>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</string> </property> - <property name="textFormat" > + <property name="textFormat"> <enum>Qt::PlainText</enum> </property> - <property name="scaledContents" > + <property name="scaledContents"> <bool>false</bool> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QRadioButton" name="rbStdIn" > - <property name="text" > + <widget class="QRadioButton" name="rbStdIn"> + <property name="text"> <string>standard input (STDIN)</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="rbParam" > - <property name="text" > + <widget class="QRadioButton" name="rbParam"> + <property name="text"> <string>Specify path as program parameter</string> </property> </widget> @@ -120,11 +122,11 @@ lpr -P hp_laserjet</string> </widget> </item> <item> - <spacer name="verticalSpacer" > - <property name="orientation" > + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>37</height> @@ -133,8 +135,8 @@ lpr -P hp_laserjet</string> </spacer> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="standardButtons" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> @@ -149,11 +151,11 @@ lpr -P hp_laserjet</string> <receiver>PrinterCmdDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>230</x> <y>519</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>230</x> <y>270</y> </hint> diff --git a/printprocess.cpp b/printprocess.cpp index 910a1e5..ab88356 100644 --- a/printprocess.cpp +++ b/printprocess.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: printprocess -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "x2goclientconfig.h" #include "printprocess.h" #include "x2gologdebug.h" diff --git a/printprocess.h b/printprocess.h index 290f9d2..d6803be 100644 --- a/printprocess.h +++ b/printprocess.h @@ -1,14 +1,20 @@ -// -// C++ Interface: printprocess -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef PRINTPROCESS_H #define PRINTPROCESS_H diff --git a/printwidget.cpp b/printwidget.cpp index 75ea92a..471d6de 100644 --- a/printwidget.cpp +++ b/printwidget.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: printwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "printwidget.h" #if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) #include "cupsprintwidget.h" diff --git a/printwidget.h b/printwidget.h index 449bd40..fc50b6f 100644 --- a/printwidget.h +++ b/printwidget.h @@ -1,14 +1,20 @@ -// -// C++ Interface: printwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef PRINTWIDGET_H #define PRINTWIDGET_H diff --git a/printwidget.ui b/printwidget.ui index cf37453..eac5c7e 100644 --- a/printwidget.ui +++ b/printwidget.ui @@ -1,7 +1,9 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>PrintWidget</class> - <widget class="QWidget" name="PrintWidget" > - <property name="geometry" > + <widget class="QWidget" name="PrintWidget"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,37 +11,37 @@ <height>497</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Form</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_5" > + <layout class="QVBoxLayout" name="verticalLayout_5"> <item> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QRadioButton" name="rbPrint" > - <property name="text" > + <widget class="QRadioButton" name="rbPrint"> + <property name="text"> <string>Print</string> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QRadioButton" name="rbView" > - <property name="text" > + <widget class="QRadioButton" name="rbView"> + <property name="text"> <string>View as PDF</string> </property> </widget> </item> <item> - <spacer name="verticalSpacer" > - <property name="orientation" > + <spacer name="verticalSpacer"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> @@ -50,69 +52,69 @@ </layout> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout_4" > + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <widget class="QGroupBox" name="gbPrint" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QGroupBox" name="gbPrint"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>Print settings</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3" > + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QLabel" name="lWinPrinter" > - <property name="text" > + <widget class="QLabel" name="lWinPrinter"> + <property name="text"> <string>Printer:</string> </property> </widget> </item> <item> - <widget class="QComboBox" name="cbWinPrinter" /> + <widget class="QComboBox" name="cbWinPrinter"/> </item> <item> - <widget class="QLabel" name="lWinInfo" > - <property name="text" > + <widget class="QLabel" name="lWinInfo"> + <property name="text"> <string>Print using default Windows PDF Viewer (Viewer application needs to be installed)</string> </property> </widget> </item> <item> - <widget class="Line" name="line" > - <property name="orientation" > + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QCheckBox" name="cbPrintCmd" > - <property name="text" > + <widget class="QCheckBox" name="cbPrintCmd"> + <property name="text"> <string>Printer command:</string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_3" > + <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> - <widget class="QLineEdit" name="lePrintCmd" > - <property name="enabled" > + <widget class="QLineEdit" name="lePrintCmd"> + <property name="enabled"> <bool>false</bool> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QPushButton" name="pbPrintCmd" > - <property name="enabled" > + <widget class="QPushButton" name="pbPrintCmd"> + <property name="enabled"> <bool>false</bool> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> </widget> @@ -120,11 +122,11 @@ </layout> </item> <item> - <spacer name="verticalSpacer_3" > - <property name="orientation" > + <spacer name="verticalSpacer_3"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>325</width> <height>2</height> @@ -136,57 +138,57 @@ </widget> </item> <item> - <widget class="QGroupBox" name="gbView" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QGroupBox" name="gbView"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>Viewer settings</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QRadioButton" name="rbOpen" > - <property name="text" > + <widget class="QRadioButton" name="rbOpen"> + <property name="text"> <string>Open in viewer application</string> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>Command:</string> </property> </widget> </item> <item> - <widget class="QLineEdit" name="leOpenCmd" /> + <widget class="QLineEdit" name="leOpenCmd"/> </item> </layout> </item> <item> - <widget class="QRadioButton" name="rbSave" > - <property name="text" > + <widget class="QRadioButton" name="rbSave"> + <property name="text"> <string>Save to disk</string> </property> - <property name="checked" > + <property name="checked"> <bool>false</bool> </property> </widget> </item> <item> - <spacer name="verticalSpacer_2" > - <property name="orientation" > + <spacer name="verticalSpacer_2"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>18</height> @@ -202,11 +204,11 @@ </layout> </item> <item> - <widget class="QCheckBox" name="cbShowDialog" > - <property name="text" > + <widget class="QCheckBox" name="cbShowDialog"> + <property name="text"> <string>Show this dialog before start printing</string> </property> - <property name="checked" > + <property name="checked"> <bool>true</bool> </property> </widget> @@ -221,11 +223,11 @@ <receiver>label</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>249</x> <y>120</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>165</x> <y>150</y> </hint> @@ -237,11 +239,11 @@ <receiver>leOpenCmd</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>249</x> <y>120</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>284</x> <y>150</y> </hint> @@ -253,11 +255,11 @@ <receiver>lePrintCmd</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>248</x> <y>56</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>206</x> <y>88</y> </hint> @@ -269,11 +271,11 @@ <receiver>pbPrintCmd</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>248</x> <y>56</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>327</x> <y>88</y> </hint> @@ -285,11 +287,11 @@ <receiver>gbPrint</receiver> <slot>setVisible(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>62</x> <y>22</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>296</x> <y>64</y> </hint> @@ -301,11 +303,11 @@ <receiver>gbView</receiver> <slot>setVisible(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>62</x> <y>46</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>296</x> <y>188</y> </hint> diff --git a/sessionbutton.cpp b/sessionbutton.cpp index c5ed6b0..576d491 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: sessionbutton -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "sessionbutton.h" #include "x2goclientconfig.h" diff --git a/sessionbutton.h b/sessionbutton.h index fe294d6..bef550b 100644 --- a/sessionbutton.h +++ b/sessionbutton.h @@ -1,14 +1,20 @@ -// -// C++ Interface: sessionbutton -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef SESSIONBUTTON_H #define SESSIONBUTTON_H diff --git a/sessionmanagedialog.cpp b/sessionmanagedialog.cpp index f4a9026..2459276 100644 --- a/sessionmanagedialog.cpp +++ b/sessionmanagedialog.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: sessionmanagedialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "x2goclientconfig.h" #include "sessionmanagedialog.h" #include "onmainwindow.h" diff --git a/sessionmanagedialog.h b/sessionmanagedialog.h index 4bbe34f..931226e 100644 --- a/sessionmanagedialog.h +++ b/sessionmanagedialog.h @@ -1,14 +1,20 @@ -// -// C++ Interface: sessionmanagedialog -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef SESSIONMANAGEDIALOG_H #define SESSIONMANAGEDIALOG_H #include "x2goclientconfig.h" diff --git a/sessionwidget.cpp b/sessionwidget.cpp index 715c332..c78eb0c 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: sessionwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "sessionwidget.h" #include <QBoxLayout> #include <QLineEdit> diff --git a/sessionwidget.h b/sessionwidget.h index e289a30..fe2240a 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -1,14 +1,20 @@ -// -// C++ Interface: sessionwidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef SESSIONWIDGET_H #define SESSIONWIDGET_H diff --git a/settingswidget.cpp b/settingswidget.cpp index 12ac5f1..98cb9b0 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: settingswidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "settingswidget.h" #include "onmainwindow.h" #include <QBoxLayout> diff --git a/settingswidget.h b/settingswidget.h index eeed255..590e728 100644 --- a/settingswidget.h +++ b/settingswidget.h @@ -1,14 +1,20 @@ -// -// C++ Interface: settingswidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef SETTINGSWIDGET_H #define SETTINGSWIDGET_H diff --git a/sharewidget.cpp b/sharewidget.cpp index dcece1d..22b9380 100644 --- a/sharewidget.cpp +++ b/sharewidget.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: sharewidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "sharewidget.h" #include "onmainwindow.h" diff --git a/sharewidget.h b/sharewidget.h index ffcf1bd..edf0707 100644 --- a/sharewidget.h +++ b/sharewidget.h @@ -1,14 +1,20 @@ -// -// C++ Interface: sharewidget -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2009 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef SHAREWIDGET_H #define SHAREWIDGET_H diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 5a23989..317be46 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1,24 +1,19 @@ - -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #include "x2goclientconfig.h" #include "x2gologdebug.h" diff --git a/sshmasterconnection.h b/sshmasterconnection.h index fa9af03..bbefe0f 100644 --- a/sshmasterconnection.h +++ b/sshmasterconnection.h @@ -1,23 +1,19 @@ - -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef SSHMASTERCONNECTION_H #define SSHMASTERCONNECTION_H diff --git a/sshprocess.cpp b/sshprocess.cpp index c997002..1347e21 100644 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -1,23 +1,19 @@ - -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #include "x2goclientconfig.h" #include "x2gologdebug.h" diff --git a/sshprocess.h b/sshprocess.h index 9bd8b92..d446e22 100644 --- a/sshprocess.h +++ b/sshprocess.h @@ -1,23 +1,19 @@ - -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef SSHPROCESS_H #define SSHPROCESS_H diff --git a/userbutton.cpp b/userbutton.cpp index 270ea93..241fb14 100644 --- a/userbutton.cpp +++ b/userbutton.cpp @@ -1,22 +1,20 @@ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "x2goclientconfig.h" #include "userbutton.h" #include <QFont> diff --git a/userbutton.h b/userbutton.h index 7606d97..0e1159c 100644 --- a/userbutton.h +++ b/userbutton.h @@ -1,22 +1,20 @@ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef USERBUTTON_H #define USERBUTTON_H diff --git a/version.h b/version.h index e442bfd..e0497dc 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,19 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #define VERSION "3.99.3.1" diff --git a/wapi.cpp b/wapi.cpp index 9af6085..affdbc4 100644 --- a/wapi.cpp +++ b/wapi.cpp @@ -1,3 +1,20 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef _WIN32_WINDOWS #define _WIN32_WINDOWS 0x0500 #define _WIN32_WINNT 0x0500 diff --git a/wapi.h b/wapi.h index e7ec667..0ba6457 100644 --- a/wapi.h +++ b/wapi.h @@ -1,3 +1,20 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef _WAPI_H #define _WAPI_H #include "x2goclientconfig.h" diff --git a/x2goclient.cpp b/x2goclient.cpp index d2d0b94..4fdd905 100644 --- a/x2goclient.cpp +++ b/x2goclient.cpp @@ -1,22 +1,20 @@ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "ongetpass.h" int main(int argc, char *argv[]) diff --git a/x2goclientconfig.h b/x2goclientconfig.h index 48a8992..341c1f7 100644 --- a/x2goclientconfig.h +++ b/x2goclientconfig.h @@ -1,3 +1,20 @@ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #if !defined(_X2GOCLIENT_CONFIG_H_) #define _X2GOCLIENT_CONFIG_H_ diff --git a/x2gologdebug.cpp b/x2gologdebug.cpp index 894a25c..c21c1c3 100644 --- a/x2gologdebug.cpp +++ b/x2gologdebug.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: x2gologdebug -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "x2gologdebug.h" #include "x2goclientconfig.h" #ifdef LOGFILE diff --git a/x2gologdebug.h b/x2gologdebug.h index 05e996d..b35f783 100644 --- a/x2gologdebug.h +++ b/x2gologdebug.h @@ -1,14 +1,20 @@ -// -// C++ Interface: x2gologdebug -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #ifndef X2GOLOGDEBUG_H #define X2GOLOGDEBUG_H #include <QTextStream> diff --git a/x2gosettings.cpp b/x2gosettings.cpp index 79077fb..97d3f7e 100644 --- a/x2gosettings.cpp +++ b/x2gosettings.cpp @@ -1,14 +1,20 @@ -// -// C++ Implementation: x2gosettings -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2010 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ + #include "x2gosettings.h" #include "x2goclientconfig.h" #include "x2gologdebug.h" diff --git a/x2gosettings.h b/x2gosettings.h index fffd350..985820a 100644 --- a/x2gosettings.h +++ b/x2gosettings.h @@ -1,15 +1,19 @@ -// -// C++ Interface: x2gosettings -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2010 -// -// Copyright: See COPYING file that comes with this distribution -// -// - +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef X2GOSETTINGS_H #define X2GOSETTINGS_H diff --git a/xsettingsui.ui b/xsettingsui.ui index 2f85125..2a89846 100644 --- a/xsettingsui.ui +++ b/xsettingsui.ui @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> + <author>Oleksandr Shneyder(o.shneyder(a)phoca-gmbh.de)</author> <class>XSettingsWidgetUI</class> <widget class="QWidget" name="XSettingsWidgetUI"> <property name="geometry"> @@ -7,7 +8,7 @@ <x>0</x> <y>0</y> <width>521</width> - <height>380</height> + <height>386</height> </rect> </property> <property name="windowTitle"> diff --git a/xsettingswidget.cpp b/xsettingswidget.cpp index a76fa61..424c047 100644 --- a/xsettingswidget.cpp +++ b/xsettingswidget.cpp @@ -1,21 +1,19 @@ -/* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2005-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -*/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #include "xsettingswidget.h" #include "x2gosettings.h" diff --git a/xsettingswidget.h b/xsettingswidget.h index 0627350..a2ca9e5 100644 --- a/xsettingswidget.h +++ b/xsettingswidget.h @@ -1,21 +1,19 @@ -/* - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2005-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -*/ +/************************************************************************** +* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program. If not, see <http://www.gnu.org/licenses/>. * +***************************************************************************/ #ifndef XSETTINGSWIDGET_H #define XSETTINGSWIDGET_H hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

pyhoca-cli.git - master (branch) updated: 0.2.0.4-23-g2ebe70d
by git-admin＠x2go.org 13 Dec '12

13 Dec '12

The branch, master has been updated via 2ebe70d85b59ff245361bf1d5cc42aa17029466b (commit) via 5130c68a32059081564bea14d8c497dd83a32918 (commit) from 28400324571e4e4dd66974a548a08004ab4a4352 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2ebe70d85b59ff245361bf1d5cc42aa17029466b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 13 13:34:16 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 13 ++++++++++--- pyhoca/cli/__init__.py | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b771383..8c71004 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ -pyhoca-cli (0.2.1.0-0~x2go1) UNRELEASED; urgency=low +pyhoca-cli (0.2.1.1-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.2.1.1): + - Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Dec 2012 13:33:33 +0100 + +pyhoca-cli (0.2.1.0-0~x2go1) unstable; urgency=low * New upstream version (0.2.1.0): - Add cmdline option --from-stdin that facilitates lightdm remote login session startup. - The option ,,password'' is not allowed for session registration. - - When finishing the application Update session status before reporting + - When finishing the application, update session status before reporting back to the user what happened to the session. - Remove cmdline option --time-to-wait, Python X2Go now offers a progress status for session startup/resumption. So we query this status instead. @@ -18,7 +25,7 @@ pyhoca-cli (0.2.1.0-0~x2go1) UNRELEASED; urgency=low + Mention keyboard auto detection switch. + Mention possible geometry value: maximize. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 16:38:54 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 10 Dec 2012 14:51:11 +0100 pyhoca-cli (0.2.0.4-0~x2go1) unstable; urgency=low diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index dcc9c61..8e65906 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.2.1.0" +__VERSION__ = "0.2.1.1" from frontend import * hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

python-x2go.git - master (branch) updated: 0.2.1.0-1-gb47b28f
by git-admin＠x2go.org 13 Dec '12

13 Dec '12

The branch, master has been updated via b47b28ff3c27d2dc75a5c18281867c2119790cc0 (commit) from 86a4bfdb9c720bc4dd24a59dc9bf7b2403f52005 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b47b28ff3c27d2dc75a5c18281867c2119790cc0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 13 13:33:17 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2go/__init__.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9baeb62..55b7597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-x2go (0.2.1.1-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.2.1.1): + - Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Dec 2012 13:32:30 +0100 + python-x2go (0.2.1.0-0~x2go1) unstable; urgency=low * New upstream version (0.2.1.0): diff --git a/x2go/__init__.py b/x2go/__init__.py index b0567cd..e8470ef 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.1.0' +__VERSION__ = '0.2.1.1' from gevent import monkey monkey.patch_all() hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.0-1-gb438cba
by git-admin＠x2go.org 13 Dec '12

13 Dec '12

The branch, master has been updated via b438cba88ab7d7a9f2ea08f349c4963ca3ec34fa (commit) from 5bb9a4b0aa33329c2b2a79260b54a6b87334332a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b438cba88ab7d7a9f2ea08f349c4963ca3ec34fa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Dec 13 13:29:03 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ pyhoca/wxgui/__init__.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 49aeba3..6b24476 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pyhoca-gui (0.2.1.1-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.2.1.1): + - Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Dec 2012 13:28:15 +0100 + pyhoca-gui (0.2.1.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 0fe95eb..467b22e 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.2.1.0' +__VERSION__ = '0.2.1.1' from frontend import * hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits December 2012