x2go-commits February 2012

x2go-commits@lists.x2go.org

1 participants
198 discussions

x2gothinclient.git - master (branch) updated: 1.0.1.5-12-g4eca45f
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 4eca45ff7d4625b038405a5bad7e4d09ff9fe272 (commit) from 7d5e1990195c50c3df475157ebfa641eb32d3465 (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 4eca45ff7d4625b038405a5bad7e4d09ff9fe272 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 13:41:26 2012 +0100 Break and replace x2gothinshutdown via /debian/control file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d118043..25b8b74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. + * Break and replace x2gothinshutdown via /debian/control file. [ Oleksandr Shneyder ] * New upstream version (1.0.1.6): diff --git a/debian/control b/debian/control index 4c562b0..b758394 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,10 @@ Recommends: nfs-kernel-server Suggests: dhcp3-server | dnsmasq | isc-dhcp-server +Breaks: + x2gothinshutdown +Replaces: + x2gothinshutdown Description: Management tools for X2Go thin client chroot server X2Go is a server based computing environment with - session resuming hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-11-g7d5e199
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 7d5e1990195c50c3df475157ebfa641eb32d3465 (commit) from cbd84540554db2861d2fd431d12e1ca7754c9fe2 (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 7d5e1990195c50c3df475157ebfa641eb32d3465 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Feb 24 13:06:48 2012 +0100 Support for new features of X2Go Client ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++ debian/control | 30 +----------- debian/rules | 3 - debian/x2gothinshutdown.install | 1 - debian/x2gothinshutdown.manpages | 1 - x2gothinclient/sbin/x2gothinclientd | 37 +++++----------- .../share/x2gothinclient_start | 4 ++ x2gothinshutdown/man/thinshutdown.1 | 25 ----------- x2gothinshutdown/thinshutdown/mb.cpp | 18 -------- x2gothinshutdown/thinshutdown/mb.h | 13 ------ x2gothinshutdown/thinshutdown/power-button.png | Bin 742 -> 0 bytes x2gothinshutdown/thinshutdown/resources.rcc | 5 -- x2gothinshutdown/thinshutdown/thinshutdown.cpp | 46 -------------------- x2gothinshutdown/thinshutdown/thinshutdown.pro | 13 ------ 14 files changed, 29 insertions(+), 177 deletions(-) delete mode 100644 debian/x2gothinshutdown.install delete mode 100644 debian/x2gothinshutdown.manpages delete mode 100644 x2gothinshutdown/man/thinshutdown.1 delete mode 100644 x2gothinshutdown/thinshutdown/mb.cpp delete mode 100644 x2gothinshutdown/thinshutdown/mb.h delete mode 100644 x2gothinshutdown/thinshutdown/power-button.png delete mode 100644 x2gothinshutdown/thinshutdown/resources.rcc delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.cpp delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.pro The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 37f7dbb..d118043 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,20 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (1.0.1.6): - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. + [ Oleksandr Shneyder ] + * New upstream version (1.0.1.6): + - x2gothinshutdown is removed. + - Options --thinclient and --haltbt added to x2gothinclient_sessions. + - x2gothinclientd is modified to use x2goclient shutdown button + instead of x2gothinshutdown. + - gnupg-agent, pinentry-x2go and gpgsm added to "Recommends" section + for package x2gothinclient. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 x2gothinclient (1.0.1.5-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4348bf8..4c562b0 100644 --- a/debian/control +++ b/debian/control @@ -48,15 +48,16 @@ Depends: ${misc:Depends}, psmisc, x2goclient, - x2gothinshutdown, xauth, xinit, locales Recommends: x2gocdmanager, - x2gothinshutdown, x2gousbmount, x2gosmartcardrules, + gnupg-agent, + pinentry-x2go, + gpgsm, vim, mc, acpid, @@ -130,31 +131,6 @@ Description: clientside daemon enabling automatic CD-Rom mounting This package adds a client-side daemon to your X2Go thin client that enables automatic CD-ROM mounting within thin client X2Go sessions. -Package: x2gothinshutdown -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - libqt4-gui, -Conflicts: - x2gocdmanager (<= 1.0.1.2-0~) -Description: shutdown button for X2Go thin client - X2Go is a server based computing environment with - - session resuming - - low bandwith support - - LDAP support - - client side mass storage mounting support - - audio support - - authentication by smartcard and USB stick - . - x2gothinshutdown: - -------------- - IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT - (This package is meant to be installed in a CHROOT environment!!!) - . - This package provides an on-screen power-off button (Qt4) for shutting - down your X2Go thin client. - Package: x2gosmartcardrules Architecture: all Depends: diff --git a/debian/rules b/debian/rules index d10f2e9..d2fdbb4 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,6 @@ configure: configure-stamp configure-stamp: dh_testdir cd x2gocdmanager/powerej && qmake-qt4 powerej.pro - cd x2gothinshutdown/thinshutdown && qmake-qt4 thinshutdown.pro touch $@ build: build-stamp @@ -20,14 +19,12 @@ build-stamp: configure-stamp dh_testdir dh_prep $(MAKE) -C x2gocdmanager/powerej - $(MAKE) -C x2gothinshutdown/thinshutdown touch $@ clean: dh_testdir dh_testroot [ ! -f x2gocdmanager/powerej/Makefile ] || $(MAKE) -C x2gocdmanager/powerej distclean - [ ! -f x2gothinshutdown/thinshutdown/Makefile ] || $(MAKE) -C x2gothinshutdown/thinshutdown distclean dh_clean build-stamp configure-stamp binary-indep: build diff --git a/debian/x2gothinshutdown.install b/debian/x2gothinshutdown.install deleted file mode 100644 index 225868f..0000000 --- a/debian/x2gothinshutdown.install +++ /dev/null @@ -1 +0,0 @@ -x2gothinshutdown/thinshutdown/thinshutdown usr/sbin diff --git a/debian/x2gothinshutdown.manpages b/debian/x2gothinshutdown.manpages deleted file mode 100644 index dca66a8..0000000 --- a/debian/x2gothinshutdown.manpages +++ /dev/null @@ -1 +0,0 @@ -x2gothinshutdown/man/thinshutdown.1 \ No newline at end of file diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index a7f4af0..eb0be03 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -89,15 +89,15 @@ elsif ($pid == 0 ) while(sleep 1) { - - my $thinshutdown_delay = 4; - + # test if shutdown button on X2Go Client was clicked + if ( -e "/home/x2goclient/.halt") + { + system("shutdown -h now"); + } # test if XServer is running, if not launch it... if ( check_x() ==0 ) { system("/usr/bin/Xorg -br &"); - # delay appearance of thinshutdown button a little longer on X server (re)start - $thinshutdown_delay = 10; } # test if pulseaudio is running, if not launch it... @@ -114,26 +114,13 @@ elsif ($pid == 0 ) $x2goclient_pid = eval { open3( \*IN, \*OUT, \*ERR, "su - x2goclient -c 'DISPLAY=:0 bash -c \"/etc/x2go/x2gothinclient_start &\"'"); }; - } - - # handle availability of the thinshutdown button GUI... - my $outp=`ps ax`; - my $CLIENT=($outp =~ m/x2goclient/); - my $PROXY=($outp =~ m/nxproxy/); - my $SHUTD=($outp =~ m/thinshutdown/); - if ( $SHUTD && $PROXY ) - { - system("killall thinshutdown"); - } - if ( !$SHUTD && !$PROXY && $CLIENT) - { - system("sleep $thinshutdown_delay; DISPLAY=:0 thinshutdown &"); - } - - ## wait for x2goclient to finish - if ( check_client() ) - { - waitpid( $x2goclient_pid, 0 ); + ## give X2Go Client some time to start + sleep(3); + ## wait for x2goclient to finish + if ( check_client() ) + { + waitpid( $x2goclient_pid, 0 ); + } } } } diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start index abc1b6f..b603c00 100755 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -27,6 +27,8 @@ --kbd-type=pc105/de \ --set-kbd=1 \ --geometry=fullscreen \ + --thinclient \ + --haltbt \ --read-exports-from=/home/x2goclient/export \ --background=/etc/x2go/x2goclient-background.svg \ --no-session-edit \ @@ -39,6 +41,8 @@ # --no-menu \ # --maximize \ # --link=lan \ +# --thinclient \ +# --haltbt \ # --kbd-layout=de \ # --kbd-type=pc105/de \ # --set-kbd=1 \ diff --git a/x2gothinshutdown/man/thinshutdown.1 b/x2gothinshutdown/man/thinshutdown.1 deleted file mode 100644 index ead3d4a..0000000 --- a/x2gothinshutdown/man/thinshutdown.1 +++ /dev/null @@ -1,25 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH thinshutdown 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" -.SH NAME -thinshutdown \- Shutdown tool for X2Go Thin Clients. -.SH SYNOPSIS -'nh -.fi -.ad l -\fBthinshutdown\fR - -.SH DESCRIPTION -\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2Go thin clients. -.PP -.SH OPTIONS -\fBthinshutdown\fR has no known options. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project -(http://www.x2go.org). diff --git a/x2gothinshutdown/thinshutdown/mb.cpp b/x2gothinshutdown/thinshutdown/mb.cpp deleted file mode 100644 index 7d81e04..0000000 --- a/x2gothinshutdown/thinshutdown/mb.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "mb.h" -#include <QProcess> -#include <QFile> -#include <QTextStream> -#include <QDebug> - -MPushButton::MPushButton():QPushButton("",0) -{ - QPixmap p(":/power-button.png"); - setIcon(p); - setFlat(true); - connect(this,SIGNAL(clicked()),this,SLOT(slot_cl())); -} - -void MPushButton::slot_cl() -{ - QProcess::startDetached("halt"); -} diff --git a/x2gothinshutdown/thinshutdown/mb.h b/x2gothinshutdown/thinshutdown/mb.h deleted file mode 100644 index 7fc94ea..0000000 --- a/x2gothinshutdown/thinshutdown/mb.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _______MB_H_ -#define _______MB_H_ - -#include <QPushButton> -class MPushButton: public QPushButton -{ -Q_OBJECT - public: - MPushButton(); - private slots: - void slot_cl(); -}; -#endif diff --git a/x2gothinshutdown/thinshutdown/power-button.png b/x2gothinshutdown/thinshutdown/power-button.png deleted file mode 100644 index 03b1d1b..0000000 Binary files a/x2gothinshutdown/thinshutdown/power-button.png and /dev/null differ diff --git a/x2gothinshutdown/thinshutdown/resources.rcc b/x2gothinshutdown/thinshutdown/resources.rcc deleted file mode 100644 index fa02634..0000000 --- a/x2gothinshutdown/thinshutdown/resources.rcc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource> - <file>power-button.png</file> - </qresource> -</RCC> diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.cpp b/x2gothinshutdown/thinshutdown/thinshutdown.cpp deleted file mode 100644 index 796adad..0000000 --- a/x2gothinshutdown/thinshutdown/thinshutdown.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * 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., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <QApplication> -#include <QTranslator> -#include <QLocale> -#include <QFrame> -#include <mb.h> -#include <QPlastiqueStyle> -#include <QDesktopWidget> - -using namespace std; -int main(int argc, char *argv[]) -{ - QApplication app(argc,argv); - app.setStyle(new QPlastiqueStyle()); - -// QFrame*fr =new QFrame(0,Qt::WindowStaysOnTopHint|Qt::X11BypassWindowManagerHint); - MPushButton*fr =new MPushButton(); - fr->setFixedSize(24,24); - fr->move(6,6); - fr->show(); - return app.exec(); -} diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.pro b/x2gothinshutdown/thinshutdown/thinshutdown.pro deleted file mode 100644 index 344c8e9..0000000 --- a/x2gothinshutdown/thinshutdown/thinshutdown.pro +++ /dev/null @@ -1,13 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Fr Jun 1 09:19:29 2007 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += mb.h -SOURCES += thinshutdown.cpp mb.cpp -RESOURCES += resources.rcc hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-11-gfe09501
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via fe095012e879566e5a782b791f3aed8a2b150d7a (commit) from cbd84540554db2861d2fd431d12e1ca7754c9fe2 (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 fe095012e879566e5a782b791f3aed8a2b150d7a Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Feb 24 13:06:48 2012 +0100 Support for new fetures of X2Go Client ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++ debian/control | 30 +----------- debian/rules | 3 - debian/x2gothinshutdown.install | 1 - debian/x2gothinshutdown.manpages | 1 - x2gothinclient/sbin/x2gothinclientd | 37 +++++----------- .../share/x2gothinclient_start | 4 ++ x2gothinshutdown/man/thinshutdown.1 | 25 ----------- x2gothinshutdown/thinshutdown/mb.cpp | 18 -------- x2gothinshutdown/thinshutdown/mb.h | 13 ------ x2gothinshutdown/thinshutdown/power-button.png | Bin 742 -> 0 bytes x2gothinshutdown/thinshutdown/resources.rcc | 5 -- x2gothinshutdown/thinshutdown/thinshutdown.cpp | 46 -------------------- x2gothinshutdown/thinshutdown/thinshutdown.pro | 13 ------ 14 files changed, 29 insertions(+), 177 deletions(-) delete mode 100644 debian/x2gothinshutdown.install delete mode 100644 debian/x2gothinshutdown.manpages delete mode 100644 x2gothinshutdown/man/thinshutdown.1 delete mode 100644 x2gothinshutdown/thinshutdown/mb.cpp delete mode 100644 x2gothinshutdown/thinshutdown/mb.h delete mode 100644 x2gothinshutdown/thinshutdown/power-button.png delete mode 100644 x2gothinshutdown/thinshutdown/resources.rcc delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.cpp delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.pro The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 37f7dbb..d118043 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,20 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (1.0.1.6): - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. + [ Oleksandr Shneyder ] + * New upstream version (1.0.1.6): + - x2gothinshutdown is removed. + - Options --thinclient and --haltbt added to x2gothinclient_sessions. + - x2gothinclientd is modified to use x2goclient shutdown button + instead of x2gothinshutdown. + - gnupg-agent, pinentry-x2go and gpgsm added to "Recommends" section + for package x2gothinclient. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 x2gothinclient (1.0.1.5-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4348bf8..4c562b0 100644 --- a/debian/control +++ b/debian/control @@ -48,15 +48,16 @@ Depends: ${misc:Depends}, psmisc, x2goclient, - x2gothinshutdown, xauth, xinit, locales Recommends: x2gocdmanager, - x2gothinshutdown, x2gousbmount, x2gosmartcardrules, + gnupg-agent, + pinentry-x2go, + gpgsm, vim, mc, acpid, @@ -130,31 +131,6 @@ Description: clientside daemon enabling automatic CD-Rom mounting This package adds a client-side daemon to your X2Go thin client that enables automatic CD-ROM mounting within thin client X2Go sessions. -Package: x2gothinshutdown -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - libqt4-gui, -Conflicts: - x2gocdmanager (<= 1.0.1.2-0~) -Description: shutdown button for X2Go thin client - X2Go is a server based computing environment with - - session resuming - - low bandwith support - - LDAP support - - client side mass storage mounting support - - audio support - - authentication by smartcard and USB stick - . - x2gothinshutdown: - -------------- - IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT - (This package is meant to be installed in a CHROOT environment!!!) - . - This package provides an on-screen power-off button (Qt4) for shutting - down your X2Go thin client. - Package: x2gosmartcardrules Architecture: all Depends: diff --git a/debian/rules b/debian/rules index d10f2e9..d2fdbb4 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,6 @@ configure: configure-stamp configure-stamp: dh_testdir cd x2gocdmanager/powerej && qmake-qt4 powerej.pro - cd x2gothinshutdown/thinshutdown && qmake-qt4 thinshutdown.pro touch $@ build: build-stamp @@ -20,14 +19,12 @@ build-stamp: configure-stamp dh_testdir dh_prep $(MAKE) -C x2gocdmanager/powerej - $(MAKE) -C x2gothinshutdown/thinshutdown touch $@ clean: dh_testdir dh_testroot [ ! -f x2gocdmanager/powerej/Makefile ] || $(MAKE) -C x2gocdmanager/powerej distclean - [ ! -f x2gothinshutdown/thinshutdown/Makefile ] || $(MAKE) -C x2gothinshutdown/thinshutdown distclean dh_clean build-stamp configure-stamp binary-indep: build diff --git a/debian/x2gothinshutdown.install b/debian/x2gothinshutdown.install deleted file mode 100644 index 225868f..0000000 --- a/debian/x2gothinshutdown.install +++ /dev/null @@ -1 +0,0 @@ -x2gothinshutdown/thinshutdown/thinshutdown usr/sbin diff --git a/debian/x2gothinshutdown.manpages b/debian/x2gothinshutdown.manpages deleted file mode 100644 index dca66a8..0000000 --- a/debian/x2gothinshutdown.manpages +++ /dev/null @@ -1 +0,0 @@ -x2gothinshutdown/man/thinshutdown.1 \ No newline at end of file diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index a7f4af0..eb0be03 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -89,15 +89,15 @@ elsif ($pid == 0 ) while(sleep 1) { - - my $thinshutdown_delay = 4; - + # test if shutdown button on X2Go Client was clicked + if ( -e "/home/x2goclient/.halt") + { + system("shutdown -h now"); + } # test if XServer is running, if not launch it... if ( check_x() ==0 ) { system("/usr/bin/Xorg -br &"); - # delay appearance of thinshutdown button a little longer on X server (re)start - $thinshutdown_delay = 10; } # test if pulseaudio is running, if not launch it... @@ -114,26 +114,13 @@ elsif ($pid == 0 ) $x2goclient_pid = eval { open3( \*IN, \*OUT, \*ERR, "su - x2goclient -c 'DISPLAY=:0 bash -c \"/etc/x2go/x2gothinclient_start &\"'"); }; - } - - # handle availability of the thinshutdown button GUI... - my $outp=`ps ax`; - my $CLIENT=($outp =~ m/x2goclient/); - my $PROXY=($outp =~ m/nxproxy/); - my $SHUTD=($outp =~ m/thinshutdown/); - if ( $SHUTD && $PROXY ) - { - system("killall thinshutdown"); - } - if ( !$SHUTD && !$PROXY && $CLIENT) - { - system("sleep $thinshutdown_delay; DISPLAY=:0 thinshutdown &"); - } - - ## wait for x2goclient to finish - if ( check_client() ) - { - waitpid( $x2goclient_pid, 0 ); + ## give X2Go Client some time to start + sleep(3); + ## wait for x2goclient to finish + if ( check_client() ) + { + waitpid( $x2goclient_pid, 0 ); + } } } } diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start index abc1b6f..b603c00 100755 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -27,6 +27,8 @@ --kbd-type=pc105/de \ --set-kbd=1 \ --geometry=fullscreen \ + --thinclient \ + --haltbt \ --read-exports-from=/home/x2goclient/export \ --background=/etc/x2go/x2goclient-background.svg \ --no-session-edit \ @@ -39,6 +41,8 @@ # --no-menu \ # --maximize \ # --link=lan \ +# --thinclient \ +# --haltbt \ # --kbd-layout=de \ # --kbd-type=pc105/de \ # --set-kbd=1 \ diff --git a/x2gothinshutdown/man/thinshutdown.1 b/x2gothinshutdown/man/thinshutdown.1 deleted file mode 100644 index ead3d4a..0000000 --- a/x2gothinshutdown/man/thinshutdown.1 +++ /dev/null @@ -1,25 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH thinshutdown 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" -.SH NAME -thinshutdown \- Shutdown tool for X2Go Thin Clients. -.SH SYNOPSIS -'nh -.fi -.ad l -\fBthinshutdown\fR - -.SH DESCRIPTION -\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2Go thin clients. -.PP -.SH OPTIONS -\fBthinshutdown\fR has no known options. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project -(http://www.x2go.org). diff --git a/x2gothinshutdown/thinshutdown/mb.cpp b/x2gothinshutdown/thinshutdown/mb.cpp deleted file mode 100644 index 7d81e04..0000000 --- a/x2gothinshutdown/thinshutdown/mb.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "mb.h" -#include <QProcess> -#include <QFile> -#include <QTextStream> -#include <QDebug> - -MPushButton::MPushButton():QPushButton("",0) -{ - QPixmap p(":/power-button.png"); - setIcon(p); - setFlat(true); - connect(this,SIGNAL(clicked()),this,SLOT(slot_cl())); -} - -void MPushButton::slot_cl() -{ - QProcess::startDetached("halt"); -} diff --git a/x2gothinshutdown/thinshutdown/mb.h b/x2gothinshutdown/thinshutdown/mb.h deleted file mode 100644 index 7fc94ea..0000000 --- a/x2gothinshutdown/thinshutdown/mb.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _______MB_H_ -#define _______MB_H_ - -#include <QPushButton> -class MPushButton: public QPushButton -{ -Q_OBJECT - public: - MPushButton(); - private slots: - void slot_cl(); -}; -#endif diff --git a/x2gothinshutdown/thinshutdown/power-button.png b/x2gothinshutdown/thinshutdown/power-button.png deleted file mode 100644 index 03b1d1b..0000000 Binary files a/x2gothinshutdown/thinshutdown/power-button.png and /dev/null differ diff --git a/x2gothinshutdown/thinshutdown/resources.rcc b/x2gothinshutdown/thinshutdown/resources.rcc deleted file mode 100644 index fa02634..0000000 --- a/x2gothinshutdown/thinshutdown/resources.rcc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource> - <file>power-button.png</file> - </qresource> -</RCC> diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.cpp b/x2gothinshutdown/thinshutdown/thinshutdown.cpp deleted file mode 100644 index 796adad..0000000 --- a/x2gothinshutdown/thinshutdown/thinshutdown.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * 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., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <QApplication> -#include <QTranslator> -#include <QLocale> -#include <QFrame> -#include <mb.h> -#include <QPlastiqueStyle> -#include <QDesktopWidget> - -using namespace std; -int main(int argc, char *argv[]) -{ - QApplication app(argc,argv); - app.setStyle(new QPlastiqueStyle()); - -// QFrame*fr =new QFrame(0,Qt::WindowStaysOnTopHint|Qt::X11BypassWindowManagerHint); - MPushButton*fr =new MPushButton(); - fr->setFixedSize(24,24); - fr->move(6,6); - fr->show(); - return app.exec(); -} diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.pro b/x2gothinshutdown/thinshutdown/thinshutdown.pro deleted file mode 100644 index 344c8e9..0000000 --- a/x2gothinshutdown/thinshutdown/thinshutdown.pro +++ /dev/null @@ -1,13 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Fr Jun 1 09:19:29 2007 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += mb.h -SOURCES += thinshutdown.cpp mb.cpp -RESOURCES += resources.rcc hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-7-g236d841
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 236d841becb21398f6137f6e8c569494f10ab11f (commit) from 0cf7b36b26b81dd2bbb650474ee8af71f82e2ff1 (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 236d841becb21398f6137f6e8c569494f10ab11f Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Feb 24 11:36:19 2012 +0100 Improved support for use in Thin Client Environment. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ onmainwindow.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ onmainwindow.h | 5 +++- onmainwindow_part3.cpp | 13 ++++++++++ png/power-button.png | Bin 0 -> 742 bytes resources.rcc | 1 + 6 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 png/power-button.png The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b5cacc8..2412314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - not including <netinet/in.h> on Q_OS_WIN platform. - not updating Xinerama configuration in "fullscreen" mode. - command line argument "--xinerama": use Xinerama by default. + - improved support for use in TCE + command line argument --thinclient - running without window manager + command line argument --haltbt - button to shutdown the thin client [ Mike Gabriel ] * New upstream version (3.99.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 87f9b94..344c993 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -57,6 +57,8 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) extLogin=false; startMaximized=false; startHidden=false; + thinMode=false; + showHaltBtn=false; defaultUseSound=true; defaultSetKbd=true; defaultSetDPI=false; @@ -393,6 +395,28 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) SLOT ( slotResize ( const QSize ) ) ); slotResize ( fr->size() ); + + +#ifdef Q_OS_LINUX + if (thinMode) + { + QTimer *timer = new QTimer(this); + connect(timer, SIGNAL(timeout()), this, SLOT(slotSyncX())); + timer->start(200); + } +#endif + if (showHaltBtn) + { + QPushButton* bHalt=new QPushButton(bgFrame); + QPixmap p(":/png/power-button.png"); + bHalt->setIcon(p); + bHalt->setFocusPolicy(Qt::NoFocus); + bHalt->setFixedSize(32,32); + bHalt->move(10,10); + bHalt->show(); + connect(bHalt,SIGNAL(clicked()),this, SLOT(slotShutdownThinClient())); + } + if (brokerMode) { broker=new HttpBrokerClient ( this, &config ); @@ -419,6 +443,12 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) connect( xineramaTimer, SIGNAL(timeout()), this, SLOT(slotConfigXinerama())); x2goDebug<<"ONMainWindows constructor finished, home Directory is:"<<homeDir<<endl; + if (thinMode) + { + showMaximized(); + activateWindow(); + raise(); + } } @@ -430,8 +460,38 @@ ONMainWindow::~ONMainWindow() x2goDebug<<"end of ONMainWindow destructor"; } +void ONMainWindow::slotShutdownThinClient() +{ + QFile file(QDir::homePath()+"/.halt"); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) + return; + + QTextStream out(&file); + out << "\n"; + file.close(); +} +void ONMainWindow::slotSyncX() +{ + if (proxyWinId) + { + if (!isHidden()) + hide(); +#ifdef Q_OS_LINUX + XSync(QX11Info::display(),false); +#endif + } + else + { + if (isHidden()) + { + showMaximized(); + activateWindow(); + raise(); + } + } +} void ONMainWindow::installTranslator() diff --git a/onmainwindow.h b/onmainwindow.h index 5aa76f6..1f2f08f 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -476,6 +476,7 @@ private: bool changeBrokerPass; bool connTest; bool embedMode; + bool thinMode; QString statusString; int defaultLink; int defaultQuality; @@ -628,6 +629,7 @@ private: bool proxyWinEmbedded; bool useLdap; bool showToolBar; + bool showHaltBtn; bool newSession; bool ldapOnly; bool isScDaemonOk; @@ -822,7 +824,6 @@ private slots: void slotChangeBrokerPass(); void slotTestConnection(); void slotCheckPortableDir(); - void readUsers(); void slotSelectedFromList ( UserButton* user ); void slotUnameEntered(); @@ -837,6 +838,8 @@ private slots: void slotSshConnectionOk(); void slotServSshConnectionOk(QString server); void slotChangeKbdLayout(const QString& layout); + void slotSyncX(); + void slotShutdownThinClient(); public slots: void slotConfig(); diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index 69a0493..fb6a3ba 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -252,6 +252,17 @@ bool ONMainWindow::parseParameter ( QString param ) defaultXinerama=true; return true; } + if (param == "--thinclient") + { + thinMode=true; + startMaximized=true; + return true; + } + if (param == "--haltbt") + { + showHaltBtn=true; + return true; + } if ( param=="--hide" ) { startHidden=true; @@ -701,6 +712,8 @@ void ONMainWindow::showHelp() "--pgp-card\t\t\t use openPGP card authentication\n" "--xinerama\t\t\t use Xinerama by default\n" "--ldap-printing\t\t\t allow client side printing in LDAP mode\n" + "--thinclient\t\t\t run without window manager\n" + "--haltbt\t\t\t show shutdown button\n" "--add-to-known-hosts\t\t add RSA key fingerprint to " ".ssh/known_hosts\n" "\t\t\t\t if authenticity of server can't be established\n\n" diff --git a/png/power-button.png b/png/power-button.png new file mode 100644 index 0000000..03b1d1b Binary files /dev/null and b/png/power-button.png differ diff --git a/resources.rcc b/resources.rcc index e3b6a5e..0b2996e 100644 --- a/resources.rcc +++ b/resources.rcc @@ -12,6 +12,7 @@ <file>png/ico_mini.png</file> <file>png/sess_ico.png</file> <file>png/ico_440x180.png</file> + <file>png/power-button.png</file> <file>icons/128x128/x2go.png</file> <file>icons/128x128/x2gosession.png</file> <file>icons/128x128/create_file.png</file> 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.1.0-7-g4311309
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 43113094153d30ac676912cad7cf06ddb59c6cad (commit) from 0cf7b36b26b81dd2bbb650474ee8af71f82e2ff1 (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 43113094153d30ac676912cad7cf06ddb59c6cad Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Feb 24 11:36:19 2012 +0100 improved support for use in TCE command line argument --thinclient - running without window manager command line argument --haltbt - button to shutdown the thin client ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ onmainwindow.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ onmainwindow.h | 5 +++- onmainwindow_part3.cpp | 13 ++++++++++ png/power-button.png | Bin 0 -> 742 bytes resources.rcc | 1 + 6 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 png/power-button.png The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b5cacc8..2412314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - not including <netinet/in.h> on Q_OS_WIN platform. - not updating Xinerama configuration in "fullscreen" mode. - command line argument "--xinerama": use Xinerama by default. + - improved support for use in TCE + command line argument --thinclient - running without window manager + command line argument --haltbt - button to shutdown the thin client [ Mike Gabriel ] * New upstream version (3.99.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 87f9b94..344c993 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -57,6 +57,8 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) extLogin=false; startMaximized=false; startHidden=false; + thinMode=false; + showHaltBtn=false; defaultUseSound=true; defaultSetKbd=true; defaultSetDPI=false; @@ -393,6 +395,28 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) SLOT ( slotResize ( const QSize ) ) ); slotResize ( fr->size() ); + + +#ifdef Q_OS_LINUX + if (thinMode) + { + QTimer *timer = new QTimer(this); + connect(timer, SIGNAL(timeout()), this, SLOT(slotSyncX())); + timer->start(200); + } +#endif + if (showHaltBtn) + { + QPushButton* bHalt=new QPushButton(bgFrame); + QPixmap p(":/png/power-button.png"); + bHalt->setIcon(p); + bHalt->setFocusPolicy(Qt::NoFocus); + bHalt->setFixedSize(32,32); + bHalt->move(10,10); + bHalt->show(); + connect(bHalt,SIGNAL(clicked()),this, SLOT(slotShutdownThinClient())); + } + if (brokerMode) { broker=new HttpBrokerClient ( this, &config ); @@ -419,6 +443,12 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) connect( xineramaTimer, SIGNAL(timeout()), this, SLOT(slotConfigXinerama())); x2goDebug<<"ONMainWindows constructor finished, home Directory is:"<<homeDir<<endl; + if (thinMode) + { + showMaximized(); + activateWindow(); + raise(); + } } @@ -430,8 +460,38 @@ ONMainWindow::~ONMainWindow() x2goDebug<<"end of ONMainWindow destructor"; } +void ONMainWindow::slotShutdownThinClient() +{ + QFile file(QDir::homePath()+"/.halt"); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) + return; + + QTextStream out(&file); + out << "\n"; + file.close(); +} +void ONMainWindow::slotSyncX() +{ + if (proxyWinId) + { + if (!isHidden()) + hide(); +#ifdef Q_OS_LINUX + XSync(QX11Info::display(),false); +#endif + } + else + { + if (isHidden()) + { + showMaximized(); + activateWindow(); + raise(); + } + } +} void ONMainWindow::installTranslator() diff --git a/onmainwindow.h b/onmainwindow.h index 5aa76f6..1f2f08f 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -476,6 +476,7 @@ private: bool changeBrokerPass; bool connTest; bool embedMode; + bool thinMode; QString statusString; int defaultLink; int defaultQuality; @@ -628,6 +629,7 @@ private: bool proxyWinEmbedded; bool useLdap; bool showToolBar; + bool showHaltBtn; bool newSession; bool ldapOnly; bool isScDaemonOk; @@ -822,7 +824,6 @@ private slots: void slotChangeBrokerPass(); void slotTestConnection(); void slotCheckPortableDir(); - void readUsers(); void slotSelectedFromList ( UserButton* user ); void slotUnameEntered(); @@ -837,6 +838,8 @@ private slots: void slotSshConnectionOk(); void slotServSshConnectionOk(QString server); void slotChangeKbdLayout(const QString& layout); + void slotSyncX(); + void slotShutdownThinClient(); public slots: void slotConfig(); diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index 69a0493..fb6a3ba 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -252,6 +252,17 @@ bool ONMainWindow::parseParameter ( QString param ) defaultXinerama=true; return true; } + if (param == "--thinclient") + { + thinMode=true; + startMaximized=true; + return true; + } + if (param == "--haltbt") + { + showHaltBtn=true; + return true; + } if ( param=="--hide" ) { startHidden=true; @@ -701,6 +712,8 @@ void ONMainWindow::showHelp() "--pgp-card\t\t\t use openPGP card authentication\n" "--xinerama\t\t\t use Xinerama by default\n" "--ldap-printing\t\t\t allow client side printing in LDAP mode\n" + "--thinclient\t\t\t run without window manager\n" + "--haltbt\t\t\t show shutdown button\n" "--add-to-known-hosts\t\t add RSA key fingerprint to " ".ssh/known_hosts\n" "\t\t\t\t if authenticity of server can't be established\n\n" diff --git a/png/power-button.png b/png/power-button.png new file mode 100644 index 0000000..03b1d1b Binary files /dev/null and b/png/power-button.png differ diff --git a/resources.rcc b/resources.rcc index e3b6a5e..0b2996e 100644 --- a/resources.rcc +++ b/resources.rcc @@ -12,6 +12,7 @@ <file>png/ico_mini.png</file> <file>png/sess_ico.png</file> <file>png/ico_440x180.png</file> + <file>png/power-button.png</file> <file>icons/128x128/x2go.png</file> <file>icons/128x128/x2gosession.png</file> <file>icons/128x128/create_file.png</file> 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-gui.git - master (branch) updated: 0.1.0.10-79-g614c2ab
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 614c2ab2a202a5a7ce45c3116e4c8a9456f36fd4 (commit) via bbb1ebd1a1814bb493ec9a261cc24a8d93a3e66e (commit) from 2d230ec2b7eed7719137ed4daa40da3082416aae (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 614c2ab2a202a5a7ce45c3116e4c8a9456f36fd4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 00:04:01 2012 +0100 rebuilt i18n binary files commit bbb1ebd1a1814bb493ec9a261cc24a8d93a3e66e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 00:03:34 2012 +0100 Update i18n files: en, de. ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/pyhoca-gui.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 19254 -> 20400 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 18044 -> 19032 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 17906 -> 17906 bytes build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo | Bin 18486 -> 18486 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 17240 -> 17240 bytes build/mo/sv/LC_MESSAGES/pyhoca-gui.mo | Bin 17940 -> 18075 bytes debian/changelog | 1 + po/bg.po | 88 +++++++++--- po/de.po | 101 +++++++++++--- po/en.po | 98 ++++++++++--- po/es.po | 88 +++++++++--- po/nb_NO.po | 88 +++++++++--- po/nl.po | 88 +++++++++--- po/pyhoca-gui.pot | 88 +++++++++--- po/sv.po | 228 +++++++++++++++++------------- 16 files changed, 626 insertions(+), 242 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/pyhoca-gui.mo b/build/mo/bg/LC_MESSAGES/pyhoca-gui.mo index b699c52..8b4f335 100644 Binary files a/build/mo/bg/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/bg/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo index aa54b85..f0dfdde 100644 Binary files a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/en/LC_MESSAGES/pyhoca-gui.mo b/build/mo/en/LC_MESSAGES/pyhoca-gui.mo index faa49a5..8346a9a 100644 Binary files a/build/mo/en/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/en/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo index c0fa1fd..2c001d7 100644 Binary files a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo index f40f420..839d21a 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo index 63ad1f1..fde3efd 100644 Binary files a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/sv/LC_MESSAGES/pyhoca-gui.mo b/build/mo/sv/LC_MESSAGES/pyhoca-gui.mo index d0851b4..884df45 100644 Binary files a/build/mo/sv/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/sv/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/debian/changelog b/debian/changelog index 176e389..c1cd4f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low gracefully. - Hook methods that notify about non-availabilities around printing, MIME box, local folder sharing. + - Update i18n files: en, de. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/po/bg.po b/po/bg.po index ee89831..de46a8b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 10:40+0100\n" +"POT-Creation-Date: 2012-02-24 00:03+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" @@ -932,12 +932,60 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:844 ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "%s - client-side printing not available" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "" +"The server denies client-side printing from within this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "%s - MIME box not available" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "" +"The server does not support the X2Go MIME box.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "%s - client-side folders not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "" +"The server denies client-side folder sharing with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "%s - client resources not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:856 ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:856 #, python-format msgid "" "%s\n" @@ -945,7 +993,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "" "%s\n" @@ -953,74 +1001,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:850 ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:862 ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:858 ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:870 ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:870 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1126,19 +1174,19 @@ msgstr "" msgid "Print" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:227 +#: ../pyhoca/wxgui/printingprefs.py:228 msgid "- no printers installed -" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:232 +#: ../pyhoca/wxgui/printingprefs.py:233 msgid "- print system is not available -" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:339 +#: ../pyhoca/wxgui/printingprefs.py:340 msgid "Choose PDF viewer application" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:355 +#: ../pyhoca/wxgui/printingprefs.py:356 msgid "Choose PDF saving location" msgstr "" diff --git a/po/de.po b/po/de.po index cde63b4..8838512 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 10:40+0100\n" -"PO-Revision-Date: 2012-02-07 23:29+0100\n" +"POT-Creation-Date: 2012-02-24 00:03+0100\n" +"PO-Revision-Date: 2012-02-24 00:03+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -964,12 +964,71 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:844 ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "%s - client-side printing not available" +msgstr "%s - Client-seitiges Drucken nicht verfügbar" + +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "" +"The server denies client-side printing from within this session.\n" +"%s" +msgstr "" +"In dieser Sitzung können Client-seitige Drucker nicht verwendet werden. Der " +"Server verweigert die Verbindung.\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "%s - MIME box not available" +msgstr "%s - MIME box nicht verfügbar" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "" +"The server does not support the X2Go MIME box.\n" +"%s" +msgstr "" +"Der Server unterstützt die X2Go MIME box nicht.\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "%s - client-side folders not sharable" +msgstr "%s - keine Freigabe Client-seitiger Ordner" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "" +"The server denies client-side folder sharing with this session.\n" +"%s" +msgstr "" +"Client-seitige Ordner können in dieser Sitzung nicht freigegeben werden. Der " +"Server verweigert die Verbindung.\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "%s - client resources not sharable" +msgstr "%s - keine Client-seitigen Ordner- und Druckerfreigaben möglich" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" +msgstr "" +"Client-seitige Ordner und Drucker können für diese Sitzung nicht freigegeben " +"werden.\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:856 ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:856 #, python-format msgid "" "%s\n" @@ -980,7 +1039,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "" "%s\n" @@ -991,12 +1050,12 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:850 ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:862 ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1005,7 +1064,7 @@ msgstr "" "Neue X2Go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "" "Another client started X2Go session\n" @@ -1014,12 +1073,12 @@ msgstr "" "Ein anderes X2Go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:858 ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:870 ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:870 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1028,7 +1087,7 @@ msgstr "" "X2Go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1037,12 +1096,12 @@ msgstr "" "Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "" "Found already running session\n" @@ -1051,12 +1110,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1065,12 +1124,12 @@ msgstr "" "X2Go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1186,19 +1245,19 @@ msgstr "Anwenden" msgid "Print" msgstr "Drucken" -#: ../pyhoca/wxgui/printingprefs.py:227 +#: ../pyhoca/wxgui/printingprefs.py:228 msgid "- no printers installed -" msgstr "- es sind keine Drucker installiert -" -#: ../pyhoca/wxgui/printingprefs.py:232 +#: ../pyhoca/wxgui/printingprefs.py:233 msgid "- print system is not available -" msgstr "- das Drucksystem ist nicht bereit -" -#: ../pyhoca/wxgui/printingprefs.py:339 +#: ../pyhoca/wxgui/printingprefs.py:340 msgid "Choose PDF viewer application" msgstr "Applikation für PDF-Anzeige auswählen" -#: ../pyhoca/wxgui/printingprefs.py:355 +#: ../pyhoca/wxgui/printingprefs.py:356 msgid "Choose PDF saving location" msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" diff --git a/po/en.po b/po/en.po index a347e59..528f75c 100644 --- a/po/en.po +++ b/po/en.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 10:40+0100\n" -"PO-Revision-Date: 2012-02-07 23:28+0100\n" +"POT-Creation-Date: 2012-02-24 00:03+0100\n" +"PO-Revision-Date: 2012-02-23 23:59+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -959,12 +959,68 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:844 ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "%s - client-side printing not available" +msgstr "%s - client-side printing not available" + +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "" +"The server denies client-side printing from within this session.\n" +"%s" +msgstr "" +"The server denies client-side printing from within this session.\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "%s - MIME box not available" +msgstr "%s - MIME box not available" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "" +"The server does not support the X2Go MIME box.\n" +"%s" +msgstr "" +"The server does not support the X2Go MIME box.\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "%s - client-side folders not sharable" +msgstr "%s - client-side folders not sharable" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "" +"The server denies client-side folder sharing with this session.\n" +"%s" +msgstr "" +"The server denies client-side folder sharing with this session.\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "%s - client resources not sharable" +msgstr "%s - client resources not sharable" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" +msgstr "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:856 ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:856 #, python-format msgid "" "%s\n" @@ -975,7 +1031,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "" "%s\n" @@ -986,12 +1042,12 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:850 ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:862 ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1000,7 +1056,7 @@ msgstr "" "New X2Go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "" "Another client started X2Go session\n" @@ -1009,12 +1065,12 @@ msgstr "" "Another client started X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:858 ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:870 ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:870 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1023,7 +1079,7 @@ msgstr "" "Resuming X2Go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1032,12 +1088,12 @@ msgstr "" "Another client resumed X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "" "Found already running session\n" @@ -1046,12 +1102,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1060,12 +1116,12 @@ msgstr "" "X2Go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1180,19 +1236,19 @@ msgstr "Apply" msgid "Print" msgstr "Print" -#: ../pyhoca/wxgui/printingprefs.py:227 +#: ../pyhoca/wxgui/printingprefs.py:228 msgid "- no printers installed -" msgstr "- no printers installed -" -#: ../pyhoca/wxgui/printingprefs.py:232 +#: ../pyhoca/wxgui/printingprefs.py:233 msgid "- print system is not available -" msgstr "- print system is not available -" -#: ../pyhoca/wxgui/printingprefs.py:339 +#: ../pyhoca/wxgui/printingprefs.py:340 msgid "Choose PDF viewer application" msgstr "Choose PDF viewer application" -#: ../pyhoca/wxgui/printingprefs.py:355 +#: ../pyhoca/wxgui/printingprefs.py:356 msgid "Choose PDF saving location" msgstr "Choose PDF saving location" diff --git a/po/es.po b/po/es.po index d7d4a84..01b0d57 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 10:40+0100\n" +"POT-Creation-Date: 2012-02-24 00:03+0100\n" "PO-Revision-Date: 2011-11-30 15:59+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" @@ -984,12 +984,60 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:844 ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:833 +#, fuzzy, python-format +msgid "%s - client-side printing not available" +msgstr "- el sistema de impresión no está disponible -" + +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "" +"The server denies client-side printing from within this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "%s - MIME box not available" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "" +"The server does not support the X2Go MIME box.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "%s - client-side folders not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "" +"The server denies client-side folder sharing with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "%s - client resources not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:856 ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:856 #, python-format msgid "" "%s\n" @@ -1000,7 +1048,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "" "%s\n" @@ -1011,12 +1059,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:850 ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:862 ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1025,7 +1073,7 @@ msgstr "" "Iniciando nueva sesión X2Go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "" "Another client started X2Go session\n" @@ -1034,12 +1082,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:858 ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:870 ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:870 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1048,7 +1096,7 @@ msgstr "" "Retornando sesión X2Go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1057,12 +1105,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "" "Found already running session\n" @@ -1071,12 +1119,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1085,12 +1133,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1202,20 +1250,20 @@ msgstr "Aplicar" msgid "Print" msgstr "Imprimir" -#: ../pyhoca/wxgui/printingprefs.py:227 +#: ../pyhoca/wxgui/printingprefs.py:228 #, fuzzy msgid "- no printers installed -" msgstr "- el sistema de impresión no está disponible -" -#: ../pyhoca/wxgui/printingprefs.py:232 +#: ../pyhoca/wxgui/printingprefs.py:233 msgid "- print system is not available -" msgstr "- el sistema de impresión no está disponible -" -#: ../pyhoca/wxgui/printingprefs.py:339 +#: ../pyhoca/wxgui/printingprefs.py:340 msgid "Choose PDF viewer application" msgstr "Elegir visor PDF" -#: ../pyhoca/wxgui/printingprefs.py:355 +#: ../pyhoca/wxgui/printingprefs.py:356 msgid "Choose PDF saving location" msgstr "Elegir localización para los PDFs" diff --git a/po/nb_NO.po b/po/nb_NO.po index 667659e..92c6490 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 10:40+0100\n" +"POT-Creation-Date: 2012-02-24 00:03+0100\n" "PO-Revision-Date: 2012-02-19 23:16+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n" @@ -963,12 +963,60 @@ msgstr "" "Klarte ikke å sette opp lydforbindelsen for denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:844 ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:833 +#, fuzzy, python-format +msgid "%s - client-side printing not available" +msgstr "- utskriftssystemet er ikke tilgjengelig -" + +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "" +"The server denies client-side printing from within this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "%s - MIME box not available" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "" +"The server does not support the X2Go MIME box.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "%s - client-side folders not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "" +"The server denies client-side folder sharing with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "%s - client resources not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:856 ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "%s - print error" msgstr "%s - feil ved utskrift" -#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:856 #, python-format msgid "" "%s\n" @@ -979,7 +1027,7 @@ msgstr "" "...oppstod på skriver %s fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "" "%s\n" @@ -990,12 +1038,12 @@ msgstr "" "...oppstod fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:850 ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:862 ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1004,7 +1052,7 @@ msgstr "" "Ny X2Go sesjon starter opp...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "" "Another client started X2Go session\n" @@ -1013,12 +1061,12 @@ msgstr "" "En annen klient startet X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:858 ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:870 ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "%s - resume" msgstr "%s - gjenoppta" -#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:870 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1027,7 +1075,7 @@ msgstr "" "Gjenopptar X2Go sesjon...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1036,12 +1084,12 @@ msgstr "" "En annen klient gjenopptok X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "" "Found already running session\n" @@ -1050,12 +1098,12 @@ msgstr "" "Fant allerede kjørende sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "%s - suspend" msgstr "%s - koble fra" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1064,12 +1112,12 @@ msgstr "" "X2Go sesjonen har blitt frakoblet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "%s - terminate" msgstr "%s - avslutt" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1184,19 +1232,19 @@ msgstr "Påfør" msgid "Print" msgstr "Skriv ut" -#: ../pyhoca/wxgui/printingprefs.py:227 +#: ../pyhoca/wxgui/printingprefs.py:228 msgid "- no printers installed -" msgstr "- ingen skrivere installert -" -#: ../pyhoca/wxgui/printingprefs.py:232 +#: ../pyhoca/wxgui/printingprefs.py:233 msgid "- print system is not available -" msgstr "- utskriftssystemet er ikke tilgjengelig -" -#: ../pyhoca/wxgui/printingprefs.py:339 +#: ../pyhoca/wxgui/printingprefs.py:340 msgid "Choose PDF viewer application" msgstr "Velg PDF leseprogram" -#: ../pyhoca/wxgui/printingprefs.py:355 +#: ../pyhoca/wxgui/printingprefs.py:356 msgid "Choose PDF saving location" msgstr "Velg plassering for PDF lagring" diff --git a/po/nl.po b/po/nl.po index 75c546c..7ae3dd8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 10:40+0100\n" +"POT-Creation-Date: 2012-02-24 00:03+0100\n" "PO-Revision-Date: 2012-02-07 23:31+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" @@ -970,12 +970,60 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:844 ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:833 +#, fuzzy, python-format +msgid "%s - client-side printing not available" +msgstr "- print systeem niet beschikbaar" + +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "" +"The server denies client-side printing from within this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "%s - MIME box not available" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "" +"The server does not support the X2Go MIME box.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "%s - client-side folders not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "" +"The server denies client-side folder sharing with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "%s - client resources not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:856 ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:856 #, python-format msgid "" "%s\n" @@ -986,7 +1034,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "" "%s\n" @@ -997,12 +1045,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:850 ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:862 ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1011,7 +1059,7 @@ msgstr "" "Nieuwe X2Go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "" "Another client started X2Go session\n" @@ -1020,12 +1068,12 @@ msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:858 ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:870 ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:870 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1034,7 +1082,7 @@ msgstr "" "X2Go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1043,12 +1091,12 @@ msgstr "" "Een andere X2Go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "" "Found already running session\n" @@ -1057,12 +1105,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1071,12 +1119,12 @@ msgstr "" "X2Go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "%s - terminate" msgstr "%s - beëindigen" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1191,20 +1239,20 @@ msgstr "Toepassen" msgid "Print" msgstr "Afdrukken" -#: ../pyhoca/wxgui/printingprefs.py:227 +#: ../pyhoca/wxgui/printingprefs.py:228 #, fuzzy msgid "- no printers installed -" msgstr "- print systeem niet beschikbaar" -#: ../pyhoca/wxgui/printingprefs.py:232 +#: ../pyhoca/wxgui/printingprefs.py:233 msgid "- print system is not available -" msgstr "- print systeem niet beschikbaar" -#: ../pyhoca/wxgui/printingprefs.py:339 +#: ../pyhoca/wxgui/printingprefs.py:340 msgid "Choose PDF viewer application" msgstr "Kies PDF viewer toepassing" -#: ../pyhoca/wxgui/printingprefs.py:355 +#: ../pyhoca/wxgui/printingprefs.py:356 msgid "Choose PDF saving location" msgstr "Kies locatie om PDF op te slaan" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index a72b7e0..0b5e03d 100644 --- a/po/pyhoca-gui.pot +++ b/po/pyhoca-gui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 10:40+0100\n" +"POT-Creation-Date: 2012-02-24 00:03+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -928,12 +928,60 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:844 ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "%s - client-side printing not available" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "" +"The server denies client-side printing from within this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "%s - MIME box not available" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "" +"The server does not support the X2Go MIME box.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "%s - client-side folders not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "" +"The server denies client-side folder sharing with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "%s - client resources not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:856 ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:856 #, python-format msgid "" "%s\n" @@ -941,7 +989,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "" "%s\n" @@ -949,74 +997,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:850 ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:862 ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:858 ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:870 ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:870 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1122,19 +1170,19 @@ msgstr "" msgid "Print" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:227 +#: ../pyhoca/wxgui/printingprefs.py:228 msgid "- no printers installed -" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:232 +#: ../pyhoca/wxgui/printingprefs.py:233 msgid "- print system is not available -" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:339 +#: ../pyhoca/wxgui/printingprefs.py:340 msgid "Choose PDF viewer application" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:355 +#: ../pyhoca/wxgui/printingprefs.py:356 msgid "Choose PDF saving location" msgstr "" diff --git a/po/sv.po b/po/sv.po index a3c04c6..4ce442d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 10:40+0100\n" +"POT-Creation-Date: 2012-02-24 00:03+0100\n" "PO-Revision-Date: 2012-02-20 18:49+0100\n" "Last-Translator: Daniel Lindgren <bd.dali(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" @@ -26,13 +26,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 -#: ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Användarnamn" -#: ../pyhoca/wxgui/logon.py:86 -#: ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Lösenord" @@ -52,28 +50,23 @@ msgstr "Sessionsinloggning" msgid "SSH proxy server login" msgstr "SSH proxyserverinloggning" -#: ../pyhoca/wxgui/logon.py:121 -#: ../pyhoca/wxgui/profilemanager.py:296 -#: ../pyhoca/wxgui/messages.py:111 -#: ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Avbryt" -#: ../pyhoca/wxgui/logon.py:277 -#: ../pyhoca/wxgui/logon.py:310 +#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 #: ../pyhoca/wxgui/frontend.py:366 #, python-format msgid "%s - connect failure" msgstr "%s - anslutning misslyckades" -#: ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:366 msgid "User is not allowed to start X2Go sessions!" msgstr "Användaren har inte rätt att starta X2Go-sessioner!" -#: ../pyhoca/wxgui/logon.py:283 -#: ../pyhoca/wxgui/frontend.py:373 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:373 #, python-format msgid "%s - connect" msgstr "%s - anslut" @@ -99,38 +92,31 @@ msgstr "%s - SSH-proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentisering till SSH-proxy misslyckades!" -#: ../pyhoca/wxgui/logon.py:333 -#: ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:379 -#: ../pyhoca/wxgui/logon.py:387 -#: ../pyhoca/wxgui/frontend.py:392 -#: ../pyhoca/wxgui/frontend.py:413 -#: ../pyhoca/wxgui/frontend.py:420 -#: ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 +#: ../pyhoca/wxgui/logon.py:379 ../pyhoca/wxgui/logon.py:387 +#: ../pyhoca/wxgui/frontend.py:392 ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/frontend.py:420 ../pyhoca/wxgui/frontend.py:427 #, python-format msgid "%s - connect error" msgstr "%s - anslutning misslyckades" -#: ../pyhoca/wxgui/logon.py:347 -#: ../pyhoca/wxgui/frontend.py:399 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:399 #: ../pyhoca/wxgui/frontend.py:406 #, python-format msgid "%s - host key error" msgstr "%s - fel på serverns nyckel" -#: ../pyhoca/wxgui/logon.py:348 -#: ../pyhoca/wxgui/frontend.py:399 -msgid "The remote server's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:399 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" msgstr "Serverns nyckel är felaktig eller har inte accepterats av användaren" -#: ../pyhoca/wxgui/logon.py:355 -#: ../pyhoca/wxgui/frontend.py:441 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:441 #, python-format msgid "%s - missing home directory" msgstr "%s - hemkatalog saknas" -#: ../pyhoca/wxgui/logon.py:356 -#: ../pyhoca/wxgui/frontend.py:441 +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:441 msgid "The remote user's home directory does not exist." msgstr "Fjärranvändarens hemkatalog saknas." @@ -139,8 +125,7 @@ msgstr "Fjärranvändarens hemkatalog saknas." msgid "%s - key error" msgstr "%s - nyckelfel" -#: ../pyhoca/wxgui/logon.py:371 -#: ../pyhoca/wxgui/frontend.py:448 +#: ../pyhoca/wxgui/logon.py:371 ../pyhoca/wxgui/frontend.py:448 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringsfel" @@ -221,28 +206,23 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Applikation" -#: ../pyhoca/wxgui/profilemanager.py:84 -#: ../pyhoca/wxgui/profilemanager.py:189 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:189 msgid "Custom command" msgstr "Anpassat kommando" -#: ../pyhoca/wxgui/profilemanager.py:87 -#: ../pyhoca/wxgui/menus_taskbar.py:298 +#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:298 msgid "Internet Browser" msgstr "Webbbläsare" -#: ../pyhoca/wxgui/profilemanager.py:88 -#: ../pyhoca/wxgui/menus_taskbar.py:299 +#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:299 msgid "Email Client" msgstr "E-postklient" -#: ../pyhoca/wxgui/profilemanager.py:89 -#: ../pyhoca/wxgui/menus_taskbar.py:300 +#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:300 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:90 -#: ../pyhoca/wxgui/menus_taskbar.py:301 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:301 msgid "Terminal" msgstr "Terminal" @@ -373,8 +353,7 @@ msgstr "RDP-alternativ" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:201 ../pyhoca/wxgui/profilemanager.py:211 msgid "User" msgstr "Användare" @@ -499,8 +478,7 @@ msgstr "Använd lokal mappdelning" msgid "Path" msgstr "Sökväg" -#: ../pyhoca/wxgui/profilemanager.py:271 -#: ../pyhoca/wxgui/profilemanager.py:290 +#: ../pyhoca/wxgui/profilemanager.py:271 ../pyhoca/wxgui/profilemanager.py:290 msgid "Add" msgstr "Lägg till" @@ -552,14 +530,12 @@ msgstr "Spara" msgid "Reset" msgstr "Återställ" -#: ../pyhoca/wxgui/profilemanager.py:337 -#: ../pyhoca/wxgui/profilemanager.py:978 +#: ../pyhoca/wxgui/profilemanager.py:337 ../pyhoca/wxgui/profilemanager.py:978 #: ../pyhoca/wxgui/profilemanager.py:1485 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:339 -#: ../pyhoca/wxgui/profilemanager.py:980 +#: ../pyhoca/wxgui/profilemanager.py:339 ../pyhoca/wxgui/profilemanager.py:980 msgid "manually" msgstr "manuellt" @@ -622,8 +598,7 @@ msgstr "Välj en mapp att dela i en session" #: ../pyhoca/wxgui/profilemanager.py:1532 #: ../pyhoca/wxgui/profilemanager.py:1535 #: ../pyhoca/wxgui/profilemanager.py:1540 -#: ../pyhoca/wxgui/profilemanager.py:1550 -#: ../pyhoca/wxgui/menus_taskbar.py:92 +#: ../pyhoca/wxgui/profilemanager.py:1550 ../pyhoca/wxgui/menus_taskbar.py:92 msgid "Profile Manager" msgstr "Profilhanterare" @@ -644,10 +619,12 @@ msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." #: ../pyhoca/wxgui/profilemanager.py:1550 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH " +"proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-proxy.\n" +"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-" +"proxy.\n" "Ändra konfiguration för SSH-proxy ." #: ../pyhoca/wxgui/profilemanager.py:1570 @@ -693,8 +670,7 @@ msgstr "Utskriftspreferenser" msgid "Client Options" msgstr "Klientalternativ" -#: ../pyhoca/wxgui/menus_taskbar.py:121 -#: ../pyhoca/wxgui/menus_taskbar.py:570 +#: ../pyhoca/wxgui/menus_taskbar.py:121 ../pyhoca/wxgui/menus_taskbar.py:570 msgid "E&xit" msgstr "&Avsluta" @@ -802,8 +778,7 @@ msgstr "Starta/återanslut session" msgid "Connect Server" msgstr "Anslut till server" -#: ../pyhoca/wxgui/about.py:55 -#: ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "Om %s ..." @@ -813,8 +788,10 @@ msgid "Public SSH key authentication has been successful." msgstr "Autentisering med publik SSH-nyckel lyckades." #: ../pyhoca/wxgui/frontend.py:406 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" #: ../pyhoca/wxgui/frontend.py:427 msgid "Authentication protocol communication incomplete! Try again..." @@ -890,13 +867,14 @@ msgstr "%s - kanalfel" #: ../pyhoca/wxgui/frontend.py:778 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "Anslutning till %s avslutades oväntat! Försök återansluta till server..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"Anslutning till %s avslutades oväntat! Försök återansluta till server..." -#: ../pyhoca/wxgui/frontend.py:788 -#: ../pyhoca/wxgui/frontend.py:795 -#: ../pyhoca/wxgui/frontend.py:797 -#: ../pyhoca/wxgui/frontend.py:809 +#: ../pyhoca/wxgui/frontend.py:788 ../pyhoca/wxgui/frontend.py:795 +#: ../pyhoca/wxgui/frontend.py:797 ../pyhoca/wxgui/frontend.py:809 #, python-format msgid "%s - session failure" msgstr "%s - session misslyckades" @@ -926,13 +904,20 @@ msgstr "%s - sessionsvarning" #: ../pyhoca/wxgui/frontend.py:803 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Omvänd TCP port forwarding för session %s till serverport %s har nekats." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Omvänd TCP port forwarding för session %s till serverport %s har nekats." #: ../pyhoca/wxgui/frontend.py:809 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -msgstr "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. Sessionsstart misslyckades." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." +msgstr "" +"Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " +"Sessionsstart misslyckades." #: ../pyhoca/wxgui/frontend.py:821 #, python-format @@ -940,11 +925,11 @@ msgid "%s - audio warning" msgstr "%s - ljudvarning" #: ../pyhoca/wxgui/frontend.py:821 -msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgid "" +"The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "X2Go PulseAudio är inte tillgängligt i Remote Desktop-sessioner." -#: ../pyhoca/wxgui/frontend.py:824 -#: ../pyhoca/wxgui/frontend.py:827 +#: ../pyhoca/wxgui/frontend.py:824 ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "%s - audio error" msgstr "%s - ljudfel" @@ -971,13 +956,60 @@ msgstr "" "Anslutning för ljud kunde ej genomföras för denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:844 -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:833 +#, fuzzy, python-format +msgid "%s - client-side printing not available" +msgstr "- utskriftssystem ej tillgängligt -" + +#: ../pyhoca/wxgui/frontend.py:833 +#, python-format +msgid "" +"The server denies client-side printing from within this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "%s - MIME box not available" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:836 +#, python-format +msgid "" +"The server does not support the X2Go MIME box.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "%s - client-side folders not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:839 +#, python-format +msgid "" +"The server denies client-side folder sharing with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "%s - client resources not sharable" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:842 +#, python-format +msgid "" +"Client-side folders and printers cannot be shared with this session.\n" +"%s" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:856 ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "%s - print error" msgstr "%s - utskriftsfel" -#: ../pyhoca/wxgui/frontend.py:844 +#: ../pyhoca/wxgui/frontend.py:856 #, python-format msgid "" "%s\n" @@ -988,7 +1020,7 @@ msgstr "" "... orsakat på skrivare %s av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:846 +#: ../pyhoca/wxgui/frontend.py:858 #, python-format msgid "" "%s\n" @@ -999,13 +1031,12 @@ msgstr "" "...orsakat av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:850 -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:862 ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "%s - start" msgstr "%s - startar" -#: ../pyhoca/wxgui/frontend.py:850 +#: ../pyhoca/wxgui/frontend.py:862 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1014,7 +1045,7 @@ msgstr "" "Ny X2Go-session startar ...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:854 +#: ../pyhoca/wxgui/frontend.py:866 #, python-format msgid "" "Another client started X2Go session\n" @@ -1023,13 +1054,12 @@ msgstr "" "En annan klient startade X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:858 -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:870 ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "%s - resume" msgstr "%s - återanslut" -#: ../pyhoca/wxgui/frontend.py:858 +#: ../pyhoca/wxgui/frontend.py:870 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1038,7 +1068,7 @@ msgstr "" "Återansluter X2Go-session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:862 +#: ../pyhoca/wxgui/frontend.py:874 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1047,12 +1077,12 @@ msgstr "" "En annan klient återanslöt X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:866 +#: ../pyhoca/wxgui/frontend.py:878 #, python-format msgid "" "Found already running session\n" @@ -1061,12 +1091,12 @@ msgstr "" "Hittade aktiv session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "%s - suspend" msgstr "%s - vila" -#: ../pyhoca/wxgui/frontend.py:870 +#: ../pyhoca/wxgui/frontend.py:882 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1075,12 +1105,12 @@ msgstr "" "X2Go-session har försatts i vila\n" "%s" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "%s - terminate" msgstr "%s - avsluta" -#: ../pyhoca/wxgui/frontend.py:886 +#: ../pyhoca/wxgui/frontend.py:898 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1120,8 +1150,7 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "OK" @@ -1195,19 +1224,19 @@ msgstr "Verkställ" msgid "Print" msgstr "Skriv ut" -#: ../pyhoca/wxgui/printingprefs.py:227 +#: ../pyhoca/wxgui/printingprefs.py:228 msgid "- no printers installed -" msgstr "- utskrifter ej tillgängliga -" -#: ../pyhoca/wxgui/printingprefs.py:232 +#: ../pyhoca/wxgui/printingprefs.py:233 msgid "- print system is not available -" msgstr "- utskriftssystem ej tillgängligt -" -#: ../pyhoca/wxgui/printingprefs.py:339 +#: ../pyhoca/wxgui/printingprefs.py:340 msgid "Choose PDF viewer application" msgstr "Välj PDF-visare" -#: ../pyhoca/wxgui/printingprefs.py:355 +#: ../pyhoca/wxgui/printingprefs.py:356 msgid "Choose PDF saving location" msgstr "Välj mapp att spara PDF:er i" @@ -1223,4 +1252,3 @@ msgstr "Ändra sessionstitel till" #: ../pyhoca/wxgui/sessiontitle.py:73 msgid "OK" msgstr "OK" - 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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-77-g2d230ec
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 2d230ec2b7eed7719137ed4daa40da3082416aae (commit) via 7760963880bde6ac0531dac086abd92038c0fec3 (commit) from 84074f170c26a8d2431571dfbbc64a7aa3464236 (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 2d230ec2b7eed7719137ed4daa40da3082416aae Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 23:56:58 2012 +0100 typo fix commit 7760963880bde6ac0531dac086abd92038c0fec3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 23:56:20 2012 +0100 Hook methods that notify about non-availabilities around printing, MIME box, local folder sharing. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/frontend.py | 12 ++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6fe11a4..176e389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low capable. - Handle the situation that no printer is installed with CUPS/WinSpool gracefully. + - Hook methods that notify about non-availabilities around printing, + MIME box, local folder sharing. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 57338ca..a1b538a 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -829,6 +829,18 @@ class PyHocaGUI(wx.App, x2go.X2goClient): def HOOK_on_sound_tunnel_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN'): self.notifier.send(_(u'%s - audio problem') % profile_name, _(u'The audio connection could not be set up for this session.\n%s') % session_name, icon='session_warning', timeout=5000) + def HOOK_printing_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'): + self.notifier.send(_(u'%s - client-side printing not available') % profile_name, _(u'The server denies client-side printing from within this session.\n%s') % session_name, icon='session_warning', timeout=5000) + + def HOOK_mimebox_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'): + self.notifier.send(_(u'%s - MIME box not available') % profile_name, _(u'The server does not support the X2Go MIME box.\n%s') % session_name, icon='session_warning', timeout=5000) + + def HOOK_foldersharing_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'): + self.notifier.send(_(u'%s - client-side folders not sharable') % profile_name, _(u'The server denies client-side folder sharing with this session.\n%s') % session_name, icon='session_warning', timeout=5000) + + def HOOK_sshfs_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'): + self.notifier.send(_(u'%s - client resources not sharable') % profile_name, _(u'Client-side folders and printers cannot be shared with this session.\n%s') % session_name, icon='session_warning', timeout=5000) + # this hook gets called from Python X2Go classes if a print job is coming in and the print action is ,,DIALOG''... def HOOK_open_print_dialog(self, profile_name='UNKNOWN', session_name='UNKNOWN'): _print_action = None 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

python-x2go.git - master (branch) updated: 0.1.1.4-114-g4f182b4
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 4f182b4c734045250681ecea9c3f3ed5397f91be (commit) from a8385b05635aee010fa8d9704b928556ff5d52c9 (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 4f182b4c734045250681ecea9c3f3ed5397f91be Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 23:55:21 2012 +0100 fine-tune new hook methods ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 2 +- x2go/backends/terminal/_stdout.py | 14 +++++++------- x2go/session.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 0dbe1da..6353f69 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -269,7 +269,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): #return username in self._x2go_remote_group('x2gousers') return True - def is_folder_sharing_available(self): + def is_sshfs_available(self): if self.remote_username() in self._x2go_remote_group('fuse'): return True return False diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index a2a5157..08b8de5 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -451,8 +451,8 @@ class X2goTerminalSessionSTDOUT(object): Initialize Paramiko/SSH reverse forwarding tunnel for X2Go folder sharing. """ - if not self.control_session.is_folder_sharing_available(): - raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username) + if not self.control_session.is_sshfs_available(): + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share SSHFS resources with the server.' % self.session_info.username) # start reverse SSH tunnel for sshfs (folder sharing, printing) ssh_transport = self.control_session.get_transport() @@ -499,8 +499,8 @@ class X2goTerminalSessionSTDOUT(object): Initialize X2Go print spooling. """ - if not self.control_session.is_folder_sharing_available(): - raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username) + if not self.control_session.is_sshfs_available(): + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to use client-side printing.' % self.session_info.username) spool_dir = os.path.join(self.session_info.local_container, 'spool') if not os.path.exists(spool_dir): @@ -545,8 +545,8 @@ class X2goTerminalSessionSTDOUT(object): Initialize X2Go mimebox handling. """ - if not self.control_session.is_folder_sharing_available(): - raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username) + if not self.control_session.is_sshfs_available(): + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to use the MIME box.' % self.session_info.username) mimebox_dir = os.path.join(self.session_info.local_container, 'mimebox') if not os.path.exists(mimebox_dir): @@ -601,7 +601,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if not self.control_session.is_folder_sharing_available(): + if not self.control_session.is_sshfs_available(): raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username) if local_path is None: diff --git a/x2go/session.py b/x2go/session.py index 8c12410..704de7e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -358,7 +358,7 @@ class X2goSession(object): """ if self.client_instance: - self.client_instance.HOOK_foldersharing_not_available(profile_name=self.profile_name, session_name=self.session_name) + self.client_instance.HOOK_sshfs_not_available(profile_name=self.profile_name, session_name=self.session_name) else: self.logger('HOOK_sshfs_not_available: the remote X2Go server (%s) denies SSHFS access for session %s. This will result in client-side folder sharing, printing and the MIME box feature being unavailable' % (self.profile_name, self.session_name), loglevel=log.loglevel_WARN) @@ -1208,7 +1208,7 @@ class X2goSession(object): self._SUPPORTED_FOLDERSHARING = False try: - if SUPPORTED_PRINTING and self.printing: + if self._SUPPORTED_PRINTING and self.printing: self.terminal_session and not self.faulty and self.terminal_session.start_printing() self.terminal_session and not self.faulty and self.session_environment.update({'X2GO_SPOOLDIR': self.terminal_session.get_printing_spooldir(), }) except x2go_exceptions.X2goUserException, e: @@ -1226,7 +1226,7 @@ class X2goSession(object): self._SUPPORTED_MIMEBOX = False try: - if self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): + if self._SUPPORTED_FOLDERSHARING and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: for _folder in self.share_local_folders: self.share_local_folder(_folder) 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

python-x2go.git - master (branch) updated: 0.1.1.4-113-ga8385b0
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via a8385b05635aee010fa8d9704b928556ff5d52c9 (commit) from 30887eac5d754a14b9baab46d8d42b10f402b612 (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 a8385b05635aee010fa8d9704b928556ff5d52c9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 23:32:50 2012 +0100 Code cleanup: remove all unnecessary imports. Stop defining variables that get never used. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 17 ++++++++--------- x2go/backends/printing/_file.py | 1 - x2go/backends/printing/_gconf.py | 3 --- x2go/backends/printing/_winreg.py | 3 --- x2go/backends/profiles/_file.py | 2 +- x2go/backends/profiles/_gconf.py | 4 ---- x2go/backends/profiles/_httpsbroker.py | 4 ---- x2go/backends/profiles/_winreg.py | 4 ---- x2go/backends/proxy/_nx3.py | 7 ------- x2go/backends/proxy/base.py | 5 ----- x2go/backends/settings/_file.py | 3 --- x2go/backends/settings/_gconf.py | 3 --- x2go/backends/settings/_winreg.py | 3 --- x2go/backends/terminal/_stdout.py | 6 ------ x2go/cache.py | 1 - x2go/checkhosts.py | 1 - x2go/cleanup.py | 1 - x2go/client.py | 2 -- x2go/defaults.py | 4 ---- x2go/forward.py | 2 +- x2go/guardian.py | 1 - x2go/mimebox.py | 3 --- x2go/mimeboxactions.py | 11 ++--------- x2go/printactions.py | 25 ++++++++++--------------- x2go/printqueue.py | 4 ---- x2go/pulseaudio.py | 2 -- x2go/registry.py | 3 --- x2go/rforward.py | 1 - x2go/session.py | 6 ++---- x2go/sftpserver.py | 5 ++--- x2go/sshproxy.py | 1 - x2go/tests/test_printing.py | 2 -- x2go/utils.py | 2 -- 34 files changed, 28 insertions(+), 116 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f60caf1..b597198 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Tolerate names containing "-" characters. - Provide hook methods for SSHFS failures (local folder sharing, printing, MIME box). + - Code cleanup: remove all unnecessary imports. Stop defining variables that + get never used. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 05b1c96..0dbe1da 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -32,7 +32,6 @@ import paramiko import gevent import copy -import binascii import string import random @@ -906,8 +905,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('suspending associated terminal session: %s' % session_name, loglevel=log.loglevel_DEBUG) (stdin, stdout, stderr) = self._x2go_exec_command("x2gosuspend-session %s" % session_name, loglevel=log.loglevel_DEBUG) - dummy_stdout = stdout.read() - dummy_stderr = stderr.read() + stdout.read() + stderr.read() if self.associated_terminals.has_key(session_name): if self.associated_terminals[session_name] is not None: self.associated_terminals[session_name].__del__() @@ -919,8 +918,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('suspending non-associated terminal session: %s' % session_name, loglevel=log.loglevel_DEBUG) (stdin, stdout, stderr) = self._x2go_exec_command("x2gosuspend-session %s" % session_name, loglevel=log.loglevel_DEBUG) - dummy_stdout = stdout.read() - dummy_stderr = stderr.read() + stdout.read() + stderr.read() _ret = True return _ret @@ -947,8 +946,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('terminating associated session: %s' % session_name, loglevel=log.loglevel_DEBUG) (stdin, stdout, stderr) = self._x2go_exec_command("x2goterminate-session %s" % session_name, loglevel=log.loglevel_DEBUG) - dummy_stdout = stdout.read() - dummy_stderr = stderr.read() + stdout.read() + stderr.read() if self.associated_terminals.has_key(session_name): if self.associated_terminals[session_name] is not None and destroy_terminals: self.associated_terminals[session_name].__del__() @@ -961,8 +960,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('terminating non-associated session: %s' % session_name, loglevel=log.loglevel_DEBUG) (stdin, stdout, stderr) = self._x2go_exec_command("x2goterminate-session %s" % session_name, loglevel=log.loglevel_DEBUG) - dummy_stdout = stdout.read() - dummy_stderr = stderr.read() + stdout.read() + stderr.read() _ret = True return _ret diff --git a/x2go/backends/printing/_file.py b/x2go/backends/printing/_file.py index 2405279..b7446b9 100644 --- a/x2go/backends/printing/_file.py +++ b/x2go/backends/printing/_file.py @@ -29,7 +29,6 @@ __NAME__ = 'x2goprinting-pylib' # modules import types -import ConfigParser # Python X2Go modules import x2go.log as log diff --git a/x2go/backends/printing/_gconf.py b/x2go/backends/printing/_gconf.py index 0dcb0f2..9552e2c 100644 --- a/x2go/backends/printing/_gconf.py +++ b/x2go/backends/printing/_gconf.py @@ -28,12 +28,9 @@ configuration of your X2Go client application. __NAME__ = 'x2goprint-pylib' # modules -import types -import ConfigParser # Python X2Go modules import x2go.log as log -import x2go.printactions as printactions # we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables) from x2go.defaults import X2GO_CLIENTPRINTING_DEFAULTS as _X2GO_CLIENTPRINTING_DEFAULTS from x2go.defaults import X2GO_PRINTING_CONFIGFILES as _X2GO_PRINTING_CONFIGFILES diff --git a/x2go/backends/printing/_winreg.py b/x2go/backends/printing/_winreg.py index ed9eb84..f120507 100644 --- a/x2go/backends/printing/_winreg.py +++ b/x2go/backends/printing/_winreg.py @@ -28,12 +28,9 @@ configuration of your X2Go client application. __NAME__ = 'x2goprint-pylib' # modules -import types -import ConfigParser # Python X2Go modules import x2go.log as log -import x2go.printactions as printactions # we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables) from x2go.defaults import X2GO_CLIENTPRINTING_DEFAULTS as _X2GO_CLIENTPRINTING_DEFAULTS from x2go.defaults import X2GO_PRINTING_CONFIGFILES as _X2GO_PRINTING_CONFIGFILES diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index 3a40544..64688df 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -147,7 +147,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): def has_profile(self, profile_id_or_name): try: - _profile_id = self.check_profile_id_or_name(profile_id_or_name) + self.check_profile_id_or_name(profile_id_or_name) return True except X2goProfileException: return False diff --git a/x2go/backends/profiles/_gconf.py b/x2go/backends/profiles/_gconf.py index df71401..f8e6eec 100644 --- a/x2go/backends/profiles/_gconf.py +++ b/x2go/backends/profiles/_gconf.py @@ -26,16 +26,12 @@ applications. """ __NAME__ = 'x2gosessionprofiles-pylib' -import copy - # Python X2Go modules from x2go.defaults import X2GO_SESSIONPROFILES_CONFIGFILES from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS import x2go.inifiles as inifiles import x2go.log as log -import x2go.utils as hostname -from x2go.x2go_exceptions import X2goProfileException from x2go.x2go_exceptions import X2goNotImplementedYetException class X2goSessionProfilesGCONF(inifiles.X2goIniFile): diff --git a/x2go/backends/profiles/_httpsbroker.py b/x2go/backends/profiles/_httpsbroker.py index 131ee9a..26d57c4 100644 --- a/x2go/backends/profiles/_httpsbroker.py +++ b/x2go/backends/profiles/_httpsbroker.py @@ -26,16 +26,12 @@ applications. """ __NAME__ = 'x2gosessionprofiles-pylib' -import copy - # Python X2Go modules from x2go.defaults import X2GO_SESSIONPROFILES_CONFIGFILES from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS import x2go.inifiles as inifiles import x2go.log as log -import x2go.utils as utils -from x2go.x2go_exceptions import X2goProfileException from x2go.x2go_exceptions import X2goNotImplementedYetException class X2goSessionProfilesHTTPSBROKER(inifiles.X2goIniFile): diff --git a/x2go/backends/profiles/_winreg.py b/x2go/backends/profiles/_winreg.py index 4440718..9b054d9 100644 --- a/x2go/backends/profiles/_winreg.py +++ b/x2go/backends/profiles/_winreg.py @@ -26,16 +26,12 @@ applications. """ __NAME__ = 'x2gosessionprofiles-pylib' -import copy - # Python X2Go modules from x2go.defaults import X2GO_SESSIONPROFILES_CONFIGFILES from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS import x2go.inifiles as inifiles import x2go.log as log -import x2go.utils as hostname -from x2go.x2go_exceptions import X2goProfileException from x2go.x2go_exceptions import X2goNotImplementedYetException class X2goSessionProfilesWINREG(inifiles.X2goIniFile): diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index bd2d42f..f508816 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -24,16 +24,9 @@ X2goProxy classes - proxying your connection through NX3 and others. __NAME__ = 'x2goproxynx3-pylib' # modules -import gevent import os -import sys -import types -import time -import copy -import threading # Python X2Go modules -import x2go.forward as forward import x2go.utils as utils import x2go.log as log import base diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index fca9720..39cc45a 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -26,18 +26,13 @@ __NAME__ = 'x2goproxy-pylib' # modules import gevent import os -import sys -import types -import time import copy import threading -import cStringIO # Python X2Go modules import x2go.forward as forward import x2go.log as log import x2go.utils as utils -import x2go.x2go_exceptions as x2go_exceptions from x2go.defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS if _X2GOCLIENT_OS in ("Windows"): diff --git a/x2go/backends/settings/_file.py b/x2go/backends/settings/_file.py index c35d9af..b3dd81f 100644 --- a/x2go/backends/settings/_file.py +++ b/x2go/backends/settings/_file.py @@ -28,9 +28,6 @@ in your Python X2Go based applications to access the """ __NAME__ = 'x2gosettings-pylib' -# modules -import os - # Python X2Go modules import x2go.log as log from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILES diff --git a/x2go/backends/settings/_gconf.py b/x2go/backends/settings/_gconf.py index 38ad5fe..5b4ad37 100644 --- a/x2go/backends/settings/_gconf.py +++ b/x2go/backends/settings/_gconf.py @@ -28,9 +28,6 @@ in your Python X2Go based applications to access the """ __NAME__ = 'x2gosettings-pylib' -# modules -import os - # Python X2Go modules import x2go.log as log from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILES diff --git a/x2go/backends/settings/_winreg.py b/x2go/backends/settings/_winreg.py index 707aca0..6a7acac 100644 --- a/x2go/backends/settings/_winreg.py +++ b/x2go/backends/settings/_winreg.py @@ -28,9 +28,6 @@ in your Python X2Go based applications to access the """ __NAME__ = 'x2gosettings-pylib' -# modules -import os - # Python X2Go modules import x2go.log as log from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILES diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index cb190ed..a2a5157 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -28,11 +28,8 @@ __NAME__ = 'x2goterminalsession-pylib' # modules import os -import sys import types import gevent -import threading -import signal import cStringIO import copy import shutil @@ -48,8 +45,6 @@ import x2go.defaults as defaults import x2go.utils as utils import x2go.x2go_exceptions as x2go_exceptions -from x2go.cleanup import x2go_cleanup - # we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables) from x2go.defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS from x2go.defaults import X_DISPLAY as _X_DISPLAY @@ -481,7 +476,6 @@ class X2goTerminalSessionSTDOUT(object): def _x2go_pause_rev_fw_tunnel(self, name): # pause reverse SSH tunnel of name <name> - ssh_transport = self.get_transport() _tunnel = self.reverse_tunnels[self.session_info.name][name][1] if _tunnel is not None: _tunnel.pause() diff --git a/x2go/cache.py b/x2go/cache.py index 87d2bac..b447b7c 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -25,7 +25,6 @@ __NAME__ = 'x2gocache-pylib' # modules import copy -import gevent # Python X2Go modules import log diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index a94ce78..8682574 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -26,7 +26,6 @@ __NAME__ = 'x2gocheckhosts-pylib' # modules import paramiko import binascii -import uuid # Python X2Go modules import sshproxy diff --git a/x2go/cleanup.py b/x2go/cleanup.py index 760a242..82d49d1 100644 --- a/x2go/cleanup.py +++ b/x2go/cleanup.py @@ -27,7 +27,6 @@ import paramiko import threading # Python X2Go modules -import guardian import rforward from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS diff --git a/x2go/client.py b/x2go/client.py index 85481fb..4adfb01 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -117,12 +117,10 @@ Session Suspending/Terminating __NAME__ = 'x2goclient-pylib' #modules -import uuid import copy import sys import types import os -import gevent # Python X2Go modules from registry import X2goSessionRegistry diff --git a/x2go/defaults.py b/x2go/defaults.py index 8be690f..65868f2 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -23,14 +23,10 @@ Default variables and values for Python X2Go. """ __NAME__ = 'x2godefaults-pylib' -import sys import os import paramiko import platform -## X2Go imports -import utils - ## ## Common X2Go defaults ## diff --git a/x2go/forward.py b/x2go/forward.py index b5616fe..69f3af1 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -25,7 +25,7 @@ proxying of graphical X2Go elements. __NAME__ = "x2gofwtunnel-pylib" # modules -import os, sys, copy +import copy # gevent/greenlet import gevent diff --git a/x2go/guardian.py b/x2go/guardian.py index 8d20dba..5b8ea01 100644 --- a/x2go/guardian.py +++ b/x2go/guardian.py @@ -32,7 +32,6 @@ import copy # Python X2Go modules from cleanup import x2go_cleanup -import x2go_exceptions import log _sigterm_received = False diff --git a/x2go/mimebox.py b/x2go/mimebox.py index bc9dfa3..71c1e9f 100644 --- a/x2go/mimebox.py +++ b/x2go/mimebox.py @@ -42,9 +42,6 @@ import utils import log import mimeboxactions -if defaults.X2GOCLIENT_OS != 'Windows': - from x2go_exceptions import WindowsError - class X2goMIMEboxQueue(threading.Thread): """\ diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py index 2e1d881..4dec16d 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -27,11 +27,7 @@ __NAME__ = 'x2gomimeboxactions-pylib' # modules import os -import sys -import shutil import copy -import types -import threading import time from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS @@ -44,9 +40,6 @@ else: # Python X2Go modules import log -import defaults -# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables) -import utils import x2go_exceptions _MIMEBOX_ENV = os.environ.copy() @@ -163,7 +156,7 @@ class X2goMIMEboxActionOPEN(X2goMIMEboxAction): else: cmd_line = [ 'xdg-open', os.path.join(mimebox_dir, mimebox_file), ] self.logger('opening MIME box file with command: %s' % ' '.join(cmd_line), loglevel=log.loglevel_DEBUG) - p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_MIMEBOX_ENV) + subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_MIMEBOX_ENV) time.sleep(20) @@ -216,7 +209,7 @@ class X2goMIMEboxActionOPENWITH(X2goMIMEboxAction): self.logger('the evocation of the Open-with dialog box is currently not available on Linux, falling back to MIME box action OPEN', loglevel=log.loglevel_WARN) cmd_line = [ 'xdg-open', os.path.join(mimebox_dir, mimebox_file), ] self.logger('opening MIME box file with command: %s' % ' '.join(cmd_line), loglevel=log.loglevel_DEBUG) - p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_MIMEBOX_ENV) + subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_MIMEBOX_ENV) time.sleep(20) diff --git a/x2go/printactions.py b/x2go/printactions.py index c57b700..f62e804 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -30,14 +30,9 @@ __NAME__ = 'x2goprintactions-pylib' # modules import os -import sys import shutil import copy -import types -import threading import time -import re -import string from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS if _X2GOCLIENT_OS in ("Windows"): @@ -205,11 +200,11 @@ class X2goPrintActionPDFVIEW(X2goPrintAction): cmd_line = [ self.pdfview_cmd, _hr_filename, ] self.logger('viewing incoming PDF with command: %s' % ' '.join(cmd_line), loglevel=log.loglevel_DEBUG) try: - p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) + subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) except OSError, e: if e.errno == 2: cmd_line = [ defaults.DEFAULT_PDFVIEW_CMD, _hr_filename ] - p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) + subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) else: raise(e) self.logger('waiting 20s longer before deleting the PDF file ,,%s\'\'' % _hr_filename, loglevel=log.loglevel_DEBUG) @@ -329,12 +324,12 @@ class X2goPrintActionPRINT(X2goPrintAction): _gsprint_bin = os.path.normpath(os.path.join(_program_files, 'ghostgum', 'gsview', 'gsprint.exe',)) self.logger('Using hard-coded gsprint.exe path: %s' % _gsprint_bin, loglevel=log.loglevel_DEBUG) self.logger('Trying Ghostgum tool ,,gsprint.exe'' for printing first (full path: %s)' % _gsprint_bin, loglevel=log.loglevel_DEBUG) - p = subprocess.Popen([_gsprint_bin, pdf_file, ], - stdin=_stdin, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - shell=_shell, - ) + subprocess.Popen([_gsprint_bin, pdf_file, ], + stdin=_stdin, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + shell=_shell, + ) # give gsprint.exe a little time to find our printer time.sleep(10) @@ -385,7 +380,7 @@ class X2goPrintActionPRINT(X2goPrintAction): '%s' % _hr_filename, ] self.logger('executing local print command: %s' % " ".join(cmd_line), loglevel=log.loglevel_DEBUG) - p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) + subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) # this is nasty!!!! self.logger('waiting 20s longer before deleting the PDF file ,,%s\'\'' % _hr_filename, loglevel=log.loglevel_DEBUG) @@ -443,7 +438,7 @@ class X2goPrintActionPRINTCMD(X2goPrintAction): cmd_line = self.print_cmd.split() cmd_line.append(_hr_filename) self.logger('executing external command: %s' % " ".join(cmd_line), loglevel=log.loglevel_DEBUG) - p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) + subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) # this is nasty!!!! self.logger('waiting 20s longer before deleting the PDF file ,,%s\'\'' % _hr_filename, loglevel=log.loglevel_DEBUG) diff --git a/x2go/printqueue.py b/x2go/printqueue.py index 8eeaef6..f5b99c6 100644 --- a/x2go/printqueue.py +++ b/x2go/printqueue.py @@ -37,14 +37,10 @@ import gevent import defaults import utils import log -import printactions # we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables) from backends.printing import X2goClientPrinting as _X2goClientPrinting -if defaults.X2GOCLIENT_OS != 'Windows': - from x2go_exceptions import WindowsError - from defaults import X2GO_PRINTING_FILENAME as _X2GO_PRINTING_FILENAME diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py index 10ca1ef..d3fdb33 100644 --- a/x2go/pulseaudio.py +++ b/x2go/pulseaudio.py @@ -29,14 +29,12 @@ __NAME__ = 'x2gopulseaudio-pylib' from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS if _X2GOCLIENT_OS == 'Windows': - import wmi import win32process import win32con import win32event # modules import os -import subprocess import threading import gevent import copy diff --git a/x2go/registry.py b/x2go/registry.py index 4ab3d00..4fe08a0 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -26,13 +26,10 @@ __NAME__ = 'x2gosessregistry-pylib' import os import copy import types -import uuid import time -import threading # Python X2Go modules import log -import utils import session import x2go_exceptions diff --git a/x2go/rforward.py b/x2go/rforward.py index 1fa81e4..d41b9c6 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -33,7 +33,6 @@ import paramiko # gevent/greenlet from gevent import select, socket, Timeout -from gevent import sleep as gevent_sleep # Python X2Go modules import log diff --git a/x2go/session.py b/x2go/session.py index c4b71b5..8c12410 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -33,7 +33,6 @@ import copy import types import uuid import time -import threading import gevent # Python X2Go modules @@ -47,7 +46,6 @@ from x2go.backends.terminal import X2goTerminalSession as _X2goTerminalSession from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList from x2go.backends.proxy import X2goProxy as _X2goProxy -from x2go.backends.profiles import X2goSessionProfiles as _X2goSessionProfiles from x2go.backends.settings import X2goClientSettings as _X2goClientSettings from x2go.backends.printing import X2goClientPrinting as _X2goClientPrinting @@ -907,7 +905,7 @@ class X2goSession(object): # then tidy up... self.disconnect() - _dummy = self.get_server_hostname() + self.get_server_hostname() if self.connected: self.update_status() @@ -1302,7 +1300,7 @@ class X2goSession(object): raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop) _session_owner = _desktop.split('@')[0] - _display = _desktop.split('@')[1] + #_display = _desktop.split('@')[1] if self.is_alive(): if self.get_username() != _session_owner: diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py index e10e79b..730acc6 100644 --- a/x2go/sftpserver.py +++ b/x2go/sftpserver.py @@ -31,9 +31,9 @@ for further information see his website: http://www.richardmurri.com """ __NAME__ = "x2gosftpserver-pylib" -import base64, os, sys +import os import shutil -import copy, types +import copy import threading import paramiko import gevent @@ -41,7 +41,6 @@ import gevent # Python X2Go modules import rforward import defaults -import utils import log class _SSHServer(paramiko.ServerInterface): diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index f37cb29..a4d14ed 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -29,7 +29,6 @@ import os import copy import paramiko import threading -import socket import string import random diff --git a/x2go/tests/test_printing.py b/x2go/tests/test_printing.py index efb13af..77dba3b 100644 --- a/x2go/tests/test_printing.py +++ b/x2go/tests/test_printing.py @@ -17,10 +17,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -import sys import unittest import tempfile -import time # Python X2Go modules import x2go diff --git a/x2go/utils.py b/x2go/utils.py index 87c053d..87c4a4f 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -29,11 +29,9 @@ import locale import re import types import copy -import paramiko import socket import gevent import string -import re import subprocess import Xlib 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

python-x2go.git - master (branch) updated: 0.1.1.4-112-g30887ea
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 30887eac5d754a14b9baab46d8d42b10f402b612 (commit) via 84683b883de5c853506c116d715f8c054de4a2bf (commit) from 5aa1c6f22f593c1efb58c1f0342746f5772ea540 (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 30887eac5d754a14b9baab46d8d42b10f402b612 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 23:03:51 2012 +0100 fix undefined names in terminal backend commit 84683b883de5c853506c116d715f8c054de4a2bf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 23:03:22 2012 +0100 Provide hook methods for SSHFS failures (local folder sharing, printing, MIME box). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + x2go/backends/terminal/_stdout.py | 14 ++++---- x2go/client.py | 48 ++++++++++++++++++++++++++ x2go/session.py | 68 ++++++++++++++++++++++++++++++++----- 4 files changed, 116 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b74c497..f60caf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Fix X2Go desktop sharing support. - New feature, allow/fix sessions on localhost system. - Tolerate names containing "-" characters. + - Provide hook methods for SSHFS failures (local folder sharing, printing, + MIME box). * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 4af12c9..cb190ed 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1115,22 +1115,22 @@ class X2goTerminalSessionSTDOUT(object): for stdout_line in stdout.read(): try: _new_value = stdout_line.split("=")[1].strip() - if 'gr_port=' in stdout_line and _new_value != str(session_info.graphics_port): + if 'gr_port=' in stdout_line and _new_value != str(self.session_info.graphics_port): try: - session_info.graphics_port = int(_new_value) + self.session_info.graphics_port = int(_new_value) self.logger('re-allocating graphics port for session %s, old server-side port is in use; new graphics port is %s' % (self.session_info, self.session_info.graphics_port), loglevel=log.loglevel_NOTICE) except TypeError: # if the re-allocation fails, this is fatal!!! - raise X2goTerminalSessionException('Failed to retrieve new graphics port from server. X2Go Session cannot be resumed.') - elif 'sound_port=' in stdout_line and _new_value != str(session_info.snd_port): + raise x2go_exceptions.X2goTerminalSessionException('Failed to retrieve new graphics port from server. X2Go Session cannot be resumed.') + elif 'sound_port=' in stdout_line and _new_value != str(self.session_info.snd_port): try: - session_info.snd_port = int(_new_value) + self.session_info.snd_port = int(_new_value) self.logger('re-allocating sound port for session %s, old server-side port is in use; new sound port is %s' % (self.session_info, self.session_info.snd_port), loglevel=log.loglevel_NOTICE) except TypeError: self.logger('Failed to retrieve new sound port from server for session %s, session will be without sound.' % self.session_info, loglevel=log.loglevel_WARN) - elif 'fs_port=' in stdout_line and _new_value != str(session_info.sshfs_port): + elif 'fs_port=' in stdout_line and _new_value != str(self.session_info.sshfs_port): try: - session_info.sshfs_port = int(_new_value) + self.session_info.sshfs_port = int(_new_value) self.logger('re-allocating sshfs port for session %s, old server-side port is in use; new sshfs port is %s' % (self.session_info, self.session_info.sshfs_port), loglevel=log.loglevel_NOTICE) except TypeError: self.logger('Failed to retrieve new sshfs port from server for session %s, session will be without client-side folder sharing. Neither will there be X2Go printing nor X2Go MIME box support.' % self.session_info, loglevel=log.loglevel_WARN) diff --git a/x2go/client.py b/x2go/client.py index 880c79d..85481fb 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -595,6 +595,54 @@ class X2goClient(object): """ self.logger('HOOK_on_session_has_terminated (session_uuid: %s, profile_name: %s): session %s has terminated' % (session_uuid, profile_name, session_name), loglevel=log.loglevel_NOTICE) + def HOOK_printing_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'): + """\ + HOOK method: called if X2Go client-side printing is not available. + + @param profile_name: profile name of session that called this hook method + @type profile_name: C{str} + @param session_name: X2Go session name + @type session_name: C{str} + + """ + self.logger('HOOK_foldersharing_not_available: X2Go\'s client-side printing feature is not available with this session (%s) of profile %s.' % (session_name, profile_name), loglevel=log.loglevel_WARN) + + def HOOK_mimebox_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'): + """\ + HOOK method: called if the X2Go MIME box is not available. + + @param profile_name: profile name of session that called this hook method + @type profile_name: C{str} + @param session_name: X2Go session name + @type session_name: C{str} + + """ + self.logger('HOOK_mimebox_not_available: X2Go\'s MIME box feature is not available with this session (%s) of profile %s.' % (session_name, profile_name), loglevel=log.loglevel_WARN) + + def HOOK_foldersharing_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'): + """\ + HOOK method: called if X2Go client-side folder-sharing is not available. + + @param profile_name: profile name of session that called this hook method + @type profile_name: C{str} + @param session_name: X2Go session name + @type session_name: C{str} + + """ + self.logger('HOOK_foldersharing_not_available: X2Go\'s client-side folder sharing feature is not available with this session (%s) of profile %s.' % (session_name, profile_name), loglevel=log.loglevel_WARN) + + def HOOK_sshfs_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'): + """\ + HOOK method: called if the X2Go server denies SSHFS access. + + @param profile_name: profile name of session that called this hook method + @type profile_name: C{str} + @param session_name: X2Go session name + @type session_name: C{str} + + """ + self.logger('HOOK_sshfs_not_available: the remote X2Go server (%s) denies SSHFS access for session %s. This will result in client-side folder sharing, printing and the MIME box feature being unavailable' % (session_name, profile_name), loglevel=log.loglevel_WARN) + def _detect_backend_classes(self): # CONTROL session backend if type(self.control_backend) is types.StringType: diff --git a/x2go/session.py b/x2go/session.py index 5d58b63..c4b71b5 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -324,6 +324,46 @@ class X2goSession(object): # get rid of the faulty session... self.terminate() + def HOOK_printing_not_available(self): + """\ + HOOK method: called if X2Go client-side printing is not available. + + """ + if self.client_instance: + self.client_instance.HOOK_printing_not_available(profile_name=self.profile_name, session_name=self.session_name) + else: + self.logger('HOOK_foldersharing_not_available: X2Go\'s client-side printing feature is not available with this session (%s) of profile %s.' % (self.session_name, self.profile_name), loglevel=log.loglevel_WARN) + + def HOOK_mimebox_not_available(self): + """\ + HOOK method: called if the X2Go MIME box is not available. + + """ + if self.client_instance: + self.client_instance.HOOK_mimebox_not_available(profile_name=self.profile_name, session_name=self.session_name) + else: + self.logger('HOOK_mimebox_not_available: X2Go\'s MIME box feature is not available with this session (%s) of profile %s.' % (self.session_name, self.profile_name), loglevel=log.loglevel_WARN) + + def HOOK_foldersharing_not_available(self): + """\ + HOOK method: called if X2Go client-side folder-sharing is not available. + + """ + if self.client_instance: + self.client_instance.HOOK_foldersharing_not_available(profile_name=self.profile_name, session_name=self.session_name) + else: + self.logger('HOOK_foldersharing_not_available: X2Go\'s client-side folder sharing feature is not available with this session (%s) of profile %s.' % (self.session_name, self.profile_name), loglevel=log.loglevel_WARN) + + def HOOK_sshfs_not_available(self): + """\ + HOOK method: called if the X2Go server denies SSHFS access. + + """ + if self.client_instance: + self.client_instance.HOOK_foldersharing_not_available(profile_name=self.profile_name, session_name=self.session_name) + else: + self.logger('HOOK_sshfs_not_available: the remote X2Go server (%s) denies SSHFS access for session %s. This will result in client-side folder sharing, printing and the MIME box feature being unavailable' % (self.profile_name, self.session_name), loglevel=log.loglevel_WARN) + def HOOK_check_host_dialog(self, host, port, fingerprint='no fingerprint', fingerprint_type='RSA'): """\ HOOK method: called if a host check is requested. This hook has to either return C{True} (default) or C{False}. @@ -1164,7 +1204,7 @@ class X2goSession(object): self.terminal_session and not self.faulty and self.terminal_session.start_sshfs() except x2go_exceptions.X2goUserException, e: self.logger('%s' % str(e), loglevel=log.loglevel_WARN) - # TODO: handle this exception as a notification hook method... + self.HOOK_sshfs_not_available() self._SUPPORTED_PRINTING = False self._SUPPORTED_MIMEBOX = False self._SUPPORTED_FOLDERSHARING = False @@ -1175,17 +1215,27 @@ class X2goSession(object): self.terminal_session and not self.faulty and self.session_environment.update({'X2GO_SPOOLDIR': self.terminal_session.get_printing_spooldir(), }) except x2go_exceptions.X2goUserException, e: self.logger('%s' % str(e), loglevel=log.loglevel_WARN) - # TODO: handle this exception as a notification hook method... + self.HOOK_printing_not_available() self._SUPPORTED_PRINTING = False - if self._SUPPORTED_MIMEBOX and self.allow_mimebox: - self.terminal_session and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) - self.terminal_session and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) + try: + if self._SUPPORTED_MIMEBOX and self.allow_mimebox: + self.terminal_session and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) + self.terminal_session and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) + except x2go_exceptions.X2goUserException, e: + self.logger('%s' % str(e), loglevel=log.loglevel_WARN) + self.HOOK_mimebox_not_available() + self._SUPPORTED_MIMEBOX = False - if self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): - if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: - for _folder in self.share_local_folders: - self.share_local_folder(_folder) + try: + if self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): + if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: + for _folder in self.share_local_folders: + self.share_local_folder(_folder) + except x2go_exceptions.X2goUserException, e: + self.logger('%s' % str(e), loglevel=log.loglevel_WARN) + self.HOOK_foldersharing_not_available() + self._SUPPORTED_FOLDERSHARING = False self.virgin = False self.suspended = False 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2012