x2go-commits

x2go-commits@lists.x2go.org

37910 discussions

python-x2go.git - twofactorauth (branch) updated: aaeba00c384aaf023617de8619c8668055550c93
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via aaeba00c384aaf023617de8619c8668055550c93 (commit) from f4ff086c8d81ca375bc2f96e60a85138544b9b6b (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/client.py | 393 +++++++++++++++++++++++++++++------------------------- x2go/printing.py | 2 +- x2go/profiles.py | 9 +- x2go/registry.py | 270 ++++++++++++++++++++++++++++++++++++- 4 files changed, 489 insertions(+), 185 deletions(-) The diff of changes is: diff --git a/x2go/client.py b/x2go/client.py index 8298b2f..1f5233f 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -40,7 +40,9 @@ from session import X2goSession, _X2GO_SESSION_OPTIONS import log import utils +# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables) from defaults import LOCAL_HOME as _LOCAL_HOME +from defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR class X2goClient(object): @@ -99,7 +101,10 @@ class X2goClient(object): x2go_client.terminate_session(x2go_profile_id) """ + session_profiles = None session_registry = None + client_settings = None + client_printing = None def __init__(self, loglevel=log.loglevel_DEFAULT, logger=None, *args, **kwargs): """\ @@ -122,41 +127,22 @@ class X2goClient(object): self.client_settings = X2goClientSettings(logger=self.logger) self.client_printing = X2goClientPrinting(logger=self.logger) - def __get_username(self, session_hash): + def __get_client_username(self): """\ - After a session has been setup up you can query the - username the sessions runs as. - - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + Query the local user's username. - @return: the remote username the X2go session runs as + @return: the local username this X2goClient instance runs as @rtype: str """ - return self.session_registry(session_hash).session_object.get_transport().get_username() - get_username = __get_username - - def __get_server(self, session_hash): - """\ - After a session has been setup up you can query the - hostname of the host the sessions is connected to (or - about to connect to). - - @param session_hash: the X2go sessions UUID registry hash - @type session_hash: str - - @return: the host an X2go session is connected to - (as an C{(addr,port)} tuple) - @rtype: tuple - - """ - return self.session_registry(session_hash).session_object.get_transport().getpeername() - get_server = __get_server + return _CURRENT_LOCAL_USER + get_client_username = __get_client_username def __register_session(self, server=None, profile_id=None, profile_name=None, custom_profile_name=None, - printing=False, share_local_folders=[], **kwargs): + printing=False, share_local_folders=[], return_object=False, **kwargs): """\ + DOCUMENTATION OUT OF DATE + Register a new X2go client session. Within one X2goClient instance you can manage several sessions on serveral remote X2go servers under different user names. @@ -209,9 +195,48 @@ class X2goClient(object): session_options = self.session_registry(session_uuid).session_options self.logger('initializing X2go session...', log.loglevel_NOTICE) - return session_uuid + if return_object: + return self(session_uuid) + else: + return session_uuid register_session = __register_session + ### + ### WRAPPER METHODS FOR X2goRegisteredSession objects + ### + + def __get_session_username(self, session_uuid): + """\ + After an X2go session has been setup up you can query the + username the remote sessions runs as. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str + + @return: the remote username the X2go session runs as + @rtype: str + + """ + return self.session_registry(session_uuid).get_username() + get_session_username = __get_session_username + + def __get_session_server(self, session_uuid): + """\ + After a session has been setup up you can query the + hostname of the host the sessions is connected to (or + about to connect to). + + @param session_uuid: the X2go sessions UUID registry hash + @type session_uuid: str + + @return: the host an X2go session is connected to + (as an C{(addr,port)} tuple) + @rtype: tuple + + """ + return self.session_registry(session_uuid).get_server() + get_session_server = __get_session_server + def __get_session(self, session_uuid): """\ Retrieve the complete X2goSession object that has been @@ -233,14 +258,14 @@ class X2goClient(object): Retrieve the server-side X2go session name for the session that has been registered under C{profile_id}. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @return: X2go session name @rtype: str """ - return self.session_registry(session_uuid).session_object.session_info + return self.session_registry(session_uuid).get_session_name() get_session_name = __get_session_name def __connect_session(self, session_uuid, password=None, add_to_known_hosts=False, force_password_auth=False): @@ -263,13 +288,10 @@ class X2goClient(object): @type force_password_auth: bool """ - session = self.session_registry(session_uuid).session_object - server = self.session_registry(session_uuid).server - connect_options = self.session_registry(session_uuid).connect_options - connect_options['password'] = password - connect_options['force_password_auth'] = force_password_auth - session.connect(server, **connect_options) - self.session_registry(session_uuid).connected = True + self.session_registry(session_uuid).connect(password=password, + add_to_known_hosts=add_to_known_hosts, + force_password_auth=force_password_auth + ) connect_session = __connect_session def __set_session_print_action(self, session_uuid, print_action, **kwargs): @@ -277,9 +299,7 @@ class X2goClient(object): STILL UNDOCUMENTED """ - if type(print_action) is not types.StringType: - return False - self.with_session(session_uuid).set_print_action(print_action, **kwargs) + self.session_registry(session_uuid).set_print_action(print_action=print_action, **kwargs) set_session_print_action = __set_session_print_action def __start_session(self, session_uuid): @@ -290,55 +310,9 @@ class X2goClient(object): @type session_uuid: str """ - session = self.session_registry(session_uuid).session_object - - session.start() - - if session.params.snd_system is not 'none': - session.start_sound() - - session.start_sshfs() - if self.session_registry(session_uuid).printing: - session.start_printing() - - if self.session_registry(session_uuid).share_local_folders: - if session.get_transport().reverse_tunnels['sshfs'][1] is not None: - for _folder in self.session_registry(session_uuid).share_local_folders: - session.share_local_folder(_folder) - - session.run_command() - self.session_registry(session_uuid).running = True + self.session_registry(session_uuid).start() start_session = __start_session - def __clean_sessions(self, session_uuid): - """\ - Find running X2go sessions that have been standard by the connected - user and terminate them. - - @param session_uuid: the X2go session's UUID registry hash - @type session_uuid: str - - """ - session = self.session_registry(session_uuid).session_object - session_infos = session.list_sessions() - for session_info in session_infos.values(): - session.terminate(session_name=session_info) - clean_sessions = __clean_sessions - - def __list_sessions(self, session_uuid): - """\ - Use the X2go session registered under C{session_uuid} to - retrieve a list of running or suspended X2go sessions on the - connected X2go server (for the authenticated user). - - @param session_uuid: the X2go session's UUID registry hash - @type session_uuid: str - - """ - session = self.session_registry(session_uuid).session_object - return session.list_sessions() - list_sessions = __list_sessions - def __resume_session(self, session_uuid, session_name): """\ Resume or continue a suspended / running X2go session on the @@ -381,13 +355,13 @@ class X2goClient(object): @type session_name: str """ - session = self.session_registry(session_uuid).session_object if session_name: + # suspend a non-registered session by session name + session = self.session_registry(session_uuid).session_object session.associate(session_name) - session.suspend(session_name=session_name) - if session_name is None: - self.session_registry(session_uuid).running = False - self.session_registry(session_uuid).suspended = True + session.suspend(session_name=session_name) + else: + self.session_registry(session_uuid).suspend() suspend_session = __suspend_session def __terminate_session(self, session_uuid, session_name=None): @@ -407,100 +381,44 @@ class X2goClient(object): @type session_name: str """ - session = self.session_registry(session_uuid).session_object if session_name: - session.associate(session_name=session_name) - session.terminate() - if session_name is None: - self.session_registry(session_uuid).running = False - self.session_registry(session_uuid).suspended = False - self.session_registry(session_uuid).terminated = True + # terminate a non-registered session by session name + session = self.session_registry(session_uuid).session_object + session.associate(session_name) + session.terminate(session_name=session_name) + else: + self.session_registry(session_uuid).terminate() terminate_session = __terminate_session - ### - ### Session profile oriented methods - ### - - def __get_profile(self, session_uuid): + def __get_session_profile_name(self, session_uuid): """\ - Retrieve the complete X2goSession object that has been - registry under the given sesion registry hash. + Retrieve the profile name of the session that has been registered + under C{session_uuid} @param session_uuid: the X2go session's UUID registry hash @type session_uuid: str - @return: the L{X2goSession} object - @rtype: obj - - """ - return self.session_registry[session_hash]['profile'] - get_profile = __get_profile - with_profile = __get_profile - - def __get_profile_name(self, session_uuid): - """\ - Retrieve the profile name of the session that has been registered - under C{session_hash} - - - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str - @return: X2go client profile name of the session @rtype: str """ - return self.session_registry(session_uuid).profile_name - get_profile_name = __get_profile_name + return self.session_registry(session_uuid).get_profile_name() + get_session_profile_name = __get_session_profile_name - def __get_profile_id(self, profile_name): + def __get_session_profile_id(self, session_uuid): """\ - Retrieve the session profile id of the session whose profile name - is C{profile_name} + Retrieve the profile id of the session that has been registered + under C{session_uuid} - @param profile_name: the session profile name - @type profile_name: str + @param session_uuid: the session profile name + @type session_uuid: str - @return: the session profile's id + @return: the session profile's id as in the sessions configuration file @rtype: str """ - return self.session_registry(profile_name).profile_id - get_profile_id = __get_profile_id - - ### - ### Provide access to config file class objects - ### - - def __get_session_profiles(self): - """\ - STILL UNDOCUMENTED - - """ - return self.session_profiles - get_session_profiles = __get_session_profiles - __get_profiles = __get_session_profiles - get_profiles = __get_profiles - - def __get_client_settings(self): - """\ - STILL UNDOCUMENTED - - """ - return self.client_settings - get_client_settings = __get_client_settings - - def __get_client_printing(self): - """\ - STILL UNDOCUMENTED - - """ - return self.client_printing - get_client_printing = __get_client_printing - - ### - ### QUERYING INFORMATION - ### + return self.session_registry(session_uuid).profile_id + get_session_profile_id = __get_session_profile_id def __session_ok(self, session_uuid): """\ @@ -514,10 +432,10 @@ class X2goClient(object): @rtype: bool """ - return self.with_session(session_uuid).ok() + return self.session_registry(session_uuid).session_ok() session_ok = __session_ok - def __is_running(self, session_uuid): + def __is_session_running(self, session_uuid): """\ Test if the X2go session registered as C{session_uuid} is up and running. @@ -529,10 +447,10 @@ class X2goClient(object): @rtype: bool """ - return self.with_session(session_uuid).is_running() - is_running = __is_running + return self.session_registry(session_uuid).is_running() + is_session_running = __is_session_running - def __is_suspended(self, session_uuid): + def __is_session_suspended(self, session_uuid): """\ Test if the X2go session registered as C{session_uuid} is in suspended state. @@ -544,10 +462,10 @@ class X2goClient(object): @rtype: bool """ - return self.with_session(session_uuid).is_suspended() - is_suspended = __is_suspended + return self.session_registry(session_uuid).is_suspended() + is_session_suspended = __is_session_suspended - def __has_terminated(self, session_uuid): + def __has_session_terminated(self, session_uuid): """\ Test if the X2go session registered as C{session_uuid} has terminated. @@ -559,10 +477,10 @@ class X2goClient(object): @rtype: bool """ - return self.with_session(session_uuid).has_terminated() - has_terminated = __has_terminated + return self.session_registry(session_uuid).has_terminated() + has_session_terminated = __has_session_terminated - def __share_local_folder(self, session_uuid, folder_name): + def __share_local_folder_with_session(self, session_uuid, folder_name): """\ Share a local folder with the X2go session registered as C{session_uuid}. @@ -577,5 +495,118 @@ class X2goClient(object): @rtype: bool """ - return self.with_session(session_uuid).share_local_folder(folder_name=folder_name) - share_local_folder = __share_local_folder + return self.session_registry(session_uuid).share_local_folder(folder_name=folder_name) + share_local_folder_with_session = __share_local_folder_with_session + + ### + ### CLIENT OPERATIONS ON SESSIONS (listing sessions, terminating non-associated sessions etc.) + ### + + def __clean_sessions(self, session_uuid): + """\ + Find running X2go sessions that have been standard by the connected + user and terminate them. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str + + """ + session = self.session_registry(session_uuid).session_object + session_infos = session.list_sessions() + for session_info in session_infos.values(): + session.terminate(session_name=session_info) + clean_sessions = __clean_sessions + + def __list_sessions(self, session_uuid): + """\ + Use the X2go session registered under C{session_uuid} to + retrieve a list of running or suspended X2go sessions on the + connected X2go server (for the authenticated user). + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str + + """ + session = self.session_registry(session_uuid).session_object + return session.list_sessions() + list_sessions = __list_sessions + + ### + ### Provide access to config file class objects + ### + + def __get_profiles(self): + """\ + STILL UNDOCUMENTED + + """ + return self.session_profiles + get_profiles = __get_profiles + + def __get_client_settings(self): + """\ + STILL UNDOCUMENTED + + """ + return self.client_settings + get_client_settings = __get_client_settings + + def __get_client_printing(self): + """\ + STILL UNDOCUMENTED + + """ + return self.client_printing + get_client_printing = __get_client_printing + + ### + ### Session profile oriented methods + ### + + def __get_profile_config(self, profile_id_or_name): + """\ + Retrieve the complete X2goSession object that has been + registry under the given sesion registry hash. + + @param profile_id_or_name: name or id of an X2go session profile as found + in the sessions configuration file + @type profile_id_or_name: str + + @return: a Python dictionary with session profile options + @rtype: dict + + """ + return self.session_profiles.get_profile_config(profile_id_or_name) + get_profile_config = __get_profile_config + with_profile_config = __get_profile_config + + def __to_profile_id(self, profile_name): + """\ + Retrieve the session profile id of the session whose profile name + is C{profile_name} + + @param profile_name: the session profile name + @type profile_name: str + + @return: the session profile's id + @rtype: str + + """ + return self.session_profiles.get_profile_id(profile_name) + to_profile_id = __to_profile_id + + def __to_profile_name(self, profile_id): + """\ + Retrieve the session profile name of the session whose profile id + is C{profile_id} + + @param profile_id: the session profile id + @type profile_id: str + + @return: the session profile's name + @rtype: str + + """ + return self.session_profiles.get_profile_name(profile_id) + to_profile_name = __to_profile_name + diff --git a/x2go/printing.py b/x2go/printing.py index a3341a7..423a0c5 100644 --- a/x2go/printing.py +++ b/x2go/printing.py @@ -49,7 +49,7 @@ if sys.platform == 'win32': # Python X2go modules import log import defaults -# we have to import the X2GO_PRINT_ACTIONS in this awkward way, otherwise we create an import loop +# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables) from defaults import LOCAL_HOME as _LOCAL_HOME from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR from defaults import X2GO_CLIENTPRINTING_DEFAULTS as _X2GO_CLIENTPRINTING_DEFAULTS diff --git a/x2go/profiles.py b/x2go/profiles.py index 81c0c2f..749198c 100644 --- a/x2go/profiles.py +++ b/x2go/profiles.py @@ -207,4 +207,11 @@ class X2goSessionProfiles(inifiles.X2goIniFile): """ _profile_id = self.check_profile_id_or_name(profile_id_or_name) - return utils._convert_SessionProfileOptions_2_SessionParams(self.get_profile_config(_profile_id)) \ No newline at end of file + return utils._convert_SessionProfileOptions_2_SessionParams(self.get_profile_config(_profile_id)) + + def get_session_param(self, profile_id_or_name, param): + """\ + STILL UNDOCUMENTED + + """ + return self.to_session_params(profile_id_or_name)[param] \ No newline at end of file diff --git a/x2go/registry.py b/x2go/registry.py index 72f3c58..672bcba 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -35,17 +35,283 @@ from x2go_exceptions import * class X2goRegisteredSession(object): + def __init__(self): self.uuid = uuid.uuid1() def __str__(self): - return self.uuid + return self.__get_uuid() def __repr__(self): - result = 'X2goRegistrySession(' + result = 'X2goRegisteredSession(' for p in dir(self): if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue result += p + '=' + str(self.__dict__[p]) + ', ' return result + ')' + def __get_uuid(self): + """\ + STILL UNDOCUMENTED + + """ + return self.uuid + get_uuid = __get_uuid + + def __get_username(self): + """\ + After a session has been setup up you can query the + username the sessions runs as. + + @return: the remote username the X2go session runs as + @rtype: str + + """ + return self.session_object.get_transport().get_username() + get_username = __get_username + + def __get_server(self): + """\ + After a session has been setup up you can query the + hostname of the host the sessions is connected to (or + about to connect to). + + @return: the hostname of the server the X2go session is + connected to (as an C{(addr,port)} tuple) + @rtype: tuple + + """ + return self.session_object.get_transport().getpeername() + get_server = __get_server + + def __get_session_name(self): + """\ + Retrieve the server-side X2go session name for the session that has + been registered under C{profile_id}. + + @return: X2go session name + @rtype: str + + """ + return self.session_object.session_info + get_session_name = __get_session_name + + def __connect(self, password=None, add_to_known_hosts=False, force_password_auth=False): + """\ + Connect to a registered X2go session with registry hash C{<session_uuid>}. + This method basically wraps around paramiko.SSHClient.connect() for the + corresponding session. + + @param password: the user's password for the X2go server that is going to be + connected to + @type password: str + @param add_to_known_hosts: non-paramiko option, if C{True} paramiko.AutoAddPolicy() + is used as missing-host-key-policy. If set to C{False} paramiko.RejectPolicy() + is used + @type add_to_known_hosts: bool + @param force_password_auth: disable SSH pub/priv key authentication mechanisms + completely + @type force_password_auth: bool + + """ + connect_options = self.connect_options + connect_options['password'] = password + connect_options['force_password_auth'] = force_password_auth + self.session_object.connect(self.server, **connect_options) + self.connected = True + connect = __connect + + def __set_print_action(self, session_uuid, print_action, **kwargs): + """\ + STILL UNDOCUMENTED + + """ + if type(print_action) is not types.StringType: + return False + self.session_object.set_print_action(print_action, **kwargs) + set_print_action = __set_print_action + + def __start(self): + """\ + Start a new X2go session on the remote X2go server. + + """ + session = self.session_object + + session.start() + + if session.params.snd_system is not 'none': + session.start_sound() + + session.start_sshfs() + if self.printing: + session.start_printing() + + if self.share_local_folders: + if session.get_transport().reverse_tunnels['sshfs'][1] is not None: + for _folder in self.share_local_folders: + session.share_local_folder(_folder) + + session.run_command() + self.running = True + start = __start + + def __resume(self, session_name): + """\ + Resume or continue a suspended / running X2go session on the + remote X2go server. + + @param session_name: the server-side name of an X2go session + @type session_name: str + + """ + self.session_object.associate(session_name) + self.session_object.resume() + + if self.session_object.params.snd_system is not 'none': + self.session_object.start_sound() + + self.session_object.start_sshfs() + if self.printing: + session.start_printing() + + self.running = True + resume = __resume + + def __suspend(self): + """\ + Suspend an X2go session. + + You can either suspend a session that you have formerly + started/resumed the current X2goClient instance. + + Or you can suspend a non-attached session by simply + registering an X2go server session and then passing the + server-side X2go session name to this method. + + """ + self.session_object.suspend() + self.running = False + self.suspended = True + suspend = __suspend + + def __terminate(self): + """\ + Terminate an X2go session. + + You can either terminate a session that you have formerly + started/resumed within the current X2goClient instance. + + Or you can terminate a non-attached session by simply + registering an X2go server session and then passing the + server-side X2go session name to this method. + + """ + self.session_object.terminate() + self.running = False + self.suspended = False + self.terminated = True + terminate = __terminate + + def __get_profile_name(self): + """\ + Retrieve the profile name of the session that has been registered + under C{session_hash} + + + @param session_hash: the X2go session's UUID registry hash + @type session_hash: str + + @return: X2go client profile name of the session + @rtype: str + + """ + return self.profile_name + get_profile_name = __get_profile_name + + def __get_profile_id(self): + """\ + Retrieve the session profile id of the session whose profile name + is C{profile_name} + + @param profile_name: the session profile name + @type profile_name: str + + @return: the session profile's id + @rtype: str + + """ + return self.profile_id + get_profile_id = __get_profile_id + + ### + ### QUERYING INFORMATION + ### + + def __session_ok(self): + """\ + Test if the X2go session registered as C{session_uuid} is + in a healthy state. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str + + @return: C{True} if session is ok, C{False} otherwise + @rtype: bool + + """ + return self.session_object.ok() + session_ok = __session_ok + + def __is_running(self): + """\ + Test if the X2go session registered as C{session_uuid} is up + and running. + + @return: C{True} if session is running, C{False} otherwise + @rtype: bool + + """ + return self.session_object.is_running() + is_running = __is_running + + def __is_suspended(self): + """\ + Test if the X2go session registered as C{session_uuid} + is in suspended state. + + @return: C{True} if session is suspended, C{False} otherwise + @rtype: bool + + """ + return self.session_object.is_suspended() + is_suspended = __is_suspended + + def __has_terminated(self): + """\ + Test if the X2go session registered as C{session_uuid} + has terminated. + + @return: C{True} if session has terminated, C{False} otherwise + @rtype: bool + + """ + return self.session_object.has_terminated() + has_terminated = __has_terminated + + def __share_local_folder(self, folder_name): + """\ + Share a local folder with the X2go session registered as C{session_uuid}. + + @param folder_name: the full path to an existing folder on the local + file system + @type folder_name: str + + @return: returns C{True} if the local folder has been successfully mounted within the + X2go server session registerd as UUID C{session_uuid} + @rtype: bool + + """ + return self.session_object.share_local_folder(folder_name=folder_name) + share_local_folder = __share_local_folder + class X2goSessionRegistry(object): """\ hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.8-19-g27ec5cc
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via 27ec5cc630337191abc7404f62dbd62ae2e8a24f (commit) from 8298fa5fb3ef2553bf698d6cbd9c2bac7386a732 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2de6c53..72fc91f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ pyhoca-gui (0.1.0.9-0~x2go1) UNRELEASED; urgency=low - Only offer foldering sharing in menus if server provides it. - Add error message in case logon fails due to a missing home directory on the remote X2go server. - * Depend on python-x2go (>=0.1.1.7). + * Depend on python-x2go (>=0.1.1.8). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:49:08 +0200 diff --git a/debian/control b/debian/control index e918ade..1965a97 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.7-0~), + python-x2go (>=0.1.1.8-0~), python-argparse, python-notify, python-setproctitle, 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 - twofactorauth (branch) updated: 507bf248fb7777458f526ce11cd8e58f19ee4085
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via 507bf248fb7777458f526ce11cd8e58f19ee4085 (commit) from a2194be3cb1b099d612134d3390ef11aa68db4da (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/client.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) The diff of changes is: diff --git a/x2go/client.py b/x2go/client.py index 137ca65..ba6f1d2 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -119,6 +119,8 @@ class X2goClient(object): self.session_profiles = X2goSessionProfiles(logger=self.logger) self.session_registry = X2goSessionRegistry(logger=self.logger) + self.client_settings = X2goClientSettings(logger=self.logger) + self.client_printing = X2goClientPrinting(logger=self.logger) def __get_username(self, session_hash): """\ @@ -463,6 +465,34 @@ class X2goClient(object): get_session_profile_id = __get_session_profile_id ### + ### Provide access to config file class objects + ### + + def __get_session_profiles(self): + """\ + STILL UNDOCUMENTED + + """ + return self.session_profiles + get_session_profiles = __get_session_profiles + + def __get_client_settings(self): + """\ + STILL UNDOCUMENTED + + """ + return self.client_settings + get_client_settings = __get_client_settings + + def __get_client_printing(self): + """\ + STILL UNDOCUMENTED + + """ + return self.client_printing + get_client_printing = __get_client_printing + + ### ### QUERYING INFORMATION ### 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 - twofactorauth (branch) updated: 4bc5bfc1358b525e7b36fbe97264957be0a9fbef
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via 4bc5bfc1358b525e7b36fbe97264957be0a9fbef (commit) from eff06124e17bf39b855097080cc6a851ba8fff46 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/__init__.py | 3 +++ x2go/inifiles.py | 3 ++- x2go/registry.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/__init__.py b/x2go/__init__.py index ebf297a..ddfb2f7 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -47,6 +47,9 @@ _signal.signal (_signal.SIGTERM, guardian._sigterm_handle ) _signal.signal (_signal.SIGINT, guardian._sigterm_handle ) from client import X2goClient +from profiles import X2goSessionProfiles +from printing import X2goClientPrinting +from settings import X2goClientSettings from x2go_exceptions import * from log import * diff --git a/x2go/inifiles.py b/x2go/inifiles.py index fead74c..2d149e4 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -96,13 +96,14 @@ class X2goIniFile(object): self.user_config_file = file_name break + self.config_files = _found_config_files self._fill_defaults() self._updateDataObject() def __repr__(self): result = 'X2goIniFile(' for p in dir(self): - if '__' in p or not p in self.__dict__ or type(p) is InstanceType: continue + if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue result += p + '=' + str(self.__dict__[p]) return result + ')' diff --git a/x2go/registry.py b/x2go/registry.py index cb2e178..72f3c58 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -68,7 +68,7 @@ class X2goSessionRegistry(object): def __repr__(self): result = 'X2goSessionRegistry(' for p in dir(self): - if '__' in p or not p in self.__dict__ or type(p) is InstanceType: continue + if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue result += p + '=' + str(self.__dict__[p]) return result + ')' hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.8-9-g57c379d
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via 57c379d53d8e6e0965779beb52aefb70682b0608 (commit) from 882c21a2b37ab8540ac6c957e69fab76bd5cb2ca (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 17628 -> 17628 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 16519 -> 16519 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 15140 -> 15153 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 16228 -> 16228 bytes po/de.po | 10 +++++----- po/en.po | 10 +++++----- po/es.po | 10 +++++----- po/nl.po | 6 +++--- po/pyhoca-gui.pot | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) The diff of changes is: diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo index 41dd546..21460dc 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 51a2c57..be4c3b1 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 632ff71..ded9228 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/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo index 1806229..3a9e21d 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/po/de.po b/po/de.po index 9459313..afcacb1 100644 --- a/po/de.po +++ b/po/de.po @@ -1,17 +1,17 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. -# Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>, 2011. +# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:19+0200\n" +"POT-Creation-Date: 2011-09-17 02:38+0200\n" "PO-Revision-Date: 2011-09-17 02:18+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" -"Language-Team: de <m.gabriel(a)das-netzwerkteam.de>\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/en.po b/po/en.po index aef2769..1296cfb 100644 --- a/po/en.po +++ b/po/en.po @@ -1,17 +1,17 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. -# Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>, 2011. +# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:19+0200\n" +"POT-Creation-Date: 2011-09-17 02:38+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" -"Language-Team: en <m.gabriel(a)das-netzwerkteam.de>\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/es.po b/po/es.po index acd1769..5ad05e4 100644 --- a/po/es.po +++ b/po/es.po @@ -1,5 +1,5 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:19+0200\n" +"POT-Creation-Date: 2011-09-17 02:38+0200\n" "PO-Revision-Date: 2011-06-23 15:48+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" -"Language-Team: es <oceanosoftlapalma(a)gmail.com>\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"Language-Team: Spanish Team <oceanosoftlapalma(a)gmail.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" +"Language: es\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" diff --git a/po/nl.po b/po/nl.po index 5230aa1..8e28475 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,14 +1,14 @@ # PyHoca-GUI / i18n. -# Copyright (C) 2010-2011 Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. -# Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>, 2011. +# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:19+0200\n" +"POT-Creation-Date: 2011-09-17 02:38+0200\n" "PO-Revision-Date: 2011-07-14 08:07+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 488b58b..c957588 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: 2011-09-17 02:19+0200\n" +"POT-Creation-Date: 2011-09-17 02:38+0200\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" 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 - twofactorauth (branch) updated: eff06124e17bf39b855097080cc6a851ba8fff46
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via eff06124e17bf39b855097080cc6a851ba8fff46 (commit) from 18385858e6fef356682e81f668faddfac864c395 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/client.py | 238 ++++++++++++++++++++-------------------- x2go/inifiles.py | 1 + x2go/printing.py | 12 +-- x2go/profiles.py | 99 ++++++++++++++--- x2go/registry.py | 317 +++++++++--------------------------------------------- x2go/session.py | 5 +- x2go/utils.py | 20 ++-- 7 files changed, 274 insertions(+), 418 deletions(-) The diff of changes is: diff --git a/x2go/client.py b/x2go/client.py index 4e97fa5..2eeee42 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -34,10 +34,11 @@ import copy # Python X2go modules from settings import X2goClientSettings from printing import X2goClientPrinting -from profiles import X2goClientSessions +from profiles import X2goSessionProfiles from registry import X2goSessionRegistry from session import X2goSession, _X2GO_SESSION_OPTIONS import log +import utils from defaults import LOCAL_HOME as _LOCAL_HOME from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR @@ -116,41 +117,38 @@ class X2goClient(object): self.logger = copy.deepcopy(logger) self.logger.tag = __NAME__ - self.session_registry = X2goSessionRegistry() + self.session_profiles = X2goSessionProfiles(logger=self.logger) + self.session_registry = X2goSessionRegistry(logger=self.logger) - def get_username(self, profile_id): + def get_username(self, session_hash): """\ After a session has been setup up you can query the username the sessions runs as. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_hash: the X2go session's UUID registry hash + @type session_hash: str @return: the remote username the X2go session runs as @rtype: str """ - return self.session_registry(profile_id).session_object.get_transport().get_username() + return self.session_registry(session_hash).session_object.get_transport().get_username() - def get_server(self, profile_id): + def get_server(self, session_hash): """\ After a session has been setup up you can query the hostname of the host the sessions is connected to (or about to connect to). - @param profile_id: the X2go sessions UUID registry hash - @type profile_id: str + @param session_hash: the X2go sessions UUID registry hash + @type session_hash: str @return: the host an X2go session is connected to (as an C{(addr,port)} tuple) @rtype: tuple """ - return self.session_registry(profile_id).session_object.get_transport().getpeername() - - ### - ### SESSION ORIENTED CODE - ### + return self.session_registry(session_hash).session_object.get_transport().getpeername() def register_session(self, server=None, profile_id=None, profile_name=None, custom_profile_name=None, printing=False, share_local_folders=[], **kwargs): @@ -178,44 +176,38 @@ class X2goClient(object): @rtype: str """ - if profile_id and self.session_registry.has_profile_id(profile_id): + if profile_id and self.session_profiles.has_profile_id(profile_id): _p = profile_id - elif profile_name and self.session_registry.has_profile_name(profile_name): + elif profile_name and self.session_profiles.has_profile_name(profile_name): _p = profile_name else: _p = None if _p: - kwargs = self.session_registry.get_session_params(_p) - profile_id = self.session_registry(_p).profile_id + _profile_id = self.session_profiles.check_profile_id_or_name(_p) + _profile_name = self.session_profiles.to_profile_name(_profile_id) + _params = self.session_profiles.to_session_params(_profile_id) + del _params['profile_name'] + else: if server is None: return None + _profile_id = utils._genSessionProfileId() _profile_name = profile_name or custom_profile_name or sys.args[0] - kwargs['server'] = server - kwargs['printing'] = printing - kwargs['share_local_folders'] = share_local_folders + _params = kwargs + _params['server'] = server + _params['printing'] = printing + _params['share_local_folders'] = share_local_folders - profile_id = self.session_registry.register_by_session_params(_profile_name, **kwargs) + session_uuid = self.session_registry.register(_profile_id, _profile_name, **_params ) - connect_options = self.session_registry(profile_id).connect_options - session_options = self.session_registry(profile_id).session_options + connect_options = self.session_registry(session_uuid).connect_options + session_options = self.session_registry(session_uuid).session_options self.logger('initializing X2go session...', log.loglevel_NOTICE) + return session_uuid - self.logger('X2go session options are:', log.loglevel_DEBUG) - for k in session_options: - self.logger(' %s: %s' % (k, session_options[k]), log.loglevel_DEBUG) - - self.logger('Paramiko connect options are:', log.loglevel_DEBUG) - for k in connect_options: - self.logger(' %s: %s' % (k,connect_options[k]), log.loglevel_DEBUG) - - # setup X2go session - session = X2goSession(logger=self.logger, **session_options) - return self.session_registry(profile_id).uuid - - def get_session(self, profile_id): + def get_session(self, session_uuid): """\ Retrieve the complete X2goSession object that has been registry under the given sesion registry hash. @@ -227,10 +219,10 @@ class X2goClient(object): @rtype: obj """ - return self.session_registry(profile_id).session_object + return self.session_registry(session_uuid).session_object with_session = get_session - def get_session_name(self, profile_id): + def get_session_name(self, session_uuid): """\ Retrieve the server-side X2go session name for the session that has been registered under C{profile_id}. @@ -242,16 +234,16 @@ class X2goClient(object): @rtype: str """ - return self.session_registry(profile_id).session_object.session_info + return self.session_registry(session_uuid).session_object.session_info - def __connect_session(self, profile_id, password=None, add_to_known_hosts=False, force_password_auth=False): + def __connect_session(self, session_uuid, password=None, add_to_known_hosts=False, force_password_auth=False): """\ - Connect to a registered X2go session with registry hash C{<profile_id>}. + Connect to a registered X2go session with registry hash C{<session_uuid>}. This method basically wraps around paramiko.SSHClient.connect() for the corresponding session. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @param password: the user's password for the X2go server that is going to be connected to @type password: str @@ -264,34 +256,34 @@ class X2goClient(object): @type force_password_auth: bool """ - session = self.session_registry(profile_id).session_object - server = self.session_registry(profile_id).server - connect_options = self.session_registry(profile_id).connect_options + session = self.session_registry(session_uuid).session_object + server = self.session_registry(session_uuid).server + connect_options = self.session_registry(session_uuid).connect_options connect_options['password'] = password connect_options['force_password_auth'] = force_password_auth session.connect(server, **connect_options) - self.session_registry(profile_id).connected = True + self.session_registry(session_uuid).connected = True connect_session = __connect_session - def __session_print_action(self, profile_id, print_action, **kwargs): + def __session_print_action(self, session_uuid, print_action, **kwargs): """\ STILL UNDOCUMENTED """ if type(print_action) is not types.StringType: return False - self.with_session(profile_id).set_print_action(print_action, **kwargs) + self.with_session(session_uuid).set_print_action(print_action, **kwargs) session_print_action = __session_print_action - def __start_session(self, profile_id): + def __start_session(self, session_uuid): """\ Start a new X2go session on the remote X2go server. - @param profile_id: the X2go sessions UUID registry hash - @type profile_id: str + @param session_uuid: the X2go sessions UUID registry hash + @type session_uuid: str """ - session = self.session_registry(profile_id).session_object + session = self.session_registry(session_uuid).session_object session.start() @@ -299,59 +291,59 @@ class X2goClient(object): session.start_sound() session.start_sshfs() - if self.session_registry(profile_id).printing: + if self.session_registry(session_uuid).printing: session.start_printing() - if self.session_registry(profile_id).share_local_folders: + if self.session_registry(session_uuid).share_local_folders: if session.get_transport().reverse_tunnels['sshfs'][1] is not None: - for _folder in self.session_registry(profile_id).share_local_folders: + for _folder in self.session_registry(session_uuid).share_local_folders: session.share_local_folder(_folder) session.run_command() - self.session_registry(profile_id).running = True + self.session_registry(session_uuid).running = True start_session = __start_session - def __clean_sessions(self, profile_id): + def __clean_sessions(self, session_uuid): """\ Find running X2go sessions that have been standard by the connected user and terminate them. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str """ - session = self.session_registry(profile_id).session_object + session = self.session_registry(session_uuid).session_object session_infos = session.list_sessions() for session_info in session_infos.values(): session.terminate(session_name=session_info) clean_sessions = __clean_sessions - def __list_sessions(self, profile_id): + def __list_sessions(self, session_uuid): """\ - Use the X2go session registered under C{profile_id} to + Use the X2go session registered under C{session_uuid} to retrieve a list of running or suspended X2go sessions on the connected X2go server (for the authenticated user). - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str """ - session = self.session_registry(profile_id).session_object + session = self.session_registry(session_uuid).session_object return session.list_sessions() list_sessions = __list_sessions - def __resume_session(self, profile_id, session_name): + def __resume_session(self, session_uuid, session_name): """\ Resume or continue a suspended / running X2go session on the remote X2go server. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @param session_name: the server-side name of an X2go session @type session_name: str """ - session = self.session_registry(profile_id).session_object + session = self.session_registry(session_uuid).session_object session.associate(session_name) session.resume() @@ -359,13 +351,13 @@ class X2goClient(object): session.start_sound() session.start_sshfs() - if self.session_registry(profile_id).printing: + if self.session_registry(session_uuid).printing: session.start_printing() - self.session_registry(profile_id).running = True + self.session_registry(session_uuid).running = True resume_session = __resume_session - def __suspend_session(self, profile_id, session_name=None): + def __suspend_session(self, session_uuid, session_name=None): """\ Suspend an X2go session. @@ -376,22 +368,22 @@ class X2goClient(object): registering an X2go server session and then passing the server-side X2go session name to this method. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @param session_name: the server-side name of an X2go session @type session_name: str """ - session = self.session_registry(profile_id).session_object + session = self.session_registry(session_uuid).session_object if session_name: session.associate(session_name) session.suspend(session_name=session_name) if session_name is None: - self.session_registry(profile_id).running = False - self.session_registry(profile_id).suspended = True + self.session_registry(session_uuid).running = False + self.session_registry(session_uuid).suspended = True suspend_session = __suspend_session - def __terminate_session(self, profile_id, session_name=None): + def __terminate_session(self, session_uuid, session_name=None): """\ Terminate an X2go session. @@ -402,34 +394,46 @@ class X2goClient(object): registering an X2go server session and then passing the server-side X2go session name to this method. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @param session_name: the server-side name of an X2go session @type session_name: str """ - session = self.session_registry(profile_id).session_object + session = self.session_registry(session_uuid).session_object if session_name: session.associate(session_name=session_name) session.terminate() if session_name is None: - self.session_registry(profile_id).running = False - self.session_registry(profile_id).suspended = False - self.session_registry(profile_id).terminated = True + self.session_registry(session_uuid).running = False + self.session_registry(session_uuid).suspended = False + self.session_registry(session_uuid).terminated = True terminate_session = __terminate_session ### ### PROFILE ORIENTED CODE ### - def __load_session_profiles(self): + def __has_session_profile(self, profile_name): + """\ + STILL UNDOCUMENTED + + + """ + return self.session_profiles.has_profile(profile_name) + has_session_profile = __has_session_profile + + def __get_session_profiles(self): """\ STILL UNDOCUMENTED """ - self.session_registry.read_session_profiles() - load_session_profiles = __load_session_profiles + _ret = {} + for _profile_id in self.session_profiles.profile_ids: + _ret[_profile_id] = self.session_profiles.get_profile_config() + return _ret + get_session_profiles = __get_session_profiles # def new_session_profile(self, profile_name='NEW_SESSION_PROFILE', **kwargs): # """\ @@ -461,7 +465,7 @@ class X2goClient(object): # return self.session_registry[session_hash]['profile'] # with_profile = get_session_profile # - def get_session_profile_name(self, profile_id): + def get_session_profile_name(self, session_uuid): """\ Retrieve the profile name of the session that has been registered under C{session_hash} @@ -474,7 +478,7 @@ class X2goClient(object): @rtype: str """ - return self.session_registry(profile_id).profile_name + return self.session_registry(session_uuid).profile_name get_profile_name = get_session_profile_name def get_session_profile_id(self, profile_name): @@ -496,80 +500,80 @@ class X2goClient(object): ### QUERYING INFORMATION ### - def __session_ok(self, profile_id): + def __session_ok(self, session_uuid): """\ - Test if the X2go session registered as C{profile_id} is + Test if the X2go session registered as C{session_uuid} is in a healthy state. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @return: C{True} if session is ok, C{False} otherwise @rtype: bool """ - return self.with_session(profile_id).ok() + return self.with_session(session_uuid).ok() session_ok = __session_ok - def __is_running(self, profile_id): + def __is_running(self, session_uuid): """\ - Test if the X2go session registered as C{profile_id} is up + Test if the X2go session registered as C{session_uuid} is up and running. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @return: C{True} if session is running, C{False} otherwise @rtype: bool """ - return self.with_session(profile_id).is_running() + return self.with_session(session_uuid).is_running() is_running = __is_running - def __is_suspended(self, profile_id): + def __is_suspended(self, session_uuid): """\ - Test if the X2go session registered as C{profile_id} + Test if the X2go session registered as C{session_uuid} is in suspended state. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @return: C{True} if session is suspended, C{False} otherwise @rtype: bool """ - return self.with_session(profile_id).is_suspended() + return self.with_session(session_uuid).is_suspended() is_suspended = __is_suspended - def __has_terminated(self, profile_id): + def __has_terminated(self, session_uuid): """\ - Test if the X2go session registered as C{profile_id} + Test if the X2go session registered as C{session_uuid} has terminated. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @return: C{True} if session has terminated, C{False} otherwise @rtype: bool """ - return self.with_session(profile_id).has_terminated() + return self.with_session(session_uuid).has_terminated() has_terminated = __has_terminated - def __share_local_folder(self, profile_id, folder_name): + def __share_local_folder(self, session_uuid, folder_name): """\ - Share a local folder with the X2go session registered as C{profile_id}. + Share a local folder with the X2go session registered as C{session_uuid}. - @param profile_id: the X2go session's UUID registry hash - @type profile_id: str + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: str @param folder_name: the full path to an existing folder on the local file system @type folder_name: str @return: returns C{True} if the local folder has been successfully mounted within the - X2go server session registerd as UUID C{profile_id} + X2go server session registerd as UUID C{session_uuid} @rtype: bool """ - return self.with_session(profile_id).share_local_folder(folder_name=folder_name) + return self.with_session(session_uuid).share_local_folder(folder_name=folder_name) share_local_folder = __share_local_folder diff --git a/x2go/inifiles.py b/x2go/inifiles.py index e0a8c2a..fead74c 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -34,6 +34,7 @@ import os import ConfigParser import types import cStringIO +import copy # Python X2go modules from defaults import LOCAL_HOME as _current_home diff --git a/x2go/printing.py b/x2go/printing.py index b39c960..ccf373f 100644 --- a/x2go/printing.py +++ b/x2go/printing.py @@ -87,23 +87,23 @@ class X2goClientPrinting(inifiles.X2goIniFile): STILL UNDOCUMENTED """ - _general_pdfview = self.getValue('General', 'pdfview', key_type=types.BooleanType) - _view_open = self.getValue('view', 'open', key_type=types.BooleanType) - _print_startcmd = self.getValue('print', 'startcmd', key_type=types.BooleanType) + _general_pdfview = self.get('General', 'pdfview', key_type=types.BooleanType) + _view_open = self.get('view', 'open', key_type=types.BooleanType) + _print_startcmd = self.get('print', 'startcmd', key_type=types.BooleanType) if _general_pdfview and _view_open: - _view_command = self.getValue('view', 'command') + _view_command = self.get('view', 'command') self._print_action = X2goPrintActionPDFVIEW(pdf_viewer_command=_view_command, logger=self.logger) elif _general_pdfview and not _view_open: self._print_action = X2goPrintActionPDFSAVE(logger=self.logger) elif not _general_pdfview and not _print_startcmd: - _cups_defaultprinter = self.getValue('CUPS', 'defaultprinter') + _cups_defaultprinter = self.get('CUPS', 'defaultprinter') self._print_action = X2goPrintActionPRINT(default_printer=_cups_defaultprinter, logger=self.logger) elif not _general_pdfview and _print_startcmd: - _print_command = self.getValue('print', 'command') + _print_command = self.get('print', 'command') self._print_action = X2goPrintActionPRINTCMD(print_cmd=_print_command, logger=self.logger) @property diff --git a/x2go/profiles.py b/x2go/profiles.py index 2ba13dc..81c0c2f 100644 --- a/x2go/profiles.py +++ b/x2go/profiles.py @@ -22,6 +22,7 @@ X2goClientSessionProfile class - managing x2goclient session profiles. """ __NAME__ = 'x2gosessionprofiles-pylib' +import copy # Python X2go modules from defaults import X2GO_SESSIONPROFILES_CONFIGFILES @@ -32,7 +33,7 @@ import utils from x2go_exceptions import X2goProfileException -class X2goClientSessions(inifiles.X2goIniFile): +class X2goSessionProfiles(inifiles.X2goIniFile): defaultValues = {} defaultSessionProfile = X2GO_SESSIONPROFILE_DEFAULTS @@ -43,6 +44,12 @@ class X2goClientSessions(inifiles.X2goIniFile): STILL UNDOCUMENTED """ + if logger is None: + self.logger = log.X2goLogger(loglevel=loglevel) + else: + self.logger = copy.deepcopy(logger) + self.logger.tag = __NAME__ + # providing defaults for an X2goSessionProfiles instance will---in the worst case---override your # existing sessions file in your home directory once you write the sessions back to file... inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel) @@ -57,24 +64,38 @@ class X2goClientSessions(inifiles.X2goIniFile): self._storeValue(session_profile, key, default_value) self._updateDataObject() - def get_profile_config(self, profile_id): + def __call__(self, profile_id_or_name): """\ STILL UNDOCUMENTED """ - if (not profile_id in self.profile_ids) or (profile_id in self._non_profile_sections): - raise X2goProfileException('No X2go session profile with Id %s' % profile_id) - _profile_config = {} - for key in self.iniConfig.options(profile_id): - _profile_config[key] = self.get(profile_id, key, key_type=self.get_type(key)) - return _profile_config or None + _profile_id = check_profile_id_or_name(self, profile_id_or_name) + return self.get_profile_config(_profile_id) + + def get_profile_option_type(self, option): + """\ + STILL UNDOCUMENTED - def get_type(self, key): + """ + return type(self.defaultSessionProfile[option]) + + def get_profile_config(self, profile_id_or_name): """\ STILL UNDOCUMENTED """ - return type(self.defaultSessionProfile[key]) + _profile_id = self.check_profile_id_or_name(profile_id_or_name) + _profile_config = {} + for option in self.iniConfig.options(_profile_id): + _profile_config[option] = self.get(_profile_id, option, key_type=self.get_profile_option_type(option)) + return _profile_config or None + + def has_profile(self, profile_id_or_name): + try: + _profile_id = self.check_profile_id_or_name(profile_id_or_name) + return True + except X2goProfileException: + return False @property def profile_ids(self): @@ -84,20 +105,34 @@ class X2goClientSessions(inifiles.X2goIniFile): """ return [ s for s in self.iniConfig.sections() if s not in self._non_profile_sections ] + def has_profile_id(self, profile_id): + """\ + STILL UNDOCUMENTED + + """ + return profile_id in self.profile_ids + @property def profile_names(self): """\ STILL UNDOCUMENTED """ - return [ self.get_profile_name(p) for p in self.profile_ids ] + return [ self.to_profile_name(p) for p in self.profile_ids ] - def get_profile_id(self, profile_name): + def has_profile_name(self, profile_name): """\ STILL UNDOCUMENTED """ - _profile_ids = [ p for p in self.profile_ids if self.get_profile_name(p) == profile_name ] + return profile_name in self.profile_names + + def to_profile_id(self, profile_name): + """\ + STILL UNDOCUMENTED + + """ + _profile_ids = [ p for p in self.profile_ids if self.to_profile_name(p) == profile_name ] if len(_profile_ids) == 1: return _profile_ids[0] elif len(_profile_ids) == 0: @@ -105,7 +140,7 @@ class X2goClientSessions(inifiles.X2goIniFile): else: raise X2goProfileException('The sessions config file contains multiple session profiles with name: %s' % profile_name) - def get_profile_name(self, profile_id): + def to_profile_name(self, profile_id): """\ STILL UNDOCUMENTED @@ -136,4 +171,40 @@ class X2goClientSessions(inifiles.X2goIniFile): self.write_user_config = True self.writeIniFile() + def has_default_profile(self): + """\ + STILL UNDOCUMENTED + + """ + return self.get_default_profile() and True or False + def get_default_profile(self): + """\ + STILL UNDOCUMENTED + + """ + return '...' + + def check_profile_id_or_name(self, profile_id_or_name): + """\ + STILL UNDOCUMENTED + + """ + _profile_id = None + if self.has_profile_id(profile_id_or_name): + # we were given a session profile id... + _profile_id = profile_id_or_name + elif self.has_profile_name(profile_id_or_name): + # we were given a sesion profile name... + _profile_id = self.to_profile_id(profile_id_or_name) + if not _profile_id: + raise X2goProfileException('No session profile with id or name %s exists.' % profile_id_or_name) + return _profile_id + + def to_session_params(self, profile_id_or_name): + """\ + STILL UNDOCUMENTED + + """ + _profile_id = self.check_profile_id_or_name(profile_id_or_name) + return utils._convert_SessionProfileOptions_2_SessionParams(self.get_profile_config(_profile_id)) \ No newline at end of file diff --git a/x2go/registry.py b/x2go/registry.py index feaee77..cb2e178 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -34,13 +34,13 @@ import session from x2go_exceptions import * -class X2goRegistryProfile(object): +class X2goRegisteredSession(object): def __init__(self): self.uuid = uuid.uuid1() def __str__(self): - return '%s - %s (%s)' % (self.uuid, self.profile_name, self.profile_id, ) + return self.uuid def __repr__(self): - result = 'X2goRegistryProfile(' + result = 'X2goRegistrySession(' for p in dir(self): if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue result += p + '=' + str(self.__dict__[p]) + ', ' @@ -60,11 +60,10 @@ class X2goSessionRegistry(object): if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) else: - self.logger = logger + self.logger = copy.deepcopy(logger) self.logger.tag = __NAME__ self.registry = {} - self.profiles = profiles.X2goClientSessions(logger=logger) def __repr__(self): result = 'X2goSessionRegistry(' @@ -73,17 +72,6 @@ class X2goSessionRegistry(object): result += p + '=' + str(self.__dict__[p]) return result + ')' - def read_session_profiles(self): - """\ - STILL UNDOCUMENTED - - """ - # import sessions file into registry - for profile_id in self.profiles.profile_ids: - profile_name = self.profiles.get_profile_name(profile_id) - profile_config = self.profiles.get_profile_config(profile_id) - self.register_by_profile_config(profile_name, profile_id=profile_id, **profile_config) - def __call__(self, session_uuid): """\ STILL UNDOCUMENTED @@ -96,227 +84,62 @@ class X2goSessionRegistry(object): STILL UNDOCUMENTED """ - _profile_ids = [ p for p in self.profile_ids if self.get_profile_name(p) == profile_name ] - if len(_profile_ids) == 1: - return _profile_ids[0] - elif len(_profile_ids) == 0: - return None - else: - raise X2goProfileException('The session registry contains multiple session profiles with name: %s.' % profile_name) + return self(session_uid).profile.profile_id def get_profile_name(self, session_uuid): """\ STILL UNDOCUMENTED """ - return self.registry[profile_id].profile_name - - @property - def profile_names(self): - """\ - STILL UNDOCUMENTED - - """ - return [ self.registry[profile_id].profile_name for profile_id in self.registry.keys() ] - - @property - def profile_ids(self): - """\ - STILL UNDOCUMENTED - - """ - return self.registry.keys() - - def has_profile_name(self, profile_name): - """\ - STILL UNDOCUMENTED - - """ - return profile_name in self.profile_names - - def has_profile_id(self, profile_id): - """\ - STILL UNDOCUMENTED - - """ - return profile_id in self.registry.keys() - - def _check_profile_id_or_name(self, profile_id_or_name): - """\ - STILL UNDOCUMENTED - - """ - _profile_id = None - if self.has_profile_id(profile_id_or_name): - # we were given a session profile id... - _profile_id = profile_id_or_name - elif self.has_profile_name(profile_id_or_name): - # we were given a sesion profile name... - _profile_id = self.get_profile_id(profile_id_or_name) - if not _profile_id: - raise X2goProfileException('No session profile with id or name %s exists.' % profile_id_or_name) - return _profile_id - - def get_profile_config(self, profile_id_or_name): - """\ - STILL UNDOCUMENTED - - """ - _profile_id = self._check_profile_id_or_name(profile_id_or_name) - return self.registry[_profile_id].config - - def get_session_params(self, profile_id_or_name): - """\ - STILL UNDOCUMENTED - - """ - _profile_id = self._check_profile_id_or_name(profile_id_or_name) - return self.registry[_profile_id].session_params + return self(session_uuid).profile.profile_name - def has_default_profile(self): - """\ - STILL UNDOCUMENTED + def register(self, profile_id, profile_name, **kwargs): - """ - return self.get_default() and True or False + _r = X2goRegisteredSession() + session_uuid = _r.uuid + self.registry[session_uuid] = _r + self(session_uuid).profile_id = profile_id + self(session_uuid).profile_name = profile_name + self(session_uuid).session_params = kwargs + self(session_uuid).server = kwargs['server'] + del kwargs['server'] + self(session_uuid).printing = kwargs['printing'] + del kwargs['printing'] + self(session_uuid).share_local_folders = kwargs['share_local_folders'] + del kwargs['share_local_folders'] + self(session_uuid).session_params = kwargs + # differentiate SSH options from X2go options + _session_options = copy.deepcopy(kwargs) + _connect_options = copy.deepcopy(kwargs) - def get_default_profile(self): - """\ - STILL UNDOCUMENTED + for k in kwargs.keys(): + if k in session._X2GO_SESSION_OPTIONS: + del _connect_options[k] + else: + del _session_options[k] - """ - return '...' + self.logger('registering X2go session %s...' % profile_name, log.loglevel_NOTICE) + self.logger('registering X2go session with UUID %s' % session_uuid, log.loglevel_DEBUG) + self.logger('X2go session options for profile %s:' % profile_name, log.loglevel_DEBUG) + for k in _session_options: + self.logger(' %s: %s' % (k, _session_options[k]), log.loglevel_DEBUG) - def register_by_profile_config(self, profile_name, profile_id=None, **config): - """\ - STILL UNDOCUMENTED + self.logger('Paramiko connect options for profile %s are:' % profile_name, log.loglevel_DEBUG) + for k in _connect_options: + self.logger(' %s: %s' % (k,_connect_options[k]), log.loglevel_DEBUG) - """ - if self.has_profile_name(profile_name): - raise X2goProfileException('X2go session profile %s already exists.' % profile_name) - else: - if not profile_id: - profile_id = utils._genSessionProfileId() - self.profiles.add_profile(profile_id, **config) - _config = self.profiles.get_profile_config(profile_id) - self.registry[profile_id] = X2goRegistryProfile() - self.registry[profile_id].profile_id = profile_id - self.registry[profile_id].profile_name = profile_name - self.registry[profile_id].profile_config = _config - _params = utils._convert_config2params(config) - self.registry[profile_id].server = _params['server'] - del _params['server'] - self.registry[profile_id].printing = _params['printing'] - del _params['printing'] - self.registry[profile_id].share_local_folders = _params['share_local_folders'] - del _params['share_local_folders'] - self.registry[profile_id].session_params = _params - # differentiate SSH options from X2go options - _session_options = copy.deepcopy(_params) - _connect_options = copy.deepcopy(_params) - - for k in _params.keys(): - if k in session._X2GO_SESSION_OPTIONS: - del _connect_options[k] - else: - del _session_options[k] - - self.logger('loading X2go profile %s...' % profile_name, log.loglevel_NOTICE) - - self.logger('X2go session options for profile %s:' % profile_name, log.loglevel_DEBUG) - for k in _session_options: - self.logger(' %s: %s' % (k, _session_options[k]), log.loglevel_DEBUG) - - self.logger('Paramiko connect options for profile %s are:' % profile_name, log.loglevel_DEBUG) - for k in _connect_options: - self.logger(' %s: %s' % (k,_connect_options[k]), log.loglevel_DEBUG) - - self.registry[profile_id].session_object = session.X2goSession(**_session_options) - self.registry[profile_id].connected = False - self.registry[profile_id].running = False - self.registry[profile_id].suspended = False - self.registry[profile_id].terminated = False - self.registry[profile_id].connect_options = _connect_options - self.registry[profile_id].session_options = _session_options - - return self.registry[profile_id].uuid - - def register_by_session_params(self, profile_name, profile_id=None, **params): - """\ - STILL UNDOCUMENTED + self(session_uuid).session_object = session.X2goSession(logger=self.logger, **_session_options) + self(session_uuid).connected = False + self(session_uuid).running = False + self(session_uuid).suspended = False + self(session_uuid).terminated = False + self(session_uuid).connect_options = _connect_options + self(session_uuid).session_options = _session_options - """ - if self.has_profile_name(profile_name): - raise X2goProfileException('X2go session profile %s already exists.' % profile_name) - else: - if not profile_id: - profile_id = utils._genSessionProfileId() - ### TODO - #_config = utils._convert_params2config(params) - #self.profiles.add_profile(profile_id, **_config) - _config = None - self.registry[profile_id] = X2goRegistryProfile() - self.registry[profile_id].profile_id = profile_id - self.registry[profile_id].profile_name = profile_name - self.registry[profile_id].profile_config = _config - self.registry[profile_id].server = params['server'] - del params['server'] - self.registry[profile_id].printing = params['printing'] - del params['printing'] - self.registry[profile_id].share_local_folders = params['share_local_folders'] - del params['share_local_folders'] - self.registry[profile_id].session_params = params - # differentiate SSH options from X2go options - _session_options = copy.deepcopy(params) - _connect_options = copy.deepcopy(params) - - for k in params.keys(): - if k in session._X2GO_SESSION_OPTIONS: - del _connect_options[k] - else: - del _session_options[k] - - self.logger('initializing X2go profile %s...' % profile_name, log.loglevel_NOTICE) - - self.logger('X2go session options for profile %s:' % profile_name, log.loglevel_DEBUG) - for k in _session_options: - self.logger(' %s: %s' % (k, _session_options[k]), log.loglevel_DEBUG) - - self.logger('Paramiko connect options for profile %s are:' % profile_name, log.loglevel_DEBUG) - for k in _connect_options: - self.logger(' %s: %s' % (k,_connect_options[k]), log.loglevel_DEBUG) - - self.registry[profile_id].session_object = session.X2goSession(**_session_options) - self.registry[profile_id].connected = False - self.registry[profile_id].running = False - self.registry[profile_id].suspended = False - self.registry[profile_id].terminated = False - self.registry[profile_id].connect_options = _connect_options - self.registry[profile_id].session_options = _session_options - - return self.registry[profile_id].uuid - - def del_profile(self, profile_name): - """\ - STILL UNDOCUMENTED - - """ - if not self.has_profile_name(profile_name): - raise X2goProfileException('X2go session profile %s does not exist.' % profile_name) - else: - if self.registry[profile_id].connected: - raise X2goProfileException('Cannot delete, X2go session profile is connected.' % profile_name) - elif self.registry[profile_id].running: - raise X2goProfileException('Cannot delete, X2go session profile is running.' % profile_name) - else: - del self.registry[profile_id] + return session_uuid def _sessionsWithState(self, state): - _x2go_single_profiles = [] - for p in self.registry.items(): - if getattr(p, state, False): - _x2go_single_profiles.append(p) - return _x2go_single_profiles + return [ session for session in self.registry.values() if eval('session.%s' % state) ] @property def connected_sessions(self): @@ -359,15 +182,12 @@ class X2goSessionRegistry(object): return len(self.running_sessions) > 0 @property - def list_sessions(self): + def registered_sessions(self): """\ STILL UNDOCUMENTED """ - _available_sessions_profiles = [] - for p in self.registry.items(): - _available_session_profiles.append([p.name, p.running, p.isAlive ]) - return _available_session_profiles + return self.registry.values() @property def non_running_sessions(self): @@ -375,46 +195,5 @@ class X2goSessionRegistry(object): STILL UNDOCUMENTED """ - _non_running = [] - _running = self.runningSessions - for p in self.registry.items(): - if p not in _running: - _non_running.append(p) - return _non_running - - @property - def list_non_running_sessions_by_profile_id(self): - """\ - STILL UNDOCUMENTED - - """ - return [ p.name for p in self.non_running_sessions ] + return [ s for s in self.registry.values() if s not in self.running_sessions ] - def getX2goSessionByName(self, profile_name): - """\ - STILL UNDOCUMENTED - - """ - return self.registry[self._profileName2ProfileIds(profile_name)].session - - def getX2goSessionById(self, profile_id): - """\ - STILL UNDOCUMENTED - - """ - return self.registry[profile_id].session - - #def updProfileByNumber(self, profile): - # """\ - # STILL UNDOCUMENTED - # - # """ - # counter = 0 - # for nameKeys in self.x2gonames.keys(): - # if counter == self.current_selected_profile_nr: - # oldName = nameKeys - # break - # counter += 1 - # del self.x2gonames[oldName] - # self.x2goprofs[self.current_selected_profile_nr] = profile - # self.x2gonames[profile.name] = self.current_selected_profile_nr \ No newline at end of file diff --git a/x2go/session.py b/x2go/session.py index 766d53b..7ea83e5 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -31,6 +31,7 @@ import gevent import threading import signal import cStringIO +import copy # Python X2go modules import proxy @@ -359,7 +360,7 @@ class X2goSession(paramiko.SSHClient): if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) else: - self.logger = logger + self.logger = copy.deepcopy(logger) self.logger.tag = __NAME__ if proxy_class is None: @@ -810,7 +811,7 @@ class X2goSession(paramiko.SSHClient): _tmp_io_object.write('----BEGIN RSA IDENTITY----') _tmp_io_object.write('%s %s' % (_host_rsakey.get_name(),_host_rsakey.get_base64(),)) - _x2go_key_fname = os.path.join(self.params.rootdir, 'ssh', 'key.z%s' % self.session_info.agent_pid) + _x2go_key_fname = os.path.join(os.path.dirname(self.session_info.remote_container), 'ssh', 'key.z%s' % self.session_info.agent_pid) _x2go_key_bundle = _tmp_io_object.getvalue() self._x2go_sftp_write(_x2go_key_fname, _x2go_key_bundle) diff --git a/x2go/utils.py b/x2go/utils.py index 0a822ba..cb5a2c7 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -105,9 +105,9 @@ def _checkSessionProfileDefaults(defaults): return True -def _convert_config2params(_config): +def _convert_SessionProfileOptions_2_SessionParams(_options): - _params = copy.deepcopy(_config) + _params = copy.deepcopy(_options) _rename_dict = { 'host': 'server', @@ -131,7 +131,7 @@ def _convert_config2params(_config): '5': 'lan', } - for opt, val in _config.iteritems(): + for opt, val in _options.iteritems(): # rename options if necessary if opt in _rename_dict.keys(): @@ -155,7 +155,7 @@ def _convert_config2params(_config): else: _params[opt] = [] #del _params['export'] - if not _config['fstunnel']: + if not _options['fstunnel']: _params[opt] = None if not val: @@ -168,26 +168,26 @@ def _convert_config2params(_config): del _params['fstunnel'] - if not _config['fullscreen']: - _params['geometry'] = '%sx%s' % (_config['width'], _config['height']) + if not _options['fullscreen']: + _params['geometry'] = '%sx%s' % (_options['width'], _options['height']) else: _params['geometry'] = 'fullscreen' del _params['width'] del _params['height'] del _params['fullscreen'] - if not _config['sound']: + if not _options['sound']: snd_system = 'none' del _params['sound'] - if _config['rootless']: + if _options['rootless']: _params['session_type'] = 'application' else: _params['session_type'] = 'desktop' del _params['rootless'] # currently ignored in Python X2go, use it for client implementations - _ignored_config_options = [ + _ignored_options = [ 'iconvto', 'iconvfrom', 'useiconv', @@ -205,6 +205,6 @@ def _convert_config2params(_config): 'xdmcpserver', 'default', ] - for i in _ignored_config_options: + for i in _ignored_options: del _params[i] return _params \ No newline at end of file hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.8-14-gf5d508c
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via f5d508c28cfee81e3b96dc9a57767ebe959e8edd (commit) from 73ca9051b032b93911dde2d3abf1fa7033a76022 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 17628 -> 17848 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 16519 -> 16731 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 15153 -> 15156 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 16228 -> 16228 bytes po/bg.po | 379 +++++++++++++++++--------------- po/de.po | 383 +++++++++++++++++---------------- po/en.po | 383 +++++++++++++++++---------------- po/es.po | 381 +++++++++++++++++--------------- po/nl.po | 381 +++++++++++++++++--------------- po/pyhoca-gui.pot | 378 +++++++++++++++++--------------- 10 files changed, 1208 insertions(+), 1077 deletions(-) The diff of changes is: diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo index 21460dc..69242fe 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 be4c3b1..d1ce6dc 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 ded9228..28aebed 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/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo index 3a9e21d..b6b3b42 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/po/bg.po b/po/bg.po index 9115860..537ea40 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:38+0200\n" +"POT-Creation-Date: 2011-09-24 00:59+0200\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" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: Bulgarian\n" "X-Poedit-Country: Bulgaria\n" @@ -50,22 +50,22 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:274 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/frontend.py:360 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:360 msgid "User is not allowed to start X2go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:367 #, python-format msgid "%s - connect" msgstr "" @@ -92,20 +92,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 -#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 +#: ../pyhoca/wxgui/frontend.py:421 #, python-format msgid "%s - connect error" msgstr "" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:393 +#: ../pyhoca/wxgui/frontend.py:400 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:393 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -115,7 +115,7 @@ msgstr "" msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 #, python-format msgid "%s - auth error" msgstr "" @@ -150,402 +150,419 @@ msgid "" "Client for connecting you to a remote X2go server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "GNOME Desktop (GNOME)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:73 msgid "K Desktop Environment (KDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:74 msgid "Lightweight X Desktop (LXDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:75 msgid "Trinity X Desktop (KDE3-like)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Unity X Desktop Shell (UNITY)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:68 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "XDMCP Query" msgstr "" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:70 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Windows Terminal Server (RDP-proxy)" msgstr "" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:81 msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 +#: ../pyhoca/wxgui/profilemanager.py:82 ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom command" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Internet Browser" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Email Client" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Openoffice.org" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:79 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "Terminal" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:102 msgid "Open file with system's default application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:103 msgid "Open application chooser dialog" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:95 +#: ../pyhoca/wxgui/profilemanager.py:104 msgid "Save incoming file as ..." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:123 msgid "new session profile" msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Profile " msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:137 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:138 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:139 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:140 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:142 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:143 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:144 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:136 +#: ../pyhoca/wxgui/profilemanager.py:145 msgid "File Import" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:141 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "Icon" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "RDP settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:169 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "XDMCP server" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:179 ../pyhoca/wxgui/profilemanager.py:189 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:206 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:219 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:239 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:237 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:249 ../pyhoca/wxgui/profilemanager.py:268 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:251 +msgid "Local Path" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:252 +msgid "Connect Method" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:261 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:313 ../pyhoca/wxgui/profilemanager.py:924 +#: ../pyhoca/wxgui/profilemanager.py:1409 +msgid "automatically" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:926 +msgid "manually" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:322 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:324 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:665 msgid "Session Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:666 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:648 +#: ../pyhoca/wxgui/profilemanager.py:667 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:649 +#: ../pyhoca/wxgui/profilemanager.py:668 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1038 +#: ../pyhoca/wxgui/profilemanager.py:1100 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1041 +#: ../pyhoca/wxgui/profilemanager.py:1103 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1220 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1160 -#: ../pyhoca/wxgui/profilemanager.py:1175 +#: ../pyhoca/wxgui/profilemanager.py:1222 +#: ../pyhoca/wxgui/profilemanager.py:1237 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1327 +#: ../pyhoca/wxgui/profilemanager.py:1389 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1392 -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 -#: ../pyhoca/wxgui/profilemanager.py:1403 -#: ../pyhoca/wxgui/profilemanager.py:1413 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1453 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 +#: ../pyhoca/wxgui/profilemanager.py:1464 +#: ../pyhoca/wxgui/profilemanager.py:1474 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1453 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1403 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1474 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -553,21 +570,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1433 +#: ../pyhoca/wxgui/profilemanager.py:1494 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1434 +#: ../pyhoca/wxgui/profilemanager.py:1495 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1438 +#: ../pyhoca/wxgui/profilemanager.py:1499 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1439 +#: ../pyhoca/wxgui/profilemanager.py:1500 msgid "Changes to profile have been saved." msgstr "" @@ -592,7 +609,7 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:457 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 msgid "E&xit" msgstr "" @@ -621,58 +638,62 @@ msgid "Terminate Session" msgstr "" #: ../pyhoca/wxgui/menus_taskbar.py:206 -msgid "&Share local folder" +msgid "&Share custom local folder" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:213 +#: ../pyhoca/wxgui/menus_taskbar.py:229 +msgid "Share:" +msgstr "" + +#: ../pyhoca/wxgui/menus_taskbar.py:240 msgid "Unshare:" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:222 +#: ../pyhoca/wxgui/menus_taskbar.py:250 msgid "Unshare &all local folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:290 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:278 +#: ../pyhoca/wxgui/menus_taskbar.py:306 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:308 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:292 +#: ../pyhoca/wxgui/menus_taskbar.py:320 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:294 +#: ../pyhoca/wxgui/menus_taskbar.py:322 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:296 +#: ../pyhoca/wxgui/menus_taskbar.py:324 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:304 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:330 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/menus_taskbar.py:427 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Connect Server" msgstr "" @@ -681,65 +702,65 @@ msgstr "" msgid "About %s ..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/frontend.py:367 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:400 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/frontend.py:421 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:420 +#: ../pyhoca/wxgui/frontend.py:428 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:442 msgid "An unknown error occurred during authentication!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:536 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Cleaning X2go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 msgid "X2go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:571 +#: ../pyhoca/wxgui/frontend.py:579 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:606 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/frontend.py:627 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:688 +#: ../pyhoca/wxgui/frontend.py:705 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -748,105 +769,105 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:713 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:725 ../pyhoca/wxgui/frontend.py:732 -#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:725 +#: ../pyhoca/wxgui/frontend.py:742 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:749 #, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:751 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:778 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:781 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:781 ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:798 #, python-format msgid "" "%s\n" @@ -854,7 +875,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "" "%s\n" @@ -862,74 +883,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:787 ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:787 +#: ../pyhoca/wxgui/frontend.py:804 #, python-format msgid "" "New X2go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "" "Another client started X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:795 ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:795 +#: ../pyhoca/wxgui/frontend.py:812 #, python-format msgid "" "Resuming X2go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "" "Another client resumed X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "" "X2go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/de.po b/po/de.po index afcacb1..5816936 100644 --- a/po/de.po +++ b/po/de.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:38+0200\n" -"PO-Revision-Date: 2011-09-17 02:18+0100\n" +"POT-Creation-Date: 2011-09-24 00:59+0200\n" +"PO-Revision-Date: 2011-09-24 00:58+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" @@ -49,22 +49,22 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:274 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Abbrechen" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/frontend.py:360 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:360 msgid "User is not allowed to start X2go sessions!" msgstr "Benutzer darf keine X2go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:367 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,20 +91,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 -#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 +#: ../pyhoca/wxgui/frontend.py:421 #, python-format msgid "%s - connect error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:393 +#: ../pyhoca/wxgui/frontend.py:400 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:393 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -116,7 +116,7 @@ msgstr "" msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 #, python-format msgid "%s - auth error" msgstr "%s - Anmeldefehler" @@ -157,403 +157,420 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Verbindungen zu entferntem X2go server aufbauen" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:73 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:74 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:75 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (ähnlich KDE3)" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Umgebung (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:68 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "XDMCP Query" msgstr "XDMCP-Serveranfrage (Query)" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:70 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminalserver (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:81 msgid "Single Application" msgstr "Einzelne Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 +#: ../pyhoca/wxgui/profilemanager.py:82 ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom command" msgstr "Benutzerdef. Kommando" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Email Client" msgstr "E-Mail Programm" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Openoffice.org" msgstr "Openoffice.org" -#: ../pyhoca/wxgui/profilemanager.py:79 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "Terminal" msgstr "Terminalkonsole" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:102 msgid "Open file with system's default application" msgstr "Mit Standardanwendung des Systems öffnen" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:103 msgid "Open application chooser dialog" msgstr "Auswahldialog öffnen, um Anwendung auszuwählen" -#: ../pyhoca/wxgui/profilemanager.py:95 +#: ../pyhoca/wxgui/profilemanager.py:104 msgid "Save incoming file as ..." msgstr "Eingehende Datei speichern unter ..." -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:123 msgid "new session profile" msgstr "neues Sitzungsprofil" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Profile " msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "Session" msgstr "Sitzung" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:137 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:138 msgid "Connection Link Speed" msgstr "Verbindungsgeschwindigkeit" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:139 msgid "Compression" msgstr "Komprimierung" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:140 msgid "Display" msgstr "Anzeige" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:142 msgid "Sound" msgstr "Audio" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:143 msgid "Printing" msgstr "Drucken" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:144 msgid "Folder Exports" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:136 +#: ../pyhoca/wxgui/profilemanager.py:145 msgid "File Import" msgstr "Dateiimport" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:141 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "Icon" msgstr "Symbol" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Application" msgstr "Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "RDP settings" msgstr "RDP Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:169 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "RDP options" msgstr "RDP Optionen" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "XDMCP server" msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:179 ../pyhoca/wxgui/profilemanager.py:189 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "RSA/DSA private key" msgstr "Privater RSA/DSA Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Server behind SSH proxy" msgstr "Server hinter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "Key file" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Host[:Port]" msgstr "Hostname[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "SSH Proxy Tunnel" msgstr "SSH-Proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:206 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "Image quality" msgstr "Bildqualität" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Fullscreen" msgstr "Vollbild" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:219 msgid "Custom Size" msgstr "Benutzerdefinierte Größe" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Set display DPI" msgstr "DPI-Wert für Anzeige setzen" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Keep current keyboard settings" msgstr "Aktuelle Tastatureinstellungen beibehalten" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Keyboard layout" msgstr "Tastaturlayout" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Enable sound support" msgstr "Audiounterstützung aktivieren" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Arts (not supported)" msgstr "Arts (nicht unterstützt)" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:239 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Use default sound port" msgstr "Standard Audio-Port verwenden" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Custom sound port" msgstr "Benutzerdefinierter Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Client Side printing" msgstr "Unterstützung für lokale Druckeranbindung" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Use local folder sharing" msgstr "Lokale Ordnerfreigabe verwenden" -#: ../pyhoca/wxgui/profilemanager.py:237 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:249 ../pyhoca/wxgui/profilemanager.py:268 msgid "Add" msgstr "Hinzufügen" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:251 +msgid "Local Path" +msgstr "Lokaler Pfad" + +#: ../pyhoca/wxgui/profilemanager.py:252 +msgid "Connect Method" +msgstr "Verbindungsart" + +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Delete" msgstr "Entfernen" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Convert between client and server encodings" msgstr "Zeichenkodierung zwischen Server und Client übersetzen" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Client encoding" msgstr "Zeichenkodierung Client" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Server encoding" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Use file MIME box for local file import" msgstr "MIME-Box für lokalen Dateiimport verwenden" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Extensions" msgstr "Erweiterungen" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Action" msgstr "Aktion" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Save" msgstr "Speichern" -#: ../pyhoca/wxgui/profilemanager.py:261 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Reset" msgstr "Zurücksetzen" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:313 ../pyhoca/wxgui/profilemanager.py:924 +#: ../pyhoca/wxgui/profilemanager.py:1409 +msgid "automatically" +msgstr "automatisch" + +#: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:926 +msgid "manually" +msgstr "manuell" + +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:322 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (verbunden)" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:324 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:665 msgid "Session Profile" msgstr "Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:666 msgid "Connection" msgstr "Verbindung" -#: ../pyhoca/wxgui/profilemanager.py:648 +#: ../pyhoca/wxgui/profilemanager.py:667 msgid "Settings" msgstr "Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:649 +#: ../pyhoca/wxgui/profilemanager.py:668 msgid "Sharing" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:1038 +#: ../pyhoca/wxgui/profilemanager.py:1100 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1041 +#: ../pyhoca/wxgui/profilemanager.py:1103 msgid "Choose an icon for this session profile" msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1220 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1160 -#: ../pyhoca/wxgui/profilemanager.py:1175 +#: ../pyhoca/wxgui/profilemanager.py:1222 +#: ../pyhoca/wxgui/profilemanager.py:1237 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1327 +#: ../pyhoca/wxgui/profilemanager.py:1389 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1392 -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 -#: ../pyhoca/wxgui/profilemanager.py:1403 -#: ../pyhoca/wxgui/profilemanager.py:1413 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1453 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 +#: ../pyhoca/wxgui/profilemanager.py:1464 +#: ../pyhoca/wxgui/profilemanager.py:1474 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1453 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:1403 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1474 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -564,21 +581,21 @@ msgstr "" "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " "Einstellungen entsprechend ändern." -#: ../pyhoca/wxgui/profilemanager.py:1433 +#: ../pyhoca/wxgui/profilemanager.py:1494 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:1434 +#: ../pyhoca/wxgui/profilemanager.py:1495 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:1438 +#: ../pyhoca/wxgui/profilemanager.py:1499 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:1439 +#: ../pyhoca/wxgui/profilemanager.py:1500 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -603,7 +620,7 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:457 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 msgid "E&xit" msgstr "&Beenden" @@ -632,58 +649,62 @@ msgid "Terminate Session" msgstr "Sitzung beenden" #: ../pyhoca/wxgui/menus_taskbar.py:206 -msgid "&Share local folder" -msgstr "Lokalen Ordner &freigeben" +msgid "&Share custom local folder" +msgstr "Lokalen Ordner für &Freigabe wählen" + +#: ../pyhoca/wxgui/menus_taskbar.py:229 +msgid "Share:" +msgstr "Freigeben:" -#: ../pyhoca/wxgui/menus_taskbar.py:213 +#: ../pyhoca/wxgui/menus_taskbar.py:240 msgid "Unshare:" msgstr "Aushängen:" -#: ../pyhoca/wxgui/menus_taskbar.py:222 +#: ../pyhoca/wxgui/menus_taskbar.py:250 msgid "Unshare &all local folders" msgstr "Alle aushängen" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:290 msgid "Start &new Session" msgstr "&Neue Sitzung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:278 +#: ../pyhoca/wxgui/menus_taskbar.py:306 msgid "Running" msgstr "aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:308 msgid "Suspended" msgstr "angehalten" -#: ../pyhoca/wxgui/menus_taskbar.py:292 +#: ../pyhoca/wxgui/menus_taskbar.py:320 msgid "&Clean all sessions" msgstr "Alle Sitzungen beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:294 +#: ../pyhoca/wxgui/menus_taskbar.py:322 msgid "Customize &profile" msgstr "Sitzungsprofil anpassen" -#: ../pyhoca/wxgui/menus_taskbar.py:296 +#: ../pyhoca/wxgui/menus_taskbar.py:324 msgid "Shared &folders" msgstr "Freigegebene Ordner" -#: ../pyhoca/wxgui/menus_taskbar.py:304 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "&Disconnect from Server" msgstr "Von Server trennen" -#: ../pyhoca/wxgui/menus_taskbar.py:330 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Add Profile" msgstr "Sitzungsprofil hinzufügen" -#: ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/menus_taskbar.py:427 msgid "No session profiles defined" msgstr "keine Sitzungsprofile definiert" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Start/Resume Session" msgstr "Sitzung starten/fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Connect Server" msgstr "Serververbindung aufbauen" @@ -692,69 +713,69 @@ msgstr "Serververbindung aufbauen" msgid "About %s ..." msgstr "Über %s ..." -#: ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/frontend.py:367 msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:400 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom " "Benutzer nicht akzeptiert" -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/frontend.py:421 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal " "versuchen..." -#: ../pyhoca/wxgui/frontend.py:420 +#: ../pyhoca/wxgui/frontend.py:428 #, python-format msgid "%s - auth key error" msgstr "%s - ungültiger Benutzerschlüssel" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:442 msgid "An unknown error occurred during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" -#: ../pyhoca/wxgui/frontend.py:536 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Cleaning X2go sessions..." msgstr "Beende X2go Sitzungen..." -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 #, python-format msgid "%s - disconnect" msgstr "%s - trennen" -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 msgid "X2go Profile is now disconnected." msgstr "X2go Profil ist nun nicht mehr verbunden." -#: ../pyhoca/wxgui/frontend.py:571 +#: ../pyhoca/wxgui/frontend.py:579 msgid "New Session Profile" msgstr "Neues Sitzungsprofil" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:606 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - profile deleted" msgstr "%s - Profil gelöscht" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 msgid "The session profile has been deleted." msgstr "Das Sitzungsprofil wurde gelöscht." -#: ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/frontend.py:627 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - lokalen Ordner für dieses Sitzungsprofile freigeben" -#: ../pyhoca/wxgui/frontend.py:688 +#: ../pyhoca/wxgui/frontend.py:705 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -767,17 +788,17 @@ msgstr "" "\n" "Sind Sie sicher, dass sie fortfahren möchten? " -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:713 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Echtheit des Servers bestätigen" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - channel error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -786,22 +807,22 @@ msgstr "" "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " "Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:725 ../pyhoca/wxgui/frontend.py:732 -#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/frontend.py:725 +#: ../pyhoca/wxgui/frontend.py:742 msgid "The session startup failed." msgstr "Der Start der Sitzung ist fehlgeschlagen." -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:749 #, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar." -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:751 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -810,12 +831,12 @@ msgstr "" "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -824,7 +845,7 @@ msgstr "" "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " "wurde vom X2go Server abgelehnt." -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -833,37 +854,37 @@ msgstr "" "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " "verweigert. Die Sitzung konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Das X2go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht " "verfügbar." -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:778 msgid "The X2go PulseAudio system could not be started." msgstr "Das X2go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:781 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Das X2go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -872,12 +893,12 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:781 ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:798 #, python-format msgid "" "%s\n" @@ -888,7 +909,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "" "%s\n" @@ -899,12 +920,12 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:787 ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:787 +#: ../pyhoca/wxgui/frontend.py:804 #, python-format msgid "" "New X2go session starting up...\n" @@ -913,7 +934,7 @@ msgstr "" "Neue X2go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "" "Another client started X2go session\n" @@ -922,12 +943,12 @@ msgstr "" "Ein anderes X2go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:795 ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:795 +#: ../pyhoca/wxgui/frontend.py:812 #, python-format msgid "" "Resuming X2go session...\n" @@ -936,7 +957,7 @@ msgstr "" "X2go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "" "Another client resumed X2go session\n" @@ -945,12 +966,12 @@ msgstr "" "Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "" "Found already running session\n" @@ -959,12 +980,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "" "X2go Session has been suspended\n" @@ -973,12 +994,12 @@ msgstr "" "X2go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/en.po b/po/en.po index 1296cfb..caba909 100644 --- a/po/en.po +++ b/po/en.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:38+0200\n" -"PO-Revision-Date: 2011-09-17 02:17+0100\n" +"POT-Creation-Date: 2011-09-24 00:59+0200\n" +"PO-Revision-Date: 2011-09-24 00: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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "X-Poedit-Language: English\n" "X-Poedit-Country: UNITED STATES\n" "X-Poedit-SourceCharset: utf-8\n" @@ -49,22 +49,22 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:274 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Cancel" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/frontend.py:360 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:360 msgid "User is not allowed to start X2go sessions!" msgstr "User is not allowed to start X2go sessions!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:367 #, python-format msgid "%s - connect" msgstr "%s - connect" @@ -91,20 +91,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 -#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 +#: ../pyhoca/wxgui/frontend.py:421 #, python-format msgid "%s - connect error" msgstr "%s - connect error" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:393 +#: ../pyhoca/wxgui/frontend.py:400 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:393 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -115,7 +115,7 @@ msgstr "" msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 #, python-format msgid "%s - auth error" msgstr "%s - auth error" @@ -158,402 +158,419 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2go server" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:73 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:74 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:75 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3-like)" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:68 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "XDMCP Query" msgstr "XDMCP Query" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:70 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminal Server (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:81 msgid "Single Application" msgstr "Single Application" -#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 +#: ../pyhoca/wxgui/profilemanager.py:82 ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom command" msgstr "Custom command" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Internet Browser" msgstr "Internet Browser" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Email Client" msgstr "Email Client" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Openoffice.org" msgstr "Openoffice.org" -#: ../pyhoca/wxgui/profilemanager.py:79 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:102 msgid "Open file with system's default application" msgstr "Open file with system's default application" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:103 msgid "Open application chooser dialog" msgstr "Open application chooser dialog" -#: ../pyhoca/wxgui/profilemanager.py:95 +#: ../pyhoca/wxgui/profilemanager.py:104 msgid "Save incoming file as ..." msgstr "Save incoming file as ..." -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:123 msgid "new session profile" msgstr "new session profile" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Profile " msgstr "Profile" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:137 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:138 msgid "Connection Link Speed" msgstr "Connection Link Speed" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:139 msgid "Compression" msgstr "Compression" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:140 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Keyboard" msgstr "Keyboard" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:142 msgid "Sound" msgstr "Sound" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:143 msgid "Printing" msgstr "Printing" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:144 msgid "Folder Exports" msgstr "Folder Exports" -#: ../pyhoca/wxgui/profilemanager.py:136 +#: ../pyhoca/wxgui/profilemanager.py:145 msgid "File Import" msgstr "File Import" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:141 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "Icon" msgstr "Icon" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Application" msgstr "Application" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "RDP settings" msgstr "RDP settings" -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:169 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "RDP options" msgstr "RDP options" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "XDMCP server" msgstr "XDMCP server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:179 ../pyhoca/wxgui/profilemanager.py:189 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "RSA/DSA private key" msgstr "RSA/DSA private key" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Server behind SSH proxy" msgstr "Server behind SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "Key file" msgstr "Key file" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:206 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Method" msgstr "Method" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "Image quality" msgstr "Image quality" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:219 msgid "Custom Size" msgstr "Custom Size" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Set display DPI" msgstr "Set display DPI" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Keep current keyboard settings" msgstr "Keep current keyboard settings" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Keyboard layout" msgstr "Keyboard layout" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Keyboard model" msgstr "Keyboard model" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Enable sound support" msgstr "Enable sound support" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Arts (not supported)" msgstr "Arts (not supported)" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:239 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Use default sound port" msgstr "Use default sound port" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Custom sound port" msgstr "Custom sound port" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Client Side printing" msgstr "Client Side printing" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Use local folder sharing" msgstr "Use local folder sharing" -#: ../pyhoca/wxgui/profilemanager.py:237 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:249 ../pyhoca/wxgui/profilemanager.py:268 msgid "Add" msgstr "Add" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:251 +msgid "Local Path" +msgstr "Local Path" + +#: ../pyhoca/wxgui/profilemanager.py:252 +msgid "Connect Method" +msgstr "Connect Method" + +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Delete" msgstr "Delete" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Convert between client and server encodings" msgstr "Convert between client and server encodings" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Use file MIME box for local file import" msgstr "Use file MIME box for local file import" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Extensions" msgstr "Extensions" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Action" msgstr "Action" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Save" msgstr "Save" -#: ../pyhoca/wxgui/profilemanager.py:261 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:313 ../pyhoca/wxgui/profilemanager.py:924 +#: ../pyhoca/wxgui/profilemanager.py:1409 +msgid "automatically" +msgstr "automatically" + +#: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:926 +msgid "manually" +msgstr "manually" + +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - new profile" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:322 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (connected)" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:324 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:665 msgid "Session Profile" msgstr "Session Profile" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:666 msgid "Connection" msgstr "Connection" -#: ../pyhoca/wxgui/profilemanager.py:648 +#: ../pyhoca/wxgui/profilemanager.py:667 msgid "Settings" msgstr "Settings" -#: ../pyhoca/wxgui/profilemanager.py:649 +#: ../pyhoca/wxgui/profilemanager.py:668 msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:1038 +#: ../pyhoca/wxgui/profilemanager.py:1100 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1041 +#: ../pyhoca/wxgui/profilemanager.py:1103 msgid "Choose an icon for this session profile" msgstr "Choose an icon for this session profile" -#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1220 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1160 -#: ../pyhoca/wxgui/profilemanager.py:1175 +#: ../pyhoca/wxgui/profilemanager.py:1222 +#: ../pyhoca/wxgui/profilemanager.py:1237 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:1327 +#: ../pyhoca/wxgui/profilemanager.py:1389 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:1392 -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 -#: ../pyhoca/wxgui/profilemanager.py:1403 -#: ../pyhoca/wxgui/profilemanager.py:1413 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1453 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 +#: ../pyhoca/wxgui/profilemanager.py:1464 +#: ../pyhoca/wxgui/profilemanager.py:1474 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1453 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:1403 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1474 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -564,21 +581,21 @@ msgstr "" "proxy to.\n" "Please change the SSH proxy settings accordingly." -#: ../pyhoca/wxgui/profilemanager.py:1433 +#: ../pyhoca/wxgui/profilemanager.py:1494 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:1434 +#: ../pyhoca/wxgui/profilemanager.py:1495 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:1438 +#: ../pyhoca/wxgui/profilemanager.py:1499 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:1439 +#: ../pyhoca/wxgui/profilemanager.py:1500 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -603,7 +620,7 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:457 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 msgid "E&xit" msgstr "E&xit" @@ -632,58 +649,62 @@ msgid "Terminate Session" msgstr "Terminate Session" #: ../pyhoca/wxgui/menus_taskbar.py:206 -msgid "&Share local folder" -msgstr "&Share local folder" +msgid "&Share custom local folder" +msgstr "&Share custom local folder" + +#: ../pyhoca/wxgui/menus_taskbar.py:229 +msgid "Share:" +msgstr "Share:" -#: ../pyhoca/wxgui/menus_taskbar.py:213 +#: ../pyhoca/wxgui/menus_taskbar.py:240 msgid "Unshare:" msgstr "Unshare:" -#: ../pyhoca/wxgui/menus_taskbar.py:222 +#: ../pyhoca/wxgui/menus_taskbar.py:250 msgid "Unshare &all local folders" msgstr "Unshare &all local folders" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:290 msgid "Start &new Session" msgstr "Start &new Session" -#: ../pyhoca/wxgui/menus_taskbar.py:278 +#: ../pyhoca/wxgui/menus_taskbar.py:306 msgid "Running" msgstr "Running" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:308 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:292 +#: ../pyhoca/wxgui/menus_taskbar.py:320 msgid "&Clean all sessions" msgstr "&Clean all sessions" -#: ../pyhoca/wxgui/menus_taskbar.py:294 +#: ../pyhoca/wxgui/menus_taskbar.py:322 msgid "Customize &profile" msgstr "Customize &profile" -#: ../pyhoca/wxgui/menus_taskbar.py:296 +#: ../pyhoca/wxgui/menus_taskbar.py:324 msgid "Shared &folders" msgstr "Shared &folders" -#: ../pyhoca/wxgui/menus_taskbar.py:304 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "&Disconnect from Server" msgstr "&Disconnect from Server" -#: ../pyhoca/wxgui/menus_taskbar.py:330 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Add Profile" msgstr "Add Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/menus_taskbar.py:427 msgid "No session profiles defined" msgstr "No session profiles defined" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Start/Resume Session" msgstr "Start/Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Connect Server" msgstr "Connect Server" @@ -692,66 +713,66 @@ msgstr "Connect Server" msgid "About %s ..." msgstr "About %s ..." -#: ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/frontend.py:367 msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:400 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "The SSH proxy's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/frontend.py:421 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authentication protocol communication incomplete! Try again..." -#: ../pyhoca/wxgui/frontend.py:420 +#: ../pyhoca/wxgui/frontend.py:428 #, python-format msgid "%s - auth key error" msgstr "%s - auth key error" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:442 msgid "An unknown error occurred during authentication!" msgstr "An unknown error occurred during authentication!" -#: ../pyhoca/wxgui/frontend.py:536 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Cleaning X2go sessions..." msgstr "Cleaning X2go sessions..." -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 #, python-format msgid "%s - disconnect" msgstr "%s - disconnect" -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 msgid "X2go Profile is now disconnected." msgstr "X2go Profile is now disconnected." -#: ../pyhoca/wxgui/frontend.py:571 +#: ../pyhoca/wxgui/frontend.py:579 msgid "New Session Profile" msgstr "New Session Profile" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:606 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Really Delete Session Profile ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - profile deleted" msgstr "%s - profile deleted" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 msgid "The session profile has been deleted." msgstr "The session profile has been deleted." -#: ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/frontend.py:627 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - share local folder with sessions of this profile" -#: ../pyhoca/wxgui/frontend.py:688 +#: ../pyhoca/wxgui/frontend.py:705 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -764,17 +785,17 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:713 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Confirm Host Authorization" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - channel error" msgstr "%s - channel error" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -783,22 +804,22 @@ msgstr "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." -#: ../pyhoca/wxgui/frontend.py:725 ../pyhoca/wxgui/frontend.py:732 -#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - session failure" msgstr "%s - session failure" -#: ../pyhoca/wxgui/frontend.py:725 +#: ../pyhoca/wxgui/frontend.py:742 msgid "The session startup failed." msgstr "The session startup failed." -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:749 #, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "The command ,,%s'' is not available on X2go server." -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:751 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -807,12 +828,12 @@ msgstr "" "The command ,,%s'' is not available on X2go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - session warning" msgstr "%s - session warning" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -821,7 +842,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -830,36 +851,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "The X2go PulseAudio system is not available within Remote Desktop sessions." -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:778 msgid "The X2go PulseAudio system could not be started." msgstr "The X2go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:781 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "The X2go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -868,12 +889,12 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:781 ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:798 #, python-format msgid "" "%s\n" @@ -884,7 +905,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "" "%s\n" @@ -895,12 +916,12 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:787 ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:787 +#: ../pyhoca/wxgui/frontend.py:804 #, python-format msgid "" "New X2go session starting up...\n" @@ -909,7 +930,7 @@ msgstr "" "New X2go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "" "Another client started X2go session\n" @@ -918,12 +939,12 @@ msgstr "" "Another client started X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:795 ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:795 +#: ../pyhoca/wxgui/frontend.py:812 #, python-format msgid "" "Resuming X2go session...\n" @@ -932,7 +953,7 @@ msgstr "" "Resuming X2go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "" "Another client resumed X2go session\n" @@ -941,12 +962,12 @@ msgstr "" "Another client resumed X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "" "Found already running session\n" @@ -955,12 +976,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "" "X2go Session has been suspended\n" @@ -969,12 +990,12 @@ msgstr "" "X2go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/es.po b/po/es.po index 5ad05e4..e894e8c 100644 --- a/po/es.po +++ b/po/es.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:38+0200\n" +"POT-Creation-Date: 2011-09-24 00:59+0200\n" "PO-Revision-Date: 2011-06-23 15:48+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish Team <oceanosoftlapalma(a)gmail.com>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" @@ -49,22 +49,22 @@ msgstr "Inicio de sesión" msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:274 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Cancelar" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/frontend.py:360 #, python-format msgid "%s - connect failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:360 msgid "User is not allowed to start X2go sessions!" msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:367 #, python-format msgid "%s - connect" msgstr "%s - conectado" @@ -91,20 +91,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 -#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 +#: ../pyhoca/wxgui/frontend.py:421 #, python-format msgid "%s - connect error" msgstr "%s - error en la conexión" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:393 +#: ../pyhoca/wxgui/frontend.py:400 #, python-format msgid "%s - host key error" msgstr "%s - error en la clave del equipo" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:393 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -116,7 +116,7 @@ msgstr "" msgid "%s - key error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 #, fuzzy, python-format msgid "%s - auth error" msgstr "%s - error en la clave de identificación" @@ -160,407 +160,425 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Cliente para conexiones remotas a servidores X2go" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:73 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:74 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:75 #, fuzzy msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3-like)" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:68 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "XDMCP Query" msgstr "XDMCP Query" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:70 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminal Server (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:81 msgid "Single Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 +#: ../pyhoca/wxgui/profilemanager.py:82 ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom command" msgstr "Comando personalizado" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Internet Browser" msgstr "Navegador web" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Email Client" msgstr "Cliente de Correo" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Openoffice.org" msgstr "Openoffice.org" -#: ../pyhoca/wxgui/profilemanager.py:79 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:102 msgid "Open file with system's default application" msgstr "Abrir archivo con la aplicación por defecto" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:103 msgid "Open application chooser dialog" msgstr "Abrir selector de aplicaciones" -#: ../pyhoca/wxgui/profilemanager.py:95 +#: ../pyhoca/wxgui/profilemanager.py:104 msgid "Save incoming file as ..." msgstr "Guardar archivo recibido como ..." -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:123 msgid "new session profile" msgstr "Nuevo Perfil de Sesión" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Profile " msgstr "Perfil " -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "Session" msgstr "Sesión" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:137 msgid "Server" msgstr "Servidor" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:138 msgid "Connection Link Speed" msgstr "Velocidad de conexión" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:139 msgid "Compression" msgstr "Compresión" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:140 msgid "Display" msgstr "Pantalla" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Keyboard" msgstr "Teclado" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:142 msgid "Sound" msgstr "Sonido" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:143 msgid "Printing" msgstr "Impresora" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:144 msgid "Folder Exports" msgstr "Carpeta de Exportaciones" -#: ../pyhoca/wxgui/profilemanager.py:136 +#: ../pyhoca/wxgui/profilemanager.py:145 msgid "File Import" msgstr "Importar Archivo" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:141 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Name" msgstr "Nombre" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "Icon" msgstr "Icono" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Type" msgstr "Tipo" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "RDP settings" msgstr "Parámetros RDP" -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:169 msgid "RDP server" msgstr "Servidor RDP" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "RDP options" msgstr "Opciones RDP" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "XDMCP server" msgstr "Servidor XDMCP" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:179 ../pyhoca/wxgui/profilemanager.py:189 msgid "User" msgstr "Usuario" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Port" msgstr "Puerto" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "RSA/DSA private key" msgstr "Clave privada RSA/DSA" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Server behind SSH proxy" msgstr "Servidor detrás del proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "Key file" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Host[:Port]" msgstr "Host[:Puerto]" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "SSH Proxy Tunnel" msgstr "Tunel Proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Modem" msgstr "Módem" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:206 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Method" msgstr "Método" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "Image quality" msgstr "Calidad de imagen" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:219 msgid "Custom Size" msgstr "Tamaño Personalizado" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Set display DPI" msgstr "Establecer DPI" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Keep current keyboard settings" msgstr "Mantener configuración actual del teclado" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Keyboard layout" msgstr "Máscara de teclado" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Keyboard model" msgstr "Modelo de teclado" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Enable sound support" msgstr "Activar soporte de sonido" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Arts (not supported)" msgstr "Arts (sin soporte)" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:239 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Use default sound port" msgstr "Usar puerto de sonido por defecto" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Custom sound port" msgstr "Puerto de sonido personalizado" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Client Side printing" msgstr "Impresión local" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Use local folder sharing" msgstr "Compartir carpetas locales" -#: ../pyhoca/wxgui/profilemanager.py:237 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:249 ../pyhoca/wxgui/profilemanager.py:268 msgid "Add" msgstr "Añadir" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:251 +msgid "Local Path" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:252 +#, fuzzy +msgid "Connect Method" +msgstr "Conexión" + +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Delete" msgstr "Eliminar" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Convert between client and server encodings" msgstr "Convertir codificaciones entre cliente y servidor" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Client encoding" msgstr "Codificación del cliente" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Server encoding" msgstr "Codificación del Servidor" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:261 #, fuzzy msgid "Use file MIME box for local file import" msgstr "Usar arrastrar archivos para la importar archivos locales" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Extensions" msgstr "Extensiones" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Action" msgstr "Acción" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Save" msgstr "Guardar" -#: ../pyhoca/wxgui/profilemanager.py:261 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Reset" msgstr "Reiniciar" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:313 ../pyhoca/wxgui/profilemanager.py:924 +#: ../pyhoca/wxgui/profilemanager.py:1409 +msgid "automatically" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:926 +msgid "manually" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:322 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:324 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:665 msgid "Session Profile" msgstr "Perfil de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:666 msgid "Connection" msgstr "Conexión" -#: ../pyhoca/wxgui/profilemanager.py:648 +#: ../pyhoca/wxgui/profilemanager.py:667 msgid "Settings" msgstr "Opciones" -#: ../pyhoca/wxgui/profilemanager.py:649 +#: ../pyhoca/wxgui/profilemanager.py:668 msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:1038 +#: ../pyhoca/wxgui/profilemanager.py:1100 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1041 +#: ../pyhoca/wxgui/profilemanager.py:1103 msgid "Choose an icon for this session profile" msgstr "Elige un icono para este perfil de sesión" -#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1220 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1160 -#: ../pyhoca/wxgui/profilemanager.py:1175 +#: ../pyhoca/wxgui/profilemanager.py:1222 +#: ../pyhoca/wxgui/profilemanager.py:1237 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:1327 +#: ../pyhoca/wxgui/profilemanager.py:1389 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:1392 -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 -#: ../pyhoca/wxgui/profilemanager.py:1403 -#: ../pyhoca/wxgui/profilemanager.py:1413 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1453 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 +#: ../pyhoca/wxgui/profilemanager.py:1464 +#: ../pyhoca/wxgui/profilemanager.py:1474 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1453 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1403 +#: ../pyhoca/wxgui/profilemanager.py:1464 #, fuzzy msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " "otra vez..." -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1474 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -568,21 +586,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1433 +#: ../pyhoca/wxgui/profilemanager.py:1494 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:1434 +#: ../pyhoca/wxgui/profilemanager.py:1495 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:1438 +#: ../pyhoca/wxgui/profilemanager.py:1499 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:1439 +#: ../pyhoca/wxgui/profilemanager.py:1500 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -607,7 +625,7 @@ msgstr "Preferencias de impresión" msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:457 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 msgid "E&xit" msgstr "S&alir" @@ -639,60 +657,65 @@ msgstr "Finalizar Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:206 #, fuzzy -msgid "&Share local folder" +msgid "&Share custom local folder" msgstr "Compartir &Carpeta local" -#: ../pyhoca/wxgui/menus_taskbar.py:213 +#: ../pyhoca/wxgui/menus_taskbar.py:229 +#, fuzzy +msgid "Share:" +msgstr "Compartir" + +#: ../pyhoca/wxgui/menus_taskbar.py:240 msgid "Unshare:" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:222 +#: ../pyhoca/wxgui/menus_taskbar.py:250 #, fuzzy msgid "Unshare &all local folders" msgstr "Compartir &Carpeta local" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:290 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:278 +#: ../pyhoca/wxgui/menus_taskbar.py:306 msgid "Running" msgstr "Activa" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:308 msgid "Suspended" msgstr "Suspendida" -#: ../pyhoca/wxgui/menus_taskbar.py:292 +#: ../pyhoca/wxgui/menus_taskbar.py:320 msgid "&Clean all sessions" msgstr "&Limpiar el registro de sesiones" -#: ../pyhoca/wxgui/menus_taskbar.py:294 +#: ../pyhoca/wxgui/menus_taskbar.py:322 msgid "Customize &profile" msgstr "Configurar &perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:296 +#: ../pyhoca/wxgui/menus_taskbar.py:324 #, fuzzy msgid "Shared &folders" msgstr "Compartir &Carpeta local" -#: ../pyhoca/wxgui/menus_taskbar.py:304 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" -#: ../pyhoca/wxgui/menus_taskbar.py:330 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Add Profile" msgstr "Añadir Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/menus_taskbar.py:427 msgid "No session profiles defined" msgstr "No se han definido perfiles de sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Start/Resume Session" msgstr "Iniciar/Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Connect Server" msgstr "Conectar con el Servidor" @@ -701,70 +724,70 @@ msgstr "Conectar con el Servidor" msgid "About %s ..." msgstr "Acerca de %s ..." -#: ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/frontend.py:367 msgid "Public SSH key authentication has been successful." msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH." -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:400 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/frontend.py:421 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " "otra vez..." -#: ../pyhoca/wxgui/frontend.py:420 +#: ../pyhoca/wxgui/frontend.py:428 #, python-format msgid "%s - auth key error" msgstr "%s - error en la clave de identificación" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:442 #, fuzzy msgid "An unknown error occurred during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" -#: ../pyhoca/wxgui/frontend.py:536 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Cleaning X2go sessions..." msgstr "Limpiando sesiones X2go..." -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 #, python-format msgid "%s - disconnect" msgstr "%s - desconectado" -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 msgid "X2go Profile is now disconnected." msgstr "Se ha desconectado el Perfil X2go." -#: ../pyhoca/wxgui/frontend.py:571 +#: ../pyhoca/wxgui/frontend.py:579 msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:606 #, fuzzy, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - profile deleted" msgstr "%s - perfil eliminado" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 msgid "The session profile has been deleted." msgstr "Se ha eliminado el perfil de sesión." -#: ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/frontend.py:627 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - compartir carpetas locales con las sesiones de este perfil" -#: ../pyhoca/wxgui/frontend.py:688 +#: ../pyhoca/wxgui/frontend.py:705 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -777,17 +800,17 @@ msgstr "" "\n" "¿Continuar con la conexión?" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:713 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Se confirma la autorización del equipo" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - channel error" msgstr "%s - error en el canal" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -796,25 +819,25 @@ msgstr "" "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " "iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:725 ../pyhoca/wxgui/frontend.py:732 -#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" -#: ../pyhoca/wxgui/frontend.py:725 +#: ../pyhoca/wxgui/frontend.py:742 #, fuzzy msgid "The session startup failed." msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:749 #, fuzzy, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "" "El comando ,,%s'' no está presente en el servidor X2go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:751 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -823,12 +846,12 @@ msgstr "" "El comando ,,%s'' no está presente en el servidor X2go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - session warning" msgstr "%s - advertencia durante la sesión" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -837,7 +860,7 @@ msgstr "" "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al " "puerto %s del servidor X2go." -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -846,37 +869,37 @@ msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " "servidor X2go/SSH . Fallo en el inicio de sesión." -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 #, python-format msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "El sistema X2go PulseAudio no está disponible en las sesiones del tipo " "Remote Desktop" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:778 msgid "The X2go PulseAudio system could not be started." msgstr "El sistema X2go PulseAudio no puede iniciarse" -#: ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:781 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "El sistema X2go PulseAudio ha finalizado inesperadamente" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "%s - audio problem" msgstr "%s - problema en el audio" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -885,12 +908,12 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:781 ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:798 #, python-format msgid "" "%s\n" @@ -901,7 +924,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "" "%s\n" @@ -912,12 +935,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:787 ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:787 +#: ../pyhoca/wxgui/frontend.py:804 #, python-format msgid "" "New X2go session starting up...\n" @@ -926,7 +949,7 @@ msgstr "" "Iniciando nueva sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "" "Another client started X2go session\n" @@ -935,12 +958,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:795 ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:795 +#: ../pyhoca/wxgui/frontend.py:812 #, python-format msgid "" "Resuming X2go session...\n" @@ -949,7 +972,7 @@ msgstr "" "Retornando sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "" "Another client resumed X2go session\n" @@ -958,12 +981,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "" "Found already running session\n" @@ -972,12 +995,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "" "X2go Session has been suspended\n" @@ -986,12 +1009,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/nl.po b/po/nl.po index 8e28475..1369210 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:38+0200\n" +"POT-Creation-Date: 2011-09-24 00:59+0200\n" "PO-Revision-Date: 2011-07-14 08:07+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "X-Poedit-Language: Dutch\n" "X-Poedit-Country: NETHERLANDS\n" "X-Poedit-SourceCharset: utf-8\n" @@ -49,22 +49,22 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:274 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Afbreken" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/frontend.py:360 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:360 msgid "User is not allowed to start X2go sessions!" msgstr "Gebruiker mag geen X2go sessie starten!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:367 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,20 +91,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 -#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 +#: ../pyhoca/wxgui/frontend.py:421 #, python-format msgid "%s - connect error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:393 +#: ../pyhoca/wxgui/frontend.py:400 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:393 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -116,7 +116,7 @@ msgstr "" msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" @@ -157,402 +157,420 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Verbinding met remote X2go server aan het opbouwen" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:73 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:74 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:75 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3)" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:68 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "XDMCP Query" msgstr "XDMCP Query" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:70 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminalserver (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:81 msgid "Single Application" msgstr "Enkelvoudige Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 +#: ../pyhoca/wxgui/profilemanager.py:82 ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom command" msgstr "Speciaal Commando" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Email Client" msgstr "E-Mail Programma" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Openoffice.org" msgstr "Openoffice.org" -#: ../pyhoca/wxgui/profilemanager.py:79 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:102 msgid "Open file with system's default application" msgstr "Open bestand met het geassocieerde programma" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:103 msgid "Open application chooser dialog" msgstr "Open dialoog, om Applicatie te kiezen" -#: ../pyhoca/wxgui/profilemanager.py:95 +#: ../pyhoca/wxgui/profilemanager.py:104 msgid "Save incoming file as ..." msgstr "Opslaan bestand als ..." -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:123 msgid "new session profile" msgstr "Nieuw Profiel" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Profile " msgstr "Profiel" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "Session" msgstr "Sessie" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:137 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:138 msgid "Connection Link Speed" msgstr "Verbindings snelheid" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:139 msgid "Compression" msgstr "Compressie" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:140 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Keyboard" msgstr "Toetsenbord" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:142 msgid "Sound" msgstr "Geluid" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:143 msgid "Printing" msgstr "Afdrukken" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:144 msgid "Folder Exports" msgstr "Map export" -#: ../pyhoca/wxgui/profilemanager.py:136 +#: ../pyhoca/wxgui/profilemanager.py:145 msgid "File Import" msgstr "Bestands import" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:141 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Name" msgstr "Naam" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "Icon" msgstr "Icon" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Application" msgstr "Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "RDP settings" msgstr "RDP instellingen" -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:169 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "RDP options" msgstr "RDP Opties" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "XDMCP server" msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:179 ../pyhoca/wxgui/profilemanager.py:189 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "RSA/DSA private key" msgstr "Private RSA/DSA Key" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Server behind SSH proxy" msgstr "Server achter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "Key file" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:206 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "Image quality" msgstr "Beeldkwaliteit" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:219 msgid "Custom Size" msgstr "Grootte instellen" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Set display DPI" msgstr "DPI-waarde instellen" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Keep current keyboard settings" msgstr "Huidige toetsenbord-instellingen behouden" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Keyboard layout" msgstr "Toetsenbord layout" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Keyboard model" msgstr "Toetsenbord model" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Enable sound support" msgstr "Geluid gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Arts (not supported)" msgstr "Arts (niet ondersteund)" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:239 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Use default sound port" msgstr "Standaard Audio-Port gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Custom sound port" msgstr "Speciale Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Client Side printing" msgstr "Afdrukken via deze computer" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Use local folder sharing" msgstr "Delen van lokale mappen" -#: ../pyhoca/wxgui/profilemanager.py:237 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:249 ../pyhoca/wxgui/profilemanager.py:268 msgid "Add" msgstr "Toevoegen" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:251 +msgid "Local Path" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:252 +#, fuzzy +msgid "Connect Method" +msgstr "Verbinding" + +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Delete" msgstr "Verwijderen" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Convert between client and server encodings" msgstr "Encoding tussen client en server vertalen" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Use file MIME box for local file import" msgstr "Importeren lokale bestanden via MIME box" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Extensions" msgstr "Uitbreidingen" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Action" msgstr "Actie" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Save" msgstr "Opslaan" -#: ../pyhoca/wxgui/profilemanager.py:261 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:313 ../pyhoca/wxgui/profilemanager.py:924 +#: ../pyhoca/wxgui/profilemanager.py:1409 +msgid "automatically" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:926 +msgid "manually" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profiel manager - nieuw profiel" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:322 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profiel manager - %s (verbonden)" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:324 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profiel manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:665 msgid "Session Profile" msgstr "Sessie Profiel" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:666 msgid "Connection" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:648 +#: ../pyhoca/wxgui/profilemanager.py:667 msgid "Settings" msgstr "Instellingen" -#: ../pyhoca/wxgui/profilemanager.py:649 +#: ../pyhoca/wxgui/profilemanager.py:668 msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:1038 +#: ../pyhoca/wxgui/profilemanager.py:1100 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1041 +#: ../pyhoca/wxgui/profilemanager.py:1103 msgid "Choose an icon for this session profile" msgstr "Icon voor dit Profiel kiezen" -#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1220 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1160 -#: ../pyhoca/wxgui/profilemanager.py:1175 +#: ../pyhoca/wxgui/profilemanager.py:1222 +#: ../pyhoca/wxgui/profilemanager.py:1237 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:1327 +#: ../pyhoca/wxgui/profilemanager.py:1389 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:1392 -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 -#: ../pyhoca/wxgui/profilemanager.py:1403 -#: ../pyhoca/wxgui/profilemanager.py:1413 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1453 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 +#: ../pyhoca/wxgui/profilemanager.py:1464 +#: ../pyhoca/wxgui/profilemanager.py:1474 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1453 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:1403 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1474 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -563,21 +581,21 @@ msgstr "" "SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:1433 +#: ../pyhoca/wxgui/profilemanager.py:1494 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1434 +#: ../pyhoca/wxgui/profilemanager.py:1495 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1438 +#: ../pyhoca/wxgui/profilemanager.py:1499 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:1439 +#: ../pyhoca/wxgui/profilemanager.py:1500 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -602,7 +620,7 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:457 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 msgid "E&xit" msgstr "&Beëindigen" @@ -632,60 +650,65 @@ msgstr "Sessie beëindigen" #: ../pyhoca/wxgui/menus_taskbar.py:206 #, fuzzy -msgid "&Share local folder" +msgid "&Share custom local folder" msgstr "Delen lokale &map" -#: ../pyhoca/wxgui/menus_taskbar.py:213 +#: ../pyhoca/wxgui/menus_taskbar.py:229 +#, fuzzy +msgid "Share:" +msgstr "Delen" + +#: ../pyhoca/wxgui/menus_taskbar.py:240 msgid "Unshare:" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:222 +#: ../pyhoca/wxgui/menus_taskbar.py:250 #, fuzzy msgid "Unshare &all local folders" msgstr "Delen lokale &map" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:290 msgid "Start &new Session" msgstr "&Nieuwe Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:278 +#: ../pyhoca/wxgui/menus_taskbar.py:306 msgid "Running" msgstr "Aktief" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:308 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:292 +#: ../pyhoca/wxgui/menus_taskbar.py:320 msgid "&Clean all sessions" msgstr "Alle Sessies beëindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:294 +#: ../pyhoca/wxgui/menus_taskbar.py:322 msgid "Customize &profile" msgstr "Sessieprofiel wijzigen" -#: ../pyhoca/wxgui/menus_taskbar.py:296 +#: ../pyhoca/wxgui/menus_taskbar.py:324 #, fuzzy msgid "Shared &folders" msgstr "Delen lokale &map" -#: ../pyhoca/wxgui/menus_taskbar.py:304 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" -#: ../pyhoca/wxgui/menus_taskbar.py:330 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Add Profile" msgstr "Profiel toevoegen" -#: ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/menus_taskbar.py:427 msgid "No session profiles defined" msgstr "Geen Profiel gedefinieerd" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Start/Resume Session" msgstr "Sessie starten/hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Connect Server" msgstr "Verbinden met Server" @@ -694,67 +717,67 @@ msgstr "Verbinden met Server" msgid "About %s ..." msgstr "About %s ..." -#: ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/frontend.py:367 msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:400 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " "gebruiker" -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/frontend.py:421 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authenticatie was niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/frontend.py:420 +#: ../pyhoca/wxgui/frontend.py:428 #, python-format msgid "%s - auth key error" msgstr "%s - Verbindingsfout met auth. key" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:442 msgid "An unknown error occurred during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" -#: ../pyhoca/wxgui/frontend.py:536 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Cleaning X2go sessions..." msgstr "Opschonen X2go sessies..." -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 #, python-format msgid "%s - disconnect" msgstr "%s - verbinding verbreken" -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 msgid "X2go Profile is now disconnected." msgstr "X2go Profiel is nu niet meer verbonden." -#: ../pyhoca/wxgui/frontend.py:571 +#: ../pyhoca/wxgui/frontend.py:579 msgid "New Session Profile" msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:606 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Verwijder sessie profiel ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - profile deleted" msgstr "%s - Profiel is verwijderd!" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 msgid "The session profile has been deleted." msgstr "Het sessie profiel is verwijderd." -#: ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/frontend.py:627 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - deel lokale map met dit Profiel" -#: ../pyhoca/wxgui/frontend.py:688 +#: ../pyhoca/wxgui/frontend.py:705 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -767,17 +790,17 @@ msgstr "" "\n" "Weet u zeker dat u de verbinding wilt maken?" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:713 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bevestig dat de Host geautoriseerd is" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - channel error" msgstr "%s - Verbindingsfout (channel error)" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -786,25 +809,25 @@ msgstr "" "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " "opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:725 ../pyhoca/wxgui/frontend.py:732 -#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" -#: ../pyhoca/wxgui/frontend.py:725 +#: ../pyhoca/wxgui/frontend.py:742 #, fuzzy msgid "The session startup failed." msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:749 #, fuzzy, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:751 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -813,12 +836,12 @@ msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -827,7 +850,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -836,36 +859,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 #, python-format msgid "%s - audio warning" msgstr "%s - audio waarschuwing" -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Het X2go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:778 msgid "The X2go PulseAudio system could not be started." msgstr "Het X2go PulseAudio systeem kon niet gestart worden" -#: ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:781 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Het X2go PulseAudio systeem is gecrashed" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "%s - audio problem" msgstr "%s - audio probleem" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -874,12 +897,12 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:781 ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:798 #, python-format msgid "" "%s\n" @@ -890,7 +913,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "" "%s\n" @@ -901,12 +924,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:787 ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:787 +#: ../pyhoca/wxgui/frontend.py:804 #, python-format msgid "" "New X2go session starting up...\n" @@ -915,7 +938,7 @@ msgstr "" "Nieuwe X2go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "" "Another client started X2go session\n" @@ -924,12 +947,12 @@ msgstr "" "Een andere X2go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:795 ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:795 +#: ../pyhoca/wxgui/frontend.py:812 #, python-format msgid "" "Resuming X2go session...\n" @@ -938,7 +961,7 @@ msgstr "" "X2go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "" "Another client resumed X2go session\n" @@ -947,12 +970,12 @@ msgstr "" "Een andere X2go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "" "Found already running session\n" @@ -961,12 +984,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "" "X2go Session has been suspended\n" @@ -975,12 +998,12 @@ msgstr "" "X2go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "%s - terminate" msgstr "%s - beëindigen" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index c957588..db1daa2 100644 --- a/po/pyhoca-gui.pot +++ b/po/pyhoca-gui.pot @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-17 02:38+0200\n" +"POT-Creation-Date: 2011-09-24 00:59+0200\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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -45,22 +46,22 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:274 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/frontend.py:360 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:360 msgid "User is not allowed to start X2go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:367 #, python-format msgid "%s - connect" msgstr "" @@ -87,20 +88,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 -#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 +#: ../pyhoca/wxgui/frontend.py:421 #, python-format msgid "%s - connect error" msgstr "" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:393 +#: ../pyhoca/wxgui/frontend.py:400 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:393 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -110,7 +111,7 @@ msgstr "" msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 #, python-format msgid "%s - auth error" msgstr "" @@ -145,402 +146,419 @@ msgid "" "Client for connecting you to a remote X2go server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "GNOME Desktop (GNOME)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:73 msgid "K Desktop Environment (KDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:74 msgid "Lightweight X Desktop (LXDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:75 msgid "Trinity X Desktop (KDE3-like)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Unity X Desktop Shell (UNITY)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:68 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "XDMCP Query" msgstr "" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:70 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Windows Terminal Server (RDP-proxy)" msgstr "" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:81 msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 +#: ../pyhoca/wxgui/profilemanager.py:82 ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom command" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Internet Browser" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Email Client" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Openoffice.org" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:79 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "Terminal" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:102 msgid "Open file with system's default application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:103 msgid "Open application chooser dialog" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:95 +#: ../pyhoca/wxgui/profilemanager.py:104 msgid "Save incoming file as ..." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:123 msgid "new session profile" msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Profile " msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:137 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:138 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:139 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:140 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:142 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:143 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:144 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:136 +#: ../pyhoca/wxgui/profilemanager.py:145 msgid "File Import" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:141 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "Icon" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "RDP settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:169 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "XDMCP server" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:179 ../pyhoca/wxgui/profilemanager.py:189 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:191 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:205 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:206 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:219 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:239 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:241 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:237 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:249 ../pyhoca/wxgui/profilemanager.py:268 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:251 +msgid "Local Path" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:252 +msgid "Connect Method" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:269 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:261 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:313 ../pyhoca/wxgui/profilemanager.py:924 +#: ../pyhoca/wxgui/profilemanager.py:1409 +msgid "automatically" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:926 +msgid "manually" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:320 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:322 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:324 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:665 msgid "Session Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:666 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:648 +#: ../pyhoca/wxgui/profilemanager.py:667 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:649 +#: ../pyhoca/wxgui/profilemanager.py:668 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1038 +#: ../pyhoca/wxgui/profilemanager.py:1100 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1041 +#: ../pyhoca/wxgui/profilemanager.py:1103 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1220 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1160 -#: ../pyhoca/wxgui/profilemanager.py:1175 +#: ../pyhoca/wxgui/profilemanager.py:1222 +#: ../pyhoca/wxgui/profilemanager.py:1237 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1327 +#: ../pyhoca/wxgui/profilemanager.py:1389 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1392 -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 -#: ../pyhoca/wxgui/profilemanager.py:1403 -#: ../pyhoca/wxgui/profilemanager.py:1413 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1453 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 +#: ../pyhoca/wxgui/profilemanager.py:1464 +#: ../pyhoca/wxgui/profilemanager.py:1474 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1453 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1395 -#: ../pyhoca/wxgui/profilemanager.py:1398 +#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1459 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1403 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1474 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -548,21 +566,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1433 +#: ../pyhoca/wxgui/profilemanager.py:1494 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1434 +#: ../pyhoca/wxgui/profilemanager.py:1495 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1438 +#: ../pyhoca/wxgui/profilemanager.py:1499 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1439 +#: ../pyhoca/wxgui/profilemanager.py:1500 msgid "Changes to profile have been saved." msgstr "" @@ -587,7 +605,7 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:457 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 msgid "E&xit" msgstr "" @@ -616,58 +634,62 @@ msgid "Terminate Session" msgstr "" #: ../pyhoca/wxgui/menus_taskbar.py:206 -msgid "&Share local folder" +msgid "&Share custom local folder" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:213 +#: ../pyhoca/wxgui/menus_taskbar.py:229 +msgid "Share:" +msgstr "" + +#: ../pyhoca/wxgui/menus_taskbar.py:240 msgid "Unshare:" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:222 +#: ../pyhoca/wxgui/menus_taskbar.py:250 msgid "Unshare &all local folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:290 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:278 +#: ../pyhoca/wxgui/menus_taskbar.py:306 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:308 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:292 +#: ../pyhoca/wxgui/menus_taskbar.py:320 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:294 +#: ../pyhoca/wxgui/menus_taskbar.py:322 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:296 +#: ../pyhoca/wxgui/menus_taskbar.py:324 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:304 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:330 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/menus_taskbar.py:427 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:430 +#: ../pyhoca/wxgui/menus_taskbar.py:458 msgid "Connect Server" msgstr "" @@ -676,65 +698,65 @@ msgstr "" msgid "About %s ..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/frontend.py:367 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:400 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:413 +#: ../pyhoca/wxgui/frontend.py:421 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:420 +#: ../pyhoca/wxgui/frontend.py:428 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:442 msgid "An unknown error occurred during authentication!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:536 +#: ../pyhoca/wxgui/frontend.py:544 msgid "Cleaning X2go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:555 +#: ../pyhoca/wxgui/frontend.py:563 msgid "X2go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:571 +#: ../pyhoca/wxgui/frontend.py:579 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:606 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:612 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:619 +#: ../pyhoca/wxgui/frontend.py:627 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:688 +#: ../pyhoca/wxgui/frontend.py:705 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -743,105 +765,105 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:713 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:725 ../pyhoca/wxgui/frontend.py:732 -#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:725 +#: ../pyhoca/wxgui/frontend.py:742 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:749 #, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:751 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:763 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:758 +#: ../pyhoca/wxgui/frontend.py:775 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:778 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:781 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:767 +#: ../pyhoca/wxgui/frontend.py:784 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:781 ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:798 #, python-format msgid "" "%s\n" @@ -849,7 +871,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:783 +#: ../pyhoca/wxgui/frontend.py:800 #, python-format msgid "" "%s\n" @@ -857,74 +879,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:787 ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:787 +#: ../pyhoca/wxgui/frontend.py:804 #, python-format msgid "" "New X2go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:808 #, python-format msgid "" "Another client started X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:795 ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:795 +#: ../pyhoca/wxgui/frontend.py:812 #, python-format msgid "" "Resuming X2go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:799 +#: ../pyhoca/wxgui/frontend.py:816 #, python-format msgid "" "Another client resumed X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:803 +#: ../pyhoca/wxgui/frontend.py:820 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:807 +#: ../pyhoca/wxgui/frontend.py:824 #, python-format msgid "" "X2go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:823 +#: ../pyhoca/wxgui/frontend.py:840 #, python-format msgid "" "X2go Session has terminated\n" 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 - twofactorauth (branch) updated: 6607484aa765425af31fb62819eb4a7332598a35
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via 6607484aa765425af31fb62819eb4a7332598a35 (commit) from 29b4c7f2e0b4adea74994b2dc839da8ea9f05e75 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/defaults.py | 1 + x2go/printing.py | 32 ++++++++++++++++++++------------ x2go/utils.py | 4 ++-- 3 files changed, 23 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index 60a91e0..1b4ce5c 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -208,6 +208,7 @@ from printing import X2goPrintActionPDFVIEW from printing import X2goPrintActionPDFSAVE from printing import X2goPrintActionPRINT from printing import X2goPrintActionPRINTCMD + X2GO_PRINT_ACTIONS = { 'PDFVIEW': X2goPrintActionPDFVIEW, 'PDFSAVE': X2goPrintActionPDFSAVE, diff --git a/x2go/printing.py b/x2go/printing.py index ccf373f..a3341a7 100644 --- a/x2go/printing.py +++ b/x2go/printing.py @@ -45,12 +45,15 @@ import ConfigParser if sys.platform == 'win32': import win32api + # Python X2go modules import log import defaults +# we have to import the X2GO_PRINT_ACTIONS in this awkward way, otherwise we create an import loop from defaults import LOCAL_HOME as _LOCAL_HOME from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR -from defaults import X2GO_CLIENTPRINTING_DEFAULTS +from defaults import X2GO_CLIENTPRINTING_DEFAULTS as _X2GO_CLIENTPRINTING_DEFAULTS +from defaults import X2GO_PRINTING_CONFIGFILES as _X2GO_PRINTING_CONFIGFILES import utils import inifiles @@ -63,9 +66,9 @@ class X2goClientPrinting(inifiles.X2goIniFile): """ config_files = [] _print_action = None - defaultValues = defaults.X2GO_CLIENTPRINTING_DEFAULTS + defaultValues = _X2GO_CLIENTPRINTING_DEFAULTS - def __init__(self, config_files=defaults.X2GO_PRINTING_CONFIGFILES, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT): + def __init__(self, config_files=_X2GO_PRINTING_CONFIGFILES, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT): """\ STILL UNDOCUMENTED @@ -100,7 +103,7 @@ class X2goClientPrinting(inifiles.X2goIniFile): elif not _general_pdfview and not _print_startcmd: _cups_defaultprinter = self.get('CUPS', 'defaultprinter') - self._print_action = X2goPrintActionPRINT(default_printer=_cups_defaultprinter, logger=self.logger) + self._print_action = X2goPrintActionPRINT(printer=_cups_defaultprinter, logger=self.logger) elif not _general_pdfview and _print_startcmd: _print_command = self.get('print', 'command') @@ -267,18 +270,22 @@ class X2goPrintActionPRINT(X2goPrintAction): ) else: if self.printer is None: - cmd_line = [ 'lpr -h -r', - '-J "%s"' % job_title, - '"%s"' % _hr_filename, + cmd_line = [ 'lpr', + '-h', + '-r', + '-J%s' % job_title, + '%s' % _hr_filename, ] else: - cmd_line = [ 'lpr -h -r', + cmd_line = [ 'lpr', + '-h', + '-r', '-P%s' % self.printer, - '-J "%s"' % job_title, - '"%s"' % _hr_filename, + '-J%s' % job_title, + '%s' % _hr_filename, ] self.logger('executing local print command: %s' % " ".join(cmd_line), loglevel=log.loglevel_DEBUG) - lpr = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) + p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=_PRINT_ENV) # this is nasty!!!! gevent.sleep(20) @@ -333,7 +340,8 @@ class X2goPrintQueue(threading.Thread): self.logger.tag = __NAME__ self.spool_dir = spool_dir - self.set_print_action(print_action, logger=logger, **print_action_args) + if print_action is not None: + self.set_print_action(print_action, logger=logger, **print_action_args) threading.Thread.__init__(self) self.daemon = True self._accept_jobs = True diff --git a/x2go/utils.py b/x2go/utils.py index cb5a2c7..0ecd4f2 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -31,7 +31,7 @@ import copy import paramiko # Python X2go modules -import defaults +from defaults import _pack_methods_nx3 def is_in_nx3packmethods(method): @@ -40,7 +40,7 @@ def is_in_nx3packmethods(method): Test if a given compression method is valid for NX3 Proxy. """ - return method in defaults._pack_methods_nx3 + return method in _pack_methods_nx3 def find_session_line_in_x2golistsessions(session_name, x2go_stdout): 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 - twofactorauth (branch) updated: ce981684654d333b61219c0b76e625d7c38561f2
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via ce981684654d333b61219c0b76e625d7c38561f2 (commit) from 62cdc5c76c212bbbf0086717f56d147107f0f8d1 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/__init__.py | 2 +- x2go/client.py | 437 +++++++++++++++----------- x2go/defaults.py | 108 +++++-- x2go/forward.py | 5 +- x2go/guardian.py | 5 + x2go/log.py | 18 +- x2go/printing.py | 88 +++--- x2go/profiles.py | 469 +++++++--------------------- x2go/proxy.py | 9 +- x2go/rforward.py | 19 +- x2go/session.py | 69 ++-- x2go/settings.py | 27 +- x2go/sftpserver.py | 40 ++- x2go/utils.py | 156 ++++++++- x2go/{exceptions.py => x2go_exceptions.py} | 4 +- 15 files changed, 757 insertions(+), 699 deletions(-) rename x2go/{exceptions.py => x2go_exceptions.py} (96%) The diff of changes is: diff --git a/x2go/__init__.py b/x2go/__init__.py index 2a06dff..ebf297a 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -47,7 +47,7 @@ _signal.signal (_signal.SIGTERM, guardian._sigterm_handle ) _signal.signal (_signal.SIGINT, guardian._sigterm_handle ) from client import X2goClient -from exceptions import * +from x2go_exceptions import * from log import * from cleanup import x2go_cleanup diff --git a/x2go/client.py b/x2go/client.py index 2d1a50c..4e97fa5 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -23,6 +23,7 @@ X2goClient class - use this class in your Python-based X2go applications. The X2goClient class supports registry based multiple sessions, parsing of configuration files and managing X2go session profiles. + """ __NAME__ = 'x2goclient-pylib' @@ -33,7 +34,8 @@ import copy # Python X2go modules from settings import X2goClientSettings from printing import X2goClientPrinting -#from profiles import X2goClientSessionProfile, X2goClientSessionProfiles +from profiles import X2goClientSessions +from registry import X2goSessionRegistry from session import X2goSession, _X2GO_SESSION_OPTIONS import log @@ -67,20 +69,20 @@ class X2goClient(object): - register a new X2goClient session, this creates an X2goSession instance and calls its constructor method:: - x2go_session_hash = x2go_client.register_session(<many-options>) + x2go_profile_id = x2go_client.register_session(<many-options>) - connect to the session's remote X2go server (SSH/Paramiko):: - x2go_client.connect_session(x2go_session_hash) + x2go_client.connect_session(x2go_profile_id) - with the connected X2go client session you can start or resume a remote X-windows session on an X2go server now:: - x2go_client.start_session(x2go_session_hash) + x2go_client.start_session(x2go_profile_id) resp.:: - x2go_client.start_session(x2go_session_hash, session_name=<session_name_of_resumable_session>) + x2go_client.start_session(x2go_profile_id, session_name=<session_name_of_resumable_session>) A new config based (i.e. using pre-defined session profiles) X2go session in an X2goClient instance is initiated in a slightly different way: @@ -89,13 +91,14 @@ class X2goClient(object): You can suspend or terminate your sessions by calling the follwing commands:: - x2go_client.suspend_session(x2go_session_hash) + x2go_client.suspend_session(x2go_profile_id) resp.:: - x2go_client.terminate_session(x2go_session_hash) + x2go_client.terminate_session(x2go_profile_id) + """ - session_registry = {} + session_registry = None def __init__(self, loglevel=log.loglevel_DEFAULT, logger=None, *args, **kwargs): """\ @@ -105,18 +108,52 @@ class X2goClient(object): @param loglevel: if no X2goLogger object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ - self.settings_config = X2goClientSettings() - #self.sessions_config = X2goClientSessionProfiles() - self.printing_config = X2goClientPrinting() if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) else: self.logger = copy.deepcopy(logger) self.logger.tag = __NAME__ + self.session_registry = X2goSessionRegistry() + + def get_username(self, profile_id): + """\ + After a session has been setup up you can query the + username the sessions runs as. + + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str + + @return: the remote username the X2go session runs as + @rtype: str + + """ + return self.session_registry(profile_id).session_object.get_transport().get_username() - def register_session(self, server=None, profile_name='UNKNOWN', printing=False, **kwargs): + def get_server(self, profile_id): + """\ + After a session has been setup up you can query the + hostname of the host the sessions is connected to (or + about to connect to). + + @param profile_id: the X2go sessions UUID registry hash + @type profile_id: str + + @return: the host an X2go session is connected to + (as an C{(addr,port)} tuple) + @rtype: tuple + + """ + return self.session_registry(profile_id).session_object.get_transport().getpeername() + + ### + ### SESSION ORIENTED CODE + ### + + def register_session(self, server=None, profile_id=None, profile_name=None, custom_profile_name=None, + printing=False, share_local_folders=[], **kwargs): """\ Register a new X2go client session. Within one X2goClient instance you can manage several sessions on serveral @@ -139,131 +176,82 @@ class X2goClient(object): @return: a unique identifier (UUID) for the newly registered X2go session @rtype: str + """ - if server is None and profile_name is 'UNKNOWN': - return None + if profile_id and self.session_registry.has_profile_id(profile_id): + _p = profile_id + elif profile_name and self.session_registry.has_profile_name(profile_name): + _p = profile_name + else: + _p = None + + if _p: + kwargs = self.session_registry.get_session_params(_p) + profile_id = self.session_registry(_p).profile_id + else: + if server is None: + return None + _profile_name = profile_name or custom_profile_name or sys.args[0] + kwargs['server'] = server + kwargs['printing'] = printing + kwargs['share_local_folders'] = share_local_folders - # differentiate SSH options from X2go options - x2go_session_options = copy.deepcopy(kwargs) - paramiko_connect_options = copy.deepcopy(kwargs) + profile_id = self.session_registry.register_by_session_params(_profile_name, **kwargs) - for k in kwargs.keys(): - if k in _X2GO_SESSION_OPTIONS: - del paramiko_connect_options[k] - else: - del x2go_session_options[k] + connect_options = self.session_registry(profile_id).connect_options + session_options = self.session_registry(profile_id).session_options self.logger('initializing X2go session...', log.loglevel_NOTICE) self.logger('X2go session options are:', log.loglevel_DEBUG) - for k in x2go_session_options: - self.logger(' %s: %s' % (k,x2go_session_options[k]), log.loglevel_DEBUG) + for k in session_options: + self.logger(' %s: %s' % (k, session_options[k]), log.loglevel_DEBUG) self.logger('Paramiko connect options are:', log.loglevel_DEBUG) - for k in paramiko_connect_options: - self.logger(' %s: %s' % (k,paramiko_connect_options[k]), log.loglevel_DEBUG) + for k in connect_options: + self.logger(' %s: %s' % (k,connect_options[k]), log.loglevel_DEBUG) # setup X2go session - session = X2goSession(logger=self.logger, **x2go_session_options) - session_hash = uuid.uuid1() - self.session_registry[session_hash] = { - 'session': session, - 'connected': False, - 'running': False, - 'resumed': False, - 'suspended': False, - 'terminated': False, - 'server': server, - 'printing': printing, - 'paramiko_connect_options': paramiko_connect_options, - 'x2go_session_options': x2go_session_options, - 'profile_name': profile_name, - #'profile': X2goClientSessionProfile(**kwargs) - } - return session_hash - - - def get_username(self, session_hash): - """\ - After a session has been setup up you can query the - username the sessions runs as. - - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str - - @return: the remote username the X2go session runs as - @rtype: str - """ - return self.session_registry[session_hash]['session'].get_transport().get_username() - - - def get_server(self, session_hash): - """\ - After a session has been setup up you can query the - hostname of the host the sessions is connected to (or - about to connect to). - - @param session_hash: the X2go sessions UUID registry hash - @type session_hash: str - - @return: the host an X2go session is connected to - (as an C{(addr,port)} tuple) - @rtype: tuple - """ - return self.session_registry[session_hash]['session'].get_transport().getpeername() - + session = X2goSession(logger=self.logger, **session_options) + return self.session_registry(profile_id).uuid - def get_session(self, session_hash): + def get_session(self, profile_id): """\ Retrieve the complete X2goSession object that has been registry under the given sesion registry hash. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @return: the L{X2goSession} object @rtype: obj - """ - return self.session_registry[session_hash]['session'] - with_session = get_session - - def get_profile_name(self, session_hash): - """\ - Retrieve the profile name of the session that has been registered - under C{session_hash} - - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str - - @return: X2go client profile name of the session - @rtype: str """ - return self.session_registry[session_hash]['profile_name'] - + return self.session_registry(profile_id).session_object + with_session = get_session - def get_session_name(self, session_hash): + def get_session_name(self, profile_id): """\ Retrieve the server-side X2go session name for the session that has - been registered under C{session_hash}. + been registered under C{profile_id}. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @return: X2go session name @rtype: str - """ - return self.session_registry[session_hash]['session'].session_info + """ + return self.session_registry(profile_id).session_object.session_info - def __connect_session(self, session_hash, password=None, add_to_known_hosts=False, force_password_auth=False): + def __connect_session(self, profile_id, password=None, add_to_known_hosts=False, force_password_auth=False): """\ - Connect to a registered X2go session with registry hash C{<session_hash>}. + Connect to a registered X2go session with registry hash C{<profile_id>}. This method basically wraps around paramiko.SSHClient.connect() for the corresponding session. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @param password: the user's password for the X2go server that is going to be connected to @type password: str @@ -274,34 +262,36 @@ class X2goClient(object): @param force_password_auth: disable SSH pub/priv key authentication mechanisms completely @type force_password_auth: bool + """ - session = self.session_registry[session_hash]['session'] - server = self.session_registry[session_hash]['server'] - paramiko_connect_options = self.session_registry[session_hash]['paramiko_connect_options'] - paramiko_connect_options['password'] = password - paramiko_connect_options['force_password_auth'] = force_password_auth - session.connect(server, **paramiko_connect_options) - self.session_registry[session_hash]['connected'] = True + session = self.session_registry(profile_id).session_object + server = self.session_registry(profile_id).server + connect_options = self.session_registry(profile_id).connect_options + connect_options['password'] = password + connect_options['force_password_auth'] = force_password_auth + session.connect(server, **connect_options) + self.session_registry(profile_id).connected = True connect_session = __connect_session - - def session_print_action(self, session_hash, print_action, **kwargs): + def __session_print_action(self, profile_id, print_action, **kwargs): """\ STILL UNDOCUMENTED + """ if type(print_action) is not types.StringType: return False - self.with_session(session_hash).set_print_action(print_action, **kwargs) - + self.with_session(profile_id).set_print_action(print_action, **kwargs) + session_print_action = __session_print_action - def __start_session(self, session_hash): + def __start_session(self, profile_id): """\ Start a new X2go session on the remote X2go server. - @param session_hash: the X2go sessions UUID registry hash - @type session_hash: str + @param profile_id: the X2go sessions UUID registry hash + @type profile_id: str + """ - session = self.session_registry[session_hash]['session'] + session = self.session_registry(profile_id).session_object session.start() @@ -309,54 +299,59 @@ class X2goClient(object): session.start_sound() session.start_sshfs() - if self.session_registry[session_hash]['printing']: + if self.session_registry(profile_id).printing: session.start_printing() + if self.session_registry(profile_id).share_local_folders: + if session.get_transport().reverse_tunnels['sshfs'][1] is not None: + for _folder in self.session_registry(profile_id).share_local_folders: + session.share_local_folder(_folder) + session.run_command() - self.session_registry[session_hash]['running'] = True + self.session_registry(profile_id).running = True start_session = __start_session - - def __clean_sessions(self, session_hash): + def __clean_sessions(self, profile_id): """\ Find running X2go sessions that have been standard by the connected user and terminate them. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str + """ - session = self.session_registry[session_hash]['session'] + session = self.session_registry(profile_id).session_object session_infos = session.list_sessions() for session_info in session_infos.values(): session.terminate(session_name=session_info) clean_sessions = __clean_sessions - - def __list_sessions(self, session_hash): + def __list_sessions(self, profile_id): """\ - Use the X2go session registered under C{session_hash} to + Use the X2go session registered under C{profile_id} to retrieve a list of running or suspended X2go sessions on the connected X2go server (for the authenticated user). - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str + """ - session = self.session_registry[session_hash]['session'] + session = self.session_registry(profile_id).session_object return session.list_sessions() list_sessions = __list_sessions - - def __resume_session(self, session_hash, session_name): + def __resume_session(self, profile_id, session_name): """\ Resume or continue a suspended / running X2go session on the remote X2go server. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @param session_name: the server-side name of an X2go session @type session_name: str + """ - session = self.session_registry[session_hash]['session'] + session = self.session_registry(profile_id).session_object session.associate(session_name) session.resume() @@ -364,14 +359,13 @@ class X2goClient(object): session.start_sound() session.start_sshfs() - if self.session_registry[session_hash]['printing']: + if self.session_registry(profile_id).printing: session.start_printing() - self.session_registry[session_hash]['running'] = True + self.session_registry(profile_id).running = True resume_session = __resume_session - - def __suspend_session(self, session_hash, session_name=None): + def __suspend_session(self, profile_id, session_name=None): """\ Suspend an X2go session. @@ -382,22 +376,22 @@ class X2goClient(object): registering an X2go server session and then passing the server-side X2go session name to this method. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @param session_name: the server-side name of an X2go session @type session_name: str + """ - session = self.session_registry[session_hash]['session'] + session = self.session_registry(profile_id).session_object if session_name: session.associate(session_name) session.suspend(session_name=session_name) if session_name is None: - self.session_registry[session_hash]['running'] = False - self.session_registry[session_hash]['suspended'] = True + self.session_registry(profile_id).running = False + self.session_registry(profile_id).suspended = True suspend_session = __suspend_session - - def __terminate_session(self, session_hash, session_name=None): + def __terminate_session(self, profile_id, session_name=None): """\ Terminate an X2go session. @@ -408,95 +402,174 @@ class X2goClient(object): registering an X2go server session and then passing the server-side X2go session name to this method. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @param session_name: the server-side name of an X2go session @type session_name: str + """ - session = self.session_registry[session_hash]['session'] + session = self.session_registry(profile_id).session_object if session_name: session.associate(session_name=session_name) session.terminate() if session_name is None: - self.session_registry[session_hash]['running'] = False - self.session_registry[session_hash]['suspended'] = False - self.session_registry[session_hash]['terminated'] = True + self.session_registry(profile_id).running = False + self.session_registry(profile_id).suspended = False + self.session_registry(profile_id).terminated = True terminate_session = __terminate_session + ### + ### PROFILE ORIENTED CODE + ### - def __session_ok(self, session_hash): + def __load_session_profiles(self): """\ - Test if the X2go session registered as C{session_hash} is - in a healthy state. + STILL UNDOCUMENTED + + + """ + self.session_registry.read_session_profiles() + load_session_profiles = __load_session_profiles + +# def new_session_profile(self, profile_name='NEW_SESSION_PROFILE', **kwargs): +# """\ +# STILL UNDOCUMENTED +# +# @param profile_name: name of a session profile to load from your session +# config +# @type profile_name: str +# +# @return: a unique identifier (UUID) for the newly registered X2go session +# @rtype: str +# +# """ +# profile = self.session_profiles.new_profile(profile_name=profile_name, **kwargs) +# return self.register_profile(profile) +# +# def get_session_profile(self, session_hash): +# """\ +# Retrieve the complete X2goSession object that has been +# registry under the given sesion registry hash. +# +# @param session_hash: the X2go session's UUID registry hash +# @type session_hash: str +# +# @return: the L{X2goSession} object +# @rtype: obj +# +# """ +# return self.session_registry[session_hash]['profile'] +# with_profile = get_session_profile +# + def get_session_profile_name(self, profile_id): + """\ + Retrieve the profile name of the session that has been registered + under C{session_hash} + @param session_hash: the X2go session's UUID registry hash @type session_hash: str + @return: X2go client profile name of the session + @rtype: str + + """ + return self.session_registry(profile_id).profile_name + get_profile_name = get_session_profile_name + + def get_session_profile_id(self, profile_name): + """\ + Retrieve the session profile id of the session whose profile name + is C{profile_name} + + @param profile_name: the session profile name + @type profile_name: str + + @return: the session profile's id + @rtype: str + + """ + return self.session_registry(profile_name).profile_id + get_profile_id = get_session_profile_id + + ### + ### QUERYING INFORMATION + ### + + def __session_ok(self, profile_id): + """\ + Test if the X2go session registered as C{profile_id} is + in a healthy state. + + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str + @return: C{True} if session is ok, C{False} otherwise @rtype: bool + """ - return self.with_session(session_hash).ok() + return self.with_session(profile_id).ok() session_ok = __session_ok - - def __is_running(self, session_hash): + def __is_running(self, profile_id): """\ - Test if the X2go session registered as C{session_hash} is up + Test if the X2go session registered as C{profile_id} is up and running. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @return: C{True} if session is running, C{False} otherwise @rtype: bool + """ - return self.with_session(session_hash).is_running() + return self.with_session(profile_id).is_running() is_running = __is_running - - def __is_suspended(self, session_hash): + def __is_suspended(self, profile_id): """\ - Test if the X2go session registered as C{session_hash} + Test if the X2go session registered as C{profile_id} is in suspended state. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @return: C{True} if session is suspended, C{False} otherwise @rtype: bool + """ - return self.with_session(session_hash).is_suspended() + return self.with_session(profile_id).is_suspended() is_suspended = __is_suspended - - def __has_terminated(self, session_hash): + def __has_terminated(self, profile_id): """\ - Test if the X2go session registered as C{session_hash} + Test if the X2go session registered as C{profile_id} has terminated. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @return: C{True} if session has terminated, C{False} otherwise @rtype: bool + """ - return self.with_session(session_hash).has_terminated() + return self.with_session(profile_id).has_terminated() has_terminated = __has_terminated - - def __share_local_folder(self, session_hash, folder_name): + def __share_local_folder(self, profile_id, folder_name): """\ - Share a local folder with the X2go session registered as C{session_hash}. + Share a local folder with the X2go session registered as C{profile_id}. - @param session_hash: the X2go session's UUID registry hash - @type session_hash: str + @param profile_id: the X2go session's UUID registry hash + @type profile_id: str @param folder_name: the full path to an existing folder on the local file system @type folder_name: str @return: returns C{True} if the local folder has been successfully mounted within the - X2go server session registerd as UUID C{session_hash} + X2go server session registerd as UUID C{profile_id} @rtype: bool + """ - return self.with_session(session_hash).share_local_folder(folder_name=folder_name) + return self.with_session(profile_id).share_local_folder(folder_name=folder_name) share_local_folder = __share_local_folder diff --git a/x2go/defaults.py b/x2go/defaults.py index be88ec0..60a91e0 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -45,41 +45,88 @@ X2GO_CLIENT_ROOTDIR = '.x2goclient' ## X2go Printing ## +X2GO_SETTINGS_CONFIGFILES = [ + '/etc/x2goclient/settings', + os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'settings'), +] X2GO_PRINTING_CONFIGFILES = [ '/etc/x2goclient/printing', os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'printing'), ] +X2GO_SESSIONPROFILES_CONFIGFILES = [ + '/etc/x2goclient/sessions', + os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'sessions'), +] -X2GO_PRINTING_CONFIG = """\ -[General] -# ignored in Python X2go -showdialog=false -# if true, open a PDF viewer (or save as PDF file). If false, print via CUPS or print command -pdfview=true -[print] -# If false, print via CUPS. If true, run "command" to process the print job -startcmd=false -# print command for non-CUPS printing -command=lpr -# ignored in Python X2go -stdin=false -# ignored in Python X2go -ps=false - -[view] -# If General->pdfview is true: -# if open is true, the PDF viewer command is executed -# if open is false, the incoming print job is saved in ~/PDF folder -open=true -# command to execute as PDF viewer -command=xpdf - -[CUPS] -# default print queue for CUPS, if print queue does not exist, the default -# CUPS queue is detected -defaultprinter=PDF -""" - +X2GO_CLIENTSETTINGS_DEFAULTS = { + 'LDAP': { + 'useldap': False, + 'port': 389, + 'server': 'localhost', + 'port1': 0, + 'port2': 0, + }, + 'General': { + # clientport is not needed for Python X2go + 'clientport': 22, + 'autoresume': True, + }, + 'Authorization': { + 'newprofile': True, + 'suspend': True, + 'editprofile': True, + 'resume': True + }, + } +X2GO_CLIENTPRINTING_DEFAULTS = { + 'General': { + # ignored in Python X2go + 'showdialog': False, + # if true, open a PDF viewer (or save as PDF file). If false, print via CUPS or print command + 'pdfview': True, + }, + 'print': { + # If false, print via CUPS. If true, run "command" to process the print job + 'startcmd': False, + # print command for non-CUPS printing + 'command': 'lpr', + # ignored in Python X2go + 'stdin': False, + # ignored in Python X2go + 'ps': False, + }, + 'view': { + # If General->pdfview is true: + # if open is true, the PDF viewer command is executed + # if open is false, the incoming print job is saved in ~/PDF folder + 'open': True, + # command to execute as PDF viewer + 'command': 'xpdf', + }, + 'CUPS': { + # default print queue for CUPS, if print queue does not exist, the default + # CUPS queue is detected + 'defaultprinter': 'PDF', + }, + } +X2GO_SESSIONPROFILE_DEFAULTS = { + 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'link':'ADSL', + 'iconvto': 'UTF-8', 'iconvfrom': 'ISO-8859-15', 'useiconv': False, + 'fstunnel': True, + 'export': '', + 'fullscreen': False, + 'width': 800,'height': 600,'dpi': 96,'setdpi': False, + 'usekbd':True, 'layout': 'us', 'type': 'pc105/us', + 'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': True, 'soundtunnel':True, 'defsndport':True, 'sndport':4713, + 'printing':True, + 'name': None, 'icon': ':icons/128x128/x2gosession.png', + 'host': None, 'user': None, 'key': None, 'sshport': 22, 'add_to_known_hosts': True, + 'rootless': True, 'applications': 'WWWBROWSER, MAILCLIENT, OFFICE, TERMINAL', 'command':'TERMINAL', 'session_type': 'application', + 'rdpoptions':None, 'rdpserver':None, + 'default':False, + 'print': True, + 'xdmcpserver': 'localhost', + } ## ## X2go Proxy defaults @@ -171,3 +218,4 @@ X2GO_PRINT_ACTIONS = { DEFAULT_PDFVIEW_CMD = 'xdg-open' DEFAULT_PDFSAVE_LOCATION = '~/PDF' DEFAULT_PRINTCMD_CMD = 'lpr' + diff --git a/x2go/forward.py b/x2go/forward.py index 7bde755..6fcc245 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -53,6 +53,7 @@ class X2goFwServer(StreamServer): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ def __init__ (self, listener, remote_host, remote_port, ssh_transport, logger=None, loglevel=log.loglevel_DEFAULT,): if logger is None: @@ -67,7 +68,6 @@ class X2goFwServer(StreamServer): StreamServer.__init__(self, listener, self.x2go_forward_tunnel_handle) - def x2go_forward_tunnel_handle(self, fw_socket, address): """\ Handle for SSH/Paramiko forwarding tunnel. @@ -76,6 +76,7 @@ class X2goFwServer(StreamServer): @type fw_socket: class @param address: unused/ignored @type address: tuple + """ try: chan = self.ssh_transport.open_channel('direct-tcpip', @@ -132,6 +133,7 @@ def start_forward_tunnel(local_port, remote_host, remote_port, ssh_transport, lo @param ssh_transport: the Paramiko/SSH transport (i.e. the X2go sessions SSH transport object) @param logger: an X2goLogger object @type logger: class + """ fw_server = X2goFwServer(('localhost', local_port), remote_host, remote_port, ssh_transport, logger=logger) try: @@ -144,6 +146,7 @@ def start_forward_tunnel(local_port, remote_host, remote_port, ssh_transport, lo def stop_forward_tunnel(fw_server): """\ Tear down a given Paramiko/SSH port forwarding tunnel. + """ fw_server.stop() diff --git a/x2go/guardian.py b/x2go/guardian.py index 7c97d52..4271aaf 100644 --- a/x2go/guardian.py +++ b/x2go/guardian.py @@ -45,12 +45,14 @@ class X2goSessionGuardian(threading.Thread): reverse forwarding tunnels, Paramiko transport threads, etc.). Their main function is to tidy up once a session gets interrupted (SIGTERM, SIGINT). There is one L{X2goSessionGuardian} for each L{X2goSession} instance. + """ active_threads = [] """\ List of active threads that this L{X2goSessionGuardian} instance will monitor. Whenever an L{X2goSession} starts a new sub-thread, it will be appended to this list. + """ def __init__(self, session, logger=None, loglevel=log.loglevel_DEFAULT): @@ -62,6 +64,7 @@ class X2goSessionGuardian(threading.Thread): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -77,6 +80,7 @@ class X2goSessionGuardian(threading.Thread): def guardian(self): """\ The handler of this L{X2goSessionGuardian} thread. + """ global _sigterm_received while not _sigterm_received and self._keepalive: @@ -88,6 +92,7 @@ class X2goSessionGuardian(threading.Thread): def stop_thread(self): """\ Stop this L{X2goSessionGuardian} thread. + """ self._keepalive = False diff --git a/x2go/log.py b/x2go/log.py index a37c4c5..e7959d7 100644 --- a/x2go/log.py +++ b/x2go/log.py @@ -41,6 +41,7 @@ Default loglevel of X2goLogger objects is: NOTICE & WARN & ERROR class X2goLogger(object): """\ A simple logger class, that is used by all Python X2go classes. + """ name = '' tag = '' @@ -48,7 +49,6 @@ class X2goLogger(object): level = -1 destination = sys.stderr - _loglevel_NAMES = {8: 'error', 16: 'warn', 32: 'notice', @@ -57,8 +57,6 @@ class X2goLogger(object): 1024: 'debug-sftpxfer', } - - def __init__(self, name=sys.argv[0], tag=__NAME__, loglevel=loglevel_DEFAULT): """\ @param name: name of the programme that uses Python X2go @@ -67,13 +65,13 @@ class X2goLogger(object): @type tag: str @param loglevel: log level for Python X2go @type loglevel: int + """ self.name = os.path.basename(name) self.tag = tag self.loglevel = loglevel self.progpid = os.getpid() - def message(self, msg, loglevel=loglevel_NONE): """\ Log a message. @@ -82,8 +80,8 @@ class X2goLogger(object): @type msg: str @param loglevel: log level of this message @type loglevel: int - """ + """ if loglevel & self.loglevel: self.destination.write('%s[%s] (%s) %s: %s\n' % (self.name, self.progpid, self.tag, self._loglevel_NAMES[loglevel].upper(), msg)) __call__ = message @@ -94,6 +92,7 @@ class X2goLogger(object): @param loglevel_name: name of loglevel to be set @type loglevel_name: str + """ if type(loglevel_name) is types.IntegerType: self.loglevel = loglevel_name @@ -103,52 +102,59 @@ class X2goLogger(object): else: self.loglevel = loglevel_DEFAULT - def set_loglevel_none(self): """\ Silence logging completely. + """ self.loglevel = 0 def set_loglevel_error(self): """\ Set log level to I{ERROR}. + """ self.loglevel = loglevel_ERROR def set_loglevel_warn(self): """\ Set log level to I{WARN}. + """ self.loglevel = loglevel_ERROR | loglevel_WARN def set_loglevel_notice(self): """\ Set log level to I{NOTICE} (default). + """ self.loglevel = loglevel_ERROR | loglevel_WARN | loglevel_NOTICE def set_loglevel_info(self): """\ Set log level to I{INFO}. + """ self.loglevel = loglevel_ERROR | loglevel_WARN | loglevel_NOTICE | loglevel_INFO def set_loglevel_debug(self): """\ Set log level to I{DEBUG}. + """ self.loglevel = loglevel_ERROR | loglevel_WARN | loglevel_NOTICE | loglevel_INFO | loglevel_DEBUG def enable_debug_sftpxfer(self): """\ Additionally, switch on sFTP data transfer debugging + """ self.loglevel = self.loglevel | loglevel_DEBUG_SFTPXFER def disable_debug_sftpxfer(self): """\ Switch off sFTP data transfer debugging. + """ self.loglevel = self.loglevel ^ loglevel_DEBUG_SFTPXFER diff --git a/x2go/printing.py b/x2go/printing.py index 706228f..b39c960 100644 --- a/x2go/printing.py +++ b/x2go/printing.py @@ -28,6 +28,7 @@ print job. Print jobs can be either be sent to any of the local print queues, be opened in an external PDF viewer, be saved to a local folder or be handed over to a custom (print) command. + """ __NAME__ = 'x2goprint-pylib' @@ -49,20 +50,22 @@ import log import defaults from defaults import LOCAL_HOME as _LOCAL_HOME from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR +from defaults import X2GO_CLIENTPRINTING_DEFAULTS import utils +import inifiles _PRINT_ENV = os.environ.copy() -class X2goClientPrinting(inifiles.X2goProcessIniFile): +class X2goClientPrinting(inifiles.X2goIniFile): """\ STILL UNDOCUMENTED + """ config_files = [] _print_action = None + defaultValues = defaults.X2GO_CLIENTPRINTING_DEFAULTS - optionxform = str - - def __init__(self, config_files=defaults.X2GO_PRINTING_CONFIGFILES, logger=None, loglevel=log.loglevel_DEFAULT, config=None, *args, **kwargs): + def __init__(self, config_files=defaults.X2GO_PRINTING_CONFIGFILES, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT): """\ STILL UNDOCUMENTED @@ -72,66 +75,44 @@ class X2goClientPrinting(inifiles.X2goProcessIniFile): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int - """ - if logger is None: - self.logger = log.X2goLogger(loglevel=loglevel) - else: - self.logger = copy.deepcopy(logger) - self.logger.tag = __NAME__ - - ConfigParser.SafeConfigParser.__init__(self, *args, **kwargs) - if (config is not None) and type(config) is types.StringType: - c = cStringIO.StringIO(config) - self.readfp(c) - else: - if type(config_files) in (types.TupleType, types.ListType): - self.config_files = copy.deepcopy(config_files) - else: - self.config_files = [] - self.read(self.config_files) + """ + inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel) self._detect_print_action() def _detect_print_action(self): + """\ + STILL UNDOCUMENTED - _general_pdfview = ( self.get('General', 'pdfview').lower() == 'true' ) - _view_open = ( self.get('view', 'open').lower() == 'true' ) - _print_startcmd = ( self.get('print', 'startcmd').lower() == 'true' ) + """ + _general_pdfview = self.getValue('General', 'pdfview', key_type=types.BooleanType) + _view_open = self.getValue('view', 'open', key_type=types.BooleanType) + _print_startcmd = self.getValue('print', 'startcmd', key_type=types.BooleanType) if _general_pdfview and _view_open: - _view_command = self.get('view', 'command') + _view_command = self.getValue('view', 'command') self._print_action = X2goPrintActionPDFVIEW(pdf_viewer_command=_view_command, logger=self.logger) elif _general_pdfview and not _view_open: self._print_action = X2goPrintActionPDFSAVE(logger=self.logger) elif not _general_pdfview and not _print_startcmd: - _cups_defaultprinter = self.get('CUPS', 'defaultprinter') + _cups_defaultprinter = self.getValue('CUPS', 'defaultprinter') self._print_action = X2goPrintActionPRINT(default_printer=_cups_defaultprinter, logger=self.logger) elif not _general_pdfview and _print_startcmd: - _print_command = self.get('print', 'command') + _print_command = self.getValue('print', 'command') self._print_action = X2goPrintActionPRINTCMD(print_cmd=_print_command, logger=self.logger) - @property def print_action(self): """\ STILL UNDOCUMENTED - """ - return self._print_action - - @property - def config_file(self): - """\ - STILL UNDOCUMENTED """ - stdout = cStringIO.StringIO() - self.write(stdout) - return stdout.getvalue() + return self._print_action class X2goPrintAction(object): @@ -149,6 +130,7 @@ class X2goPrintAction(object): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -182,6 +164,7 @@ class X2goPrintAction(object): class X2goPrintActionPDFVIEW(X2goPrintAction): """\ STILL UNDOCUMENTED + """ __name__= 'PDFVIEW' __decription__= 'View as PDF document' @@ -197,7 +180,6 @@ class X2goPrintActionPDFVIEW(X2goPrintAction): self.pdfview_cmd = pdfview_cmd X2goPrintAction.__init__(self, *args, **kwargs) - def do_print(self, pdf_file, job_title, spool_dir, ): """\ STILL UNDOCUMENTED @@ -220,6 +202,7 @@ class X2goPrintActionPDFVIEW(X2goPrintAction): class X2goPrintActionPDFSAVE(X2goPrintAction): """\ STILL UNDOCUMENTED + """ __name__ = 'PDFSAVE' __decription__= 'Save as PDF' @@ -229,16 +212,17 @@ class X2goPrintActionPDFSAVE(X2goPrintAction): def __init__(self, save_to_folder=None, *args, **kwargs): """\ STILL UNDOCUMENTED + """ if save_to_folder is None: save_to_folder = os.path.expanduser(defaults.DEFAULT_PDFSAVE_LOCATION) self.save_to_folder = save_to_folder X2goPrintAction.__init__(self, *args, **kwargs) - def do_print(self, pdf_file, job_title, spool_dir, ): """\ STILL UNDOCUMENTED + """ dest_file = self._humanreadable_filename(pdf_file, job_title, target_path=self.save_to_folder) shutil.copy2(pdf_file, dest_file) @@ -248,10 +232,10 @@ class X2goPrintActionPDFSAVE(X2goPrintAction): os.remove(_hr_filename) - class X2goPrintActionPRINT(X2goPrintAction): """\ STILL UNDOCUMENTED + """ __name__ = 'PRINT' __decription__= 'UNIX/Win32GDI printing' @@ -259,14 +243,15 @@ class X2goPrintActionPRINT(X2goPrintAction): def __init__(self, printer=None, *args, **kwargs): """\ STILL UNDOCUMENTED + """ self.printer = printer X2goPrintAction.__init__(self, *args, **kwargs) - def do_print(self, pdf_file, job_title, spool_dir, ): """\ STILL UNDOCUMENTED + """ _hr_filename = self._humanreadable_filename(pdf_file, job_title, spool_dir) shutil.copy2(pdf_file, _hr_filename) @@ -302,6 +287,7 @@ class X2goPrintActionPRINT(X2goPrintAction): class X2goPrintActionPRINTCMD(X2goPrintAction): """\ STILL UNDOCUMENTED + """ __name__ = 'PRINTCMD' __decription__= 'Print via a command (like LPR)' @@ -309,6 +295,7 @@ class X2goPrintActionPRINTCMD(X2goPrintAction): def __init__(self, print_cmd=None, *args, **kwargs): """\ STILL UNDOCUMENTED + """ if print_cmd is None: print_cmd = defaults.DEFAULT_PRINTCMD_CMD @@ -319,6 +306,7 @@ class X2goPrintActionPRINTCMD(X2goPrintAction): class X2goPrintQueue(threading.Thread): """\ STILL UNDOCUMENTED + """ print_action = None @@ -336,6 +324,7 @@ class X2goPrintQueue(threading.Thread): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -349,40 +338,38 @@ class X2goPrintQueue(threading.Thread): self.daemon = True self._accept_jobs = True - def __del__(self): self.stop_thread() - def pause(self): """\ Prevent acceptance of new incoming print jobs. The processing of print jobs that are currently still active will be completed, though. + """ if self._accept_jobs == True: self._accept_jobs = False self.logger('paused thread: %s' % repr(self), loglevel=log.loglevel_DEBUG) - def resume(self): """\ Resume operation of the X2go print spooler and continue accepting new incoming print jobs. + """ if self._accept_jobs == False: self._accept_jobs = True self.logger('resumed thread: %s' % repr(self), loglevel=log.loglevel_DEBUG) - def stop_thread(self): """\ Stops this L{X2goRevFwTunnel} thread completely. + """ self.pause() self._keepalive = False self.logger('stopping thread: %s' % repr(self), loglevel=log.loglevel_DEBUG) - @property def _incoming_print_jobs(self): @@ -397,10 +384,10 @@ class X2goPrintQueue(threading.Thread): jobs.append((_job_file, pdf_filename, job_title)) return [ j for j in jobs if j[1] not in self.active_jobs.keys() ] - def set_print_action(self, print_action, **kwargs): """\ STILL UNDOCUMENTED + """ if print_action in defaults.X2GO_PRINT_ACTIONS.keys(): print_action = defaults.X2GO_PRINT_ACTIONS[print_action] @@ -408,10 +395,10 @@ class X2goPrintQueue(threading.Thread): if print_action in defaults.X2GO_PRINT_ACTIONS.values(): self.print_action = print_action(**kwargs) - def run(self): """\ STILL UNDOCUMENTED + """ self.logger('starting print queue thread: %s' % repr(self), loglevel=log.loglevel_DEBUG) @@ -445,6 +432,7 @@ class X2goPrintQueue(threading.Thread): def x2go_printjob_handler(job_file=None, pdf_file=None, job_title=None, print_action=None, parent_thread=None, logger=None, ): """\ STILL UNDOCUMENTED + """ if print_action is None: _printing = X2goClientPrinting(logger=logger) @@ -467,10 +455,12 @@ def x2go_printjob_handler(job_file=None, pdf_file=None, job_title=None, print_ac class X2goPrintJob(threading.Thread): """\ STILL UNDOCUMENTED + """ def __init__(self, **kwargs): """\ STILL UNDOCUMENTED + """ threading.Thread.__init__(self, **kwargs) self.daemon = True diff --git a/x2go/profiles.py b/x2go/profiles.py index 04568a8..2ba13dc 100644 --- a/x2go/profiles.py +++ b/x2go/profiles.py @@ -22,359 +22,118 @@ X2goClientSessionProfile class - managing x2goclient session profiles. """ __NAME__ = 'x2gosessionprofiles-pylib' -#import os -#import ConfigParser -#import types -#import exceptions -#class _processINI(object): -# """ -# Base class to process the different ini files used in x2go. -# Primarily used to standardize the content of the -# ini file. -# If entries are omitted in the file, they are filled with -# default values, so the resulting objects always contain -# the same fields -# """ -# def __init__(self, fileName): -# """\ -# STILL UNDOCUMENTED -# """ -# self.writeconfig = False -# self.iniConfig = ConfigParser.SafeConfigParser() -# if fileName and os.path.exists(fileName): -# self.iniConfig.read(fileName) -# -# -# def fillDefaultsSection(self): -# """\ -# STILL UNDOCUMENTED -# """ -# for section, sectionvalue in self.defaultValues.items(): -# for key, value in sectionvalue.items(): -# if self.iniConfig.has_option(section,key): continue -# if not self.iniConfig.has_section(section): -# self.iniConfig.add_section(section) -# self.storeValueTypes(section, key, value) -# -# -# def updValue(self, section, key, value): -# """\ -# STILL UNDOCUMENTED -# """ -# if not self.iniConfig.has_section(section): -# self.iniConfig.add_section(section) -# self.storeValueTypes(section, key, value) -# self.writeconfig = True -# -# -# def storeValueTypes(self, section, key, value): -# """\ -# STILL UNDOCUMENTED -# """ -# if type(value) is types.StringType: -# self.iniConfig.set(section,key,value) -# elif type(value) is types.BooleanType: -# if value: -# self.iniConfig.set(section,key,'1') -# else: -# self.iniConfig.set(section,key,'0') -# else: -# self.iniConfig.set(section,key,str(value)) -## -# def writeIni(self): -# """\ -# STILL UNDOCUMENTED -# """ -# if self.writeconfig: -# fd = open(self.fileName, 'wb') -# self.iniConfig.write(fd) -# fd.close() -# self.writeconfig = False -# -# def getValue(self, section, key, getType=None): -# """\ -# STILL UNDOCUMENTED -# """ -# if self.iniConfig.has_option(section, key): -# if getType is None: -# return self.iniConfig.get(section, key) -# elif getType is types.BooleanType: -# return self.iniConfig.getboolean(section, key) -# elif getType is types.IntType: -# return self.iniConfig.getint(section, key) -# -# def bldSessionObj(self): -# """ -# This routine flattens the items making them simple -# object members -# -# Note, it assumes the option is unique within the config! -# """ -# for section in self.iniConfig.sections(): -# for option in self.iniConfig.options(section): -# if section in self.defaultValues and option in self.defaultValues[section]: -# setattr(self, option, self.getValue(section, option, type(self.defaultValues[section][option]))) -# else: -# setattr(self, option, self.getValue(section, option)) -# -# -#class X2goClientSettings(_processINI): -# """ -# Settings object that contains all data that is generally necessary -# """ -# defaultValues = { 'LDAP':{'useldap':False,'port':389,'server':'localhost','port1':0,'port2':0}, \ -# 'General':{'clientport':22,'autoresume':True}, \ -# 'Authorization': {'newprofile':True,'suspend':True,'editprofile':True,'resume':True} -# } -# def __init__(self, fileName=None): -# """\ -# STILL UNDOCUMENTED -# """ -# if fileName is None: -# fileName = os.path.normpath(os.path.expanduser('~/.x2goclient/settings')) -# _processINI.__init__(self, fileName) -# self.fillDefaultsSection() -# self.bldSessionObj() -# -# -#class X2goClientSessionProfiles(_processINI): -# """ -# Session object that contains several sessionProfiles that contain all data necessary to open the connection with -# an x2go server -# """ -# defaultValues = \ -# {'speed':2,'pack':'16m-jpeg','quality':9,'fstunnel':True,'export':'"/home/dick/Documenten:1;"','fullscreen':False,'width':800,'height':600,'dpi':96, -# 'setdpi':False,'usekbd':True,'layout':'us','type':'pc105/us','sound':False,'soundsystem':'pulse','startsoundsystem':True,'soundtunnel':True, -# 'defsndport':True,'sndport':4713, 'printing':True,'name':None,'icon':':icons/128x128/x2gosession.png','host':None,'user':None, 'key':None, -# 'sshport':22,'rootless':True,'applications':'dummy, WWWBROWSER, MAILCLIENT, OFFICE, TERMINAL','command':'dummy','rdpoptions':None, -# 'rdpserver':None,'default':False,'connected':False} -# def __init__(self, fileName=None): -# """\ -# STILL UNDOCUMENTED -# """ -# if fileName is None: -# fileName = os.path.normpath(os.path.expanduser('~/.x2goclient/sessions')) -# _processINI.__init__(self, fileName) -# self.SessionProfiles = self.iniConfig.sections() -# for section in self.SessionProfiles: -# for key, sectionvalue in self.defaultValues.items(): -# if not self.iniConfig.has_option(section,key): -# self.storeValueTypes(section, key, sectionvalue) -# -# def getSection(self, section): -# """\ -# STILL UNDOCUMENTED -# """ -# return self.iniConfig.items(section) -# -# def newProfile(self, name, **kw): -# """\ -# STILL UNDOCUMENTED -# """ -# for key, value in kw.items(): -# if key in defaultValues: -# self.updValue(name, key, value) -# else: -# raise exceptions.X2goProfileException('Keyword %s not supported in profile' % key) -# -# for key, value in defaultValues.items(): -# if key in kw: continue -# self.storeValueTypes(name, key, value) -# -# -#class X2goSingleSessionProfile(object): -# """\ -# STILL UNDOCUMENTED -# """ -# -# def __init__(self, prof, profiles): -# """\ -# STILL UNDOCUMENTED -# """ -# self.prof = prof -# self.profiles = profiles -# self.session_uuid = None -# self.showConfigScreen = False -# self.bldSessionObj() -# if self.host is None: -# self.showConfigScreen = True -# -# -# def bldSessionObj(self): -# """\ -# STILL UNDOCUMENTED -# """ -# for option in self.profiles.iniConfig.options(self.prof): -# if self.prof in self.profiles.defaultValues and option in self.profiles.defaultValues[self.prof]: -# setattr(self, option, self.profiles.getValue(self.prof, option, type(self.profiles.defaultValues[self.prof][option]))) -# else: -# setattr(self, option, self.profiles.getValue(self.prof, option)) -# -# -# def updConfig(self): -# """\ -# STILL UNDOCUMENTED -# """ -# for key, retType in self.fieldList: -# self.updValue(self.prof, key, self.__dict__[key]) -# -# -# def Connect(self, parent): -# """\ -# STILL UNDOCUMENTED -# """ -# printing = parent.printProfile -# geometry = str(self.width) + 'x' + str(self.height) -# self.c = x2go.X2goClient(logger=parent.liblogger) -# self.session_uuid = c.register_session(self.host, port=self.sshport, -# username=self.user, -# password=self.password, -# key_filename=self.key, -# add_to_known_hosts=self.add_to_known_hosts, -# profile_name = self.name, -# session_type=self.session_type, -# link=self.link, -# geometry=geometry, -# pack=self.pack, -# cache_type=self.cache_type, -# kblayout=self.layout, -# kbtype=self.type, -# snd_system=self.sound, -# printing=self.printing, -# print_action=printing.print_action, -# print_action_args=printing.print_action_args, -# cmd=printing.command) -# self.c.session_start(session_uid) -# self.profiles.updValue(self.prof, 'connected', True) -# self.connected = True -# self.profiles.writeIni() -# -# def Resume(self, parent, printing): -# """\ -# STILL UNDOCUMENTED -# """ -# pass -# -# -# def DisConnect(self): -# """\ -# STILL UNDOCUMENTED -# """ -# self.profiles.updValue(self.prof, 'connected', True) -# self.connected = False -# self.profiles.writeIni() -# -# -# def isAlive(self): -# """\ -# STILL UNDOCUMENTED -# """ -# return self.c.session_ok(self.session_uuid) -# -# -#class X2goClientSessionProfiles(object): -# """\ - # STILL UNDOCUMENTED -# """ -# -# def __init__(self): -# """\ -# STILL UNDOCUMENTED -# """ -# self.x2goprofs = [] -# self.there_is_a_default = 0 -# self.profiles = SessionProfiles() - # for prof in self.profiles.SessionProfiles: -# newSession = SingleProfile(prof, self.profiles) -# if newSession.default: -# self.x2goprofs.insert(0,newSession) -# self.there_is_a_default += 1 -# else: -# self.x2goprofs.append(newSession) -# if len(self.profiles.SessionProfiles): -# self.current_profile = self.x2goprofs[0] -# -# def Append(self, name, **kw): -# """\ -# STILL UNDOCUMENTED -# """ -# if self.profileExists(name): -# raise exceptions.X2goProfileException('Profile %s already exists' % name) -# else: -# self.profiles.newProfile(name, kw) -# self.x2goprofs.append(SingleProfile(name, self.profiles)) -# -# def writeIni(self): -# """\ -# STILL UNDOCUMENTED -# """ -# for s in self.x2goprofs: -# s.updConfig() -# self.profiles.writeIni() -# -# def defaultAvailable(self): -# """\ -# STILL UNDOCUMENTED -# """ -# return self.there_is_a_default == 1 -# -# def profileExists(self, name): -# """\ - # STILL UNDOCUMENTED -# """ -# for profile in self.x2goprofs: -# if profile.prof == name or profile.name == name: -# self.current_profile = profile -# return True -# return False -# -# def runningSessions(self): -# """\ -# STILL UNDOCUMENTED -## """ -# running = [] -# for idx, profs in enumerate(self.profiles.iniConfig.sections()): -# connected = self.profiles.getValue(profs, 'connected', getType='bool') -# if connected: -# running.append(x2goprofs[idx]) -# return running -# -# def suspendedSessions(self): -# """\ -# STILL UNDOCUMENTED -# """ -# running = self.runningSessions() -# suspended = [] -# for idx, run in enumerate(running): -# if running.isAlive(): continue -# suspended.appended(run) -# return suspended -# -# def anyRunningSessions(self): -# """\ -# STILL UNDOCUMENTED -# """ -# return len(self.runningSessions()) > 0 -# -# def listAllAvailableSessions(self): -# """\ -# STILL UNDOCUMENTED -# """ -# availableSessions = [] -# for idx, profs in enumerate(self.profiles.iniConfig.sections()): -# availableSessions.append([self.profiles.getValue(profs, 'name'), self.profiles.getValue(profs, 'connected', getType='bool')]) -# return availableSessions -# -# def listNonRunningProfiles(self): -# """\ -# STILL UNDOCUMENTED -# """ -# nonrunning = [] -# for idx, profs in enumerate(self.profiles.iniConfig.sections()): -# connected = self.profiles.getValue(profs, 'connected', getType='bool') -# if not connected: -# nonrunning.append(self.profiles.getValue(profs,'name')) -# return nonrunning -# -# \ No newline at end of file +# Python X2go modules +from defaults import X2GO_SESSIONPROFILES_CONFIGFILES +from defaults import X2GO_SESSIONPROFILE_DEFAULTS +import inifiles +import log +import utils +from x2go_exceptions import X2goProfileException + + +class X2goClientSessions(inifiles.X2goIniFile): + + defaultValues = {} + defaultSessionProfile = X2GO_SESSIONPROFILE_DEFAULTS + _non_profile_sections = ('embedded') + + def __init__(self, config_files=X2GO_SESSIONPROFILES_CONFIGFILES, defaults=None, session_profile_defaults=None, logger=None, loglevel=log.loglevel_DEFAULT): + """\ + STILL UNDOCUMENTED + + """ + # providing defaults for an X2goSessionProfiles instance will---in the worst case---override your + # existing sessions file in your home directory once you write the sessions back to file... + inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel) + + if utils._checkSessionProfileDefaults(session_profile_defaults): + self.defaultSessionProfile = session_profile_defaults + + self.session_profiles = self.iniConfig.sections() + for session_profile in self.session_profiles: + for key, default_value in self.defaultSessionProfile.iteritems(): + if not self.iniConfig.has_option(session_profile, key): + self._storeValue(session_profile, key, default_value) + self._updateDataObject() + + def get_profile_config(self, profile_id): + """\ + STILL UNDOCUMENTED + + """ + if (not profile_id in self.profile_ids) or (profile_id in self._non_profile_sections): + raise X2goProfileException('No X2go session profile with Id %s' % profile_id) + _profile_config = {} + for key in self.iniConfig.options(profile_id): + _profile_config[key] = self.get(profile_id, key, key_type=self.get_type(key)) + return _profile_config or None + + def get_type(self, key): + """\ + STILL UNDOCUMENTED + + """ + return type(self.defaultSessionProfile[key]) + + @property + def profile_ids(self): + """\ + STILL UNDOCUMENTED + + """ + return [ s for s in self.iniConfig.sections() if s not in self._non_profile_sections ] + + @property + def profile_names(self): + """\ + STILL UNDOCUMENTED + + """ + return [ self.get_profile_name(p) for p in self.profile_ids ] + + def get_profile_id(self, profile_name): + """\ + STILL UNDOCUMENTED + + """ + _profile_ids = [ p for p in self.profile_ids if self.get_profile_name(p) == profile_name ] + if len(_profile_ids) == 1: + return _profile_ids[0] + elif len(_profile_ids) == 0: + return None + else: + raise X2goProfileException('The sessions config file contains multiple session profiles with name: %s' % profile_name) + + def get_profile_name(self, profile_id): + """\ + STILL UNDOCUMENTED + + """ + return self.get_profile_config(profile_id)['name'] + + def add_profile(self, profile_id, **kwargs): + """\ + STILL UNDOCUMENTED + + """ + for key, value in kwargs.items(): + if key in self.defaultSessionProfile: + self.update(profile_id, key, value) + else: + raise X2goProfileException('keyword ,,%s\'\' not supported in X2go session profile' % key) + + for key, value in self.defaultSessionProfile.items(): + if key in kwargs: continue + self._storeValueTypes(profile_id, key, value) + + def delete_profile(self, profile_id): + """\ + STILL UNDOCUMENTED + + """ + self.iniConfig.remove_section(profile_id) + self.write_user_config = True + self.writeIniFile() + + diff --git a/x2go/proxy.py b/x2go/proxy.py index aeb43f5..85d0691 100644 --- a/x2go/proxy.py +++ b/x2go/proxy.py @@ -19,6 +19,7 @@ """\ X2goProxy classes - proxying your connection through NX3 and others. + """ __NAME__ = 'x2goproxy-pylib' @@ -39,6 +40,7 @@ class X2goProxy(object): This class needs to be inherited from a concrete proxy class. Only currently available proxy class is: L{X2goNX3Proxy}. + """ PROXY_CMD = '' """Proxy command. Needs to be set by a potential child class, might be OS specific.""" @@ -68,6 +70,7 @@ class X2goProxy(object): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -80,11 +83,11 @@ class X2goProxy(object): self.session_log = session_log self.PROXY_ENV = os.environ.copy() - def __del__(self): """\ Close any left open port forwarding tunnel, also close session log file, if left open. + """ if self.proxy is not None and self.proxy.poll() is None: self.logger('Shutting down X2go proxy subprocess', log.loglevel_DEBUG) @@ -97,12 +100,12 @@ class X2goProxy(object): if self.session_log_stderr is not None: self.session_log_stderr.close() - def start(self): """\ Start the X2go proxy command. The X2go proxy command utilizes a Paramiko/SSH based forwarding tunnel (openssh -L option). This tunnel gets started here and is forked into background (Greenlet/gevent). + """ if self.session_info is None or self.ssh_transport is None: return None @@ -141,10 +144,12 @@ class X2goNX3Proxy(X2goProxy): It basically fills X2goProxy variables with sensible content. Its methods mostly wrap around the corresponding methods of the parent class. + """ def __init__(self, *args, **kwargs): """\ For available parameters refer to L{X2goProxy} class documentation. + """ X2goProxy.__init__(self, *args, **kwargs) diff --git a/x2go/rforward.py b/x2go/rforward.py index 400e76b..8161338 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -52,6 +52,7 @@ def x2go_transport_tcp_handler(chan, (origin_addr, origin_port), (server_addr, s If the server port of an incoming Paramiko/SSH channel matches the configured port of an L{X2goRevFwTunnel} instance, this instance gets notified of the incoming channel and a new L{X2goRevFwChannelThread} is started. This L{X2goRevFwChannelThread} then takes care of the new channel's incoming data stream. + """ transport = chan.get_transport() transport._queue_incoming_channel(chan) @@ -70,6 +71,7 @@ class X2goRevFwTunnel(threading.Thread): L{X2goRevFwTunnel} class objects are used to reversely tunnel X2go audio, X2go printing and X2go folder sharing / device mounting through Paramiko/SSH. + """ def __init__(self, server_port, remote_host, remote_port, ssh_transport, logger=None, loglevel=log.loglevel_DEFAULT): """\ @@ -97,6 +99,7 @@ class X2goRevFwTunnel(threading.Thread): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -116,34 +119,32 @@ class X2goRevFwTunnel(threading.Thread): self.daemon = True self._accept_channels = True - def __del__(self): self.stop_thread() - def pause(self): """\ Prevent acceptance of new incoming connections through the Paramiko/SSH reverse forwarding tunnel. Also, any active connection on this L{X2goRevFwTunnel} instance is closed immediately, if this method is called. + """ if self._accept_channels == True: self.ssh_transport.cancel_port_forward('', self._requested_port) self._accept_channels = False self.logger('paused thread: %s' % repr(self), loglevel=log.loglevel_DEBUG) - def resume(self): """\ Resume operation of the Paramiko/SSH reverse forwarding tunnel and continue accepting new incoming connections. + """ if self._accept_channels == False: self._accept_channels = True self._requested_port = self.ssh_transport.request_port_forward('', self.server_port, handler=x2go_transport_tcp_handler) self.logger('resumed thread: %s' % repr(self), loglevel=log.loglevel_DEBUG) - def notify(self): """\ Notify an L{X2goRevFwTunnel} instance of an incoming Paramiko/SSH channel. @@ -154,23 +155,23 @@ class X2goRevFwTunnel(threading.Thread): The sent notification will trigger a C{thread.Condition()} waiting for notification in L{X2goRevFwTunnel.run()}. + """ self.incoming_channel.acquire() self.logger('notifying thread of incoming channel: %s' % repr(self), loglevel=log.loglevel_DEBUG) self.incoming_channel.notify() self.incoming_channel.release() - def stop_thread(self): """\ Stops this L{X2goRevFwTunnel} thread completely. + """ self.pause() self._keepalive = False self.logger('stopping thread: %s' % repr(self), loglevel=log.loglevel_DEBUG) self.notify() - def run(self): """\ This method gets run once an L{X2goRevFwTunnel} has been started with its @@ -190,6 +191,7 @@ class X2goRevFwTunnel(threading.Thread): The channel will last till the connection gets dropped on the X2go server side or until the tunnel gets paused by an L{X2goRevFwTunnel.pause()} call or stopped via the L{X2goRevFwTunnel.stop_thread()} method. + """ self._requested_port = self.ssh_transport.request_port_forward('', self.server_port, handler=x2go_transport_tcp_handler) self._keepalive = True @@ -235,6 +237,7 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N of L{X2goRevFwTunnel.pause()} on the instance can be used to shut down all incoming tunneled SSH connections associated to this L{X2goRevFwTunnel} instance from within a Python X2go application. + """ fw_socket = socket.socket() if logger is None: @@ -273,6 +276,7 @@ class X2goRevFwChannelThread(threading.Thread): """\ Starts a thread for each incoming Paramiko/SSH data channel trough the reverse forwarding tunnel. + """ def __init__(self, channel, remote=None, **kwargs): """\ @@ -281,6 +285,7 @@ class X2goRevFwChannelThread(threading.Thread): @type channel: class @param remote: tuple (addr, port) that specifies the data endpoint of the channel @type remote: (str, int) + """ self.channel = channel if remote is not None: @@ -288,5 +293,3 @@ class X2goRevFwChannelThread(threading.Thread): self.remote_port = remote[1] threading.Thread.__init__(self, **kwargs) self.daemon = True - - diff --git a/x2go/session.py b/x2go/session.py index 5b1c904..766d53b 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -19,6 +19,7 @@ """\ X2goSession class - core functions for handling your individual X2go sessions. + """ __NAME__ = 'x2gosession-pylib' @@ -39,7 +40,7 @@ import printing import log import defaults import utils -import exceptions +import x2go_exceptions import guardian from cleanup import x2go_cleanup @@ -54,7 +55,7 @@ from defaults import X2GO_SESSION_ROOTDIR as _X2GO_SESSION_ROOTDIR _X2GO_SESSION_OPTIONS = ('geometry', 'depth', 'link', 'pack', 'cache_type', 'kblayout', 'kbtype', 'session_type', 'snd_system', 'cmd', - 'rootdir', 'loglevel', + 'rootdir', 'loglevel', 'profile_name', 'profile_id', 'print_action', 'print_action_args', 'proxy_class', 'logger', ) @@ -82,6 +83,7 @@ class X2goSessionParams(object): """\ The L{X2goSessionParams} class is used to store all parameters that L{X2goSession} objects are constructed with. + """ def rewrite_session_type(self): """\ @@ -95,6 +97,7 @@ class X2goSessionParams(object): @return: 'D' if session should probably a desktop session, 'R' (for rootless) else @rtype: str + """ session_type = self.session_type cmd = self.cmd @@ -110,7 +113,6 @@ class X2goSessionParams(object): return self.session_type = 'R' - def update(self, properties_to_be_updated={}): """\ Update all properties in the object L{X2goSessionParams} object from @@ -120,8 +122,8 @@ class X2goSessionParams(object): property names as keys und their values to be update in L{X2goSessionParams} object. @type properties_to_be_updated: dict - """ + """ for key in properties_to_be_updated.keys(): setattr(self, key, properties_to_be_updated[key] or '') self.rewrite_session_type() @@ -132,6 +134,7 @@ class X2goServerSessionInfo(object): L{X2goServerSessionInfo} is used to store all information that is retrieved from the connected X2go server on L{X2goSession.start()} resp. L{X2goSession.resume()}. + """ def __str__(self): return self.name @@ -141,6 +144,7 @@ class X2goServerSessionInfo(object): def _parse_x2golistsessions_line(self, x2go_output): """\ Parse a single line of X2go's listsessions output. + """ l = x2go_output.split("|") self.name = l[1] @@ -162,6 +166,7 @@ class X2goServerSessionInfo(object): def _parse_x2gostartagent_output(self, x2go_output): """\ Parse x2gostartagent output. + """ l = x2go_output.split("\n") self.name = l[3] @@ -196,6 +201,7 @@ class X2goServerSessionInfo(object): @type local_container: str @param remote_container: X2go server session directory for config files, cache and session logs @type remote_container: str + """ self._parse_x2gostartagent_output(x2go_output) self.username = username @@ -206,6 +212,7 @@ class X2goServerSessionInfo(object): def clear(self): """\ Clear all properties of a L{X2goServerSessionInfo} object. + """ self.name = '' self.cookie = '' @@ -230,6 +237,7 @@ class X2goServerSessionList(object): L{X2goServerSessionList} is used to store all information that is retrieved from a connected X2go server on a L{X2goSession.list_sessions()} call. + """ sessions = {} @@ -239,6 +247,7 @@ class X2goServerSessionList(object): session separated by a newline character. Session values are separated by Unix Pipe Symbols ('|') @type x2go_output: str + """ lines = x2go_output.split("\n") for line in lines: @@ -314,6 +323,7 @@ class X2goSession(paramiko.SSHClient): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ associated = False params = None @@ -336,6 +346,7 @@ class X2goSession(paramiko.SSHClient): cache_type="unix-kde", kblayout='us', kbtype='pc105/us', session_type="application", snd_system='pulse', cmd=None, rootdir=None, proxy_class=None, + profile_name='UNKNOWN', profile_id=utils._genSessionProfileId(), print_action=None, print_action_args={}, logger = None, loglevel=log.loglevel_DEFAULT, *args, **kwargs): @@ -343,8 +354,8 @@ class X2goSession(paramiko.SSHClient): Initialize an X2go session. With the X2goSession class you can start new X2go sessions, resume suspended sessions or suspend resp. terminate currently running sessions on a connected X2go server. - """ + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) else: @@ -378,11 +389,9 @@ class X2goSession(paramiko.SSHClient): self._mk_session_rootdir(self.params.rootdir) paramiko.SSHClient.__init__(self, *args, **kwargs) - def __del__(self): self._x2go_tidy_up() - def _mk_session_rootdir(self, d): try: @@ -406,13 +415,11 @@ class X2goSession(paramiko.SSHClient): else: raise exceptions.X2goSessionException('the Paramiko/SSH client is not connected') - def _x2go_sftp_put(self, local_path, remote_path, loglevel=log.loglevel_INFO): self.logger('sFTP-put: %s -> %s:%s' % (local_path, self.session_info.hostname, remote_path), loglevel) self.sftp_client.put(local_path, remote_path) - def _x2go_sftp_write(self, remote_path, content, loglevel=log.loglevel_INFO): self.logger('sFTP-write: opening remote file %s on host %s for writing' % (remote_path, self.session_info.hostname), loglevel=log.loglevel_DEBUG) @@ -421,13 +428,11 @@ class X2goSession(paramiko.SSHClient): remote_fileobj.write(content) remote_fileobj.close() - def _x2go_sftp_remove(self, remote_path, loglevel=log.loglevel_INFO): self.logger('sFTP-write: removing remote file %s on host %s' % (remote_path, self.session_info.hostname), loglevel) self.sftp_client.remove(remote_path) - @property def _x2go_remote_home(self): @@ -438,14 +443,12 @@ class X2goSession(paramiko.SSHClient): else: return self._remote_home - @property def _x2go_session_auth_rsakey(self): if self._session_auth_rsakey is None: self._session_auth_rsakey = paramiko.RSAKey.generate(defaults.RSAKEY_STRENGTH) return self._session_auth_rsakey - def _x2go_tidy_up(self): if self.proxy is not None: @@ -527,6 +530,7 @@ class X2goSession(paramiko.SSHClient): @raise SSHException: if there was any other error connecting or establishing an SSH session @raise socket.error: if a socket error occurred while connecting + """ if add_to_known_hosts: self.set_missing_host_key_policy(paramiko.AutoAddPolicy()) @@ -581,13 +585,13 @@ class X2goSession(paramiko.SSHClient): self.guardian_thread.start() self.guardian_thread.active_threads.append(self.get_transport()) - def start(self, **kwargs): """\ Start a new X2go session. The L{X2goSession.start()} method accepts any parameter that can be passed to the class constructor. + """ self.params.update(kwargs) @@ -626,7 +630,6 @@ class X2goSession(paramiko.SSHClient): self.associated = True - def start_sound(self): """\ Initialize Paramiko/SSH reverse forwarding tunnel for X2go sound. @@ -635,6 +638,7 @@ class X2goSession(paramiko.SSHClient): - Pulse Audio - Esound + """ _tunnel = None ssh_transport = self.get_transport() @@ -691,10 +695,10 @@ class X2goSession(paramiko.SSHClient): # tunnel has already been started and might simply need a resume call ssh_transport.reverse_tunnels['snd'][1].resume() - def start_sshfs(self): """\ Initialize Paramiko/SSH reverse forwarding tunnel for X2go folder sharing. + """ # start reverse SSH tunnel for sshfs (folder sharing, printing) ssh_transport = self.get_transport() @@ -715,7 +719,6 @@ class X2goSession(paramiko.SSHClient): # tunnel has already been started and might simply need a resume call ssh_transport.reverse_tunnels['sshfs'][1].resume() - def _x2go_pause_rev_fw_tunnel(self, name): # pause reverse SSH tunnel of name <name> ssh_transport = self.get_transport() @@ -723,24 +726,24 @@ class X2goSession(paramiko.SSHClient): if _tunnel is not None: _tunnel.pause() - def stop_sound(self): """\ Shutdown (pause) Paramiko/SSH reverse forwarding tunnel for X2go sound. + """ self._x2go_pause_rev_fw_tunnel('sound') - def stop_sshfs(self): """\ Shutdown (pause) Paramiko/SSH reverse forwarding tunnel for X2go folder sharing. + """ self._x2go_pause_rev_fw_tunnel('sshfs') - def start_printing(self): """\ Initialize X2go print spooling. + """ spool_dir = '%s/spool' % self.session_info.local_container if not os.path.exists(spool_dir): @@ -754,10 +757,10 @@ class X2goSession(paramiko.SSHClient): self.print_queue.start() self.guardian_thread.active_threads.append(self.print_queue) - def set_print_action(self, print_action, **kwargs): """\ STILL UNDOCUMENTED + """ self.print_queue.set_print_action(print_action, logger=self.logger, **kwargs) @@ -765,11 +768,11 @@ class X2goSession(paramiko.SSHClient): def stop_printing(self): """\ Shutdown (pause) the X2go Print Queue thread. + """ if self.print_queue is not None: self.print_queue.pause() - def share_local_folder(self, folder_name=None, folder_type='disk'): """\ Share a local folder with the X2go session. @@ -783,6 +786,7 @@ class X2goSession(paramiko.SSHClient): @return: returns C{True} if the local folder has been successfully mounted within the X2go server session @rtype: bool + """ if folder_name is None: self.logger('no folder name given...', log.loglevel_WARN) @@ -838,7 +842,6 @@ class X2goSession(paramiko.SSHClient): (stdin, stdout, stderr) = self._x2go_exec_command(cmd_line) self.logger('x2gomountdirs output is : %s' % stdout.read().split('\n'), log.loglevel_INFO) - def run_command(self, cmd=None): """\ Run a command in this session. @@ -853,6 +856,7 @@ class X2goSession(paramiko.SSHClient): @return: stdout.read() and stderr.read() as returned by the run command on the X2go server @rtype: tuple of str + """ if cmd in ("", None): if self.params.cmd is None: @@ -880,7 +884,6 @@ class X2goSession(paramiko.SSHClient): return stdout.read(), stderr.read() - def list_sessions(self, raw=False): """\ List all sessions of current user on the connected server. @@ -893,6 +896,7 @@ class X2goSession(paramiko.SSHClient): if the raw argument is set, the plain text output of the x2golistsessions command is returned @rtype: L{X2goServerSessionList} instance or str + """ (stdin, stdout, stderr) = self._x2go_exec_command("x2golistsessions") @@ -902,7 +906,6 @@ class X2goSession(paramiko.SSHClient): sessions = X2goServerSessionList(stdout.read()).sessions return sessions - def ok(self): """\ Returns C{True} if this X2go session is up and running, @@ -910,10 +913,10 @@ class X2goSession(paramiko.SSHClient): @return: X2go session OK? @rtype: bool + """ return bool(self.session_info.name and (self.proxy_subprocess and self.proxy_subprocess.poll() is None)) - def is_running(self): """\ Returns C{True} if this X2go session is in running state ('R'), @@ -921,13 +924,13 @@ class X2goSession(paramiko.SSHClient): @return: X2go session running? @rtype: bool + """ session_infos = self.list_sessions() if self.session_info.name in session_infos.keys(): return session_infos[self.session_info.name].status == "R" return False - def is_suspended(self): """\ Returns C{True} if this X2go session is in suspended state ('S'), @@ -935,13 +938,13 @@ class X2goSession(paramiko.SSHClient): @return: X2go session suspended? @rtype: bool + """ session_infos = self.list_sessions() if self.session_info.name in session_infos.keys(): return session_infos[self.session_info.name].status == "S" return False - def has_terminated(self): """\ Returns C{True} if this X2go session is not in the session list on the @@ -952,11 +955,11 @@ class X2goSession(paramiko.SSHClient): @return: X2go session has terminate? @rtype: bool + """ session_infos = self.list_sessions() return self.session_info.name not in session_infos.keys() - def associate(self, session_name): """\ Associate L{session_name} with an available (state 'R' or 'S') @@ -964,6 +967,7 @@ class X2goSession(paramiko.SSHClient): @param session_name: X2go name of an available session. @type session_name: str + """ self.associated = False try: @@ -977,7 +981,6 @@ class X2goSession(paramiko.SSHClient): pass return self.associated - def resume(self, **kwargs): """\ Resume a running/suspended X2go session. @@ -987,6 +990,7 @@ class X2goSession(paramiko.SSHClient): @return: True if the session could be successfully resumed @rtype: bool + """ if self.associated: self.params.update(kwargs) @@ -1038,6 +1042,7 @@ class X2goSession(paramiko.SSHClient): @return: True if the session could be successfully suspended @rtype: bool + """ _ret = False if session_name is not None: @@ -1061,7 +1066,6 @@ class X2goSession(paramiko.SSHClient): return _ret - def terminate(self, session_name=None): """\ Terminate either this or another available X2go session on the connected @@ -1075,6 +1079,7 @@ class X2goSession(paramiko.SSHClient): @return: True if the session could be successfully terminate @rtype: bool + """ _ret = False if session_name is not None: @@ -1088,7 +1093,7 @@ class X2goSession(paramiko.SSHClient): elif self.associated: self.logger('terminating associated session: %s' % self.session_info, log.loglevel_INFO) - (stdin, stdout, stderr) = self.exec_command("x2goterminate-session %s" % self.session_info, loglevel=log.loglevel_DEBUG) + (stdin, stdout, stderr) = self._x2go_exec_command("x2goterminate-session %s" % self.session_info, loglevel=log.loglevel_DEBUG) dummy_stdout = stdout.read() dummy_stderr = stderr.read() self.session_info.clear() diff --git a/x2go/settings.py b/x2go/settings.py index 3c01824..c2ad480 100644 --- a/x2go/settings.py +++ b/x2go/settings.py @@ -24,23 +24,26 @@ __NAME__ = 'x2gosettings-pylib' # modules import os -import ConfigParser -import StringIO # Python X2go modules -from defaults import LOCAL_HOME as _LOCAL_HOME +import log +from defaults import LOCAL_HOME as _current_home from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR +from defaults import X2GO_SETTINGS_CONFIGFILES +from defaults import X2GO_CLIENTSETTINGS_DEFAULTS +import inifiles -DEFAULT_PRINTING_CONFIGS = [ - '/etc/x2goclient/printing', - os.path.join(_LOCAL_HOME, _X2GO_CLIENT_ROOTDIR, 'printing'), -] - -class X2goClientSettings(ConfigParser.SafeConfigParser): +class X2goClientSettings(inifiles.X2goIniFile): """\ - NOT IMPLEMENTED YET + (Generally) file based settings for X2goClient instances. + """ - def load(self): - pass + defaultValues = X2GO_CLIENTSETTINGS_DEFAULTS + + def __init__(self, config_files=X2GO_SETTINGS_CONFIGFILES, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT): + """\ + STILL UNDOCUMENTED + """ + inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel) diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py index a7ab7b1..49af2b2 100644 --- a/x2go/sftpserver.py +++ b/x2go/sftpserver.py @@ -27,6 +27,7 @@ does not need a locally installed SSH daemon on the client side machine. The Python X2go sFTP server code was originally written by Richard Murri, for further information see his website: http://www.richardmurri.com + """ __NAME__ = "x2gosftpserver-pylib" @@ -47,10 +48,12 @@ class _SSHServer(paramiko.ServerInterface): """\ Implementation of a basic SSH server that is supposed to run with his sFTP server implementation. + """ def __init__(self, auth_key=None, logger=None, loglevel=log.loglevel_DEFAULT, *args, **kwargs): """\ Initialize a new sFTP server interface. + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -66,15 +69,16 @@ class _SSHServer(paramiko.ServerInterface): def check_channel_request(self, kind, chanid): """\ Only allow session requests. + """ if kind == 'session': return paramiko.OPEN_SUCCEEDED return paramiko.OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED - def check_auth_publickey(self, username, key): """\ Ensure proper authentication. + """ if username == self.current_local_user: self.logger('sFTP server %s: username is %s' % (self, self.current_local_user), loglevel=log.loglevel_DEBUG) @@ -84,10 +88,10 @@ class _SSHServer(paramiko.ServerInterface): self.logger('sFTP server %s: publickey auth failed' % (self), loglevel=log.loglevel_WARN) return paramiko.AUTH_FAILED - def get_allowed_auths(self, username): """\ Only allow public key authentication. + """ return 'publickey' @@ -95,6 +99,7 @@ class _SSHServer(paramiko.ServerInterface): class _SFTPHandle(paramiko.SFTPHandle): """\ Represents a handle to an open file. + """ def stat(self): try: @@ -106,10 +111,12 @@ class _SFTPHandle(paramiko.SFTPHandle): class _SFTPServerInterface(paramiko.SFTPServerInterface): """\ sFTP server implementation. + """ def __init__(self, server, chroot=None, logger=None, loglevel=log.loglevel_DEFAULT, server_event=None, *args, **kwargs): """\ Make user information accessible as well as set chroot jail directory. + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -121,7 +128,6 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): self.logger('sFTP server: initializing new channel...', loglevel=log.loglevel_DEBUG) self.CHROOT = chroot or '/tmp' - def _realpath(self, path): """\ Enforce the chroot jail. @@ -130,10 +136,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): path = path.replace('//','/') return path - def list_folder(self, path): """\ List the contents of a folder. + """ path = self._realpath(path) self.logger('sFTP server: listing files in folder: %s' % path, loglevel=log.loglevel_DEBUG_SFTPXFER) @@ -157,10 +163,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): self.logger('sFTP server %s: encountered error: %s' % (self, str(e)), loglevel=log.loglevel_DEBUG_SFTPXFER) return paramiko.SFTPServer.convert_errno(e.errno) - def stat(self, path): """\ Stat on a file. + """ path = self._realpath(path) self.logger('sFTP server %s: calling stat on path: %s' % (self, path), loglevel=log.loglevel_DEBUG_SFTPXFER) @@ -170,10 +176,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): self.logger('sFTP server %s: encountered error: %s' % (self, str(e)), loglevel=log.loglevel_DEBUG_SFTPXFER) return paramiko.SFTPServer.convert_errno(e.errno) - def lstat(self, path): """\ LStat on a file. + """ path = self._realpath(path) self.logger('sFTP server: calling lstat on path: %s' % path, loglevel=log.loglevel_DEBUG_SFTPXFER) @@ -183,7 +189,6 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): self.logger('sFTP server %s: encountered error: %s' % (self, str(e)), loglevel=log.loglevel_DEBUG_SFTPXFER) return paramiko.SFTPServer.convert_errno(e.errno) - def open(self, path, flags, attr): """\ Open a file.for reading, writing, appending etc. @@ -230,7 +235,6 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): fobj.writefile = f return fobj - def remove(self, path): """\ Remove a file. @@ -239,10 +243,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): self.logger('sFTP server %s: removing file: %s' % (self, path), loglevel=log.loglevel_DEBUG_SFTPXFER) return paramiko.SFTP_OK - def rename(self, oldpath, newpath): """\ Rename/Move a file. + """ self.logger('sFTP server %s: renaming path from %s to %s' % (self, oldpath, newpath), loglevel=log.loglevel_DEBUG_SFTPXFER) oldpath = self._realpath(oldpath) @@ -254,10 +258,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): return paramiko.SFTPServer.convert_errno(e.errno) return paramiko.SFTP_OK - def mkdir(self, path, attr): """\ Make a directory. + """ self.logger('sFTP server: creating new dir (perms: %s): %s' % (attr.st_mode, path), loglevel=log.loglevel_DEBUG_SFTPXFER) path = self._realpath(path) @@ -268,10 +272,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): return paramiko.SFTPServer.convert_errno(e.errno) return paramiko.SFTP_OK - def rmdir(self, path): """\ Remove a directory (if needed recursively). + """ self.logger('sFTP server %s: removing dir: %s' % (self, path), loglevel=log.loglevel_DEBUG_SFTPXFER) path = self._realpath(path) @@ -282,10 +286,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): return paramiko.SFTPServer.convert_errno(e.errno) return paramiko.SFTP_OK - def chattr(self, path, attr): """\ Change file attributes. + """ self.logger('sFTP server %s: modifying attributes of path: %s' % (self, path), loglevel=log.loglevel_DEBUG_SFTPXFER) path = self._realpath(path) @@ -299,10 +303,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): return paramiko.SFTPServer.convert_errno(e.errno) return paramiko.SFTP_OK - def symlink(self, target_path, path): """\ Create a symbolic link. + """ self.logger('sFTP server %s: creating symlink from: %s to target: %s' % (self, path, target_path), loglevel=log.loglevel_DEBUG_SFTPXFER) path = self._realpath(path) @@ -315,10 +319,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): return paramiko.SFTPServer.convert_errno(e.errno) return paramiko.SFTP_OK - def readlink(self, path): """\ Read the target of a symbolic link. + """ path = self._realpath(path) try: @@ -327,10 +331,10 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface): self.logger('sFTP server %s: encountered error: %s' % (self, str(e)), loglevel=log.loglevel_DEBUG_SFTPXFER) return paramiko.SFTPServer.convert_errno(e.errno) - def session_ended(self): """\ Tidy up when the sFTP session has ended. + """ if self.server_event is not None: self.logger('sFTP server %s: session has ended' % self, loglevel=log.loglevel_DEBUG_SFTPXFER) @@ -342,6 +346,7 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel): A reverse fowarding tunnel with an sFTP server at its endpoint. This blend of a Paramiko/SSH reverse forwarding tunnel is used to provide access to local X2go client folders from within the the remote X2go server session. + """ def __init__(self, server_port, ssh_transport, auth_key=None, logger=None, loglevel=log.loglevel_DEFAULT): """\ @@ -362,6 +367,7 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel): @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel @type loglevel: int + """ if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -382,7 +388,6 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel): self.daemon = True self._accept_channels = True - def run(self): """\ This method gets run once an L{X2goRevFwTunnelToSFTP} has been started with its @@ -401,6 +406,7 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel): The channel will last till the connection gets dropped on the X2go server side or until the tunnel gets paused by an L{X2goRevFwTunnelToSFTP.pause()} call or stopped via the C{X2goRevFwTunnelToSFTP.stop_thread()} method. + """ self._requested_port = self.ssh_transport.request_port_forward('', self.server_port, handler=rforward.x2go_transport_tcp_handler) self._keepalive = True @@ -431,7 +437,6 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel): self.open_channels['[%s]:%s' % _chan.origin_addr] = _new_chan_thread - def x2go_rev_forward_sftpchannel_handler(chan=None, auth_key=None, logger=None): """\ Handle incoming sFTP channels that got setup by an L{X2goRevFwTunnelToSFTP} instance. @@ -453,6 +458,7 @@ def x2go_rev_forward_sftpchannel_handler(chan=None, auth_key=None, logger=None): @param logger: you can pass an L{X2goLogger} object to the L{X2goProxy} constructor @type logger: C{X2goLogger} instance + """ if logger is None: def _dummy_logger(msg, l): diff --git a/x2go/utils.py b/x2go/utils.py index 19122cd..0a822ba 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -19,23 +19,36 @@ """\ Python X2go helper functions, constants etc. + """ __NAME__ = 'x2goutils-pylib' -import sys, os +import sys +import os import re +import types +import copy import paramiko +# Python X2go modules import defaults + def is_in_nx3packmethods(method): + """\ Test if a given compression method is valid for NX3 Proxy. + """ return method in defaults._pack_methods_nx3 def find_session_line_in_x2golistsessions(session_name, x2go_stdout): + """\ + Return the X2go session meta info as output by x2golistsessions command + for session C{session_name}. + + """ sessions = stdout.read().split("\n") for line in sessions: # skip empty lines @@ -47,12 +60,151 @@ def find_session_line_in_x2golistsessions(session_name, x2go_stdout): def slugify(value): - """ + """\ Normalizes string, converts to lowercase, removes non-alpha characters, and converts spaces to hyphens. + """ import unicodedata value = unicodedata.normalize('NFKD', unicode(value)).encode('ascii', 'ignore') value = re.sub('[^\w\s-]', '', value).strip().lower() return value +def _genSessionProfileId(): + """\ + Generate a session profile ID as used in x2goclient's sessions config file. + """ + import datetime + return datetime.datetime.utcnow().strftime('%Y%m%d%H%m%S%f') + + +def _checkIniFileDefaults(defaults): + """\ + Check an ini file data structure passed on by a user app or class. + + """ + if defaults is None: + return False + if type(defaults) is not types.DictType: + return False + for sub_dict in defaults.values(): + if type(sub_dict) is not types.DictType: + return False + return True + + +def _checkSessionProfileDefaults(defaults): + """\ + Check the data structure of a default session profile passed by a user app. + + """ + if defaults is None: + return False + if type(defaults) is not types.DictType: + return False + return True + + +def _convert_config2params(_config): + + _params = copy.deepcopy(_config) + + _rename_dict = { + 'host': 'server', + 'user': 'username', + 'soundsystem': 'snd_system', + 'type': 'kbtype', + 'layout': 'kblayout', + 'speed': 'link', + 'sshport': 'port', + 'export': 'share_local_folders', + 'print': 'printing', + 'name': 'profile_name', + 'key': 'key_filename', + 'command': 'cmd', + } + _speed_dict = { + '1': 'modem', + '2': 'isdn', + '3': 'adsl', + '4': 'wan', + '5': 'lan', + } + + for opt, val in _config.iteritems(): + + # rename options if necessary + if opt in _rename_dict.keys(): + del _params[opt] + opt = _rename_dict[opt] + _params[opt] = val + + # translate integer values for connection speed to readable strings + if opt == 'link': + val = str(val).lower() + if val in _speed_dict.keys(): + val = _speed_dict[val] + val = val.lower() + _params['link'] = val + + # share_local_folders is a list + if opt == 'share_local_folders': + if type(val) is types.StringType: + if val: + _params[opt] = _params[opt].split(',') + else: + _params[opt] = [] + #del _params['export'] + if not _config['fstunnel']: + _params[opt] = None + + if not val: + val = None + + # append value for quality to value for pack method + if _params['quality']: + _params['pack'] = '%s-%s' % (_params['pack'], _params['quality']) + del _params['quality'] + + del _params['fstunnel'] + + if not _config['fullscreen']: + _params['geometry'] = '%sx%s' % (_config['width'], _config['height']) + else: + _params['geometry'] = 'fullscreen' + del _params['width'] + del _params['height'] + del _params['fullscreen'] + + if not _config['sound']: + snd_system = 'none' + del _params['sound'] + + if _config['rootless']: + _params['session_type'] = 'application' + else: + _params['session_type'] = 'desktop' + del _params['rootless'] + + # currently ignored in Python X2go, use it for client implementations + _ignored_config_options = [ + 'iconvto', + 'iconvfrom', + 'useiconv', + 'dpi', + 'setdpi', + 'usekbd', + 'startsoundsystem', + 'soundtunnel', + 'defsndport', + 'sndport', + 'icon', + 'applications', + 'rdpoptions', + 'rdpserver', + 'xdmcpserver', + 'default', + ] + for i in _ignored_config_options: + del _params[i] + return _params \ No newline at end of file diff --git a/x2go/exceptions.py b/x2go/x2go_exceptions.py similarity index 96% rename from x2go/exceptions.py rename to x2go/x2go_exceptions.py index 53452e6..142b2e1 100644 --- a/x2go/exceptions.py +++ b/x2go/x2go_exceptions.py @@ -19,6 +19,7 @@ """\ Python X2go exceptions. + """ __NAME__ = 'x2goexceptions-pylib' @@ -46,5 +47,4 @@ class X2goSessionException(_X2goException): pass class X2goProfileException(_X2goException): pass class X2goSettingsException(_X2goException): pass class X2goFwTunnelException(_X2goException): pass -class X2goRevFwTunnelException(_X2goException): pass - +class X2goRevFwTunnelException(_X2goException): pass \ No newline at end of file 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 - twofactorauth (branch) updated: 18385858e6fef356682e81f668faddfac864c395
by git-admin＠x2go.org 14 Sep '13

14 Sep '13

The branch, twofactorauth has been updated via 18385858e6fef356682e81f668faddfac864c395 (commit) from ce981684654d333b61219c0b76e625d7c38561f2 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/inifiles.py | 213 +++++++++++++++++++++++++++ x2go/registry.py | 420 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 633 insertions(+) create mode 100644 x2go/inifiles.py create mode 100644 x2go/registry.py The diff of changes is: diff --git a/x2go/inifiles.py b/x2go/inifiles.py new file mode 100644 index 0000000..e0a8c2a --- /dev/null +++ b/x2go/inifiles.py @@ -0,0 +1,213 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# +# Python X2go is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Python X2go 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. +# +# This code was initially written by: +# 2010 Dick Kniep <dick.kniep(a)lindix.nl> +# +# Other contributors: +# none so far + +"""\ +X2goProcessIniFile - helper class for parsing .ini files +""" +__NAME__ = 'x2goinifiles-pylib' + + +# modules +import os +import ConfigParser +import types +import cStringIO + +# Python X2go modules +from defaults import LOCAL_HOME as _current_home +import log +import utils + +class X2goIniFile(object): + """ + Base class to process the different ini files used by X2o + clients. Primarily used to standardize the content of the + ini file. + If entries are omitted in the file, they are filled with + default values, so the resulting objects always contain + the same fields + + @param logger: you can pass an L{X2goLogger} object to the + L{X2goFwServer} constructor + @type logger: L{X2goLogger} instance + @param loglevel: if no L{X2goLogger} object has been supplied a new one will be + constructed with the given loglevel + @type loglevel: int + """ + defaultValues = { + 'none': { + 'none': 'empty', + }, + } + write_user_config = False + user_config_file = None + + def __init__(self, config_files, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT): + """\ + STILL UNDOCUMENTED + + """ + if logger is None: + self.logger = log.X2goLogger(loglevel=loglevel) + else: + self.logger = copy.deepcopy(logger) + self.logger.tag = __NAME__ + + if utils._checkIniFileDefaults(defaults): + self.defaultValues = defaults + + # we purposefully do not inherit the SafeConfigParser class + # here as we do not want to run into name conflicts between + # X2go ini file options and method / property names in + # SafeConfigParser... This is a pre-cautious approach... + self.iniConfig = ConfigParser.SafeConfigParser() + self.iniConfig.optionxform = str + + self.logger('proposed config files are %s' % config_files, log.loglevel_INFO, ) + _found_config_files = self.iniConfig.read(config_files) + self.logger('config files found: %s' % _found_config_files or 'none', log.loglevel_INFO, ) + + for file_name in _found_config_files: + if file_name.startswith(_current_home): + # we will use the first file found in the user's home dir for writing modifications + self.user_config_file = file_name + break + + self._fill_defaults() + self._updateDataObject() + + def __repr__(self): + result = 'X2goIniFile(' + for p in dir(self): + if '__' in p or not p in self.__dict__ or type(p) is InstanceType: continue + result += p + '=' + str(self.__dict__[p]) + return result + ')' + + def _storeValue(self, section, key, value): + """\ + STILL UNDOCUMENTED + + """ + if type(value) is types.StringType: + self.iniConfig.set(section,key,value) + elif type(value) is types.BooleanType: + self.iniConfig.set(section,key,str(int(value))) + else: + self.iniConfig.set(section,key,str(value)) + + def _fill_defaults(self): + """\ + STILL UNDOCUMENTED + + """ + for section, sectionvalue in self.defaultValues.items(): + for key, value in sectionvalue.items(): + if self.iniConfig.has_option(section, key): continue + if not self.iniConfig.has_section(section): + self.iniConfig.add_section(section) + self._storeValue(section, key, value) + self._updateDataObject + + def update(self, section, key, value): + """\ + STILL UNDOCUMENTED + + """ + if not self.iniConfig.has_section(section): + self.iniConfig.add_section(section) + self._storeValue(section, key, value) + self.write_config = True + self._updateDataObject() + + def write(self): + """\ + STILL UNDOCUMENTED + + """ + if self.user_config_file and self.write_user_config: + fd = open(self.user_config_file, 'wb') + self.iniConfig.write(fd) + fd.close() + self.write_config = False + + def get_type(self, section, option): + """\ + STILL UNDOCUMENTED + + """ + return type(self.defaultValues[section][option]) + + def get(self, section, key, key_type=None): + """\ + STILL UNDOCUMENTED + + """ + if self.iniConfig.has_option(section, key): + if key_type is types.BooleanType: + return self.iniConfig.getboolean(section, key) + elif key_type is types.IntType: + return self.iniConfig.getint(section, key) + else: + return self.iniConfig.get(section, key) + __call__ = get + + def _updateDataObject(self): + """\ + This routine transfers the ini file's config items into simple + object data properties of the form:: + + <X2goIniFile instance>.<section_name>.<option_name> = value + + """ + class ini_section(object): + def __str__(self): + return self.name + def __repr__(self): + return "<%s instance: %s>" % (self.__class__, self.name) + def __init__(self, name): + self.name = name + def set_option(self, option_name, value): + setattr(self, option_name, value) + + for section_name in self.iniConfig.sections(): + section = ini_section(section_name) + for option_name in self.iniConfig.options(section.name): + if section.name in self.defaultValues and option_name in self.defaultValues[section.name]: + section.set_option(option_name, self.get(section.name, option_name, self.get_type(section.name, option_name))) + else: + section.set_option(option_name, self.get(section.name, option_name)) + setattr(self, section.name, section) + + @property + def printable_config_file(self): + """\ + STILL UNDOCUMENTED + + """ + stdout = cStringIO.StringIO() + self.iniConfig.write(stdout) + _ret_val = stdout.getvalue() + stdout.close() + return _ret_val diff --git a/x2go/registry.py b/x2go/registry.py new file mode 100644 index 0000000..feaee77 --- /dev/null +++ b/x2go/registry.py @@ -0,0 +1,420 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# +# Python X2go is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Python X2go 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. + +"""\ +X2goSessionRegistry class - managing x2goclient session profiles. +""" +__NAME__ = 'x2gosessregistry-pylib' + +import copy +import types +import uuid + +# Python X2go modules +import profiles +import log +import utils +import session +from x2go_exceptions import * + + +class X2goRegistryProfile(object): + def __init__(self): + self.uuid = uuid.uuid1() + def __str__(self): + return '%s - %s (%s)' % (self.uuid, self.profile_name, self.profile_id, ) + def __repr__(self): + result = 'X2goRegistryProfile(' + for p in dir(self): + if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue + result += p + '=' + str(self.__dict__[p]) + ', ' + return result + ')' + + +class X2goSessionRegistry(object): + """\ + STILL UNDOCUMENTED + + """ + def __init__(self, logger=None, loglevel=log.loglevel_DEFAULT): + """\ + STILL UNDOCUMENTED + + """ + if logger is None: + self.logger = log.X2goLogger(loglevel=loglevel) + else: + self.logger = logger + self.logger.tag = __NAME__ + + self.registry = {} + self.profiles = profiles.X2goClientSessions(logger=logger) + + def __repr__(self): + result = 'X2goSessionRegistry(' + for p in dir(self): + if '__' in p or not p in self.__dict__ or type(p) is InstanceType: continue + result += p + '=' + str(self.__dict__[p]) + return result + ')' + + def read_session_profiles(self): + """\ + STILL UNDOCUMENTED + + """ + # import sessions file into registry + for profile_id in self.profiles.profile_ids: + profile_name = self.profiles.get_profile_name(profile_id) + profile_config = self.profiles.get_profile_config(profile_id) + self.register_by_profile_config(profile_name, profile_id=profile_id, **profile_config) + + def __call__(self, session_uuid): + """\ + STILL UNDOCUMENTED + + """ + return self.registry[session_uuid] + + def get_profile_id(self, session_uuid): + """\ + STILL UNDOCUMENTED + + """ + _profile_ids = [ p for p in self.profile_ids if self.get_profile_name(p) == profile_name ] + if len(_profile_ids) == 1: + return _profile_ids[0] + elif len(_profile_ids) == 0: + return None + else: + raise X2goProfileException('The session registry contains multiple session profiles with name: %s.' % profile_name) + + def get_profile_name(self, session_uuid): + """\ + STILL UNDOCUMENTED + + """ + return self.registry[profile_id].profile_name + + @property + def profile_names(self): + """\ + STILL UNDOCUMENTED + + """ + return [ self.registry[profile_id].profile_name for profile_id in self.registry.keys() ] + + @property + def profile_ids(self): + """\ + STILL UNDOCUMENTED + + """ + return self.registry.keys() + + def has_profile_name(self, profile_name): + """\ + STILL UNDOCUMENTED + + """ + return profile_name in self.profile_names + + def has_profile_id(self, profile_id): + """\ + STILL UNDOCUMENTED + + """ + return profile_id in self.registry.keys() + + def _check_profile_id_or_name(self, profile_id_or_name): + """\ + STILL UNDOCUMENTED + + """ + _profile_id = None + if self.has_profile_id(profile_id_or_name): + # we were given a session profile id... + _profile_id = profile_id_or_name + elif self.has_profile_name(profile_id_or_name): + # we were given a sesion profile name... + _profile_id = self.get_profile_id(profile_id_or_name) + if not _profile_id: + raise X2goProfileException('No session profile with id or name %s exists.' % profile_id_or_name) + return _profile_id + + def get_profile_config(self, profile_id_or_name): + """\ + STILL UNDOCUMENTED + + """ + _profile_id = self._check_profile_id_or_name(profile_id_or_name) + return self.registry[_profile_id].config + + def get_session_params(self, profile_id_or_name): + """\ + STILL UNDOCUMENTED + + """ + _profile_id = self._check_profile_id_or_name(profile_id_or_name) + return self.registry[_profile_id].session_params + + def has_default_profile(self): + """\ + STILL UNDOCUMENTED + + """ + return self.get_default() and True or False + + def get_default_profile(self): + """\ + STILL UNDOCUMENTED + + """ + return '...' + + def register_by_profile_config(self, profile_name, profile_id=None, **config): + """\ + STILL UNDOCUMENTED + + """ + if self.has_profile_name(profile_name): + raise X2goProfileException('X2go session profile %s already exists.' % profile_name) + else: + if not profile_id: + profile_id = utils._genSessionProfileId() + self.profiles.add_profile(profile_id, **config) + _config = self.profiles.get_profile_config(profile_id) + self.registry[profile_id] = X2goRegistryProfile() + self.registry[profile_id].profile_id = profile_id + self.registry[profile_id].profile_name = profile_name + self.registry[profile_id].profile_config = _config + _params = utils._convert_config2params(config) + self.registry[profile_id].server = _params['server'] + del _params['server'] + self.registry[profile_id].printing = _params['printing'] + del _params['printing'] + self.registry[profile_id].share_local_folders = _params['share_local_folders'] + del _params['share_local_folders'] + self.registry[profile_id].session_params = _params + # differentiate SSH options from X2go options + _session_options = copy.deepcopy(_params) + _connect_options = copy.deepcopy(_params) + + for k in _params.keys(): + if k in session._X2GO_SESSION_OPTIONS: + del _connect_options[k] + else: + del _session_options[k] + + self.logger('loading X2go profile %s...' % profile_name, log.loglevel_NOTICE) + + self.logger('X2go session options for profile %s:' % profile_name, log.loglevel_DEBUG) + for k in _session_options: + self.logger(' %s: %s' % (k, _session_options[k]), log.loglevel_DEBUG) + + self.logger('Paramiko connect options for profile %s are:' % profile_name, log.loglevel_DEBUG) + for k in _connect_options: + self.logger(' %s: %s' % (k,_connect_options[k]), log.loglevel_DEBUG) + + self.registry[profile_id].session_object = session.X2goSession(**_session_options) + self.registry[profile_id].connected = False + self.registry[profile_id].running = False + self.registry[profile_id].suspended = False + self.registry[profile_id].terminated = False + self.registry[profile_id].connect_options = _connect_options + self.registry[profile_id].session_options = _session_options + + return self.registry[profile_id].uuid + + def register_by_session_params(self, profile_name, profile_id=None, **params): + """\ + STILL UNDOCUMENTED + + """ + if self.has_profile_name(profile_name): + raise X2goProfileException('X2go session profile %s already exists.' % profile_name) + else: + if not profile_id: + profile_id = utils._genSessionProfileId() + ### TODO + #_config = utils._convert_params2config(params) + #self.profiles.add_profile(profile_id, **_config) + _config = None + self.registry[profile_id] = X2goRegistryProfile() + self.registry[profile_id].profile_id = profile_id + self.registry[profile_id].profile_name = profile_name + self.registry[profile_id].profile_config = _config + self.registry[profile_id].server = params['server'] + del params['server'] + self.registry[profile_id].printing = params['printing'] + del params['printing'] + self.registry[profile_id].share_local_folders = params['share_local_folders'] + del params['share_local_folders'] + self.registry[profile_id].session_params = params + # differentiate SSH options from X2go options + _session_options = copy.deepcopy(params) + _connect_options = copy.deepcopy(params) + + for k in params.keys(): + if k in session._X2GO_SESSION_OPTIONS: + del _connect_options[k] + else: + del _session_options[k] + + self.logger('initializing X2go profile %s...' % profile_name, log.loglevel_NOTICE) + + self.logger('X2go session options for profile %s:' % profile_name, log.loglevel_DEBUG) + for k in _session_options: + self.logger(' %s: %s' % (k, _session_options[k]), log.loglevel_DEBUG) + + self.logger('Paramiko connect options for profile %s are:' % profile_name, log.loglevel_DEBUG) + for k in _connect_options: + self.logger(' %s: %s' % (k,_connect_options[k]), log.loglevel_DEBUG) + + self.registry[profile_id].session_object = session.X2goSession(**_session_options) + self.registry[profile_id].connected = False + self.registry[profile_id].running = False + self.registry[profile_id].suspended = False + self.registry[profile_id].terminated = False + self.registry[profile_id].connect_options = _connect_options + self.registry[profile_id].session_options = _session_options + + return self.registry[profile_id].uuid + + def del_profile(self, profile_name): + """\ + STILL UNDOCUMENTED + + """ + if not self.has_profile_name(profile_name): + raise X2goProfileException('X2go session profile %s does not exist.' % profile_name) + else: + if self.registry[profile_id].connected: + raise X2goProfileException('Cannot delete, X2go session profile is connected.' % profile_name) + elif self.registry[profile_id].running: + raise X2goProfileException('Cannot delete, X2go session profile is running.' % profile_name) + else: + del self.registry[profile_id] + + def _sessionsWithState(self, state): + _x2go_single_profiles = [] + for p in self.registry.items(): + if getattr(p, state, False): + _x2go_single_profiles.append(p) + return _x2go_single_profiles + + @property + def connected_sessions(self): + """\ + STILL UNDOCUMENTED + + """ + self._sessionsWithState(self, 'connected') + + @property + def running_sessions(self): + """\ + STILL UNDOCUMENTED + + """ + self._sessionsWithState(self, 'running') + + @property + def suspended_sessions(self): + """\ + STILL UNDOCUMENTED + + """ + self._sessionsWithState(self, 'suspended') + + @property + def terminated_sessions(self): + """\ + STILL UNDOCUMENTED + + """ + self._sessionsWithState(self, 'terminated') + + @property + def has_running_session(self): + """\ + STILL UNDOCUMENTED + + """ + return len(self.running_sessions) > 0 + + @property + def list_sessions(self): + """\ + STILL UNDOCUMENTED + + """ + _available_sessions_profiles = [] + for p in self.registry.items(): + _available_session_profiles.append([p.name, p.running, p.isAlive ]) + return _available_session_profiles + + @property + def non_running_sessions(self): + """\ + STILL UNDOCUMENTED + + """ + _non_running = [] + _running = self.runningSessions + for p in self.registry.items(): + if p not in _running: + _non_running.append(p) + return _non_running + + @property + def list_non_running_sessions_by_profile_id(self): + """\ + STILL UNDOCUMENTED + + """ + return [ p.name for p in self.non_running_sessions ] + + def getX2goSessionByName(self, profile_name): + """\ + STILL UNDOCUMENTED + + """ + return self.registry[self._profileName2ProfileIds(profile_name)].session + + def getX2goSessionById(self, profile_id): + """\ + STILL UNDOCUMENTED + + """ + return self.registry[profile_id].session + + #def updProfileByNumber(self, profile): + # """\ + # STILL UNDOCUMENTED + # + # """ + # counter = 0 + # for nameKeys in self.x2gonames.keys(): + # if counter == self.current_selected_profile_nr: + # oldName = nameKeys + # break + # counter += 1 + # del self.x2gonames[oldName] + # self.x2goprofs[self.current_selected_profile_nr] = profile + # self.x2gonames[profile.name] = self.current_selected_profile_nr \ No newline at end of file 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:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits